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

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

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

parents d661c754 9311daa0
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -51,4 +51,5 @@
  <string name="alarm_picker_title">Kies alarm tipe</string>
  <string name="alarm_type_ringtone">Luitoon</string>
  <string name="alarm_type_random">Willekeurig</string>
  <string name="warn_silent_alarm_title">Alarm volume is af</string>
</resources>
+1 −0
Original line number Diff line number Diff line
@@ -51,4 +51,5 @@
  <string name="alarm_picker_title">اختر نوع التنبيه</string>
  <string name="alarm_type_ringtone">نغمة رنين</string>
  <string name="alarm_type_random">عشوائياً</string>
  <string name="warn_silent_alarm_title">صوت التنبيه على الصامت</string>
</resources>
+55 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.net-->
<!--
    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
@@ -51,4 +51,5 @@
  <string name="alarm_picker_title">Tria el tipus d\'alarma</string>
  <string name="alarm_type_ringtone">To de trucada</string>
  <string name="alarm_type_random">A l\'atzar</string>
  <string name="warn_silent_alarm_title">El volum de l\'alarma està en silenci</string>
</resources>
+2 −2
Original line number Diff line number Diff line
@@ -90,10 +90,10 @@
    <item msgid="3688923880208568496">"Martinik"</item>
    <item msgid="3124245926616896140">"Mendoza"</item>
    <item msgid="8264013691437690644">"Metlakatla"</item>
    <item msgid="3242307788223843671">"Mexico City"</item>
    <item msgid="3242307788223843671">"Ciudad de México"</item>
    <item msgid="3904210242491724008">"Monterrey"</item>
    <item msgid="2049700402307558992">"Montevideo"</item>
    <item msgid="6972371385309297826">"Montreal"</item>
    <item msgid="6972371385309297826">"Montréal"</item>
    <item msgid="1121150121639680484">"Nassau"</item>
    <item msgid="8783518093470040300">"New York"</item>
    <item msgid="8685565479120721681">"Beulah"</item>
Loading