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

Commit c90bd0c9 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge tag 'android-4.4.3_r1' into HEAD 

Android 4.4.3 release 1
parents 224a3201 3ec9a85f

res/layout/confirm_add_detail_activity.xml

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ 
            android:id="@+id/photo"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:scaleType="centerCrop"

            android:src="@drawable/ic_contact_picture_180_holo_light" />

            android:scaleType="centerCrop"/>



        <View

            android:id="@+id/photo_text_bar"

res/layout/item_photo_editor.xml

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
            android:id="@+id/photo"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:src="@drawable/ic_contact_picture_holo_light"

            android:cropToPadding="true"

            android:scaleType="centerCrop"

            android:gravity="start"

res/values-af/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ 
    <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> van <xliff:g id="TOTAL_NUMBER">%s</xliff:g> kontakte"</string>

    <string name="search_settings_description" msgid="2675223022992445813">"Name van jou kontakte"</string>

    <string name="quickcontact_missing_app" msgid="358168575340921552">"Geen program is gevind om hierdie aksie te hanteer nie."</string>

    <string name="missing_app" msgid="1466111003546611387">"Geen program is gevind om hierdie handeling te behartig nie."</string>

    <string name="menu_share" msgid="943789700636542260">"Deel"</string>

    <string name="share_via" msgid="563121028023030093">"Deel kontak met"</string>

    <string name="dialog_new_group_account" msgid="2318032089273496830">"Skep groep onder rekening"</string>

res/values-am/strings.xml

+2 −1
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ 
    <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> ከ <xliff:g id="TOTAL_NUMBER">%s</xliff:g> እውቂያዎች"</string>

    <string name="search_settings_description" msgid="2675223022992445813">"የዕውቂያዎችዎ ስሞች"</string>

    <string name="quickcontact_missing_app" msgid="358168575340921552">"ይህን እርምጃ ለማስተናገድ ምንም መተግበሪያ አልተገኘም፡፡"</string>

    <string name="missing_app" msgid="1466111003546611387">"ይህን እርምጃ የሚያከናውን ምንም መተግበሪያ አልተገኘም።"</string>

    <string name="menu_share" msgid="943789700636542260">"መጋሪያ"</string>

    <string name="share_via" msgid="563121028023030093">"ዕውቂያበ በኩል አጋራ"</string>

    <string name="dialog_new_group_account" msgid="2318032089273496830">"በመለያ ስር ቡድን ፍጠር"</string>
@@ -147,7 +148,7 @@ 
    <string name="pick_new_photo" msgid="7962368009197147617">"ከማዕከለ ስእላት አዲስ ፎቶ ምረጥ"</string>

    <string name="locale_change_in_progress" msgid="7583992153091537467">"የቋንቋ ለውጥ ለማንፀባረቅ የዕውቂያ ዝርዝር ዘምኗል።"</string>

    <string name="upgrade_in_progress" msgid="474511436863451061">"የዕውቂያ ዝርዝር ዘምኗል"</string>

    <string name="upgrade_out_of_memory" msgid="1209994418877625940">"ዕውቂያዎች በአልቅ ሂደት ውስጥ ናቸው።\n\nየአልቁ ሂደት ወደ <xliff:g id="SIZE_IN_MEGABYTES">%s</xliff:g>ሜባ አካባቢ የውስጥ ማከማቻ \n\nይጠይቃል።ከሚከተሉት አማራጮች አንዱን ምረጥ፡"</string>

    <string name="upgrade_out_of_memory" msgid="1209994418877625940">"ዕውቂያዎች በአልቅ ሂደት ውስጥ ናቸው።\n\nየአልቁ ሂደት ወደ <xliff:g id="SIZE_IN_MEGABYTES">%s</xliff:g>ሜባ አካባቢ የውስጥ ማከማቻ \n\nይጠይቃል።ከሚከተሉት አማራጮች አንዱን ይምረጡ፡"</string>

    <string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"አንዳንድ ትግበራዎችን አለመጫን"</string>

    <string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"አልቅ ድጋሚ ሞክር"</string>

    <string name="search_results_searching" msgid="3984833028938569930">"በመፈለግ ላይ…"</string>

res/values-ar/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ 
    <string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> من <xliff:g id="TOTAL_NUMBER">%s</xliff:g> من جهات الاتصال"</string>

    <string name="search_settings_description" msgid="2675223022992445813">"أسماء جهات الاتصال"</string>

    <string name="quickcontact_missing_app" msgid="358168575340921552">"لم يتم العثور على تطبيق يمكنه مباشرة هذا الإجراء."</string>

    <string name="missing_app" msgid="1466111003546611387">"لم يتم العثور على تطبيق يمكنه مباشرة هذا الإجراء."</string>

    <string name="menu_share" msgid="943789700636542260">"مشاركة"</string>

    <string name="share_via" msgid="563121028023030093">"مشاركة جهة الاتصال عبر"</string>

    <string name="dialog_new_group_account" msgid="2318032089273496830">"إنشاء مجموعة ضمن حساب"</string>