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

Commit 16d20d45 authored by Romain Hunault's avatar Romain Hunault
Browse files

Merge branch 'cm-14.1' into eelo-0.1

parents 279ee03f 26218427
Loading
Loading
Loading
Loading
+14 −1
Original line number Diff line number Diff line
@@ -207,6 +207,14 @@
  </string-array>
  <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
  <!-- Do not translate. -->
  <string-array name="wifi_sleep_policy_values">
    <!-- Do not translate. -->
    <item>2</item>
    <!-- Do not translate. -->
    <item>1</item>
    <!-- Do not translate. -->
    <item>0</item>
  </string-array>
  <!-- Data Usage settings. Range of data usage. -->
  <!-- Display options for UsageStats class -->
  <string-array name="usage_stats_display_order_types">
@@ -488,7 +496,7 @@
    <!-- Memory is critical. -->
    <item>Critical</item>
    <!-- Unknown memory state -->
    <item>\?</item>
    <item>\¿?</item>
  </string-array>
  <!-- Display color space adjustment modes for accessibility -->
  <!-- Values for display color space adjustment modes for accessibility -->
@@ -517,6 +525,11 @@
    <item>Entrugar siempres</item>
  </string-array>
  <!-- Wifi extension requirement -->
  <string-array name="cellcular2wifi_values">
    <item>0</item>
    <item>1</item>
    <item>2</item>
  </string-array>
  <!-- CT MCC-MNC-->
  <!-- dm plmn that need to be hidden -->
  <string-array name="hidedm_plmn_list">
+139 −3

File changed.

Preview size limit exceeded, changes collapsed.

+238 −21
Original line number Diff line number Diff line
@@ -23,24 +23,122 @@
         These values will be used as search terms for TimeZone displayName
         strings. -->
  <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
  <string-array name="timezone_filters">
    <!-- The next level of the time zoner picker should show time zones from the Americas. -->
    <item>America</item>
    <!-- The next level of the time zoner picker should show time zones from Europe. -->
    <item>Ewrop</item>
    <!-- The next level of the time zoner picker should show time zones from Africa. -->
    <item>Affrica</item>
    <!-- The next level of the time zoner picker should show time zones from Asia. -->
    <item>Asia</item>
    <!-- The next level of the time zoner picker should show time zones from Australia. -->
    <item>Awstralia</item>
    <!-- The next level of the time zoner picker should show time zones from Pacific. -->
    <item>Cefnfor Tawel</item>
    <!-- The next level of the time zoner picker should show time zones from ALL regions. -->
    <item>Y Cyfan</item>
  </string-array>
  <!-- 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 eiliad</item>
    <item>30 eiliad</item>
    <item>1 munud</item>
    <item>2 funud</item>
    <item>5 munud</item>
    <item>10 munud</item>
    <item>30 munud</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>Byth</item>
    <item>15 eiliad</item>
    <item>30 eiliad</item>
    <item>1 munud</item>
    <item>2 funud</item>
    <item>5 munud</item>
    <item>10 munud</item>
    <item>30 munud</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. -->
  <string-array name="lock_after_timeout_entries">
    <item>Ar unwaith</item>
    <item>5 eiliad</item>
    <item>15 eiliad</item>
    <item>30 eiliad</item>
    <item>1 munud</item>
    <item>2 funud</item>
    <item>5 munud</item>
    <item>10 munud</item>
    <item>30 munud</item>
  </string-array>
  <!-- Do not translate. -->
  <string-array name="entries_font_size">
    <item msgid="6490061470416867723">Small</item>
    <item msgid="6490061470416867723">Bach</item>
    <item msgid="3579015730662088893">Default</item>
    <item msgid="1678068858001018666">Large</item>
    <item msgid="1678068858001018666">Mawr</item>
    <item msgid="490158884605093126">Mwyaf</item>
  </string-array>
  <!-- Wi-Fi settings -->
  <!-- Match this with the order of NetworkInfo.DetailedState. -->
  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
  <string-array name="wifi_status">
    <!-- Status message of Wi-Fi when it is idle. -->
    <item></item>
    <!-- Status message of Wi-Fi when it is scanning. -->
    <item>Yn sganio\u2026</item>
    <!-- Status message of Wi-Fi when it is connecting. -->
    <item>Yn cysylltu\u2026</item>
    <!-- Status message of Wi-Fi when it is authenticating. -->
    <item>Yn dilysu\u2026</item>
    <!-- Status message of Wi-Fi when it is obtaining IP address. -->
    <item>Yn cael cyfeiriad IP\u2026</item>
    <!-- Status message of Wi-Fi when it is connected. -->
    <item>Wedi cysyllltu</item>
    <!-- Status message of Wi-Fi when it is suspended. -->
    <item>Wedi\'i atal</item>
    <!-- Status message of Wi-Fi when it is disconnecting. -->
    <item>Yn datgysylltu\u2026</item>
    <!-- Status message of Wi-Fi when it is disconnected. -->
    <item>Disconnected</item>
    <!-- Status message of Wi-Fi when it is a failure. -->
    <item>Aflwyddiannus</item>
    <!-- Status message of Wi-Fi when it is blocked. -->
    <item>Wedi\'i rhwystro</item>
    <!-- Status message of Wi-Fi when connectiong is being verified. -->
    <item>Temporarily avoiding poor connection</item>
  </string-array>
  <!-- Match this with the order of NetworkInfo.DetailedState. -->
  <!-- Wi-Fi settings. The status messages when the network is known. -->
  <string-array name="wifi_status_with_ssid">
    <!-- Status message of Wi-Fi when it is idle. -->
    <item></item>
    <!-- Status message of Wi-Fi when it is scanning. -->
    <item>Yn sganio\u2026</item>
    <!-- Status message of Wi-Fi when it is connecting to a network. -->
    <item>Yn cysylltu â <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
    <!-- Status message of Wi-Fi when it is authenticating with a network. -->
    <item>Yn dilysu gyda <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
    <!-- Status message of Wi-Fi when it is obtaining IP address from a network. -->
    <item>Yn cael cyfeiriad IP oddi wrth <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
    <!-- Status message of Wi-Fi when it is connected to a network. -->
    <item>Wedi cysylltu â <xliff:g id="network_name">%1$s </xliff:g></item>
    <!-- Status message of Wi-Fi when it is suspended. -->
    <item>Wedi\'i atal</item>
    <!-- Status message of Wi-Fi when it is disconnecting from a network. -->
    <item>Yn datgysylltu oddi wrth <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
    <!-- Status message of Wi-Fi when it is disconnected. -->
    <item>Disconnected</item>
    <!-- Status message of Wi-Fi when it is a failure. -->
    <item>Aflwyddiannus</item>
    <!-- Status message of Wi-Fi when it is blocked. -->
    <item>Wedi\'i rhwystro</item>
    <!-- Status message of Wi-Fi when connectiong is being verified. -->
    <item>Yn osgoi cysylltiad gwael am y tro</item>
  </string-array>
  <!-- Match this with the constants in AccessPoint. -->
  <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
  <!-- Match this with the constants in AccessPoint. -->
@@ -56,13 +154,48 @@
  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
  <!-- Match this with the order of WifiP2pDevice.Status -->
  <!-- Wi-Fi p2p settings device status message -->
  <string-array name="wifi_p2p_status">
    <item>Wedi cysyllltu</item>
    <item>Gwahoddwyd</item>
    <item>Aflwyddiannus</item>
    <item>Ar gael</item>
    <item>Allan-o-amrediad</item>
  </string-array>
  <!-- Bluetooth Settings -->
  <!-- Discoverable mode timeout options -->
  <string-array name="bluetooth_visibility_timeout_entries">
    <item>2 funud</item>
    <item>5 munud</item>
    <item>1 awr</item>
    <item>Peidio diffodd byth</item>
  </string-array>
  <!-- Match this with drawable.wifi_signal. -->
  <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
  <string-array name="wifi_signal">
    <item>Gwael</item>
    <item>Gweddol</item>
    <item>Da</item>
    <item>Ardderchog</item>
  </string-array>
  <!-- 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>O hyd</item>
    <!-- Keep Wi-Fi on when screen turns off and plugged in.  When on battery, go to sleep when screen turns off. -->
    <item>Pan fo\'r ddyfais yn gwefru</item>
    <!-- Do not keep Wi-Fi on when screen turns off.  [CHAR LIMIT=40] -->
    <item>Byth</item>
  </string-array>
  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
         the device is Wi-Fi-only. [CHAR LIMIT=30] -->
  <string-array name="wifi_sleep_policy_entries_wifi_only">
    <!-- Always keep Wi-Fi on when screen turns off. -->
    <item>O hyd</item>
    <!-- Keep Wi-Fi on when screen turns off and plugged in.  When on battery, go to sleep when screen turns off. -->
    <item>Pan fo\'r ddyfais yn gwefru</item>
    <!-- Do not keep Wi-Fi on when screen turns off, for Wi-Fi-only devices, no other data connection -->
    <item>Byth</item>
  </string-array>
  <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
  <!-- Do not translate. -->
  <!-- Data Usage settings. Range of data usage. -->
@@ -70,22 +203,52 @@
    <!-- Last 30 days [CHAR LIMIT=25]-->
    <item>Y 30 diwrnod diwethaf</item>
    <!-- Set usage cycle [CHAR LIMIT=25]-->
    <item>Set usage cycle...</item>
    <item>Gosod cyfnod defnydd...</item>
  </string-array>
  <!-- Display options for UsageStats class -->
  <string-array name="usage_stats_display_order_types">
    <item>Usage time</item>
    <item>Last time used</item>
    <item>Enw\'r ap</item>
  </string-array>
  <!-- EAP method -->
  <!-- Phase 2 options for PEAP -->
  <string-array name="wifi_peap_phase2_entries">
    <item>Dim</item>
    <item>MSCHAPV2</item>
    <item>GTC</item>
  </string-array>
  <!-- Phase 2 options for rest of EAP methods -->
  <!-- Wi-Fi IP settings. -->
  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
  <string-array name="wifi_ip_settings">
    <!-- Use DHCP (Dynamic Host Configuration Protocol) for obtaining IP settings [CHAR LIMIT=25] -->
    <item>DHCP</item>
    <!-- Use statically defined IP settings [CHAR LIMIT=25]-->
    <item>Statig</item>
  </string-array>
  <!-- Wi-Fi proxy settings. -->
  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
  <string-array name="wifi_proxy_settings">
    <!-- No HTTP proxy is used for the current wifi network [CHAR LIMIT=25] -->
    <item>Dim</item>
    <!-- Manual HTTP proxy settings are used for the current wifi network [CHAR LIMIT=25] -->
    <item>Â llaw</item>
    <!-- Proxy Auto-Config URL that is used for the current wifi network [CHAR LIMIT=25] -->
    <item>Proxy Auto-Config</item>
  </string-array>
  <!-- Authentication Types used in APN editor -->
  <string-array name="apn_auth_entries">
    <item>Dim</item>
    <item>PAP</item>
    <item>CHAP</item>
    <item>PAP or CHAP</item>
  </string-array>
  <!-- Authentication Types used in APN editor -->
  <!-- Bearer Info used in APN editor -->
  <!-- MVNO Info used in APN editor -->
  <string-array name="mvno_type_entries">
    <item>None</item>
    <item>Dim</item>
    <!-- Do not translate. -->
    <item>SPN</item>
    <!-- Do not translate. -->
@@ -98,6 +261,13 @@
  <!-- Apps on SD installation location options in ApplicationSettings -->
  <!-- Do not translate. -->
  <!-- Names of categories of app ops tabs -->
  <string-array name="app_ops_categories">
    <item>Lleoliad</item>
    <item>Personal</item>
    <item>Messaging</item>
    <item>Media</item>
    <item>Dyfais</item>
  </string-array>
  <!-- User display names for app ops codes -->
  <string-array name="app_ops_summaries">
    <item>coarse location</item>
@@ -106,14 +276,14 @@
    <item>vibrate</item>
    <item>read contacts</item>
    <item>modify contacts</item>
    <item>read call log</item>
    <item>modify call log</item>
    <item>darllen y log galwadau</item>
    <item>addasu\'r log galwadau</item>
    <item>read calendar</item>
    <item>modify calendar</item>
    <item>wi-fi scan</item>
    <item>hysbysiad</item>
    <item>cell scan</item>
    <item>call phone</item>
    <item>galw ffôn</item>
    <item>read SMS</item>
    <item>write SMS</item>
    <item>receive SMS</item>
@@ -123,7 +293,7 @@
    <item>anfon SMS</item>
    <item>read ICC SMS</item>
    <item>write ICC SMS</item>
    <item>modify settings</item>
    <item>addasu gosodiadau</item>
    <item>draw on top</item>
    <item>access notifications</item>
    <item>camera</item>
@@ -137,7 +307,7 @@
    <item>voice volume</item>
    <item>ring volume</item>
    <item>media volume</item>
    <item>alarm volume</item>
    <item>uchder sain larymau</item>
    <item>uchder sain hysbysiadau</item>
    <item>bluetooth volume</item>
    <item>keep awake</item>
@@ -153,20 +323,20 @@
  </string-array>
  <!-- User display names for app ops codes -->
  <string-array name="app_ops_labels">
    <item>Location</item>
    <item>Location</item>
    <item>Location</item>
    <item>Lleoliad</item>
    <item>Lleoliad</item>
    <item>Lleoliad</item>
    <item>Vibrate</item>
    <item>Read contacts</item>
    <item>Modify contacts</item>
    <item>Read call log</item>
    <item>Modify call log</item>
    <item>Darllen y log galwadau</item>
    <item>Addasu\'r log galwadau</item>
    <item>Read calendar</item>
    <item>Modify calendar</item>
    <item>Location</item>
    <item>Lleoliad</item>
    <item>Post notification</item>
    <item>Location</item>
    <item>Call phone</item>
    <item>Lleoliad</item>
    <item>Galw ffôn</item>
    <item>Read SMS/MMS</item>
    <item>Write SMS/MMS</item>
    <item>Receive SMS/MMS</item>
@@ -176,7 +346,7 @@
    <item>Anfon SMS/MMS</item>
    <item>Read SMS/MMS</item>
    <item>Write SMS/MMS</item>
    <item>Modify settings</item>
    <item>Addasu gosodiadau</item>
    <item>Draw on top</item>
    <item>Access notifications</item>
    <item>Camera</item>
@@ -190,12 +360,12 @@
    <item>Voice volume</item>
    <item>Ring volume</item>
    <item>Media volume</item>
    <item>Alarm volume</item>
    <item>Uchder sain larymau</item>
    <item>Uchder sain hysbysiadau</item>
    <item>Bluetooth volume</item>
    <item>Keep awake</item>
    <item>Location</item>
    <item>Location</item>
    <item>Lleoliad</item>
    <item>Lleoliad</item>
    <item>Get usage stats</item>
    <item>Mute/unmute microphone</item>
    <item>Project media</item>
@@ -209,14 +379,37 @@
  <!-- Titles for captioning typeface preference. [CHAR LIMIT=35] -->
  <!-- Values for captioning typeface preference. -->
  <!-- Titles for captioning font size preference. [CHAR LIMIT=35] -->
  <string-array name="captioning_font_size_selector_titles">
    <item>Bach iawn</item>
    <item>Bach</item>
    <item>Arferol</item>
    <item>Mawr</item>
    <item>Mawr iawn</item>
  </string-array>
  <!-- Values for captioning font size preference. -->
  <!-- Titles for captioning character edge type preference. [CHAR LIMIT=35] -->
  <string-array name="captioning_edge_type_selector_titles">
    <item>Default</item>
    <item>Dim</item>
    <item>Outline</item>
    <item>Drop shadow</item>
    <item>Raised</item>
    <item>Depressed</item>
  </string-array>
  <!-- Values for captioning character edge type preference. -->
  <!-- Titles for captioning color preference. -->
  <!-- Values for captioning color preference. -->
  <!-- Titles for captioning opacity preference. [CHAR LIMIT=35] -->
  <!-- Values for captioning opacity preference. -->
  <!-- Titles for captioning text style preset preference. [CHAR LIMIT=35] -->
  <string-array name="captioning_preset_selector_titles">
    <item>Defnyddio rhagosodiadau\'r ap</item>
    <item>Gwyn ar ddu</item>
    <item>Du ar wyn</item>
    <item>Melyn ar ddu</item>
    <item>Melyn ar las</item>
    <item>Addasedig</item>
  </string-array>
  <!-- Values for captioning text style preset preference. -->
  <!-- Match this with the constants in VpnProfile. -->
  <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
@@ -227,12 +420,36 @@
  <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
  <!-- Values for user content ratings for restricted users -->
  <!-- Values for premium SMS permission selector [CHAR LIMIT=30] -->
  <string-array name="security_settings_premium_sms_values">
    <!-- Ask user before sending to premium SMS short code. -->
    <item>Ask</item>
    <!-- Never allow app to send to premium SMS short code. -->
    <item>Caniatáu Byth</item>
    <!-- Always allow app to send to premium SMS short code. -->
    <item>Caniatáu Bob Tro</item>
  </string-array>
  <!-- [CHAR LIMIT=40] Labels for memory states -->
  <!-- Display color space adjustment modes for accessibility -->
  <!-- Values for display color space adjustment modes for accessibility -->
  <!-- Battery saver mode: allowable trigger threshold levels. -->
  <!-- Process stats memory use details: labels for memory states -->
  <!-- Process stats memory use details: labels for process -->
  <string-array name="proc_stats_process_states">
    <item>Persistent</item>
    <item>Top activity</item>
    <item>Important (foreground)</item>
    <item>Important (background)</item>
    <item>Copi wrth gefn</item>
    <item>Heavy weight</item>
    <item>Service (running)</item>
    <item>Service (restarting)</item>
    <item>Receiver</item>
    <item>Cartref</item>
    <item>Last activity</item>
    <item>Cached (activity)</item>
    <item>Cached (activity client)</item>
    <item>Cached (empty)</item>
  </string-array>
  <!-- Array of titles for sim color for multi-sim -->
  <!-- Wifi extension requirement -->
  <string-array name="cellcular2wifi_entries">
+8 −0
Original line number Diff line number Diff line
@@ -28,12 +28,15 @@
  <!-- About phone screen, Device name -->
  <!-- About phone screen, LineageOS Api Level -->
  <!-- About phone screen, build date -->
  <string name="build_date">Dyddiad adeiledd</string>
  <!-- CM Updater -->
  <!-- Names of categories of app ops tabs - extension of AOSP -->
  <string name="app_ops_categories_background">Cefndir</string>
  <!-- User display names for app ops codes - extension of AOSP -->
  <string name="app_ops_summaries_camera">camera</string>
  <string name="app_ops_summaries_run_in_background">rhedeg yn y cefndir</string>
  <!-- User display names for app ops codes - extension of AOSP -->
  <string name="app_ops_labels_camera">Camera</string>
  <string name="app_ops_labels_run_in_background">Rhedeg yn y cefndir</string>
  <!-- App ops permissions -->
  <!-- App ops detail -->
@@ -51,6 +54,7 @@
  <!-- Lights settings -->
  <!-- Memory -->
  <!-- Advanced restart options -->
  <string name="advanced_reboot_title">Ailgychwyn arbennig</string>
  <!-- PIN scramble -->
  <!-- lock screen visualizer -->
  <!-- Lock screen cover art -->
@@ -64,6 +68,8 @@
  <!-- High touch sensitivity -->
  <!-- Touchscreen hovering -->
  <!-- Whether to display IME switcher notifcation -->
  <string name="ime_switcher_notify">Eicon dewis</string>
  <string name="ime_switcher_notify_summary">Dangos icon dewis dull mewnbwn</string>
  <!-- [CHAR LIMIT=100] Notification Importance slider: very low importance level description -->
  <!-- Stylus Icon -->
  <!-- Kill app long-press back -->
@@ -107,9 +113,11 @@
  <!-- Title for switch to block app data usage [CHAR LIMIT=30] -->
  <!-- Summary for switch to block app data usage [CHAR LIMIT=NONE] -->
  <!-- Volume link notification -->
  <string name="volume_link_notification_title">Cysylltu uchder sain caniad ffôn a hysbysiadau</string>
  <!-- Launch music player when headset is connected -->
  <!-- Update recovery -->
  <!-- Status bar - double tap to sleep -->
  <string name="sim_enabler_airplane_on">Nid yw\'n bosib cyflawni\'r dasg tra ym modd awyren.</string>
  <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
  <!-- SAR information -->
  <!-- IC Codes -->
+719 −23

File changed.

Preview size limit exceeded, changes collapsed.

Loading