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

Commit 254290d4 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE: Merge Oreo MR1 into master"

parents 7d9d3247 a05260a2

res/values-ca/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ 
    <string name="alarm_settings" msgid="2947147071388290814">"Alarmes"</string>

    <string name="timer_service_desc" msgid="2256002649882602433">"Processa les accions de les notificacions del temporitzador."</string>

    <string name="stopwatch_service_desc" msgid="9220132827343760767">"Processa les accions de les notificacions del cronòmetre."</string>

    <string name="swn_paused" msgid="6364358842808263589">"Aturat"</string>

    <string name="swn_paused" msgid="6364358842808263589">"En pausa"</string>

    <string name="description_direction_right" msgid="5709209043267548985">"Llisca cap a la dreta per ignorar"</string>

    <string name="description_direction_left" msgid="7448141043674998679">"Llisca cap a l\'esquerra per posposar"</string>

    <string name="description_direction_both" msgid="1841309486023845685">"Llisca cap a l\'esquerra per posposar l\'alarma o cap a la dreta per ignorar-la"</string>

res/values-fa/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -369,8 +369,8 @@ 
    <string name="shortcut_start_screensaver_short" msgid="3414762073311954753">"محافظ صفحه"</string>

    <string name="shortcut_start_screensaver_long" msgid="6134275671119484907">"شروع محافظ صفحه‌نمایش"</string>

    <string name="alarm_settings" msgid="2947147071388290814">"هشدارها"</string>

    <string name="timer_service_desc" msgid="2256002649882602433">"اقدامات را از اعلان‌های تایمر پردازش می‌کند."</string>

    <string name="stopwatch_service_desc" msgid="9220132827343760767">"اقدامات را از اعلان‌های کرونومتر پردازش می‌کند."</string>

    <string name="timer_service_desc" msgid="2256002649882602433">"کنش‌ها را از اعلان‌های تایمر پردازش می‌کند."</string>

    <string name="stopwatch_service_desc" msgid="9220132827343760767">"کنش‌ها را از اعلان‌های کرونومتر پردازش می‌کند."</string>

    <string name="swn_paused" msgid="6364358842808263589">"متوقف شد"</string>

    <string name="description_direction_right" msgid="5709209043267548985">"برای ردکردن، انگشتتان را روی صفحه تند به راست بکشید"</string>

    <string name="description_direction_left" msgid="7448141043674998679">"برای تعویق، انگشتتان را روی صفحه تند به چپ بکشید"</string>

res/values-in/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ 
    <string name="swn_paused" msgid="6364358842808263589">"Dijeda"</string>

    <string name="description_direction_right" msgid="5709209043267548985">"Geser ke kanan untuk menutup"</string>

    <string name="description_direction_left" msgid="7448141043674998679">"Geser ke kiri untuk menunda"</string>

    <string name="description_direction_both" msgid="1841309486023845685">"Gesek ke kiri untuk menunda atau ke kanan untuk menutup"</string>

    <string name="description_direction_both" msgid="1841309486023845685">"Geser ke kiri untuk menunda atau ke kanan untuk menutup"</string>

    <string name="timer_settings" msgid="7955522143086154795">"Timer"</string>

    <string name="timer_vibrate_title" msgid="7788920024785587518">"Timer bergetar"</string>

    <string name="timer_paused" msgid="5941160896040771462">"Timer dijeda"</string>

res/values-mr/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ 
    </plurals>

    <string name="every_day" msgid="4100909974923444602">"दररोज"</string>

    <string name="day_concat" msgid="971998564991636532">", "</string>

    <string name="loading_widget" msgid="5306242862476796500">"लोड करीत आहे..."</string>

    <string name="loading_widget" msgid="5306242862476796500">"लोड करत आहे..."</string>

    <string name="analog_gadget" msgid="1670505720837152766">"अॅनालॉग घड्याळ"</string>

    <string name="digital_gadget" msgid="2326954556720571358">"डिजिटल घड्याळ"</string>

    <string name="settings" msgid="5849739030579520686">"सेटिंग्ज"</string>

res/values-ne/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ 
    <string name="timers_in_use" msgid="5570729467344408506">"<xliff:g id="NUMBER">%d</xliff:g> घडीहरू"</string>

    <string name="next_timer_notif" msgid="6136454740115613653">"अर्को घडी: <xliff:g id="TIME_REMAINING">%s</xliff:g>"</string>

    <string name="screensaver_settings" msgid="1780742944194267226">"स्क्रिन सेभर सम्बन्धी सेटिङहरू"</string>

    <string name="night_mode_title" msgid="5983813889469616299">"रात्री मोड"</string>

    <string name="night_mode_title" msgid="5983813889469616299">"रात्रि मोड"</string>

    <string name="night_mode_summary" msgid="1017350187324162631">"ज्यादै मधुरो प्रदर्शन (अध्याँरा कोठाहरूका लागि)"</string>

    <string name="expand_alarm" msgid="7392616528943305020">"अलार्म विस्तार गर्नुहोस्"</string>

    <string name="collapse_alarm" msgid="3561772046433483980">"अलार्म ढाल्नुहोस्"</string>