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

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

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

parents 763d37d0 a8059acb
Loading
Loading
Loading
Loading
+55 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<!--
    Copyright (C) 2012 The Android Open Source 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>
  <array name="snooze_dismiss_drawables">
    <item>@drawable/ic_alarm_alert_dismiss</item>
    <item>@null</item>
    <item>@drawable/ic_alarm_alert_snooze</item>
    <item>@null</item>
  </array>
  <array name="snooze_dismiss_descriptions">
    <item>@string/alarm_alert_dismiss_text</item>
    <item>@null</item>
    <item>@string/alarm_alert_snooze_text</item>
    <item>@null</item>
  </array>
  <array name="snooze_dismiss_direction_descriptions">
    <item>@string/description_direction_right</item>
    <item>@null</item>
    <item>@string/description_direction_left</item>
    <item>@null</item>
  </array>
  <array name="dismiss_drawables">
    <item>@drawable/ic_alarm_alert_dismiss</item>
    <item>@null</item>
    <item>@null</item>
    <item>@null</item>
  </array>
  <array name="dismiss_descriptions">
    <item>@string/alarm_alert_dismiss_text</item>
    <item>@null</item>
    <item>@null</item>
    <item>@null</item>
  </array>
  <array name="dismiss_direction_descriptions">
    <item>@string/description_direction_right</item>
    <item>@null</item>
    <item>@null</item>
    <item>@null</item>
  </array>
</resources>
+1 −0
Original line number Diff line number Diff line
@@ -56,4 +56,5 @@
  <string name="alarm_select_ringtone">Klingelton</string>
  <string name="alarm_select_external">Musik</string>
  <string name="ringtone_default">"Standard-Klingelton"</string>
  <string name="take_persistent_grant_uri_permission_failed_msg">Dauerhafte Berechtigung zum Ändern des Klingeltons konnte nicht eingeholt werden</string>
</resources>
+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="show_status_bar_icon_title">Εμφάνιση εικονιδίου</string>
  <string name="show_status_bar_icon_summary">Εμφάνιση εικονιδίου στη γραμμή κατάστασης όταν έχει ρυθμιστεί ένα ξυπνητήρι</string>
  <string name="show_status_bar_icon_summary">Εμφάνιση εικονιδίου στη γραμμή κατάστασης όταν έχει οριστεί ώρα αφύπνισης</string>
  <string name="alarm_increasing_volume">Αυξανόμενη ένταση</string>
  <string name="profile_description">Προφίλ <xliff:g id="profile">%s</xliff:g></string>
  <string name="profile_no_selected">Δεν επιλέχθηκε προφίλ</string>
+5 −0
Original line number Diff line number Diff line
@@ -52,4 +52,9 @@
  <string name="alarm_type_ringtone">צלצול</string>
  <string name="alarm_type_random">אקראי</string>
  <string name="warn_silent_alarm_title">שעון מעורר מושתק בעוצמה</string>
  <string name="alarm_select">בחר צלצול</string>
  <string name="alarm_select_ringtone">צליל חיוג</string>
  <string name="alarm_select_external">מוזיקה</string>
  <string name="ringtone_default">"רינגטון ברירת מחדל"</string>
  <string name="take_persistent_grant_uri_permission_failed_msg">אין אפשרות לקבל הרשאות תמידיות לרינגטון</string>
</resources>
+17 −17
Original line number Diff line number Diff line
@@ -316,38 +316,38 @@
    <item>Tegucigalpa</item>
    <item>Paramaribo</item>
    <item>Quito</item>
    <item>Marshall Islands</item>
    <item>Midway Island</item>
    <item>Marshallinselen</item>
    <item>Midwayinselen</item>
    <item>Regina</item>
    <item>Manaus</item>
    <item>Araguaina</item>
    <item>Godthab</item>
    <item>South Georgia</item>
    <item>Azores</item>
    <item>Araguaína</item>
    <item>Nuuk</item>
    <item>Südgeorgien</item>
    <item>Azoren</item>
    <item>Windhoek</item>
    <item>Tbilisi</item>
    <item>Yerevan</item>
    <item>Tiflis</item>
    <item>Jerewan</item>
    <item>Oral</item>
    <item>Yekaterinburg</item>
    <item>Krasnoyarsk</item>
    <item>Jekaterinburg</item>
    <item>Krasnojarsk</item>
    <item>Irkutsk</item>
    <item>Yakutsk</item>
    <item>Jakutsk</item>
    <item>Hobart</item>
    <item>Magadan</item>
    <item>Tongatapu</item>
    <item>Aklavik</item>
    <item>Montgomery</item>
    <item>Geneva</item>
    <item>Odesa</item>
    <item>Genf</item>
    <item>Odessa</item>
    <item>Aden</item>
    <item>Abu Dhabi</item>
    <item>Tashkent</item>
    <item>New Delhi</item>
    <item>Taschhkent</item>
    <item>Nei-Delhi</item>
    <item>Suva</item>
    <item>Wellington</item>
    <item>Chatham</item>
    <item>Vladivostok</item>
    <item>Kamchatka</item>
    <item>Wladiwostok</item>
    <item>Kamtschatka</item>
  </string-array>
  <array name="snooze_dismiss_drawables">
    <item>@drawable/ic_alarm_alert_dismiss</item>
Loading