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

Commit 76295343 authored by Xin Li's avatar Xin Li
Browse files

Merge Coral/Flame into AOSP master 

Bug: 141248619
Change-Id: I39549add6322c462ce47f7efb40c93ae5ea4a18c
Merged-In: Id38b45dec8741b1de8b29c4653c2e0a4ac1e0603
parents d02698ce 8cd734d0

android/app/res/values-ar/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
    <string name="status_connection_error" msgid="947681831523219891">"لم يتم الاتصال بنجاح."</string>

    <string name="status_protocol_error" msgid="3245444473429269539">"لا يمكن معالجة الطلب بشكل صحيح."</string>

    <string name="status_unknown_error" msgid="8156660554237824912">"خطأ غير معروف."</string>

    <string name="btopp_live_folder" msgid="7967791481444474554">"تم الاستلام عبر بلوتوث"</string>

    <string name="btopp_live_folder" msgid="7967791481444474554">"ملفات بلوتوث المستلَمة"</string>

    <string name="opp_notification_group" msgid="3486303082135789982">"مشاركة البلوتوث"</string>

    <string name="download_success" msgid="7036160438766730871">"اكتمل استلام <xliff:g id="FILE_SIZE">%1$s</xliff:g>."</string>

    <string name="upload_success" msgid="4014469387779648949">"اكتمل إرسال <xliff:g id="FILE_SIZE">%1$s</xliff:g>."</string>

android/app/res/values-de/strings.xml

+4 −4
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
    <string name="incoming_file_confirm_content" msgid="2752605552743148036">"Eingehende Datei annehmen?"</string>

    <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"Ablehnen"</string>

    <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Akzeptieren"</string>

    <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"OK"</string>

    <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"Ok"</string>

    <string name="incoming_file_confirm_timeout_content" msgid="172779756093975981">"Die Zeit zum Empfang der eingehenden Datei von \"<xliff:g id="SENDER">%1$s</xliff:g>\" ist abgelaufen."</string>

    <string name="incoming_file_confirm_Notification_title" msgid="5573329005298936903">"Eingehende Datei"</string>

    <string name="incoming_file_confirm_Notification_content" msgid="3359694069319644738">"<xliff:g id="SENDER">%1$s</xliff:g> kann jetzt <xliff:g id="FILE">%2$s</xliff:g> senden."</string>
@@ -59,19 +59,19 @@ 
    <string name="download_fail_line1" msgid="3846450148862894552">"Datei nicht empfangen"</string>

    <string name="download_fail_line2" msgid="8950394574689971071">"Datei: <xliff:g id="FILE">%1$s</xliff:g>"</string>

    <string name="download_fail_line3" msgid="3451040656154861722">"Grund: <xliff:g id="REASON">%1$s</xliff:g>"</string>

    <string name="download_fail_ok" msgid="1521733664438320300">"OK"</string>

    <string name="download_fail_ok" msgid="1521733664438320300">"Ok"</string>

    <string name="download_succ_line5" msgid="4509944688281573595">"Datei empfangen"</string>

    <string name="download_succ_ok" msgid="7053688246357050216">"Öffnen"</string>

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

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

    <string name="upload_line5" msgid="7759322537674229752">"Datei wird gesendet..."</string>

    <string name="upload_succ_line5" msgid="5687317197463383601">"Die Datei wurde gesendet."</string>

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

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

    <string name="upload_fail_line1" msgid="7899394672421491701">"Die Datei wurde nicht an \"<xliff:g id="RECIPIENT">%1$s</xliff:g>\" gesendet."</string>

    <string name="upload_fail_line1_2" msgid="2108129204050841798">"Datei: <xliff:g id="FILE">%1$s</xliff:g>"</string>

    <string name="upload_fail_ok" msgid="5807702461606714296">"Wiederholen"</string>

    <string name="upload_fail_cancel" msgid="9118496285835687125">"Schließen"</string>

    <string name="bt_error_btn_ok" msgid="5965151173011534240">"OK"</string>

    <string name="bt_error_btn_ok" msgid="5965151173011534240">"Ok"</string>

    <string name="unknown_file" msgid="6092727753965095366">"Unbekannte Datei"</string>

    <string name="unknown_file_desc" msgid="480434281415453287">"Dieser Dateityp kann von keiner App verarbeitet werden. \n"</string>

    <string name="not_exist_file" msgid="3489434189599716133">"Keine Datei"</string>

android/app/res/values-de/test_strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
    <string name="update_record" msgid="2480425402384910635">"Aufnahme bestätigen"</string>

    <string name="ack_record" msgid="6716152390978472184">"Aufnahme bestätigen"</string>

    <string name="deleteAll_record" msgid="4383349788485210582">"Gesamte Aufnahme löschen"</string>

    <string name="ok_button" msgid="6519033415223065454">"OK"</string>

    <string name="ok_button" msgid="6519033415223065454">"Ok"</string>

    <string name="delete_record" msgid="4645040331967533724">"Aufnahme löschen"</string>

    <string name="start_server" msgid="9034821924409165795">"TCP-Server starten"</string>

    <string name="notify_server" msgid="4369106744022969655">"TCP-Server benachrichtigen"</string>

android/app/res/values-es-rUS/strings.xml

+4 −4
Original line number Diff line number Diff line
@@ -111,12 +111,12 @@ 
    <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth: archivos enviados"</string>

    <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth: archivos recibidos"</string>

    <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">

      <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> con error</item>

      <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> con error</item>

      <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> incompletos</item>

      <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> incompleto </item>

    </plurals>

    <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">

      <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> correctos, %2$s</item>

      <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> correcto, %2$s</item>

      <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> completos, %2$s</item>

      <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> completo, %2$s</item>

    </plurals>

    <string name="transfer_menu_clear_all" msgid="790017462957873132">"Eliminar lista"</string>

    <string name="transfer_menu_open" msgid="3368984869083107200">"Abrir"</string>

android/app/res/values-et/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>

    <string name="unknown_device" msgid="9221903979877041009">"Tundmatu seade"</string>

    <string name="unknownNumber" msgid="4994750948072751566">"Tundmatu"</string>

    <string name="airplane_error_title" msgid="2683839635115739939">"Lennurežiim"</string>

    <string name="airplane_error_title" msgid="2683839635115739939">"Lennukirežiim"</string>

    <string name="airplane_error_msg" msgid="8698965595254137230">"Te ei saa Bluetoothi lennurežiimis kasutada."</string>

    <string name="bt_enable_title" msgid="8657832550503456572"></string>

    <string name="bt_enable_line1" msgid="7203551583048149">"Bluetoothi teenuste kasutamiseks peate esmalt Bluetoothi sisse lülitama."</string>