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

Commit 9061f9af authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-18.1' into v1-r

parents 36f81422 af9c0bc2
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@
        <item>Escartar</item>
        <item>Nada</item>
    </string-array>
    <string name="firing_alarms_timers_channel">Activación d\'alarmes y de temporizadores</string>
    <string name="firing_alarms_timers_channel">Activación d\'alarmes ya de temporizadores</string>
    <string name="alarm_missed_channel">Alarmes perdíes</string>
    <string name="alarm_snooze_channel">Alarmes aplazaes</string>
    <string name="alarm_upcoming_channel">Alarmes próximes</string>
+4 −0
Original line number Diff line number Diff line
@@ -16,12 +16,16 @@
     limitations under the License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="flip_action_title">Åtgärd som utförs när enheten vänds</string>
    <string name="shake_action_title">Åtgärd som utförs när enheten skakas</string>
    <string-array name="action_setting_entries">
        <item>Pausa</item>
        <item>Avvisa</item>
        <item>Ingenting</item>
    </string-array>
    <string name="firing_alarms_timers_channel">Ringande alarm och tidur</string>
    <string name="alarm_missed_channel">Missade alarm</string>
    <string name="alarm_snooze_channel">Snoozade alarm</string>
    <string name="alarm_upcoming_channel">Kommande alarm</string>
    <string name="stopwatch_channel">Stoppur</string>
    <string name="timer_channel">Timer</string>