diff options
author | Geoff Mendal <mendal@google.com> | 2015-07-08 14:05:53 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-08 14:05:55 +0000 |
commit | db586e69afc71cbc9864849e29e77bf3b6d5ba3c (patch) | |
tree | ba3d854572047b7366518d234edc1fa0fda271f4 | |
parent | 18d4eaf54a60caaa2ffeae810a435bfad4abb59d (diff) | |
parent | ec135f6ac5d17223af8280dacc170daec52efb9b (diff) | |
download | frameworks_base-db586e69afc71cbc9864849e29e77bf3b6d5ba3c.zip frameworks_base-db586e69afc71cbc9864849e29e77bf3b6d5ba3c.tar.gz frameworks_base-db586e69afc71cbc9864849e29e77bf3b6d5ba3c.tar.bz2 |
Merge "Import translations. DO NOT MERGE" into mnc-dev
-rw-r--r-- | packages/SystemUI/res/values-fr/strings.xml | 4 | ||||
-rw-r--r-- | packages/SystemUI/res/values-ko/strings.xml | 6 | ||||
-rw-r--r-- | packages/SystemUI/res/values-sk/strings.xml | 4 | ||||
-rw-r--r-- | packages/SystemUI/res/values-tl/strings.xml | 2 | ||||
-rw-r--r-- | packages/SystemUI/res/values-zh-rCN/strings.xml | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 286aa32..39f7a33 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -22,7 +22,7 @@ <string name="app_label" msgid="7164937344850004466">"Interface du système"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Effacer"</string> <string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Supprimer de la liste"</string> - <string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Informations sur l\'application"</string> + <string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Infos application"</string> <string name="status_bar_no_recent_apps" msgid="7374907845131203189">"Vos écrans récents s\'affichent ici"</string> <string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Masquer les applications récentes"</string> <plurals name="status_bar_accessibility_recent_apps" formatted="false" msgid="9138535907802238759"> @@ -298,7 +298,7 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> au maximum"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Avertissement : <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="recents_empty_message" msgid="8682129509540827999">"Vos écrans récents s\'affichent ici"</string> - <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informations sur l\'application"</string> + <string name="recents_app_info_button_label" msgid="2890317189376000030">"Infos application"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"épinglage d\'écran"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"rechercher"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"Impossible de lancer <xliff:g id="APP">%s</xliff:g>."</string> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 18018d9..aac76c6 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -244,7 +244,7 @@ <string name="ethernet_label" msgid="7967563676324087464">"이더넷"</string> <string name="quick_settings_dnd_label" msgid="8735855737575028208">"알림 일시중지"</string> <string name="quick_settings_dnd_priority_label" msgid="483232950670692036">"중요 알림만"</string> - <string name="quick_settings_dnd_alarms_label" msgid="2559229444312445858">"알람만 수신"</string> + <string name="quick_settings_dnd_alarms_label" msgid="2559229444312445858">"알람만"</string> <string name="quick_settings_dnd_none_label" msgid="5025477807123029478">"모두 차단"</string> <string name="quick_settings_bluetooth_label" msgid="6304190285170721401">"블루투스"</string> <string name="quick_settings_bluetooth_multiple_devices_label" msgid="3912245565613684735">"블루투스(<xliff:g id="NUMBER">%d</xliff:g>개의 기기)"</string> @@ -326,10 +326,10 @@ <string name="interruption_level_none_with_warning" msgid="5114872171614161084">"전체 무음입니다. 이렇게 하면 스크린 리더도 무음으로 설정됩니다."</string> <string name="interruption_level_none" msgid="6000083681244492992">"모두 차단"</string> <string name="interruption_level_priority" msgid="6426766465363855505">"중요 알림만"</string> - <string name="interruption_level_alarms" msgid="5226306993448328896">"알람만 수신"</string> + <string name="interruption_level_alarms" msgid="5226306993448328896">"알람만"</string> <string name="interruption_level_none_twoline" msgid="3957581548190765889">"모두\n차단"</string> <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"중요 알림만\n허용"</string> - <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"알람만\n수신"</string> + <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"알람만\n"</string> <string name="keyguard_indication_charging_time" msgid="1757251776872835768">"충전 중(<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> 후 충전 완료)"</string> <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"사용자 전환"</string> <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"사용자 전환, 현재 사용자 <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 65e0cd5..67a7418 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -65,8 +65,8 @@ <string name="usb_debugging_title" msgid="4513918393387141949">"Povoliť ladenie USB?"</string> <string name="usb_debugging_message" msgid="2220143855912376496">"Digitálny odtlačok RSA počítača je:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> <string name="usb_debugging_always" msgid="303335496705863070">"Vždy povoliť z tohto počítača"</string> - <string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Ladenie USB nie je povolené"</string> - <string name="usb_debugging_secondary_user_message" msgid="6011931347142270156">"Používateľ, ktorý je práve prihlásený na tomto zariadení, nemôže zapnúť ladenie USB. Ak chcete použiť túto funkciu, prepnite na hlavného používateľa <xliff:g id="NAME">%s</xliff:g>."</string> + <string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Ladenie cez USB nie je povolené"</string> + <string name="usb_debugging_secondary_user_message" msgid="6011931347142270156">"Používateľ, ktorý je práve prihlásený na tomto zariadení, nemôže zapnúť ladenie cez USB. Ak chcete použiť túto funkciu, prepnite na hlavného používateľa <xliff:g id="NAME">%s</xliff:g>."</string> <string name="compat_mode_on" msgid="6623839244840638213">"Priblížiť na celú obrazovku"</string> <string name="compat_mode_off" msgid="4434467572461327898">"Na celú obrazovku"</string> <string name="screenshot_saving_ticker" msgid="7403652894056693515">"Prebieha ukladanie snímky obrazovky..."</string> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 0d0ee09..26ebdcf 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -279,7 +279,7 @@ <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"Brightness"</string> <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTO"</string> <string name="quick_settings_inversion_label" msgid="8790919884718619648">"I-invert ang mga kulay"</string> - <string name="quick_settings_color_space_label" msgid="853443689745584770">"Mode ng pagtatama ng kulay"</string> + <string name="quick_settings_color_space_label" msgid="853443689745584770">"Correction mode ng kulay"</string> <string name="quick_settings_more_settings" msgid="326112621462813682">"Marami pang setting"</string> <string name="quick_settings_done" msgid="3402999958839153376">"Tapos na"</string> <string name="quick_settings_connected" msgid="1722253542984847487">"Nakakonekta"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 618cf09..18aa25c 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -247,7 +247,7 @@ <string name="quick_settings_dnd_label" msgid="8735855737575028208">"勿扰"</string> <string name="quick_settings_dnd_priority_label" msgid="483232950670692036">"仅限优先打扰"</string> <string name="quick_settings_dnd_alarms_label" msgid="2559229444312445858">"仅限闹钟"</string> - <string name="quick_settings_dnd_none_label" msgid="5025477807123029478">"完全静音"</string> + <string name="quick_settings_dnd_none_label" msgid="5025477807123029478">"完全阻止"</string> <string name="quick_settings_bluetooth_label" msgid="6304190285170721401">"蓝牙"</string> <string name="quick_settings_bluetooth_multiple_devices_label" msgid="3912245565613684735">"蓝牙(<xliff:g id="NUMBER">%d</xliff:g> 台设备)"</string> <string name="quick_settings_bluetooth_off_label" msgid="8159652146149219937">"蓝牙:关闭"</string> @@ -326,7 +326,7 @@ <string name="voice_hint" msgid="8939888732119726665">"滑动图标即可打开语音助理"</string> <string name="camera_hint" msgid="7939688436797157483">"滑动图标即可打开相机"</string> <string name="interruption_level_none_with_warning" msgid="5114872171614161084">"完全静音。此模式也会将屏幕阅读器静音。"</string> - <string name="interruption_level_none" msgid="6000083681244492992">"完全静音"</string> + <string name="interruption_level_none" msgid="6000083681244492992">"完全阻止"</string> <string name="interruption_level_priority" msgid="6426766465363855505">"仅限优先打扰"</string> <string name="interruption_level_alarms" msgid="5226306993448328896">"仅限闹钟"</string> <string name="interruption_level_none_twoline" msgid="3957581548190765889">"完全\n静音"</string> |