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

Commit 5c443f4a authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-17.1' into v1-q

parents b45acf4f cd2b28c8
Loading
Loading
Loading
Loading

res/values-ast-rES/cities.xml

deleted100644 → 0
+0 −358

File deleted.

Preview size limit exceeded, changes collapsed.

+3 −3
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@
    <string name="flip_action_title">Aición al voltiar el preséu</string>
    <string name="shake_action_title">Aición al ximelgar el preséu</string>
    <string-array name="action_setting_entries">
        <item>Posponer</item>
        <item>Aplazar</item>
        <item>Escartar</item>
        <item>Nada</item>
    </string-array>
    <string name="firing_alarms_timers_channel">Alarmes y temporizadores que suenen</string>
    <string name="firing_alarms_timers_channel">Activación d\'alarmes y de temporizadores</string>
    <string name="alarm_missed_channel">Alarmes perdíes</string>
    <string name="alarm_snooze_channel">Alarmes pospuestes</string>
    <string name="alarm_snooze_channel">Alarmes aplazaes</string>
    <string name="alarm_upcoming_channel">Alarmes próximes</string>
    <string name="stopwatch_channel">Cronómetru</string>
    <string name="timer_channel">Temporizador</string>

res/values-ast-rES/strings.xml

deleted100644 → 0
+0 −380

File deleted.

Preview size limit exceeded, changes collapsed.

+22 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2012-2016 The CyanogenMod Project
     Copyright (C) 2017-2018 The LineageOS Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="alarm_upcoming_channel">আসন্ন অ্যালার্মগুলো</string>
    <string name="stopwatch_channel">স্টপওয়াচ</string>
    <string name="timer_channel">টাইমার</string>
</resources>
+324 −0

File added.

Preview size limit exceeded, changes collapsed.