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

Commit e2156465 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie

parents 01964125 7072eb1c
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="menu_emergency_information_txt">Información d\'emerxencia</string>
    <string name="call_via_template">Llamar per <xliff:g id="account">%1$s</xliff:g></string>
    <string name="call_via_template">Llamar per «<xliff:g id="account">%1$s</xliff:g>»</string>
</resources>

res/values-ast-rES/strings.xml

deleted100644 → 0
+0 −516

File deleted.

Preview size limit exceeded, changes collapsed.

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@
     limitations under the License.
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="menu_emergency_information_txt">Təcili vəziyyəti ismarışı</string>
    <string name="menu_emergency_information_txt">Fövqəladə vəziyyət məlumatı</string>
    <string name="call_via_template"><xliff:g id="account">%1$s</xliff:g> ilə zəng et</string>
</resources>
+19 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 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="menu_emergency_information_txt">জরুরি তথ্য</string>
</resources>
+397 −11

File changed.

Preview size limit exceeded, changes collapsed.

Loading