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

Commit d1527a91 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge remote-tracking branch 'origin/lineage-15.1' into v1-oreo

parents 5e23c354 0ea67505
Loading
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -20,4 +20,5 @@
    <string name="callFailed_incoming_cb_enabled">Pihak lain telah mencegah semua panggilan masuk.</string>
    <string name="callUnanswered_forwarded">Panggilan tidak terjawab dan diteruskan</string>
    <string name="incall_connecting_waiting">Memanggil (menunggu\u2026)</string>
    <string name="incall_calling_via_waiting_template">Memanggil melalui <xliff:g id="provider_name">%s</xliff:g> (menunggu\u2026)</string>
</resources>
+24 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<!--
     Copyright (C) 2013-2014 The CyanogenMod Project
     Copyright (c) 2013, The Linux Foundation. All rights reserved.

     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="callFailed_incoming_cb_enabled">パーティーが全ての着信を禁止しています</string>
    <string name="callUnanswered_forwarded">通話は応答されずに転送されました</string>
    <string name="incall_connecting_waiting">発信中(待機中\u2026)</string>
    <string name="incall_calling_via_waiting_template"><xliff:g id="provider_name">%s</xliff:g>経由の通話(待機中...)</string>
</resources>