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

Commit 03c85416 authored by Bill Yi's avatar Bill Yi Committed by Gerrit Code Review
Browse files

Merge "Merge mainline-release 6664920 to master - DO NOT MERGE"

parents e25c5940 1e07bf40

res/values-fa/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
    <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"نپذیرفتن"</string>

    <string name="incoming_file_confirm_ok" msgid="281462442932231475">"پذیرفتن"</string>

    <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"تأیید"</string>

    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"هنگام پذیرش یک فایل ورودی از \"<xliff:g id="SENDER">%1$s</xliff:g>\" درنگ پیش آمد"</string>

    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"هنگام پذیرش یک فایل ورودی از \"<xliff:g id="SENDER">%1$s</xliff:g>\" وقفه زمانی پیش آمد"</string>

    <string name="incoming_file_confirm_Notification_title" msgid="5573329005298936903">"فایل ورودی"</string>

    <string name="incoming_file_confirm_Notification_content" msgid="3359694069319644738">"<xliff:g id="SENDER">%1$s</xliff:g> آماده ارسال <xliff:g id="FILE">%2$s</xliff:g> است"</string>

    <string name="notification_receiving" msgid="4674648179652543984">"اشتراک بلوتوث: در حال دریافت <xliff:g id="FILE">%1$s</xliff:g>"</string>

res/values-it/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
    <string name="download_line2" msgid="5876973543019417712">"File: <xliff:g id="FILE">%1$s</xliff:g>"</string>

    <string name="download_line3" msgid="4384821622908676061">"Dim. file: <xliff:g id="SIZE">%1$s</xliff:g>"</string>

    <string name="download_line4" msgid="8535996869722666525"></string>

    <string name="download_line5" msgid="3069560415845295386">"Ricezione file…"</string>

    <string name="download_line5" msgid="3069560415845295386">"Ricezione file..."</string>

    <string name="download_cancel" msgid="9177305996747500768">"Interrompi"</string>

    <string name="download_ok" msgid="5000360731674466039">"Nascondi"</string>

    <string name="incoming_line1" msgid="2127419875681087545">"Da"</string>
@@ -64,7 +64,7 @@ 
    <string name="download_succ_ok" msgid="7053688246357050216">"Apri"</string>

    <string name="upload_line1" msgid="2055952074059709052">"A: \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\""</string>

    <string name="upload_line3" msgid="4920689672457037437">"Tipo di file: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="SIZE">%2$s</xliff:g>)"</string>

    <string name="upload_line5" msgid="7759322537674229752">"Invio file…"</string>

    <string name="upload_line5" msgid="7759322537674229752">"Invio file..."</string>

    <string name="upload_succ_line5" msgid="5687317197463383601">"File inviato"</string>

    <string name="upload_succ_ok" msgid="7705428476405478828">"OK"</string>

    <string name="upload_fail_line1" msgid="7899394672421491701">"Impossibile inviare il file a \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\"."</string>
@@ -75,7 +75,7 @@ 
    <string name="unknown_file_desc" msgid="480434281415453287">"Non sono disponibili applicazioni in grado di gestire questo tipo di file. \n"</string>

    <string name="not_exist_file" msgid="3489434189599716133">"Nessun file"</string>

    <string name="not_exist_file_desc" msgid="4059531573790529229">"Il file non esiste. \n"</string>

    <string name="enabling_progress_title" msgid="436157952334723406">"Attendi…"</string>

    <string name="enabling_progress_title" msgid="436157952334723406">"Attendi..."</string>

    <string name="enabling_progress_content" msgid="4601542238119927904">"Attivazione Bluetooth…"</string>

    <string name="bt_toast_1" msgid="972182708034353383">"Il file verrà ricevuto. Controlla l\'avanzamento nel pannello Notifiche."</string>

    <string name="bt_toast_2" msgid="8602553334099066582">"Impossibile ricevere il file."</string>