Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2

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

13 files changed, 23 insertions, 23 deletions

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index bb13bd1c2..5a918055b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -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>
diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
index cb28455d4..941af43ac 100644
--- a/res/values-be-rBY/strings.xml
+++ b/res/values-be-rBY/strings.xml
@@ -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>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index d7dc99952..f6dc43aa9 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -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>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 7ad8f554e..4b6c9dc3c 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -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>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 044ddfbb0..6653bc16e 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -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>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 6bce59ea8..674ca4a4b 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -275,7 +275,7 @@
     <item msgid="4402541016410147505">"برازیلیا"</item>
     <item msgid="2251184440733164084">"بوینوس آیرس"</item>
     <item msgid="6202926618569004969">"گرینلند"</item>
-    <item msgid="2355275037115290628">"مونته ویدیو"</item>
+    <item msgid="2355275037115290628">"مونته ویدئو"</item>
     <item msgid="1377549694711708945">"آتلانتیک میانی"</item>
     <item msgid="3457671272126347981">"آزورس"</item>
     <item msgid="3659315141063710840">"جزایر کیپ ورد"</item>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 86fbe136d..b22b90651 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -32,7 +32,7 @@
     <string name="off_switch" msgid="3381070073851148013">"Անջատված է"</string>
     <string name="default_label" msgid="5590025289805630372">"Զարթուցիչ"</string>
     <string name="set_alarm" msgid="9148359866152726808">"Դնել զարթուցիչ"</string>
-    <string name="alarm_vibrate" msgid="3476686921490362230">"Թրթռալ"</string>
+    <string name="alarm_vibrate" msgid="3476686921490362230">"Թրթռոց"</string>
     <string name="alarm_repeat" msgid="7242985466344233206">"Կրկնել"</string>
     <string name="alert" msgid="6506982899651975645">"Զարթուցիչի զանգերանգը"</string>
     <string name="default_timer_ringtone_title" msgid="1370799536406862317">"Ժամաչափի ժամանակը սպառվել է"</string>
@@ -55,10 +55,10 @@
     <string name="alarm_alert_off_text" msgid="4472073417593915002">"Անջատված է"</string>
     <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"Հետաձգել"</string>
     <plurals name="alarm_alert_snooze_set" formatted="false" msgid="3212729193036041768">
-      <item quantity="one">Ննջում է <xliff:g id="MINUTES">%d</xliff:g> րոպեով:</item>
-      <item quantity="other">Ննջում է <xliff:g id="MINUTES">%d</xliff:g> րոպեով:</item>
+      <item quantity="one">Հետաձգվում է <xliff:g id="MINUTES">%d</xliff:g> րոպեով:</item>
+      <item quantity="other">Հետաձգվում է <xliff:g id="MINUTES">%d</xliff:g> րոպեով:</item>
     </plurals>
-    <string name="alarm_alert_snooze_until" msgid="6958013659168344550">"Ննջում է մինչև <xliff:g id="TIME">%s</xliff:g>"</string>
+    <string name="alarm_alert_snooze_until" msgid="6958013659168344550">"Հետաձգվում է մինչև <xliff:g id="TIME">%s</xliff:g>"</string>
     <string name="alarm_alert_predismiss_title" msgid="5723945586913705445">"Սպասվող ազդանշան"</string>
     <string name="missed_alarm_has_been_deleted" msgid="5295473204045979335">"Ձեր բաց թողած ազդանշանը հեռացված է"</string>
     <string name="timer_notifications_less_min" msgid="5481375048976427255">"Մնացել է մեկ րոպեից քիչ:"</string>
@@ -129,7 +129,7 @@
     <item msgid="3993530639455360921">"Կիրակի"</item>
     <item msgid="8594709368683324282">"Երկուշաբթի"</item>
   </string-array>
-    <string name="done" msgid="6509722361933858451">"Կատարված է"</string>
+    <string name="done" msgid="6509722361933858451">"Պատրաստ է"</string>
     <string name="revert" msgid="9100911171235162926">"Հետադարձել"</string>
     <string name="delete" msgid="5732434972457000541">"Ջնջել"</string>
     <string name="alarm_volume_title" msgid="8506245173912428522">"Զարթուցիչի ձայնի բարձրությունը"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index c279a084e..473a2cd1d 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -162,7 +162,7 @@
     <string name="menu_alarm" msgid="4772010125376647519">"მაღვიძარა"</string>
     <string name="menu_timer" msgid="6459070074762877114">"ტაიმერი"</string>
     <string name="menu_clock" msgid="5612760670606829805">"საათი"</string>
-    <string name="menu_stopwatch" msgid="3396117705293574701">"წამზომი"</string>
+    <string name="menu_stopwatch" msgid="3396117705293574701">"წამმზომი"</string>
     <string name="button_alarms" msgid="3907838219512538763">"მაღვიძარას დამატება"</string>
     <string name="button_cities" msgid="4555761857494501363">"ქალაქები"</string>
     <string name="button_menu" msgid="6050484561842120282">"მეტი პარამეტრი"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 53e7a0fea..1dae79751 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -209,7 +209,7 @@
     <string name="timer_stop" msgid="3361154678667736722">"ನಿಲ್ಲಿಸು"</string>
     <string name="timer_stop_all" msgid="9080780442843034376">"ಎಲ್ಲಾ ಟೈಮರ್‌ಗಳನ್ನು ನಿಲ್ಲಿಸಿ"</string>
     <string name="timer_reset" msgid="7848424809190171640">"ಮರುಹೊಂದಿಸಿ"</string>
-    <string name="timer_cancel" msgid="3572868404230815644">"ರದ್ದುಮಾಡು"</string>
+    <string name="timer_cancel" msgid="3572868404230815644">"ರದ್ದುಮಾಡಿ"</string>
     <string name="timer_canceled" msgid="7327923392567128060">"ಟೈಮರ್ ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="timer_times_up" msgid="9190440395938519009">"ಸಮಯ ಮುಗಿದಿದೆ"</string>
     <string name="timer_multi_times_up" msgid="1239104626836080409">"<xliff:g id="NUM_TIMERS">%d</xliff:g> ಟೈಮರ್‌ಗಳ ಅವಧಿ ಮೀರಿದೆ"</string>
@@ -242,7 +242,7 @@
     <string name="automatic_home_clock_summary" msgid="6020476321040807273">"ಸಮಯವು ಭಿನ್ನವಾಗಿರುವ ಪ್ರದೇಶದಲ್ಲಿ ಪ್ರಯಾಣಿಸುವಾಗ ಹೋಮ್‌ನಲ್ಲಿ ಗಡಿಯಾರ ಸೇರಿಸಿ"</string>
     <string name="home_time_zone" msgid="9199730676287974501">"ಸ್ಥಳೀಯ ಸಮಯ ವಲಯ"</string>
     <string name="home_time_zone_title" msgid="807894493443834624">"ಸ್ಥಳೀಯ ಸಮಯ ವಲಯ"</string>
-    <string name="time_picker_cancel" msgid="7437106489606013077">"ರದ್ದುಮಾಡು"</string>
+    <string name="time_picker_cancel" msgid="7437106489606013077">"ರದ್ದುಮಾಡಿ"</string>
     <string name="time_picker_set" msgid="331153175471468051">"ಸರಿ"</string>
     <string name="time_picker_time_seperator" msgid="7484926510054777041">":"</string>
     <string name="time_picker_ampm_label" msgid="6754113715199751083">"--"</string>
@@ -357,7 +357,7 @@
     <string name="night_mode_summary" msgid="1017350187324162631">"ತೀರಾ ಮಂದ ಡಿಸ್‌ಪ್ಲೇ (ಕತ್ತಲೆ ಕೊಠಡಿಗಳಿಗಾಗಿ)"</string>
     <string name="expand_alarm" msgid="7392616528943305020">"ಅಲಾರಮ್ ವಿಸ್ತರಿಸಿ"</string>
     <string name="collapse_alarm" msgid="3561772046433483980">"ಅಲಾರಮ್ ಸಂಕುಚಿಸು"</string>
-    <string name="alarm_undo" msgid="5710042601177655254">"ರದ್ದುಮಾಡು"</string>
+    <string name="alarm_undo" msgid="5710042601177655254">"ರದ್ದುಮಾಡಿ"</string>
     <string name="alarm_deleted" msgid="6131529309389084785">"ಅಲಾರಮ್ ಅಳಿಸಲಾಗಿದೆ"</string>
     <string name="slash" msgid="2077577763821006919">"/"</string>
     <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index aad9efbc1..9d8b12ef3 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -172,7 +172,7 @@
     <string name="ringtone_description" msgid="7580922112921069925">"Dzwonek"</string>
     <string name="weather_fetch_failure" msgid="3425804832021006835">"Informacje o pogodzie są w tej chwili niedostępne."</string>
     <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Usługa odtwarzania dźwięku alarmów ustawionych w zegarze"</string>
-    <string name="loading_ringtone" msgid="6523322777415268044">"Wczytywanie dzwonka…"</string>
+    <string name="loading_ringtone" msgid="6523322777415268044">"Wczytuję dzwonek…"</string>
     <string name="timer_ring_service_desc" msgid="2620214305660322415">"Usługa odtwarzania dźwięku minutników ustawionych w zegarze."</string>
     <string name="control_set_alarm" msgid="2194676418924016327">"Ustaw alarm"</string>
     <string name="menu_alarm" msgid="4772010125376647519">"Alarm"</string>
@@ -260,7 +260,7 @@
     <item msgid="917900462224167608">"Analogowy"</item>
     <item msgid="8483930821046925592">"Cyfrowy"</item>
   </string-array>
-    <string name="automatic_home_clock" msgid="6274174710735449252">"Zegar dla mojej strefy czasowej"</string>
+    <string name="automatic_home_clock" msgid="6274174710735449252">"Zegar dla domowej strefy czasowej"</string>
     <string name="automatic_home_clock_summary" msgid="6020476321040807273">"Gdy jestem w innej strefie czasowej, pokazuj też czas w moim kraju"</string>
     <string name="home_time_zone" msgid="9199730676287974501">"Domowa strefa czasowa"</string>
     <string name="home_time_zone_title" msgid="807894493443834624">"Domowa strefa czasowa"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 1016a44da..9d83bd9e8 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -205,7 +205,7 @@
     <string name="timer_delete" msgid="8699122001991909302">"මකන්න"</string>
     <string name="timer_descriptive_delete" msgid="8794915342760383536">"<xliff:g id="NUMBER_STRING">%s</xliff:g> මකන්න"</string>
     <string name="timer_plus_one" msgid="6631211310420106116">"මිනිත්තු 1 ක් එක් කරන්න"</string>
-    <string name="timer_plus_1_min" msgid="8645224089494875062">"1 මිනි එකතු කරන්න"</string>
+    <string name="timer_plus_1_min" msgid="8645224089494875062">"වි 1 එක් කරන්න"</string>
     <string name="timer_stop" msgid="3361154678667736722">"නතර කරන්න"</string>
     <string name="timer_stop_all" msgid="9080780442843034376">"සියලු ටයිමර නවත්වන්න"</string>
     <string name="timer_reset" msgid="7848424809190171640">"යළි පිහිටුවන්න"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a1312b7cb..a5137f601 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -239,7 +239,7 @@
     <item msgid="8483930821046925592">"Dijital"</item>
   </string-array>
     <string name="automatic_home_clock" msgid="6274174710735449252">"Otomatik ev saati"</string>
-    <string name="automatic_home_clock_summary" msgid="6020476321040807273">"Saat diliminin farklı olduğu bir bölgede seyahat ederken  ülkeniz için bir saat ekleyin"</string>
+    <string name="automatic_home_clock_summary" msgid="6020476321040807273">"Saat diliminin farklı olduğu bir bölgede seyahat ederken yaşadığınız yerin saatini ekleyin"</string>
     <string name="home_time_zone" msgid="9199730676287974501">"Ev saat dilimi"</string>
     <string name="home_time_zone_title" msgid="807894493443834624">"Ev saat dilimi"</string>
     <string name="time_picker_cancel" msgid="7437106489606013077">"İptal"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ee78a7675..f5b81e734 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -360,7 +360,7 @@
     <string name="night_mode_title" msgid="5983813889469616299">"夜间模式"</string>
     <string name="night_mode_summary" msgid="1017350187324162631">"将屏幕亮度调至非常低（适合光线昏暗的环境）"</string>
     <string name="expand_alarm" msgid="7392616528943305020">"展开闹钟"</string>
-    <string name="collapse_alarm" msgid="3561772046433483980">"折叠闹钟"</string>
+    <string name="collapse_alarm" msgid="3561772046433483980">"收起闹钟"</string>
     <string name="alarm_undo" msgid="5710042601177655254">"撤消"</string>
     <string name="alarm_deleted" msgid="6131529309389084785">"闹钟已删除"</string>
     <string name="alarm_select">选择铃声</string>