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

Commit 763d37d0 authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge branch 'cm-11.0' into stable/cm-11.0

parents b3ec3af4 61b47993
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@


        <receiver android:name="AlarmInitReceiver">
            <intent-filter>
            <intent-filter android:priority="1000">
                <action android:name="android.intent.action.BOOT_COMPLETED" />
                <action android:name="android.intent.action.TIME_SET" />
                <action android:name="android.intent.action.TIMEZONE_CHANGED" />
+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@
            style="@style/bold_button"
            android:contentDescription="@string/timer_stop"
            android:layout_height="wrap_content"
            android:textColor="@color/clock_white"
            android:focusable="true" />

        <ImageButton
+0 −1
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@
    <item msgid="4616641627708493425">"Helsinki"</item>
    <item msgid="212359461403262711">"Eiland Man"</item>
    <item msgid="4245799496293578703">"Istanboel"</item>
    <item msgid="4477669700025211678">"Kiëf"</item>
    <item msgid="7233802930588725294">"Lissabon"</item>
    <item msgid="7186725202454661926">"Londen"</item>
    <item msgid="5298853578615697920">"Luxemburg"</item>
+5 −0
Original line number Diff line number Diff line
@@ -52,4 +52,9 @@
  <string name="alarm_type_ringtone">Luitoon</string>
  <string name="alarm_type_random">Willekeurig</string>
  <string name="warn_silent_alarm_title">Alarm volume is af</string>
  <string name="alarm_select">Kies alarm</string>
  <string name="alarm_select_ringtone">Luitoon</string>
  <string name="alarm_select_external">Musiek</string>
  <string name="ringtone_default">"Standaard luitoon"</string>
  <string name="take_persistent_grant_uri_permission_failed_msg">Kon nie permanente toestemming verleen aan luitoon (uri)</string>
</resources>
+0 −1
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@
    <item msgid="4616641627708493425">"ሄልሲንኪ"</item>
    <item msgid="212359461403262711">"አይል ኦፍ ማን"</item>
    <item msgid="4245799496293578703">"ኢስታንቡል"</item>
    <item msgid="4477669700025211678">"ኪዬቭ"</item>
    <item msgid="7233802930588725294">"ሊስቦን"</item>
    <item msgid="7186725202454661926">"ለንደን"</item>
    <item msgid="5298853578615697920">"ሉክሰምበርግ"</item>
Loading