Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Upstream Changes. #2

Open
wants to merge 6 commits into
base: own-n
Choose a base branch
from
Open

Merge Upstream Changes. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2af7cb2
Automatic translation import
ciwrl Jul 22, 2017
d883515
MSIM: Fix user set DDS sub in hotswap cases.
Jan 8, 2016
b3d31ad
Automatic translation import
ciwrl Jul 26, 2017
04247c6
Automatic translation import
ciwrl Jul 28, 2017
5067a1c
Automatic translation import
ciwrl Aug 4, 2017
930f512
Merge branch 'cm-14.1' of https://github.com/LineageOS/android_packag…
HassanSardar Aug 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 33 additions & 3 deletions res/values-ast-rES/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,27 @@
strings. -->
<!-- The time zone picker screen has two levels. The first level allows the user to choose a region. -->
<!-- Display settings. The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
<string-array name="screen_timeout_entries">
<item>15 seconds</item>
<item>30 seconds</item>
<item>1 minutu</item>
<item>2 minutos</item>
<item>5 minutos</item>
<item>10 minutos</item>
<item>30 minutos</item>
</string-array>
<!-- Do not translate. -->
<!-- Display settings. The delay in inactivity before the dream is shown. These are shown in a list dialog. -->
<string-array name="dream_timeout_entries">
<item>Never</item>
<item>15 seconds</item>
<item>30 seconds</item>
<item>1 minutu</item>
<item>2 minutos</item>
<item>5 minutos</item>
<item>10 minutos</item>
<item>30 minutos</item>
</string-array>
<!-- Do not translate. -->
<!-- Security settings. The delay after screen is turned off until device locks.
These are shown in a list dialog. -->
Expand Down Expand Up @@ -170,12 +189,18 @@
<!-- Wi-Fi p2p settings device status message -->
<!-- Bluetooth Settings -->
<!-- Discoverable mode timeout options -->
<string-array name="bluetooth_visibility_timeout_entries">
<item>2 minutos</item>
<item>5 minutos</item>
<item>1 hour</item>
<item>Never time out</item>
</string-array>
<!-- Match this with drawable.wifi_signal. -->
<!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
<!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
<string-array name="wifi_sleep_policy_entries">
<!-- Always keep Wi-Fi on when screen turns off. -->
<item>Always</item>
<item>Siempres</item>
<!-- Keep Wi-Fi on when screen turns off and plugged in. When on battery, go to sleep when screen turns off. -->
<item>Only when plugged in</item>
<!-- Do not keep Wi-Fi on when screen turns off. [CHAR LIMIT=40] -->
Expand Down Expand Up @@ -285,7 +310,7 @@
<item>read calendar</item>
<item>modify calendar</item>
<item>wi-fi scan</item>
<item>notification</item>
<item>avisu</item>
<item>cell scan</item>
<item>call phone</item>
<item>read SMS</item>
Expand Down Expand Up @@ -338,7 +363,7 @@
<item>Read calendar</item>
<item>Modify calendar</item>
<item>Allugamientu</item>
<item>Post notification</item>
<item>Espublizar avisu</item>
<item>Allugamientu</item>
<item>Call phone</item>
<item>Read SMS/MMS</item>
Expand Down Expand Up @@ -489,6 +514,11 @@
<item>Bermeyu</item>
</string-array>
<!-- Wifi extension requirement -->
<string-array name="cellcular2wifi_entries">
<item>Automatically connect</item>
<item>Coneutar a mano</item>
<item>Entrugar siempres</item>
</string-array>
<!-- Wifi extension requirement -->
<string-array name="cellcular2wifi_values">
<item>0</item>
Expand Down
11 changes: 11 additions & 0 deletions res/values-ast-rES/cm_strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
<string name="app_ops_categories_personal">Personal</string>
<string name="app_ops_categories_messaging">Mensaxería</string>
<string name="app_ops_categories_device">Preséu</string>
<string name="app_ops_categories_bootup">Arranque</string>
<string name="app_ops_categories_su">Accesu root</string>
<!-- User display names for app ops codes - extension of AOSP -->
<string name="app_ops_summaries_gps">GPS</string>
Expand Down Expand Up @@ -92,6 +93,7 @@
<string name="app_ops_summaries_get_usage_stats">consiguir estadístiques d\'usu d\'aplicaciones</string>
<string name="app_ops_summaries_mute_unmute_microphone">de/silenciar micrófonu</string>
<string name="app_ops_summaries_activate_vpn">activar VPN</string>
<string name="app_ops_summaries_mock_location">allugamientu falsu</string>
<string name="app_ops_summaries_run_in_background">executase de fondu</string>
<string name="app_ops_summaries_toggle_nfc">alternar NFC</string>
<!-- User display names for app ops codes - extension of AOSP -->
Expand Down Expand Up @@ -124,6 +126,7 @@
<string name="app_ops_labels_use_sip">Usar SIP</string>
<string name="app_ops_labels_use_fingerprint">Usar buelga</string>
<string name="app_ops_labels_use_body_sensors">Usar sensores corporales</string>
<string name="app_ops_labels_mock_location">Allugamientu falsu</string>
<string name="app_ops_labels_read_external_storage">Lleer almacenamientu esternu</string>
<string name="app_ops_labels_write_external_storage">Escribir nel almacenamientu esternu</string>
<string name="app_ops_labels_turn_screen_on">Prender pantalla</string>
Expand All @@ -138,6 +141,7 @@
<string name="app_ops_permissions_always_ask">Entrugar siempre</string>
<!-- App ops detail -->
<!-- App ops menu options -->
<string name="app_ops_show_user_apps">Amosar aplicaciones d\'usuariu</string>
<string name="app_ops_reset_confirm_mesg">¿De xuru que quies reafitar los contadores?</string>
<string name="ok">Aceutar</string>
<!-- Volume settings - Volume adjustment sound -->
Expand All @@ -162,6 +166,7 @@
<!-- lock screen visualizer -->
<!-- Lock screen cover art -->
<!-- Double tap to sleep on keyguard -->
<string name="double_tap_sleep_anywhere_title">Calcu doblu en cualesquier sitiu pa dormir</string>
<!-- Protected apps lockpattern reset button -->
<!-- Protected Apps -->
<string name="launch_app">Llanzar applicación</string>
Expand All @@ -186,7 +191,9 @@
<!-- Allow vibration in zen mode -->
<!-- Zen mode allowed event setting summary items -->
<!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
<string name="zen_mode_summary_reminders">recordatorios</string>
<!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
<string name="zen_mode_summary_events">eventos</string>
<!-- [CHAR LIMIT=50] Like zen_mode_all_callers, but part of a list, so lower case if needed -->
<string name="zen_mode_summary_all_callers">tolos que llamen</string>
<!-- [CHAR LIMIT=50] Like zen_mode_selected_callers, but part of a list, so lower case if needed -->
Expand All @@ -195,6 +202,7 @@
<!-- [CHAR LIMIT=50] Like zen_mode_all_messages, but part of a list, so lower case if needed -->
<string name="zen_mode_summary_all_messages">tolos mensaxes</string>
<!-- [CHAR LIMIT=50] Like zen_mode_selected_messages, but part of a list, so lower case if needed -->
<string name="zen_mode_summary_selected_messages">mensaxes esbillaos</string>
<!-- Notification sound timeout -->
<string name="app_notification_sound_timeout_title">Tiempu mínimo ente soníos d\'avisu</string>
<string name="app_notification_sound_timeout_summary_template">Permite soníos o vibración namái una vegada cada <xliff:g id="duration">%1$s</xliff:g></string>
Expand All @@ -206,6 +214,7 @@
<string name="app_notification_sound_timeout_value_15_minutes">10 minutos</string>
<string name="app_notification_sound_timeout_value_30_minutes">30 minutos</string>
<!-- MSIM SIM status -->
<string name="sim_card_summary_empty">Nun s\'inxertó la SIM</string>
<string name="sim_mobile_network_settings_category_title">Axustes de rede móvil</string>
<!-- NFC PreferenceCategory title -->
<string name="nfc_title_category">NFC</string>
Expand All @@ -220,6 +229,8 @@
<!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
<string name="wifi_setting_countrycode_error">Hebo un problema al afitar el códigu de rexón.</string>
<!-- Wake on plug -->
<string name="wake_when_plugged_or_unplugged_title">Esconsoñar al enchufar</string>
<string name="wake_when_plugged_or_unplugged_summary">Prender la pantalla al coneutar o desconeutar el cargador</string>
<!-- Heads-up -->
<string name="heads_up_notifications_enabled_title">Avisos emerxentes</string>
<string name="heads_up_notifications_enabled_summary">Amuesa los avisos prioritarios nuna ventana pequeña flotante</string>
Expand Down