Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf26d089 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/v3.3-t' into v1-t

parents d03afa32 3226b3b7

res/layout/bluetooth_pin_confirm.xml

+40 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


<ScrollView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_height="match_parent"

    android:layout_width="match_parent">
@@ -30,6 +31,18 @@ 
        android:layout_marginTop="@dimen/bluetooth_dialog_padding_top"

        android:orientation="vertical">



        <TextView

            android:id="@+id/pairing_confirmation_hint"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/bluetooth_dialog_padding"

            android:layout_marginBottom="12dp"

            android:layout_marginStart="@dimen/bluetooth_dialog_padding"

            android:layout_marginEnd="@dimen/bluetooth_dialog_padding"

            android:gravity="center_vertical"

            android:visibility="gone"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1" />



        <TextView

            android:id="@+id/pairing_caption"

            android:layout_width="wrap_content"
@@ -86,6 +99,32 @@ 
            android:layout_marginEnd="@dimen/bluetooth_dialog_padding"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1" />



        <androidx.constraintlayout.widget.ConstraintLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginBottom="16dp"

            android:layout_marginStart="@dimen/bluetooth_dialog_padding"

            android:layout_marginEnd="@dimen/bluetooth_dialog_padding">

            <Button

                android:id="@+id/negative_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:visibility="gone"

                android:text="@string/bluetooth_pairing_decline"

                app:layout_constraintBottom_toBottomOf="parent"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toTopOf="parent"

                style="@style/ActionPrimaryButton"/>

            <Button

                android:id="@+id/positive_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:visibility="gone"

                android:text="@string/bluetooth_pairing_accept"

                app:layout_constraintBottom_toBottomOf="parent"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintTop_toTopOf="parent"

                style="@style/ActionPrimaryButton"/>

        </androidx.constraintlayout.widget.ConstraintLayout>

    </LinearLayout>



</ScrollView>

res/layout/bluetooth_pin_entry.xml

+26 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


<ScrollView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_height="match_parent"

    android:layout_width="match_parent">
@@ -87,6 +88,30 @@ 
            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"

            android:textColor="?android:attr/textColorSecondary"/>



        <androidx.constraintlayout.widget.ConstraintLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginBottom="16dp"

            android:layout_marginStart="@dimen/bluetooth_pairing_padding"

            android:layout_marginEnd="@dimen/bluetooth_pairing_padding">

            <Button

                android:id="@+id/negative_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@android:string/cancel"

                app:layout_constraintBottom_toBottomOf="parent"

                app:layout_constraintStart_toStartOf="parent"

                app:layout_constraintTop_toTopOf="parent"

                style="@style/ActionPrimaryButton"/>

            <Button

                android:id="@+id/positive_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@android:string/ok"

                app:layout_constraintBottom_toBottomOf="parent"

                app:layout_constraintEnd_toEndOf="parent"

                app:layout_constraintTop_toTopOf="parent"

                style="@style/ActionPrimaryButton"/>

        </androidx.constraintlayout.widget.ConstraintLayout>

    </LinearLayout>



</ScrollView>

res/values-af/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -938,6 +938,8 @@ 
    <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"Van:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Bind met hierdie toestel saam?"</string>

    <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"Om saam te bind met:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Voer daarop in:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, druk dan Return of Enter."</string>

    <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Laat toegang tot jou kontakte en oproepgeskiedenis toe"</string>

    <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Gaan saambindkodes na"</string>

    <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Kyk of hierdie kode ooreenstem met die een op <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nJy moet hierdie kode om veiligheidsredes nêrens invoer nie."</string>

    <string name="bluetooth_error_title" msgid="2284738188253690278"></string>

    <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Kon nie aan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> koppel nie."</string>

    <string name="bluetooth_preference_scan_title" msgid="3460316252463771851">"Soek vir toestelle"</string>

res/values-am/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -938,6 +938,8 @@ 
    <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"ከ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ከዚህ መሣሪያ ጋር ይጣመር?"</string>

    <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"ከ:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ጋር ለማጣመር ላዩ ላይ ተይብበት:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> ከዚያም ተመለስ ወይም አስገባ ተጫን::"</string>

    <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"የእርስዎን የእውቂያዎች እና የጥሪ ታሪክ መዳረሻ ይፍቀዱ"</string>

    <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"የማጣመሪያ ኮዶችን በመፈተሽ ላይ"</string>

    <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"ይህ ኮድ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ላይ ካለው ጋር እንደሚዛመድ ይፈትሹ።\n\nለእርስዎ ደህንነት ሲባል ይህን ኮድ የትም ቦታ አያስገቡ።"</string>

    <string name="bluetooth_error_title" msgid="2284738188253690278"></string>

    <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"ወደ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ማገናኘት አልተቻለም።"</string>

    <string name="bluetooth_preference_scan_title" msgid="3460316252463771851">"መሣሪያዎችን ቃኝ"</string>

res/values-ar/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1006,6 +1006,8 @@ 
    <string name="bluetooth_incoming_pairing_msg" msgid="1068123527866596779">"‏من:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;الاقتران مع هذا الجهاز؟"</string>

    <string name="bluetooth_display_passkey_pin_msg" msgid="8672803845151786521">"‏للإقران مع:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>اكتب عليه:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ثم اضغط على Return أو Enter."</string>

    <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"السماح بالوصول إلى جهات الاتصال وسجلّ المكالمات"</string>

    <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"التحقُّق من رموز الإقران"</string>

    <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"يُرجى التأكُّد من تطابُق هذا الرمز مع الرمز المعروض على \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\".\n\nللحفاظ على أمانك، يجب عدم إدخال هذا الرمز في أي مكان."</string>

    <string name="bluetooth_error_title" msgid="2284738188253690278"></string>

    <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"تعذر الاتصال بـ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>

    <string name="bluetooth_preference_scan_title" msgid="3460316252463771851">"البحث عن أجهزة"</string>