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

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

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

Conflicts:
	res/values-in/cm_strings.xml
	res/values-ja/cm_strings.xml
	res/values-lt/cm_strings.xml
	res/values-nb/cm_strings.xml
	res/values-pl/cm_strings.xml
	res/values-th/cm_strings.xml

Change-Id: I152152f769d34de37787a15e157da12aa01a8b66
parents 637e2f0c b6783c46
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@
  <string name="call_log_show_all_slots">Alle SIM-Karten</string>
  <string name="yes">Ja</string>
  <string name="no">Nein</string>
  <string name="call_duration_active">Aktive Dauer:</string>
  <string name="call_duration_call_out">Gesprächsdauer:</string>
  <string name="call_log_all_calls_header">Alle Anrufe</string>
</resources>
+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@
  <string name="speed_dial_replace">Ganti</string>
  <string name="speed_dial_delete">Hapus</string>
  <string name="speed_dial_unassigned_dialog_title">Tombol belum ditetapkan</string>
  <string name="speed_dial_unassigned_dialog_message">Tidak ada kontak panggil cepat yang ditetapkan ke tombol angka \'<xliff:g id="number">%s</xliff:g>\'. Apakah Anda ingin menetapkan sebuah kontak sekarang?</string>
  <string name="dialog_speed_dial_airplane_mode_message">"Untuk menggunakan panggilan cepat, pertama matikan mode Pesawat."</string>
  <string name="msim_ime_dialog_title">Identifikasi perangkat</string>
  <string name="multi_sim_slot_name">SIM <xliff:g id="index">%d</xliff:g></string>
+19 −0
Original line number Diff line number Diff line
@@ -50,4 +50,23 @@
  <string name="start_call_playback">נגן הקלטה</string>
  <string name="stop_call_playback">עצור</string>
  <string name="call_playback_error_message">נכשל בניגון הקלטה</string>
  <string name="calllog_search_hint">חיפוש ביומן שיחות</string>
  <string name="video_call">שיחת וידאו</string>
  <string name="video_call_settings">הגדרות שיחת וידאו</string>
  <string name="description_videocall">שיחת וידאו <xliff:g id="name">%1$s</xliff:g></string>
  <string name="speed_dial_settings">הגדרות חיוג מהיר</string>
  <string name="speed_dial_not_set">(לא מוגדר)</string>
  <string name="speed_dial_replace">החלף</string>
  <string name="speed_dial_delete">מחק</string>
  <string name="speed_dial_unassigned_dialog_title">לא הוגדר מקש</string>
  <string name="speed_dial_unassigned_dialog_message">שום איש קשר מהיר אינו מחובר למספר \'<xliff:g id="number">%s</xliff:g>\'. האם ברצונך להגדיר איש קשר?</string>
  <string name="dialog_speed_dial_airplane_mode_message">"כדי להשתמש בחיוג מהיר, בטל תחילה את מצב טיסה."</string>
  <string name="msim_ime_dialog_title">מזהה התקן</string>
  <string name="multi_sim_slot_name">סים  <xliff:g id="index">%d</xliff:g></string>
  <string name="call_log_show_all_slots">כל הסימים</string>
  <string name="yes">כן</string>
  <string name="no">לא</string>
  <string name="call_duration_active">זמן שיחה פעילה:</string>
  <string name="call_duration_call_out">משך השיחה:</string>
  <string name="call_log_all_calls_header">כל השיחות</string>
</resources>
+3 −3
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@
  <string name="date_qs_lastmonth">先月</string>
  <string name="date_qs_lastquarter">下四半期</string>
  <string name="date_qs_lastyear">昨年</string>
  <string name="call_stats_date_filter">時間範囲を調整</string>
  <string name="call_stats_reset_filter">時間範囲をリセット</string>
  <string name="call_stats_date_filter">時間範囲を調整</string>
  <string name="call_stats_reset_filter">時間範囲をリセット</string>
  <string name="call_stats_sort_by_duration">通話時間で並べ替え</string>
  <string name="call_stats_sort_by_count">通話回数で並べ替え</string>
  <string name="menu_add_to_blacklist">ブラックリストに追加</string>
@@ -58,7 +58,7 @@
  <string name="speed_dial_not_set">(未設定)</string>
  <string name="speed_dial_replace">書き換える</string>
  <string name="speed_dial_delete">削除</string>
  <string name="speed_dial_unassigned_dialog_title">キー割り当てられていません</string>
  <string name="speed_dial_unassigned_dialog_title">キー割り当てがありません</string>
  <string name="speed_dial_unassigned_dialog_message">数字キー「<xliff:g id="number">%s</xliff:g>」にはスピードダイヤルの連絡先が割り当てられていません。連絡先を割り当てますか?</string>
  <string name="dialog_speed_dial_airplane_mode_message">"スピードダイヤルを使用するには、機内モードをOFFにしてください。"</string>
  <string name="msim_ime_dialog_title">端末識別子</string>
+35 −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

     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">
  <plurals name="hour">
    <item quantity="one">%d Stonn</item>
    <item quantity="other">%d Stonnen</item>
  </plurals>
  <plurals name="minute">
    <item quantity="one">%d Minutt</item>
    <item quantity="other">%d Minutten</item>
  </plurals>
  <plurals name="second">
    <item quantity="one">%d Sekonn</item>
    <item quantity="other">%d Sekonnen</item>
  </plurals>
  <plurals name="call">
    <item quantity="one">%d Uruff</item>
    <item quantity="other">%d Uriff</item>
  </plurals>
</resources>
Loading