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

Commit bd882684 authored by Dan Pasanen's avatar Dan Pasanen
Browse files

Merge tag 'android-7.1.2_r2' into cm-14.1 

Android 7.1.2 Release 2 (N2G47E)

# gpg: Signature made Mon 03 Apr 2017 01:41:49 AM CDT
# gpg:                using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
parents ded6afbe c4dc5524

res/values-ar/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -148,11 +148,11 @@ 
    <string name="auto_silence_never" msgid="4821982647348750809">"أبدًا"</string>

  <string-array name="auto_silence_entries">

    <item msgid="3024545954917711306">"دقيقة واحدة"</item>

    <item msgid="5431906692406316549">"۵ دقائق"</item>

    <item msgid="5431906692406316549">"٥ دقائق"</item>

    <item msgid="7742728812068919959">"۱۰ دقائق"</item>

    <item msgid="2855948657259647629">"۱۵ دقيقة"</item>

    <item msgid="2855948657259647629">"١٥ دقيقة"</item>

    <item msgid="6330196381284475079">"۲۰ دقيقة"</item>

    <item msgid="7809240121716151904">"۲۵ دقيقة"</item>

    <item msgid="7809240121716151904">"٢٥ دقيقة"</item>

    <item msgid="4278641338024561333">"أبدًا"</item>

  </string-array>

    <string name="week_start_title" msgid="4268917518596832096">"بداية الأسبوع يوم"</string>

res/values-be-rBY/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ 
    <string name="every_day" msgid="4100909974923444602">"Штодзень"</string>

    <string name="day_concat" msgid="971998564991636532">", "</string>

    <string name="clock_instructions" msgid="2656876819515011590">"Выбраць гадзіннiк"</string>

    <string name="analog_gadget" msgid="1670505720837152766">"Гадзіннік са стрэлкамі"</string>

    <string name="analog_gadget" msgid="1670505720837152766">"Са стрэлкамі"</string>

    <string name="help" msgid="7786263119482654015">"даведка"</string>

    <string name="settings" msgid="5849739030579520686">"Налады"</string>

    <string name="snooze_duration_title" msgid="1097309861110780483">"Iнтэрвал паўтору"</string>

res/values-bn-rBD/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ 
    <item msgid="6836603904515182333">"L33t গুণ।"</item>

    <item msgid="7508085100680861631">"এমন বিস্ময়কর গতি।"</item>

    <item msgid="5961245252909589573">"চলুন আমরা আবার সময়ের পাকে দৌড় দিই।"</item>

    <item msgid="5211891900854545940">"কেবল বাম দিকে এ লাফই যথেষ্ট।"</item>

    <item msgid="5211891900854545940">"কেবল বাঁ দিকে এ লাফই যথেষ্ট।"</item>

    <item msgid="9071353477103826053">"তাড়াহুড়োর জন্য আপনার বিশেষ দক্ষতা আছে।"</item>

    <item msgid="3785193933691117181">"আলোর গতি।"</item>

  </string-array>

res/values-da/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ 
    <string name="gallery_button_description" msgid="1151743663255257668">"Galleri"</string>

    <string name="music_button_description" msgid="1626593420810117999">"Musik"</string>

    <string name="nightmode_button_description" msgid="990894208217576381">"Dæmp"</string>

    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>

    <string name="home_button_description" msgid="3383859096809056157">"Starter"</string>

    <string name="desk_clock_button_description" msgid="4207371097361657274">"Urvisning"</string>

    <string name="label_description" msgid="8736179296142915727">"Etiket"</string>

    <string name="ringtone_description" msgid="7580922112921069925">"Ringetone"</string>

res/values-es-rUS/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ 
    <string name="no_crescendo_duration" msgid="383801592865899932">"Desactivado"</string>

    <string name="crescendo_duration" msgid="6641284876778266541">"<xliff:g id="NUMBER">%s</xliff:g> segundos"</string>

    <string name="crescendo_picker_label" msgid="7758024047003091056">"segundos"</string>

    <string name="auto_silence_title" msgid="2012754009554434544">"Silenciar automáticamente"</string>

    <string name="auto_silence_title" msgid="2012754009554434544">"Silenciar después de"</string>

    <plurals name="auto_silence_summary" formatted="false" msgid="6579258788774360396">

      <item quantity="other"><xliff:g id="FORMATTED_NUMBER">%s</xliff:g> minutos</item>

      <item quantity="one">1 minuto</item>
@@ -239,7 +239,7 @@ 
    <item msgid="8483930821046925592">"Digital"</item>

  </string-array>

    <string name="automatic_home_clock" msgid="6274174710735449252">"Reloj local automático"</string>

    <string name="automatic_home_clock_summary" msgid="6020476321040807273">"Agrega un reloj con la hora de tu ubicación mientras recorres áreas en las que la hora es diferente."</string>

    <string name="automatic_home_clock_summary" msgid="6020476321040807273">"Agrega un reloj con la hora de tu ciudad mientras recorres áreas en las que la hora es diferente."</string>

    <string name="home_time_zone" msgid="9199730676287974501">"Zona horaria local"</string>

    <string name="home_time_zone_title" msgid="807894493443834624">"Zona horaria local"</string>

    <string name="time_picker_cancel" msgid="7437106489606013077">"Cancelar"</string>