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

Commit 6ae3fe18 authored by Dan Albert's avatar Dan Albert Committed by android-build-merger
Browse files

Merge branch \'stage-aosp-master\' of... 

Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master
am: c74dd7fc

* commit 'c74dd7fc':
  Use std::unique_ptr instead of UniquePtr.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
parents dd6d2fa5 c74dd7fc

cmds/idmap/create.cpp

+2 −2
Original line number Diff line number Diff line 
#include "idmap.h"



#include <UniquePtr.h>

#include <memory>

#include <androidfw/AssetManager.h>

#include <androidfw/ResourceTypes.h>

#include <androidfw/ZipFileRO.h>
@@ -15,7 +15,7 @@ using namespace android; 
namespace {

    int get_zip_entry_crc(const char *zip_path, const char *entry_name, uint32_t *crc)

    {

        UniquePtr<ZipFileRO> zip(ZipFileRO::open(zip_path));

        std::unique_ptr<ZipFileRO> zip(ZipFileRO::open(zip_path));

        if (zip.get() == NULL) {

            return -1;

        }

cmds/idmap/scan.cpp

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


#include "idmap.h"



#include <UniquePtr.h>

#include <memory>

#include <androidfw/ResourceTypes.h>

#include <androidfw/StreamingZipInflater.h>

#include <androidfw/ZipFileRO.h>
@@ -120,7 +120,7 @@ namespace { 


    int parse_apk(const char *path, const char *target_package_name)

    {

        UniquePtr<ZipFileRO> zip(ZipFileRO::open(path));

        std::unique_ptr<ZipFileRO> zip(ZipFileRO::open(path));

        if (zip.get() == NULL) {

            ALOGW("%s: failed to open zip %s\n", __FUNCTION__, path);

            return -1;

packages/DocumentsUI/res/values-af/strings.xml

+11 −12
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_label" msgid="2783841764617238354">"Dokumente"</string>

    <string name="title_open" msgid="4353228937663917801">"Maak oop vanaf"</string>

    <string name="title_open" msgid="4353228937663917801">"Maak oop vanuit"</string>

    <string name="title_save" msgid="2433679664882857999">"Stoor na"</string>

    <string name="menu_create_dir" msgid="5947289605844398389">"Skep vouer"</string>

    <string name="menu_grid" msgid="6878021334497835259">"Roosteraansig"</string>
@@ -29,8 +29,7 @@ 
    <string name="menu_save" msgid="2394743337684426338">"Stoor"</string>

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

    <string name="menu_delete" msgid="8138799623850614177">"Vee uit"</string>

    <string name="menu_select" msgid="8711270657353563424">"Kies \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>

    <string name="menu_select_all" msgid="4320518282375109902">"Kies almal"</string>

    <string name="menu_select_all" msgid="8323579667348729928">"Kies alles"</string>

    <string name="menu_copy" msgid="3612326052677229148">"Kopieer na …"</string>

    <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Wys interne berging"</string>

    <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Wys SD-kaart"</string>
@@ -38,8 +37,8 @@ 
    <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Versteek SD-kaart"</string>

    <string name="menu_file_size_show" msgid="3240323619260823076">"Wys lêergrootte"</string>

    <string name="menu_file_size_hide" msgid="8881975928502581042">"Versteek lêergrootte"</string>

    <string name="button_select" msgid="527196987259139214">"Kies"</string>

    <string name="button_copy" msgid="8706475544635021302">"Kopieer"</string>

    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> gekies"</string>

    <string name="sort_name" msgid="9183560467917256779">"Volgens naam"</string>

    <string name="sort_date" msgid="586080032956151448">"Volgens datum gewysig"</string>

    <string name="sort_size" msgid="3350681319735474741">"Volgens grootte"</string>
@@ -60,14 +59,14 @@ 
    <string name="share_via" msgid="8966594246261344259">"Deel via"</string>

    <string name="copy_notification_title" msgid="6374299806748219777">"Kopieer tans lêers"</string>

    <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> oor"</string>

    <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">

      <item quantity="other">Kopieer tans <xliff:g id="COUNT_1">%1$d</xliff:g> lêers.</item>

      <item quantity="one">Kopieer tans <xliff:g id="COUNT_0">%1$d</xliff:g> lêer.</item>

  <plurals name="copy_begin">

    <item quantity="one" msgid="7775181564278455087">"Kopieer tans <xliff:g id="COUNT">%1$d</xliff:g> lêer."</item>

    <item quantity="other" msgid="5175026054495572228">"Kopieer tans <xliff:g id="COUNT">%1$d</xliff:g> lêers."</item>

  </plurals>

    <string name="copy_preparing" msgid="3896202461003039386">"Maak tans gereed vir kopieer …"</string>

    <plurals name="copy_error_notification_title" formatted="false" msgid="5267616889076217261">

      <item quantity="other">Kon <xliff:g id="COUNT_1">%1$d</xliff:g> lêers nie kopieer nie</item>

      <item quantity="one">Kon <xliff:g id="COUNT_0">%1$d</xliff:g> lêer nie kopieer nie</item>

  <plurals name="copy_error_notification_title">

    <item quantity="one" msgid="2515407675631145507">"Kon <xliff:g id="COUNT">%1$d</xliff:g> lêer nie kopieer nie"</item>

    <item quantity="other" msgid="7124097894673644954">"Kon <xliff:g id="COUNT">%1$d</xliff:g> lêers nie kopieer nie"</item>

  </plurals>

    <string name="notification_touch_for_details" msgid="4483108577842961665">"Raak om besonderhede te bekyk"</string>

    <string name="retry" msgid="7564024179122207376">"Herprobeer"</string>

packages/DocumentsUI/res/values-am/strings.xml

+10 −11
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ 
    <string name="menu_save" msgid="2394743337684426338">"አስቀምጥ"</string>

    <string name="menu_share" msgid="3075149983979628146">"አጋራ"</string>

    <string name="menu_delete" msgid="8138799623850614177">"ሰርዝ"</string>

    <string name="menu_select" msgid="8711270657353563424">"«<xliff:g id="DIRECTORY">^1</xliff:g>»ን ይምረጡ"</string>

    <string name="menu_select_all" msgid="4320518282375109902">"ሁሉንም ምረጥ"</string>

    <string name="menu_select_all" msgid="8323579667348729928">"ሁሉንም ምረጥ"</string>

    <string name="menu_copy" msgid="3612326052677229148">"ቅዳ ወደ…"</string>

    <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"ውስጣዊ ማከማቻ አሳይ"</string>

    <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD ካርድ አሳይ"</string>
@@ -38,8 +37,8 @@ 
    <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD ካርድ ደብቅ"</string>

    <string name="menu_file_size_show" msgid="3240323619260823076">"የፋይል መጠን አሳይ"</string>

    <string name="menu_file_size_hide" msgid="8881975928502581042">"የፋይል መጠን ደብቅ"</string>

    <string name="button_select" msgid="527196987259139214">"ምረጥ"</string>

    <string name="button_copy" msgid="8706475544635021302">"ቅዳ"</string>

    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> ተመርጠዋል"</string>

    <string name="sort_name" msgid="9183560467917256779">"በስም"</string>

    <string name="sort_date" msgid="586080032956151448">"በተለወጠበት ቀን"</string>

    <string name="sort_size" msgid="3350681319735474741">"በመጠን"</string>
@@ -60,14 +59,14 @@ 
    <string name="share_via" msgid="8966594246261344259">"በሚከተለው በኩል ያጋሩ"</string>

    <string name="copy_notification_title" msgid="6374299806748219777">"ፋይሎች በመገልበጥ ላይ"</string>

    <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> ቀርቷል"</string>

    <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">

      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎች በመቅዳት ላይ።</item>

      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎች በመቅዳት ላይ።</item>

  <plurals name="copy_begin">

    <item quantity="one" msgid="7775181564278455087">"<xliff:g id="COUNT">%1$d</xliff:g> ፋይል በመቅዳት ላይ።"</item>

    <item quantity="other" msgid="5175026054495572228">"<xliff:g id="COUNT">%1$d</xliff:g> ፋይሎችን በመቅዳት ላይ።"</item>

  </plurals>

    <string name="copy_preparing" msgid="3896202461003039386">"ቅጂ በማዘጋጀት ላይ…"</string>

    <plurals name="copy_error_notification_title" formatted="false" msgid="5267616889076217261">

      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎችን መቅዳት አልተቻለም</item>

      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎችን መቅዳት አልተቻለም</item>

  <plurals name="copy_error_notification_title">

    <item quantity="one" msgid="2515407675631145507">"<xliff:g id="COUNT">%1$d</xliff:g> ፋይል መቅዳት አልተቻለም"</item>

    <item quantity="other" msgid="7124097894673644954">"<xliff:g id="COUNT">%1$d</xliff:g> ፋይልሎችን መቅዳት አልተቻለም"</item>

  </plurals>

    <string name="notification_touch_for_details" msgid="4483108577842961665">"ዝርዝሮችን ለመመልከት ይንኩ።"</string>

    <string name="retry" msgid="7564024179122207376">"እንደገና ይሞክሩ"</string>

packages/DocumentsUI/res/values-ar/strings.xml

+10 −19
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ 
    <string name="menu_save" msgid="2394743337684426338">"حفظ"</string>

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

    <string name="menu_delete" msgid="8138799623850614177">"حذف"</string>

    <string name="menu_select" msgid="8711270657353563424">"تحديد \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>

    <string name="menu_select_all" msgid="4320518282375109902">"تحديد الكل"</string>

    <string name="menu_select_all" msgid="8323579667348729928">"تحديد الكل"</string>

    <string name="menu_copy" msgid="3612326052677229148">"نسخ إلى…"</string>

    <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"إظهار وحدة التخزين الداخلية"</string>

    <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"‏إظهار بطاقة SD"</string>
@@ -38,8 +37,8 @@ 
    <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"‏إخفاء بطاقة SD"</string>

    <string name="menu_file_size_show" msgid="3240323619260823076">"إظهار حجم الملف"</string>

    <string name="menu_file_size_hide" msgid="8881975928502581042">"إخفاء حجم الملف"</string>

    <string name="button_select" msgid="527196987259139214">"تحديد"</string>

    <string name="button_copy" msgid="8706475544635021302">"نسخ"</string>

    <string name="mode_selected_count" msgid="459111894725594625">"تم تحديد <xliff:g id="COUNT">%1$d</xliff:g>"</string>

    <string name="sort_name" msgid="9183560467917256779">"بحسب الاسم"</string>

    <string name="sort_date" msgid="586080032956151448">"بحسب تاريخ التعديل"</string>

    <string name="sort_size" msgid="3350681319735474741">"بحسب الحجم"</string>
@@ -60,22 +59,14 @@ 
    <string name="share_via" msgid="8966594246261344259">"مشاركة عبر"</string>

    <string name="copy_notification_title" msgid="6374299806748219777">"جارٍ نسخ الملفات"</string>

    <string name="copy_remaining" msgid="6283790937387975095">"المدة المتبقية: <xliff:g id="DURATION">%s</xliff:g>"</string>

    <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">

      <item quantity="zero">جارٍ نسخ <xliff:g id="COUNT_1">%1$d</xliff:g> ملفات.</item>

      <item quantity="two">جارٍ نسخ ملفين (<xliff:g id="COUNT_1">%1$d</xliff:g>).</item>

      <item quantity="few">جارٍ نسخ <xliff:g id="COUNT_1">%1$d</xliff:g> ملفات.</item>

      <item quantity="many">جارٍ نسخ <xliff:g id="COUNT_1">%1$d</xliff:g> ملفًا.</item>

      <item quantity="other">جارٍ نسخ <xliff:g id="COUNT_1">%1$d</xliff:g> من الملفات.</item>

      <item quantity="one">جارٍ نسخ ملف واحد (<xliff:g id="COUNT_0">%1$d</xliff:g>).</item>

  <plurals name="copy_begin">

    <item quantity="one" msgid="7775181564278455087">"جارٍ نسخ <xliff:g id="COUNT">%1$d</xliff:g> ملف."</item>

    <item quantity="other" msgid="5175026054495572228">"جارٍ نسخ <xliff:g id="COUNT">%1$d</xliff:g> من الملفات."</item>

  </plurals>

    <string name="copy_preparing" msgid="3896202461003039386">"جارٍ التحضير للنسخ ..."</string>

    <plurals name="copy_error_notification_title" formatted="false" msgid="5267616889076217261">

      <item quantity="zero">لم يتعذر نسخ أية ملفات (<xliff:g id="COUNT_1">%1$d</xliff:g>)</item>

      <item quantity="two">تعذر نسخ ملفين (<xliff:g id="COUNT_1">%1$d</xliff:g>)</item>

      <item quantity="few"> تعذر نسخ <xliff:g id="COUNT_1">%1$d</xliff:g> ملفات</item>

      <item quantity="many"> تعذر نسخ <xliff:g id="COUNT_1">%1$d</xliff:g> ملفًا</item>

      <item quantity="other"> تعذر نسخ <xliff:g id="COUNT_1">%1$d</xliff:g> من الملفات</item>

      <item quantity="one"> تعذر نسخ <xliff:g id="COUNT_0">%1$d</xliff:g> ملف</item>

  <plurals name="copy_error_notification_title">

    <item quantity="one" msgid="2515407675631145507">"تعذر نسخ <xliff:g id="COUNT">%1$d</xliff:g> ملف"</item>

    <item quantity="other" msgid="7124097894673644954">"تعذر نسخ <xliff:g id="COUNT">%1$d</xliff:g> من الملفات"</item>

  </plurals>

    <string name="notification_touch_for_details" msgid="4483108577842961665">"المس لعرض التفاصيل"</string>

    <string name="retry" msgid="7564024179122207376">"إعادة المحاولة"</string>