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

Commit aab45d54 authored by android-build SharedAccount's avatar android-build SharedAccount
Browse files

Merge branch 'cupcake'

parents 5df46d9c 1152aff9
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@
            </intent-filter>
        </activity>

        <activity android:name=".wifi.IpSettings" android:label="@string/wifi_ip_settings_titlebar"
        <activity android:name=".wifi.AdvancedSettings" android:label="@string/wifi_ip_settings_titlebar"
                android:theme="@android:style/Theme.NoTitleBar">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
−281 B
Loading image diff...
−2.75 KiB
Loading image diff...
+42 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string-array name="timezone_filters">
    <item>"Amerika"</item>
    <item>"Evropa"</item>
    <item>"Afrika"</item>
    <item>"Asie"</item>
    <item>"Austrálie"</item>
    <item>"Tichomoří"</item>
    <item>"Všechny"</item>
  </string-array>
  <string-array name="screen_timeout_entries">
    <item>"15 sekund"</item>
    <item>"30 sekund"</item>
    <item>"1 minuta"</item>
    <item>"2 minuty"</item>
    <item>"10 minut"</item>
    <item>"Nevypínat"</item>
  </string-array>
  <string-array name="wifi_security_entries">
    <item>"Automaticky"</item>
    <item>"Žádné"</item>
    <item>"WEP"</item>
    <item>"WPA Personal"</item>
    <item>"WPA2 Personal"</item>
  </string-array>
  <string-array name="wifi_security_without_auto_entries">
    <item>"Žádné"</item>
    <item>"WEP"</item>
    <item>"WPA Personal"</item>
    <item>"WPA2 Personal"</item>
  </string-array>
  <string-array name="wifi_wep_type">
    <item>"Automaticky"</item>
    <item>"WEP ASCII"</item>
    <item>"Hexadecimální WEP"</item>
  </string-array>
    <!-- no translation found for wifi_sleep_policy_entries:0 (3804733751095821976) -->
    <!-- no translation found for wifi_sleep_policy_entries:1 (1549288661423279207) -->
    <!-- no translation found for wifi_sleep_policy_entries:2 (1986753720941888596) -->
</resources>
+539 −759

File changed.

Preview size limit exceeded, changes collapsed.

Loading