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

Commit b5d4c457 authored by Bill Yi's avatar Bill Yi
Browse files

Merge pi-dr1-dev to aosp-master 

Change-Id: I61fc9824a9c2f8d577b79eab87c196ced5b328ef
parents bf900b00 e04961a3

res/values-bn/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ 
    <string name="alarm_volume_title" msgid="8506245173912428522">"অ্যালার্মের ভলিউম"</string>

    <string name="silent_ringtone_title" msgid="6177287302898634765">"নীরব"</string>

    <string name="unknown_ringtone_title" msgid="6637522029614550112">"অজানা"</string>

    <string name="alarm_volume_muted" msgid="6658289289695673569">"অ্যালার্মের ভলিউম নিঃশব্দ করা হয়েছে"</string>

    <string name="alarm_volume_muted" msgid="6658289289695673569">"অ্যালার্মের ভলিউম মিউট করা হয়েছে"</string>

    <string name="unmute_alarm_volume" msgid="2655009276035357497">"সশব্দ করুন"</string>

    <string name="silent_default_alarm_ringtone" msgid="6012855475009670997">"ডিফল্ট অ্যালার্মের রিংটোন হ\'ল নীরব"</string>

    <string name="change_setting_action" msgid="1224356633832430160">"পরিবর্তন করুন"</string>

res/values-ca/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ 
    <string name="silent_ringtone_title" msgid="6177287302898634765">"Silenci"</string>

    <string name="unknown_ringtone_title" msgid="6637522029614550112">"Desconegut"</string>

    <string name="alarm_volume_muted" msgid="6658289289695673569">"S\'ha silenciat el volum de l\'alarma"</string>

    <string name="unmute_alarm_volume" msgid="2655009276035357497">"Activa el so"</string>

    <string name="unmute_alarm_volume" msgid="2655009276035357497">"Deixa de silenciar"</string>

    <string name="silent_default_alarm_ringtone" msgid="6012855475009670997">"El so d\'alarma predeterminat està en silenci"</string>

    <string name="change_setting_action" msgid="1224356633832430160">"Canvia"</string>

    <string name="app_notifications_blocked" msgid="7249150789023936889">"Les notificacions del rellotge estan bloquejades"</string>

res/values-pt/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ 
    <string name="timer_notifications_hours_seconds" msgid="8168090805113197804">"<xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="SECONDS"> %4$s</xliff:g><xliff:g id="REMAINING"> %3$s</xliff:g>"</string>

    <string name="timer_notifications_hours_minutes_seconds" msgid="4666176878038730417">"<xliff:g id="HOURS">%1$s</xliff:g><xliff:g id="MINUTES"> %2$s</xliff:g><xliff:g id="SECONDS"> %4$s</xliff:g><xliff:g id="REMAINING"> %3$s</xliff:g>"</string>

    <string name="timer_accessibility_one_minute_added" msgid="6096646178998456004">"Um minuto adicionado ao temporizador, <xliff:g id="TIME">%1$s</xliff:g>"</string>

    <string name="timer_accessibility_stopped" msgid="2753501043114605474">"Temporizador pausado: <xliff:g id="TIME">%1$s</xliff:g>"</string>

    <string name="timer_accessibility_started" msgid="8503877052873671219">"Temporizador em execução: <xliff:g id="TIME">%1$s</xliff:g>"</string>

    <string name="timer_accessibility_stopped" msgid="2753501043114605474">"Timer pausado: <xliff:g id="TIME">%1$s</xliff:g>"</string>

    <string name="timer_accessibility_started" msgid="8503877052873671219">"Timer em execução: <xliff:g id="TIME">%1$s</xliff:g>"</string>

    <string name="timer_remaining_single" msgid="6782851171906765864">"restante"</string>

    <string name="timer_remaining_multiple" msgid="6052775962092160851">"restantes"</string>

  <string-array name="alarm_set">