diff options
author | Geoff Mendal <mendal@google.com> | 2015-10-07 15:45:36 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-07 15:45:36 +0000 |
commit | 47e870adc8df32c2a6e2c531be115dd0b698850e (patch) | |
tree | 2d588c7b9d823f0f12ee48d253b4d732fbbf4228 | |
parent | e3d8faa5ba76f79b112dd8925189455e878e3a66 (diff) | |
parent | 7d0343ae39c6c675e72992ca2dcac70e0aae22e7 (diff) | |
download | packages_apps_Settings-47e870adc8df32c2a6e2c531be115dd0b698850e.zip packages_apps_Settings-47e870adc8df32c2a6e2c531be115dd0b698850e.tar.gz packages_apps_Settings-47e870adc8df32c2a6e2c531be115dd0b698850e.tar.bz2 |
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
-rw-r--r-- | res/values-hy-rAM/strings.xml | 2 | ||||
-rw-r--r-- | res/values-it/strings.xml | 6 | ||||
-rw-r--r-- | res/values-ja/strings.xml | 4 | ||||
-rw-r--r-- | res/values-lt/strings.xml | 4 | ||||
-rw-r--r-- | res/values-mk-rMK/strings.xml | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index 3c72c17..b181a0b 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -2899,5 +2899,5 @@ <item msgid="5363960654009010371">"Թվային բովանդակության համար հարմարեցված գույներ"</item> </string-array> <string name="picture_color_mode" msgid="4560755008730283695">"Նկարի գունային ռեժիմ"</string> - <string name="picture_color_mode_desc" msgid="1141891467675548590">"Օգտագործել sRGB-ն"</string> + <string name="picture_color_mode_desc" msgid="1141891467675548590">"Օգտագործել sRGB"</string> </resources> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index bbf5205..54996c0 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -2864,10 +2864,10 @@ <string name="system_alert_window_settings" msgid="1757821151143694951">"Spostamento su altre app"</string> <string name="system_alert_window_apps_title" msgid="7005760279028569491">"App"</string> <string name="system_alert_window_access_title" msgid="8811695381437304132">"Spostamento su altre app"</string> - <string name="permit_draw_overlay" msgid="6606018549732046201">"Consenti spostamento su altre app"</string> + <string name="permit_draw_overlay" msgid="6606018549732046201">"Consenti Posizionamento davanti ad altre appp"</string> <string name="app_overlay_permission_preference" msgid="8355410276571387439">"Autorizzazione Spostamento di app sopra"</string> <string name="allow_overlay_description" msgid="7895191337585827691">"Questa autorizzazione consente a un\'app di spostarsi sopra altre app in uso e potrebbe interferire con il tuo utilizzo dell\'interfaccia in altre applicazioni o cambiare ciò che credi di vedere in altre applicazioni."</string> - <string name="keywords_system_alert_window" msgid="8579673659566564926">"finestra dialogo avviso sistema spostamento su altre app"</string> + <string name="keywords_system_alert_window" msgid="8579673659566564926">"finestra dialogo avviso sistema Posizionamento davanti ad altre appp"</string> <string name="overlay_settings" msgid="222062091489691363">"Spostamento su altre app"</string> <string name="system_alert_window_summary" msgid="4268867238063922290">"<xliff:g id="COUNT_0">%d</xliff:g> app su <xliff:g id="COUNT_1">%d</xliff:g> sono autorizzate a spostarsi sopra altre app"</string> <string name="filter_overlay_apps" msgid="6965969283342557573">"App con autorizzazione"</string> @@ -2899,5 +2899,5 @@ <item msgid="5363960654009010371">"Colori ottimizzati per i contenuti digitali"</item> </string-array> <string name="picture_color_mode" msgid="4560755008730283695">"Modalità colori immagini"</string> - <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utilizza sRGB"</string> + <string name="picture_color_mode_desc" msgid="1141891467675548590">"Use sRGB"</string> </resources> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 87d86da..a905a2b 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -1000,9 +1000,9 @@ <string name="storage_other_users" msgid="808708845102611856">"その他のユーザー"</string> <string name="storage_internal_title" msgid="690771193137801021">"端末のストレージ"</string> <string name="storage_external_title" msgid="3433462910096848696">"外部ストレージ"</string> - <string name="storage_volume_summary" msgid="7023441974367853372">"<xliff:g id="USED">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>を使用中"</string> + <string name="storage_volume_summary" msgid="7023441974367853372">"<xliff:g id="USED">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>"</string> <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>"<xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string> - <string name="storage_volume_used" msgid="1303803057698959872">"/ <xliff:g id="TOTAL">%1$s</xliff:g>を使用中"</string> + <string name="storage_volume_used" msgid="1303803057698959872">"/ <xliff:g id="TOTAL">%1$s</xliff:g>"</string> <string name="storage_volume_used_total" msgid="6113121714019000244">"合計<xliff:g id="TOTAL">%1$s</xliff:g>を使用中"</string> <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g>をマウントしました"</string> <string name="storage_mount_failure" msgid="1042621107954547316">"<xliff:g id="NAME">%1$s</xliff:g>をマウントできませんでした"</string> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 221c1dc..34caf54 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -2086,7 +2086,7 @@ <string name="provider_label" msgid="7724593781904508866">"Paspauskite „Prenumeratos“"</string> <!-- no translation found for sync_item_title (4782834606909853006) --> <skip /> - <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Negalima sinchronizuoti rankiniu būdu"</string> + <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Negalima sinchronizuoti neautomatiškai"</string> <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Šiuo metu šio elemento sinchronizavimas neleidžiamas. Jei norite pakeisti šį nustatymą, laikinai įjunkite foninius duomenis ir automatinį sinchronizavimą."</string> <string name="wimax_settings" msgid="2655139497028469039">"4G"</string> <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresas"</string> @@ -2222,7 +2222,7 @@ <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Bet kokie paskyrų pakeitimai, kuriuos atliekate žiniatinklyje, bus automatiškai nukopijuoti į planšetinį kompiuterį.\n\nIš kai kurių paskyrų į žiniatinklį gali būti automatiškai kopijuojami visi planšetiniame kompiuteryje atlikti pakeitimai. Taip pat daroma ir „Google“ paskyroje."</string> <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Bet kokie paskyrų pakeitimai, kuriuos atliekate žiniatinklyje, bus automatiškai nukopijuoti į telefoną.\n\nIš kai kurių paskyrų į žiniatinklį gali būti automatiškai kopijuojami visi telefone atlikti pakeitimai. Taip pat daroma ir „Google“ paskyroje."</string> <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Išjungti autom. sinchronizavimą?"</string> - <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Tai atlikus bus saikingai naudojami duomenys ir akumuliatoriaus energija, tačiau, jei norėsite surinkti naujausią informaciją, turėsite sinchronizuoti kiekvieną paskyrą rankiniu būdu. Be to, negausite pranešimų, kai atsiras naujinių."</string> + <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Tai atlikus bus saikingai naudojami duomenys ir akumuliatoriaus energija, tačiau, jei norėsite surinkti naujausią informaciją, turėsite sinchronizuoti kiekvieną paskyrą neautomatiškai. Be to, negausite pranešimų, kai atsiras naujinių."</string> <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Naudojimo ciklo nustatymo iš naujo data"</string> <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Kiekvieno mėnesio diena:"</string> <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Nustatyti"</string> diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml index ce8ae58..0ac1e6d 100644 --- a/res/values-mk-rMK/strings.xml +++ b/res/values-mk-rMK/strings.xml @@ -2899,5 +2899,5 @@ <item msgid="5363960654009010371">"Оптимизирани бои за дигитална содржина"</item> </string-array> <string name="picture_color_mode" msgid="4560755008730283695">"Режим на боја на слика"</string> - <string name="picture_color_mode_desc" msgid="1141891467675548590">"Употребете sRGB"</string> + <string name="picture_color_mode_desc" msgid="1141891467675548590">"Користи sRGB"</string> </resources> |