i18n: bump translations
Change-Id: I807816c9081fbd54802f711f38bbb2823fd3c98e
diff --git a/ring-android/app/src/main/res/values-ar/strings.xml b/ring-android/app/src/main/res/values-ar/strings.xml
index 0148d83..fdaa7f0 100644
--- a/ring-android/app/src/main/res/values-ar/strings.xml
+++ b/ring-android/app/src/main/res/values-ar/strings.xml
@@ -84,4 +84,9 @@
<string name="unknown">مجهول</string>
<!--Share fragment-->
<string name="generic_error_migration">خطأ</string>
+ <!--Pending contact requests-->
+ <string name="accept">اقبل</string>
+ <string name="refuse">أرفض</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">أرسل</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-ar/strings_account.xml b/ring-android/app/src/main/res/values-ar/strings_account.xml
index 39e4fae..06f6e3a 100644
--- a/ring-android/app/src/main/res/values-ar/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ar/strings_account.xml
@@ -74,4 +74,5 @@
<string name="account_status_unknown">مجهول</string>
<!--Create account-->
<string name="account_creation_home">مرحبا بك في Ring</string>
+ <!--Devices-->
</resources>
diff --git a/ring-android/app/src/main/res/values-bg/strings.xml b/ring-android/app/src/main/res/values-bg/strings.xml
index a5a27f9..e755011 100644
--- a/ring-android/app/src/main/res/values-bg/strings.xml
+++ b/ring-android/app/src/main/res/values-bg/strings.xml
@@ -44,8 +44,6 @@
<string name="transfer_no_other_call">Няма други чакащи разговори</string>
<string name="transfer_type_number">Въведете номер, към който да прехвърлите:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Пропуснато обаждане от %1$s</string>
- <string name="notif_missed_outgoing_call">Пропуснато обаждане до %1$s</string>
<string name="notif_incoming_call_title">Входящо обаждане от %1$s</string>
<string name="notif_incoming_call">Входящо обаждане</string>
<string name="notif_outgoing_call_title">Изходящо обаждане до %1$s</string>
@@ -115,4 +113,9 @@
<string name="share_message">Сканирайте този QR-код с вградения скенер на приложението Ring, което иска да се свърже с Вас.</string>
<string name="share_your_account_information">Споделяне на информацията аз връзка с мен</string>
<string name="generic_error_migration">Грешка</string>
+ <!--Pending contact requests-->
+ <string name="accept">Приемане</string>
+ <string name="refuse">Отказ</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Изпращане</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-bg/strings_account.xml b/ring-android/app/src/main/res/values-bg/strings_account.xml
index 241197d..368f032 100644
--- a/ring-android/app/src/main/res/values-bg/strings_account.xml
+++ b/ring-android/app/src/main/res/values-bg/strings_account.xml
@@ -130,9 +130,11 @@
<string name="registered_username">Регистрирано потребителско име</string>
<string name="username_already_taken">Потребителското име е вече заето</string>
<string name="invalid_username">Грешно потребителско име</string>
- <string name="looking_for_username_availability">Проверка дали потребителското име е свободно…</string>
<string name="account_status_connecting">Свързване</string>
<string name="account_status_unknown">Неизвестно</string>
<!--Create account-->
<string name="account_creation_home">Добре дошли в Ring</string>
+ <!--Devices-->
+ <string name="enter_password">Въведете парола</string>
+ <string name="revoke_device_wait_title">Моля, изчакайте…</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-ca/strings.xml b/ring-android/app/src/main/res/values-ca/strings.xml
index ae0603c..3750f6e 100644
--- a/ring-android/app/src/main/res/values-ca/strings.xml
+++ b/ring-android/app/src/main/res/values-ca/strings.xml
@@ -46,8 +46,6 @@
<string name="transfer_no_other_call">No hi ha altres trucades pendents</string>
<string name="transfer_type_number">Escriure un número per transferir a:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Trucada perduda de %1$s</string>
- <string name="notif_missed_outgoing_call">Trucada perduda a %1$s</string>
<string name="notif_incoming_call_title">Trucada entrant de %1$s</string>
<string name="notif_incoming_call">Trucada entrant</string>
<string name="notif_outgoing_call_title">Trucada sortint de %1$s</string>
@@ -122,4 +120,7 @@
<string name="share_message">Escaneja aquest codi QR amb l\'escàner de l\'aplicació Ring que vulga comunicar-se amb tu.</string>
<string name="share_your_account_information">Compartir la meua informació de contacte</string>
<string name="generic_error_migration">Error</string>
+ <!--Pending contact requests-->
+ <!--Send contact requests-->
+ <string name="send_request_button">Enviar</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-ca/strings_account.xml b/ring-android/app/src/main/res/values-ca/strings_account.xml
index 8666a66..979ca1b 100644
--- a/ring-android/app/src/main/res/values-ca/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ca/strings_account.xml
@@ -40,4 +40,5 @@
<!--Name registration-->
<string name="account_status_unknown">Desconegut</string>
<!--Create account-->
+ <!--Devices-->
</resources>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
index 71d2764..b0f516b 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
@@ -47,8 +47,6 @@
<string name="transfer_no_other_call">Žádné čekající hovory</string>
<string name="transfer_type_number">Vložte číslo, na něž chcete hovor přesměrovat:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Zmeškaný hovor od %1$s</string>
- <string name="notif_missed_outgoing_call">Zmeškaný hovor pro %1$s</string>
<string name="notif_incoming_call_title">Příchozí hovor od %1$s</string>
<string name="notif_incoming_call">Příchozí hovor</string>
<string name="notif_outgoing_call_title">Odchozí hovor k %1$s</string>
@@ -123,4 +121,9 @@
<string name="share_message">Naskenujte QR kód zabudovaným skenerem aplikace Ring, která s vámi chce komunikovat.</string>
<string name="share_your_account_information">Sdílet mé kontaktní informace</string>
<string name="generic_error_migration">Chyba</string>
+ <!--Pending contact requests-->
+ <string name="accept">Přijmout</string>
+ <string name="refuse">Odmítnout</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Odeslat</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
index 5c83e9b..28c638b 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
@@ -145,10 +145,12 @@
<string name="register_username">Zaregistrovat jméno veřejně (experimentální)</string>
<string name="username_already_taken">Uživatelské jméno je již obsazené</string>
<string name="invalid_username">Neplatné uživatelské jméno</string>
- <string name="looking_for_username_availability">Zjišťuje se dostupnost uživatelského jména…</string>
<string name="account_status_connecting">Spojování</string>
<string name="account_status_unknown">Neznámé</string>
<!--Create account-->
<string name="account_creation_home">Vítejte v Ringu</string>
<string name="account_creation_profile">Vytvořit vlastní profil</string>
+ <!--Devices-->
+ <string name="enter_password">Zadejte heslo</string>
+ <string name="revoke_device_wait_title">Počkejte prosím…</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-da-rDK/strings.xml b/ring-android/app/src/main/res/values-da-rDK/strings.xml
index f3e53c0..9675919 100644
--- a/ring-android/app/src/main/res/values-da-rDK/strings.xml
+++ b/ring-android/app/src/main/res/values-da-rDK/strings.xml
@@ -1,11 +1,18 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="feedback_section">Tilbagemelding</string>
+ <string name="report"><u>Send os en email</u></string>
+ <string name="section_license">Licens</string>
<string name="sponsor_section">Ring er fri software, udviklet og støttet af</string>
<string name="copyright_section">Copyright</string>
<string name="contribute_section">Bidrag</string>
<string name="version_section">Version</string>
<string name="no_email_app_installed">Ingen email-app fundet, installér en for at sende os en rapport</string>
+ <string name="no_browser_app_installed">Ingen web-browser applikation fundet, installér en for at se denne side</string>
<string name="email_chooser_title">Send mail ved brug af...</string>
+ <string name="website_chooser_title">Vis hjemmeside med...</string>
+ <string name="license">Denne software er gjort tilgængelig \"som beset\", uden nogen former for garantier. For flere detaljer, se
+<u>GNU General Public License version 3 eller senere</u></string>
<!--RingActivity-->
<string name="title_activity_sflphone_home">Ring</string>
<string name="error_no_network">Ingen netværksforbindelse</string>
@@ -34,6 +41,7 @@
<item quantity="one">%d samtale</item>
<item quantity="other">%d samtaler</item>
</plurals>
+ <string name="home_transfering">Overfører %1$s til %2$s</string>
<string name="home_transfer_complet">Overførsel afsluttet</string>
<!--ContactList Fragment-->
<string name="no_contact_found">Ingen kontakt funder</string>
@@ -46,8 +54,6 @@
<string name="transfer_no_other_call">Ikke andre opkald i kø</string>
<string name="transfer_type_number">Tast nummer at overføre til:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Mistet opkald fra %1$s</string>
- <string name="notif_missed_outgoing_call">Mistet opkald til %1$s</string>
<string name="notif_incoming_call_title">Indgående opkald fra %1$s</string>
<string name="notif_incoming_call">Indgående opkald</string>
<string name="notif_outgoing_call_title">Udgående opkald til %1$s</string>
@@ -71,6 +77,7 @@
<string name="ab_action_contact_add_question">Tilføj til kontakter?</string>
<string name="ab_action_audio_call">Lydopkald</string>
<string name="ab_action_video_call">Videoopkald</string>
+ <string name="ab_action_change_screen_orientation">Ændr skærm-orientering</string>
<string name="share_via">Del via</string>
<string name="write_a_message">Skriv en besked</string>
<string name="scan_qr">Scan QR-kode</string>
@@ -113,13 +120,23 @@
<string name="help_password_enter">Indtast dit primære Ring-konto kodeord</string>
<string name="help_pin_enter">Indtast PIN-koden fra en anden konfigureret Ring-konto. Brug eksporter-konto-funktionaliteten for at få adgang til en PIN-kode. </string>
<string name="wizard_next">Næste</string>
+ <string name="wizard_back">Tilbage</string>
<!--MenuHeaderView-->
<string name="profile">Min profil</string>
+ <string name="profile_message_warning">Din profil vil kun blive delt med dine kontakter</string>
<string name="open_the_gallery">Åben galleriet</string>
<string name="take_a_photo">Tag et billede</string>
+ <string name="profile_name_hint">Indtast dit navn (valgfrit)</string>
<string name="unknown">Ukendt</string>
<!--Share fragment-->
<string name="share_message">Skan denne QRCode med den indbyggede scanner i Ring-applikationen.</string>
+ <string name="share_message_no_account">Vælg en konto at dele.</string>
<string name="share_your_account_information">Del min kontaktinformation</string>
<string name="generic_error_migration">Fejl</string>
+ <string name="generic_error_migration_message">Der opstod en fejl under migrering</string>
+ <!--Pending contact requests-->
+ <string name="accept">Accepter</string>
+ <string name="refuse">Afvis</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Send</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-da-rDK/strings_account.xml b/ring-android/app/src/main/res/values-da-rDK/strings_account.xml
index 3a7df47..ab38fd5 100644
--- a/ring-android/app/src/main/res/values-da-rDK/strings_account.xml
+++ b/ring-android/app/src/main/res/values-da-rDK/strings_account.xml
@@ -2,7 +2,10 @@
<resources>
<!--Strings related to account edition screen-->
<string name="ic_delete_menu">Slet</string>
+ <string name="ic_advanced_menu">Avancerede indstillinger</string>
<!--Strings related to account creation-->
+ <string name="add_ring_account_title">Tilføj Ring-konto</string>
+ <string name="add_sip_account_title">Tilføj SIP-konto</string>
<string name="prompt_alias">Alias</string>
<string name="prompt_hostname">Værtsnavn</string>
<string name="prompt_username">Brugernavn</string>
@@ -18,9 +21,11 @@
<string name="dialog_warn_ip2ip_account_message">Du er ved at oprette en SIP konto uden et gyldigt værtsnavn.
Du vil kun kunne foretage eller modtage direkte IP opkald.
Du kan rette din konto senere</string>
+ <string name="account_type_ip2ip">IP-konto</string>
<string name="help_ring">En Ring-konto gør dig i stand til at kontakte andre sikkert og direkte uden mellemmand gennem et fuldt distribueret netværk.</string>
<string name="help_sip_title">Tilføj din SIP-konto</string>
<string name="help_sip">Konfigurer en eksisterende SIP-konto.</string>
+ <string name="create_sip_account">Tilføj SIP-konto</string>
<!--Strings related to account deletion-->
<string name="account_delete_dialog_title">Slet konto ?</string>
<string name="account_delete_dialog_message">Denne handling kan ikke fortrydes.</string>
@@ -99,7 +104,7 @@
<string name="error_passwords_not_equals">Kodeord stemmer ikke overens</string>
<string name="restore_failed_dialog_title">Genskabelse mislykkedes</string>
<string name="restore_failed_dialog_msg">Der skete en fejl</string>
- <string name="export_account_wait_title">Vent venligst...</string>
+ <string name="export_account_wait_title">Vent venligt...</string>
<string name="export_account_wait_message">Publicierer ny konto-information</string>
<string name="account_export_end_decryption_message">Kunne ikke låse din konto op med brug af det angivne kodeord.</string>
<string name="account_export_end_network_title">Netværksfejl</string>
@@ -107,23 +112,33 @@
<string name="account_export_end_error_title">Fejl</string>
<string name="account_export_end_error_message">Kunne ikke eksportere kontoen. En ukendt fejl opstod.</string>
<string name="account_enter_password">Indtast kodeord</string>
+ <string name="account_share_body">Kontakt mig som \'%1$s\' på Ring, den distribuerede kommunikationsplatform: http://ring.cx</string>
+ <string name="account_share_body_with_username">Kontakt mig som \'%1$s\' eller mit offentlige brugernavn \'%2$s\' på Ring, den distribuerede kommunikationsplatform: http://ring.cx</string>
<string name="account_contact_me">Kontakt mig på Ring !</string>
<string name="update_account">Opdater konto</string>
+ <string name="account_migration">Din Ring-konto kan opdateres.\nIndtast venligst dit kodeord.</string>
<string name="ring_account">Ring-konto</string>
+ <string name="ring_account_identity">Identitet</string>
<string name="account_migration_title_dialog">Konto-migrering</string>
+ <string name="account_migration_message_dialog">Dine konti kræver at blive opdateret. Vil du gå til Konto-indstillingerne for at foretage denne operation ?</string>
<string name="account_update_needed">Opdatering nødvendig</string>
<string name="account_creation_file_too_big">Filen er for stor</string>
<string name="account_cannot_read">Kan ikke læse %1$s</string>
<string name="account_cannot_be_found_title">Kan ikke finde konto</string>
<string name="account_cannot_be_found_message">Kontoen kunne ikke findes på Ring-netværket.\nSikr dig at den er eksporteret fra en eksisterende enhed, og at de angivne bruger-oplysninger er korrekte.</string>
+ <string name="account_sip_cannot_be_registered_message">Du kan fortsætte med konto-oprettelsen eller redigere informationerne her. Du kan under alle omstændigheder lave ændringer senere under konti-indstillingerne.</string>
<string name="account_no_network_title">Kan ikke forbinde til netværket</string>
<string name="account_no_network_message">Kunne ikke tilføje kontoen fordi Ring ikke kunne forbinde til det distribuerede netværk. Kontroller enhedens netværksforbindelse.</string>
<string name="account_device_added_title">Enheds-konto tilføjet</string>
<string name="account_device_added_message">Du har nu konfigureret din Ring-konto på denne enhed.</string>
<string name="account_device_updated_title">Enheds-konto opdateret</string>
<string name="account_device_updated_message">Du har opdateret din Ring-konto.</string>
+ <string name="account_cannot_be_updated_message">Kontoen på enheden kunne ikke opdateres. Kontroller venligst dit kodeord.</string>
+ <string name="account_sip_success_title">SIP-konto registreret</string>
+ <string name="account_sip_success_message">Din SIP-konto blev registreret korrekt.</string>
+ <string name="account_sip_register_anyway">Registrer alligevel</string>
<string name="account_link_button">Tilknyt denne enhed til en konto</string>
- <string name="account_import_title">Tilnyt til en eksisterende konto</string>
+ <string name="account_import_title">Tilknyt til en eksisterende konto</string>
<string name="account_link_prompt_pin">Indtast PIN-kode</string>
<string name="account_wizard_title">Velkommen til</string>
<string name="account_new_button">Opret en Ring-konto</string>
@@ -142,12 +157,21 @@
<string name="register_name">Registrer navn</string>
<string name="trying_to_register_name">Forsøger at registrere navn</string>
<string name="registered_username">Registreret brugernavn</string>
+ <string name="register_username">Registrer offentligt brugernavn (eksperimentel funktionalitet)</string>
<string name="username_already_taken">Brugernavn er allerede taget</string>
<string name="invalid_username">Ugyldigt brugernavn</string>
- <string name="looking_for_username_availability">Tjekker brugernavnets tilgængelighed ...</string>
<string name="account_status_connecting">Forbinder</string>
+ <string name="account_status_connection_error">Forbindelsesfejl</string>
+ <string name="account_status_online">Forbundet</string>
<string name="account_status_unknown">Ukendt</string>
+ <string name="account_status_offline">Ingen forbindelse</string>
<!--Create account-->
<string name="account_creation_home">Velkommen til Ring</string>
<string name="account_creation_profile">Opret din profil</string>
+ <string name="account_creation_ring">Opret din Ring-konto</string>
+ <string name="account_link_title">Tilknyt denne enhed</string>
+ <string name="account_sip_cannot_be_registered">Kan ikke registrere konto</string>
+ <!--Devices-->
+ <string name="enter_password">Indtast kodeord</string>
+ <string name="revoke_device_wait_title">Vent venligt...</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings.xml b/ring-android/app/src/main/res/values-de-rDE/strings.xml
index c61816a..a463974 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings.xml
@@ -1,11 +1,18 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="feedback_section">Feedback</string>
+ <string name="report"><u>Schreiben Sie uns eine E-Mail</u></string>
+ <string name="section_license">Lizenz</string>
<string name="sponsor_section">Ring ist freie Software. Sie wurde entwickelt und wird unterstützt von</string>
<string name="copyright_section">Copyright</string>
<string name="contribute_section">Mitwirken</string>
<string name="version_section">Version</string>
<string name="no_email_app_installed">Keine E-Mail-App gefunden, installieren Sie eine, um uns einen Bericht zu schicken</string>
+ <string name="no_browser_app_installed">Keine Browser-App gefunden, installieren Sie eine, um die Homepage darzustellen</string>
<string name="email_chooser_title">Senden von E-Mails über...</string>
+ <string name="website_chooser_title">Darstellung der Homepage mit...</string>
+ <string name="license">Diese Software wird \"wie sie ist\" ohne Gewährleistung irgendwelcher Art zur Verfügung gestellt. Details finden Sie unter
+<u>GNU General Public License Version 3 oder später</u></string>
<!--RingActivity-->
<string name="title_activity_sflphone_home">Ring</string>
<string name="error_no_network">Keine Netzwerkkonnektivität</string>
@@ -34,6 +41,7 @@
<item quantity="one">%d Gespräche</item>
<item quantity="other">%d Gespräche</item>
</plurals>
+ <string name="home_transfering">Übertragung von %1$s zu %2$s</string>
<string name="home_transfer_complet">Übertragung abgeschlossen</string>
<!--ContactList Fragment-->
<string name="no_contact_found">Es wurde kein Kontakt gefunden</string>
@@ -46,8 +54,6 @@
<string name="transfer_no_other_call">Keine weiteren Anrufe wartend</string>
<string name="transfer_type_number">Eingabe Empfänger-Nummer:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Verpasster Anruf von %1$s</string>
- <string name="notif_missed_outgoing_call">Verpasster Anruf zu %1$s</string>
<string name="notif_incoming_call_title">Eingehender Anruf von %1$s</string>
<string name="notif_incoming_call">Eingehender Anruf</string>
<string name="notif_outgoing_call_title">Ausgehende Anruf zu %1$s</string>
@@ -56,6 +62,7 @@
<string name="notif_current_call">Aktueller Anruf</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Sie:</string>
+ <string name="action_call_attended_transfer">Übergabe nach Ankündigung</string>
<string name="action_call_conference">Konferenz</string>
<string name="action_call_hangup">Auflegen</string>
<string name="ongoing_call">Aktiver Anruf</string>
@@ -63,22 +70,23 @@
<string name="hist_out_call">Ausgehende Anruf von %1$s</string>
<string name="start_error_title">Kann nicht Ring starten!</string>
<string name="start_error_mic_required">Ring erfordert Mikrofon-Zugriff.</string>
- <string name="action_call_accept">Abnehmen</string>
+ <string name="action_call_accept">Annehmen</string>
<string name="action_call_decline">Ablehnen</string>
<string name="ab_action_speakerphone">Lautsprecher aktivieren</string>
<string name="ab_action_contact_add">Kontakte hinzufügen</string>
<string name="ab_action_contact_add_question">Zu Kontakten hinzufügen?</string>
<string name="ab_action_audio_call">Audioanruf</string>
<string name="ab_action_video_call">Videoanruf</string>
+ <string name="ab_action_change_screen_orientation">Ändern der Bildschirmausrichtung</string>
<string name="share_via">Teilen über</string>
<string name="write_a_message">Eine Nachricht schreiben</string>
<string name="scan_qr">QR-Code scannen</string>
<string name="ab_action_flipcamera">Kamera wechseln</string>
<!--Text messages-->
<string name="send_message">Nachricht senden</string>
- <string name="message_sending">Nachricht senden</string>
+ <string name="message_sending">Nachricht senden...</string>
<string name="time_just_now">Gerade eben</string>
- <string name="permission_read_denied">Der Anwendung wurde der lesende Speicherzugriff verwehrt. Daher kann sie nicht ordnungsgemäß funktionieren. Bitte erlaube diesen Zugriff.</string>
+ <string name="permission_read_denied">Der Anwendung wurde der lesende Speicherzugriff verwehrt. Daher kann sie nicht ordnungsgemäß funktionieren. Bitte erlauben Sie diesen Zugriff.</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Kamera-Berechtigung</string>
<string name="permission_dialog_camera_message">Video-Konferenzen benötigen Zugriff auf die Kamera. Bitte erlauben Sie diesen Zugriff.</string>
@@ -106,19 +114,26 @@
<string name="add_call_contact_number_to_contacts">Fügen %1$s hinzu?</string>
<string name="prompt_new_password">Neues Passwort</string>
<string name="prompt_new_password_repeat">Neues Passwort wiederholen</string>
- <string name="account_create_title">Erstellen einen Ring Konto</string>
+ <string name="account_create_title">Erstelle ein Ring-Konto</string>
<string name="prompt_new_username">Neuen Benutzername eingeben</string>
<string name="help_password_choose">Wählen Sie ein sicheres Passwort und merken Sie es sich um Ihre Ring-Zugangsdaten zu schützen.</string>
<string name="help_password_enter">Geben Sie Ring-Konto-Passwort ein.</string>
<string name="help_pin_enter">Geben Sie die PIN eines anderen konfigurierten Ring-Kontos ein.</string>
<string name="wizard_next">Weiter</string>
+ <string name="wizard_back">Zurück</string>
<!--MenuHeaderView-->
<string name="profile">Mein Profil</string>
+ <string name="profile_message_warning">Ihr Profil wird nur mit Ihren Kontakten geteilt</string>
<string name="open_the_gallery">Galerie öffnen</string>
<string name="take_a_photo">Mache ein Foto</string>
+ <string name="profile_name_hint">Name eingeben (optional)</string>
<string name="unknown">Unbekannt</string>
<!--Share fragment-->
<string name="share_message">Scanne diesen QR-Code mit dem Ring-QR-Code-Scanner des neuen Kommunikationspartners.</string>
+ <string name="share_message_no_account">Bitte wählen Sie ein Konto, das Sie teilen wollen.</string>
<string name="share_your_account_information">Teile meine RING-ID</string>
<string name="generic_error_migration">Fehler</string>
+ <string name="generic_error_migration_message">Ein Fehler ist während der Datenübernahme aufgetreten</string>
+ <!--Pending contact requests-->
+ <!--Send contact requests-->
</resources>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_account.xml b/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
index d82814c..c95ecf9 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
@@ -7,9 +7,11 @@
<string name="prompt_hostname">Hostname</string>
<string name="prompt_username">Benutzername</string>
<string name="prompt_password">Kennwort</string>
+ <string name="action_create">Konto erstellen</string>
<string name="action_create_short">Registrieren</string>
<string name="error_field_required">Dieses Feld ist erforderlich</string>
<string name="dialog_wait_create">Konto wird hinzugefügt</string>
+ <string name="account_type_ip2ip">IP Konto</string>
<string name="help_sip_title">Fügen Sie Ihre SIP-Account</string>
<!--Strings related to account deletion-->
<string name="account_delete_dialog_title">Konto löschen?</string>
@@ -70,6 +72,7 @@
<string name="error_password_char_count">Mindestens 6 Zeichen</string>
<string name="error_passwords_not_equals">Kennwörter stimmen nicht überein</string>
<string name="restore_failed_dialog_msg">Fehler aufgetreten</string>
+ <string name="export_account_wait_title">Bitte warten...</string>
<string name="account_export_end_error_title">Fehler</string>
<string name="account_device_updated_message">Sie haben ihr Ring-Konto erfolgreich aktualisiert.</string>
<string name="account_new_button">Erstellen einen Ring Konto</string>
@@ -78,4 +81,6 @@
<string name="account_status_unknown">Unbekannt</string>
<!--Create account-->
<string name="account_creation_home">Willkommen bei Ring</string>
+ <!--Devices-->
+ <string name="revoke_device_wait_title">Bitte warten...</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_call.xml b/ring-android/app/src/main/res/values-de-rDE/strings_call.xml
index 1afc233..d7d84ae 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings_call.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings_call.xml
@@ -22,9 +22,9 @@
-->
<resources>
<!-- SipCalls -->
- <string name="call_human_state_incoming">Läuten</string>
+ <string name="call_human_state_incoming">Klingeln</string>
<string name="call_human_state_connecting">Verbinden</string>
- <string name="call_human_state_ringing">Rufen an</string>
+ <string name="call_human_state_ringing">Anrufen</string>
<string name="call_human_state_current">Sprechen</string>
<string name="call_human_state_hungup">Vorbei</string>
<string name="call_human_state_busy">Besetzt</string>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml b/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml
index ab85ea6..1bb42fd 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml
@@ -4,6 +4,14 @@
<string name="pref_category_contacts">Kontakte</string>
<string name="pref_category_system">System</string>
<string name="pref_category_privacy">Datenschutz</string>
- <string name="pref_mobileData_title">Mobile-Daten</string>
+ <string name="pref_mobileData_title">Mobile Daten</string>
+ <string name="pref_mobileData_summary">Ring die Nutzung von 3G/LTE zusätzlich zu WLAN erlauben</string>
+ <string name="pref_systemContacts_title">Systemkontakte benutzen</string>
+ <string name="pref_systemContacts_summary">Systemkontakte benutzen, um Anruferdetails anzuzeigen.</string>
+ <string name="pref_systemDialer_title">Telefonanrufe auch über Ring abwickeln</string>
+ <string name="pref_systemDialer_summary">Ring ebenfalls für normale Telefonanrufe nutzen, sofern dies möglich ist.</string>
+ <string name="pref_startOnBoot_title">Ring beim Hochfahren starten</string>
+ <string name="pref_startOnBoot_summary">Ring im Hintergrund aktivieren während das System startet.</string>
<string name="pref_clearHistory_title">Verlauf löschen</string>
+ <string name="pref_clearHistory_summary">Löschen der Konversationshistorie. Diese Aktion kann nicht rückgängig gemacht werden.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-de/strings.xml b/ring-android/app/src/main/res/values-de/strings.xml
index 9393c67..b270605 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -11,7 +11,7 @@
<string name="no_browser_app_installed">Es konnte keine Browser-Anwendung gefunden werden, installieren Sie einen, um die Webseite anzusehen</string>
<string name="email_chooser_title">E-Mail wird gesendet mit...</string>
<string name="website_chooser_title">Webseite anzeigen mit...</string>
- <string name="license">Diese Software wird ohne jegliche Gewährleistung zur Verfügung gestellt. Für Details
+ <string name="license">Diese Software wird \"wie sie ist\" ohne Gewährleistung irgendwelcher Art zur Verfügung gestellt. Details finden Sie unter
<u>GNU General Public License Version 3 oder höher</u></string>
<!--RingActivity-->
<string name="title_activity_sflphone_home">Ring</string>
@@ -41,6 +41,7 @@
<item quantity="one">%d Unterhaltung</item>
<item quantity="other">%d Unterhaltungen</item>
</plurals>
+ <string name="home_transfering">Übertrage von %1$s zu %2$s</string>
<string name="home_transfer_complet">Übertragung abgeschlossen</string>
<!--ContactList Fragment-->
<string name="no_contact_found">Kein Kontakt gefunden</string>
@@ -53,8 +54,6 @@
<string name="transfer_no_other_call">Kein anderer Anrufe wartend</string>
<string name="transfer_type_number">Nummer für Übertragung eingeben:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Verpasster Anruf von %1$s</string>
- <string name="notif_missed_outgoing_call">Verpasster Anruf zu %1$s</string>
<string name="notif_incoming_call_title">Eingehender Anruf von %1$s</string>
<string name="notif_incoming_call">Eingehender Anruf</string>
<string name="notif_outgoing_call_title">Ausgehender Anruf von %1$s</string>
@@ -63,7 +62,7 @@
<string name="notif_current_call">Aktueller Anruf</string>
<!--Call Fragment-->
<string name="you_txt_prefix">Du:</string>
- <string name="action_call_attended_transfer">Überwachter Transfer</string>
+ <string name="action_call_attended_transfer">Übergabe nach Ankündigung</string>
<string name="action_call_conference">Konferenz</string>
<string name="action_call_hangup">Auflegen</string>
<string name="ongoing_call">Derzeitiger Anruf</string>
@@ -78,6 +77,7 @@
<string name="ab_action_contact_add_question">Zu Kontakten hinzufügen</string>
<string name="ab_action_audio_call">Audioanruf</string>
<string name="ab_action_video_call">Videoanruf</string>
+ <string name="ab_action_change_screen_orientation">Bildschirmausrichtung ändern</string>
<string name="share_via">Teilen mit</string>
<string name="write_a_message">Sende eine Nachricht</string>
<string name="scan_qr">QR-Code scannen</string>
@@ -123,8 +123,10 @@
<string name="wizard_back">Zurück</string>
<!--MenuHeaderView-->
<string name="profile">Mein Profil</string>
+ <string name="profile_message_warning">Ihr Profil wird nur mit Ihren Kontakten geteilt</string>
<string name="open_the_gallery">Galerie öffnen</string>
<string name="take_a_photo">Foto machen</string>
+ <string name="profile_name_hint">Name eingeben (optional)</string>
<string name="unknown">Unbekannt</string>
<!--Share fragment-->
<string name="share_message">Scannen Sie diesen QR-Code mit dem eingebauten Scanner der Ringanwendung, die mit Ihnen kommunizieren will.</string>
@@ -132,4 +134,9 @@
<string name="share_your_account_information">Teile meine Kontaktinformationen</string>
<string name="generic_error_migration">Fehler</string>
<string name="generic_error_migration_message">Während der Migration ist ein Fehler aufgetreten</string>
+ <!--Pending contact requests-->
+ <string name="accept">Akzeptieren</string>
+ <string name="refuse">Verweigern</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Senden</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-de/strings_account.xml b/ring-android/app/src/main/res/values-de/strings_account.xml
index 6103cd6..377bc4a 100644
--- a/ring-android/app/src/main/res/values-de/strings_account.xml
+++ b/ring-android/app/src/main/res/values-de/strings_account.xml
@@ -133,6 +133,7 @@
<string name="account_device_added_message">Sie haben erfolgreich ihr Ring-Konto auf diesem Gerät erstellt.</string>
<string name="account_device_updated_title">Konto-Gerät aktualisiert</string>
<string name="account_device_updated_message">Sie haben erfolgreich Ihr Ring-Konto aktualisiert</string>
+ <string name="account_cannot_be_updated_message">Konto-Gerät konnte nicht aktualisiert werden. Bitte überprüfen Sie Ihr Passwort.</string>
<string name="account_sip_success_title">SIP-Konto registriert</string>
<string name="account_sip_success_message">Sie haben erfolgreich Ihr SIP-Konto registriert.</string>
<string name="account_sip_register_anyway">Trotzdem registieren</string>
@@ -159,7 +160,6 @@
<string name="register_username">Melden Sie sich für einen allgemein-bekannten Benutzername an (experimentell)</string>
<string name="username_already_taken">Dieser Benutzername ist bereits vergeben</string>
<string name="invalid_username">Ungültiger Benutzername</string>
- <string name="looking_for_username_availability">Verfügbarkeit des Benutzernamens wird geprüft ...</string>
<string name="account_status_connecting">Verbindet</string>
<string name="account_status_connection_error">Verbindungsfehler</string>
<string name="account_status_online">Online</string>
@@ -171,4 +171,7 @@
<string name="account_creation_ring">Erstellen Sie Ihr Ring-Konto</string>
<string name="account_link_title">Verbinde diese Gerät</string>
<string name="account_sip_cannot_be_registered">Konto kann nicht registriert werden</string>
+ <!--Devices-->
+ <string name="enter_password">Passwort eingeben</string>
+ <string name="revoke_device_wait_title">Bitte warten…</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-de/strings_preferences.xml b/ring-android/app/src/main/res/values-de/strings_preferences.xml
index e631ed0..38cfd62 100644
--- a/ring-android/app/src/main/res/values-de/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-de/strings_preferences.xml
@@ -7,7 +7,7 @@
<string name="pref_mobileData_title">Mobildaten</string>
<string name="pref_mobileData_summary">Ring die Nutzung von 3G/LTE neben WiFi erlauben</string>
<string name="pref_systemContacts_title">Systemkontakte benutzen</string>
- <string name="pref_systemContacts_summary">Systemkontakte benutzen um Anruferdetails anzuzeigen</string>
+ <string name="pref_systemContacts_summary">Systemkontakte benutzen, um Anruferdetails anzuzeigen</string>
<string name="pref_systemDialer_title">Auch normale Anrufe über Ring abwickeln</string>
<string name="pref_systemDialer_summary">Ring für normale Anrufe verwenden, wenn möglich.</string>
<string name="pref_startOnBoot_title">Ring beim Hochfahren starten</string>
diff --git a/ring-android/app/src/main/res/values-el/strings.xml b/ring-android/app/src/main/res/values-el/strings.xml
index 3756653..32a4f49 100644
--- a/ring-android/app/src/main/res/values-el/strings.xml
+++ b/ring-android/app/src/main/res/values-el/strings.xml
@@ -42,8 +42,6 @@
<string name="transfer_no_other_call">Δεν υπάρχουν εκκρεμείς κλήσεις</string>
<string name="transfer_type_number">Πληκτρολογείστε αριθμό για προώθηση</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Αναπάντητη κλήση από %1$s</string>
- <string name="notif_missed_outgoing_call">Αναπάντητη κλήση σε %1$s</string>
<string name="notif_incoming_call_title">Εισερχόμενη κλήση από %1$s</string>
<string name="notif_incoming_call">Εισερχόμενη κλήση</string>
<string name="notif_outgoing_call_title">Εξερχόμενη κλήση %1$s</string>
@@ -110,4 +108,7 @@
<!--Share fragment-->
<string name="share_your_account_information">Μοίρασε τις πληροφορίες των επαφών μου</string>
<string name="generic_error_migration">Σφάλμα</string>
+ <!--Pending contact requests-->
+ <!--Send contact requests-->
+ <string name="send_request_button">Αποστολή</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-el/strings_account.xml b/ring-android/app/src/main/res/values-el/strings_account.xml
index 24247d1..e91868c 100644
--- a/ring-android/app/src/main/res/values-el/strings_account.xml
+++ b/ring-android/app/src/main/res/values-el/strings_account.xml
@@ -48,4 +48,5 @@
<string name="account_status_unknown">Άγνωστοι</string>
<!--Create account-->
<string name="account_creation_home">Καλώς ήλθατε στο Ring</string>
+ <!--Devices-->
</resources>
diff --git a/ring-android/app/src/main/res/values-el/strings_content_description.xml b/ring-android/app/src/main/res/values-el/strings_content_description.xml
index 221c6b0..91a5fb0 100644
--- a/ring-android/app/src/main/res/values-el/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-el/strings_content_description.xml
@@ -2,5 +2,6 @@
<resources>
<!--Strings for xml content description of images-->
<string name="contact_quick_call_description">Γρήγορη Κλήση</string>
+ <string name="contact_picture_description">Εικόνα επαφής</string>
<string name="dial_numeric_pad">Αριθμητικό Πληκτρολόγιο</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-el/strings_preferences.xml b/ring-android/app/src/main/res/values-el/strings_preferences.xml
index 7086f65..de19316 100644
--- a/ring-android/app/src/main/res/values-el/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-el/strings_preferences.xml
@@ -3,4 +3,5 @@
<string name="pref_category_network">Δίκτυο</string>
<string name="pref_category_contacts">Επαφές</string>
<string name="pref_category_system">Σύστημα</string>
+ <string name="pref_mobileData_title">Δεδομένα κινητού</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-en-rGB/strings_account.xml b/ring-android/app/src/main/res/values-en-rGB/strings_account.xml
index 0d6667e..db66ab2 100644
--- a/ring-android/app/src/main/res/values-en-rGB/strings_account.xml
+++ b/ring-android/app/src/main/res/values-en-rGB/strings_account.xml
@@ -18,4 +18,5 @@
<!--restore/backup-->
<!--Name registration-->
<!--Create account-->
+ <!--Devices-->
</resources>
diff --git a/ring-android/app/src/main/res/values-eo/strings.xml b/ring-android/app/src/main/res/values-eo/strings.xml
index d4b5a27..8361975 100644
--- a/ring-android/app/src/main/res/values-eo/strings.xml
+++ b/ring-android/app/src/main/res/values-eo/strings.xml
@@ -39,8 +39,6 @@
<string name="transfer_no_other_call">Sen aliaj vokoj</string>
<string name="transfer_type_number">Entajpu numeron por transigi al:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Maltrafita voko de %1$s</string>
- <string name="notif_missed_outgoing_call">Maltrafita voko al %1$s</string>
<string name="notif_incoming_call_title">Eniranta voko de %1$s</string>
<string name="notif_incoming_call">Eniranta voko</string>
<string name="notif_outgoing_call_title">Eliranta voko al %1$s</string>
@@ -103,4 +101,9 @@
<string name="unknown">Nekonata</string>
<!--Share fragment-->
<string name="generic_error_migration">Eraro</string>
+ <!--Pending contact requests-->
+ <string name="accept">Akcepti</string>
+ <string name="refuse">Rifuzi</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Sendi</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-eo/strings_account.xml b/ring-android/app/src/main/res/values-eo/strings_account.xml
index 4825577..2d8430b 100644
--- a/ring-android/app/src/main/res/values-eo/strings_account.xml
+++ b/ring-android/app/src/main/res/values-eo/strings_account.xml
@@ -89,6 +89,7 @@
<string name="error_password_char_count">6 signoj minimume</string>
<string name="error_passwords_not_equals">Pasvortoj ne kongruas</string>
<string name="restore_failed_dialog_msg">Eraro okazis</string>
+ <string name="export_account_wait_title">Bonvole atendu…</string>
<string name="account_export_end_network_title">Reta eraro</string>
<string name="account_export_end_error_title">Eraro</string>
<string name="account_wizard_title">Bonvenu al</string>
@@ -99,4 +100,6 @@
<string name="account_status_unknown">Nekonata</string>
<!--Create account-->
<string name="account_creation_home">Bonvenu al Ring</string>
+ <!--Devices-->
+ <string name="revoke_device_wait_title">Bonvole atendu…</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-es/strings.xml b/ring-android/app/src/main/res/values-es/strings.xml
index 35af429..3f0b8b1 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -48,8 +48,6 @@
<string name="transfer_no_other_call">No hay llamadas pendientes</string>
<string name="transfer_type_number">Escribe el número al que transferir:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Llamada perdida de %1$s</string>
- <string name="notif_missed_outgoing_call">Llamada perdida a %1$s</string>
<string name="notif_incoming_call_title">Llamada entrante de %1$s</string>
<string name="notif_incoming_call">Llamada entrante</string>
<string name="notif_outgoing_call_title">Llamando a %1$s</string>
@@ -127,4 +125,9 @@
<string name="share_your_account_information">Compartir mi información de contacto</string>
<string name="generic_error_migration">Error</string>
<string name="generic_error_migration_message">Ha ocurrido un error durante la migración</string>
+ <!--Pending contact requests-->
+ <string name="accept">Aceptar</string>
+ <string name="refuse">No aceptar</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Enviar</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-es/strings_account.xml b/ring-android/app/src/main/res/values-es/strings_account.xml
index 8eeed27..774c149 100644
--- a/ring-android/app/src/main/res/values-es/strings_account.xml
+++ b/ring-android/app/src/main/res/values-es/strings_account.xml
@@ -145,10 +145,12 @@
<string name="register_username">Registrar un nombre público (experimental)</string>
<string name="username_already_taken">El nombre de usuario ya está en uso</string>
<string name="invalid_username">Nombre de usuario no válido</string>
- <string name="looking_for_username_availability">Verificando la disponibilidad del nombre de usuario...</string>
<string name="account_status_connecting">Conectando</string>
<string name="account_status_unknown">Desconocido</string>
<!--Create account-->
<string name="account_creation_home">Bienvenido a Ring</string>
<string name="account_creation_profile">Crea tu perfil</string>
+ <!--Devices-->
+ <string name="enter_password">Ingresa la contraseña</string>
+ <string name="revoke_device_wait_title">Por favor, espera...</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-et-rEE/strings_account.xml b/ring-android/app/src/main/res/values-et-rEE/strings_account.xml
new file mode 100644
index 0000000..2f3f8bd
--- /dev/null
+++ b/ring-android/app/src/main/res/values-et-rEE/strings_account.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <!--Strings related to account edition screen-->
+ <!--Strings related to account creation-->
+ <!--Strings related to account deletion-->
+ <!--AccountManagementFragment-->
+ <!--Basic Details-->
+ <!--Audio Details-->
+ <string name="account_ringtone_label">Helinad</string>
+ <!--Video Details-->
+ <string name="account_video_label">Video</string>
+ <!--Advanced Details-->
+ <!--Security Details-->
+ <!--SRTP Details-->
+ <!--SIP-->
+ <!--TLS Details-->
+ <!--restore/backup-->
+ <!--Name registration-->
+ <string name="account_status_connecting">Ühendab</string>
+ <!--Create account-->
+ <!--Devices-->
+</resources>
diff --git a/ring-android/app/src/main/res/values-et-rEE/strings_call.xml b/ring-android/app/src/main/res/values-et-rEE/strings_call.xml
new file mode 100644
index 0000000..b0dd5e2
--- /dev/null
+++ b/ring-android/app/src/main/res/values-et-rEE/strings_call.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
+
+Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+Author: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+<resources>
+ <!-- SipCalls -->
+ <string name="call_human_state_incoming">Heliseb</string>
+ <string name="call_human_state_connecting">Ühendab</string>
+ <string name="call_human_state_ringing">Helistab</string>
+ <string name="call_human_state_busy">Kinni</string>
+ </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-et-rEE/strings_content_description.xml b/ring-android/app/src/main/res/values-et-rEE/strings_content_description.xml
new file mode 100644
index 0000000..98a40e3
--- /dev/null
+++ b/ring-android/app/src/main/res/values-et-rEE/strings_content_description.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <!--Strings for xml content description of images-->
+ <string name="contact_picture_description">Kontakti pilt</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings.xml b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
index c5bead0..eb7679b 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
@@ -1,11 +1,18 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
- <string name="sponsor_section">رینگ نرمافزار آزادی است که توسعه داده و پشتیبانی میشود توسّط</string>
+ <string name="feedback_section">بازخورد</string>
+ <string name="report">برایمان رایانامهای بفرستید</string>
+ <string name="section_license">مجوز</string>
+ <string name="sponsor_section">رینگ نرمافزاری آزاد است که توسعه داده و پشتیبانی میشود توسّط</string>
<string name="copyright_section">حق رونوشت</string>
<string name="contribute_section">مشارکت</string>
<string name="version_section">نگارش</string>
<string name="no_email_app_installed">هیچ کارهٔ رایانامهای پیدا نشد. برای فرستادن یک گزارش به ما، یکی نصب کنید</string>
+ <string name="no_browser_app_installed">هیچ کارهٔ مرورگری پیدا نشد، برای مشاهدهٔ این صفحه، یکی نصب کنبد</string>
<string name="email_chooser_title">فرستادن نامه با…</string>
+ <string name="website_chooser_title">دیدن پایگاه وب با…</string>
+ <string name="license">این نرمافزار همانگونه که هست، بدون هرنوع ضمانت فراهم شده است،
+برای جزئیات، نگارش ۳ یا بالاتر پروانهٔ جامع همگانی گنو را ببینید</string>
<!--RingActivity-->
<string name="title_activity_sflphone_home">رینگ</string>
<string name="error_no_network">بدون اتصال شبکه</string>
@@ -33,7 +40,6 @@
<plurals name="home_conferences_title">
<item quantity="other">%d گفتگو</item>
</plurals>
- <string name="home_transfering">ارسال %1$s به %2$s</string>
<string name="home_transfer_complet">ارسال انجام شد</string>
<!--ContactList Fragment-->
<string name="no_contact_found">مخاطبی پیدا نشد</string>
@@ -46,8 +52,6 @@
<string name="transfer_no_other_call">هیچ تماس دیگری معلّق نیست</string>
<string name="transfer_type_number">شمارهای برای فرستادن وارد کنید:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">تماس از دست رفته از %1$s</string>
- <string name="notif_missed_outgoing_call">تماس از دست رفته به %1$s</string>
<string name="notif_incoming_call_title">تماس دریافتی از %1$s</string>
<string name="notif_incoming_call">تماس دریافتی</string>
<string name="notif_outgoing_call_title">تماس خروجی با %1$s</string>
@@ -112,15 +116,19 @@
<string name="help_password_choose">برای محافظت از حساب رینگتان، گذرواژهای قوی که به خاطر خواهید سپرد را برگزینید.</string>
<string name="help_password_enter">گذرواژهٔ حساب رینگ اصلیتان را وارد کنید</string>
<string name="help_pin_enter">پین را از دیگر حساب رینگ پیکربندیشده وارد کنید. برای به دست آوردن یک پین، از ویژگی «برونریزی حساب روی رینگ» استفاده کنید.</string>
- <string name="account_device_updated_message">با موفّقیت حساب رینگتان را بهروز کردید.</string>
+ <string name="wizard_next">بعدی</string>
+ <string name="wizard_back">بازگشت</string>
<!--MenuHeaderView-->
<string name="profile">نمایهٔ من</string>
- <string name="profile_message_warning">این با مخاطبانتان همرسانی شده است</string>
<string name="open_the_gallery">گشودن جُنگ</string>
<string name="take_a_photo">گرفتن عکس</string>
<string name="unknown">ناشناخته</string>
<!--Share fragment-->
<string name="share_message">این رمز QR را با پویشگر تعبیه شده در کارهٔ رینگی که میخواهد با شما گفتوگو کند، بپویید.</string>
+ <string name="share_message_no_account">لطفاً برای همرسانی، حسابی را برگزینید.</string>
<string name="share_your_account_information">همرسانی اطّلاعات تماس من</string>
<string name="generic_error_migration">خطا</string>
+ <string name="generic_error_migration_message">هنگام مهاجرت، خطایی رخ داد</string>
+ <!--Pending contact requests-->
+ <!--Send contact requests-->
</resources>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
index 1248bd7..473ce48 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
@@ -2,7 +2,10 @@
<resources>
<!--Strings related to account edition screen-->
<string name="ic_delete_menu">حذف</string>
+ <string name="ic_advanced_menu">تنظیمات پیشرفته</string>
<!--Strings related to account creation-->
+ <string name="add_ring_account_title">افزودن حساب کاربری رینگ</string>
+ <string name="add_sip_account_title">افزودن حساب کاربری سیپ</string>
<string name="prompt_alias">نام مستعار</string>
<string name="prompt_hostname">نام میزبان</string>
<string name="prompt_username">نام کاربری</string>
@@ -18,10 +21,11 @@
<string name="dialog_warn_ip2ip_account_message">در حال ایجاد یک حساب سیپ بدون هیچ نام دامنهٔ معتبری هستید.
تنها خواهید توانست تماسهای ip مستقیم ساخته و بگیرید.
میتوانید بعدها حسابتان را ویرایش کنید</string>
+ <string name="account_type_ip2ip">حساب آیپی</string>
<string name="help_ring">حساب رینگ اجازه میدهد از درون یک شبکهٔ کاملاً توزیعشده، به صورت امن با افراد در تماس باشید.</string>
<string name="help_sip_title">افزودن حساب سیپتان</string>
<string name="help_sip">پیکربندی یک حساب سیپ موجود.</string>
- <string name="create_sip_account">افزودن</string>
+ <string name="create_sip_account">افزودن حساب کاربری سیپ</string>
<!--Strings related to account deletion-->
<string name="account_delete_dialog_title">حذف حساب؟</string>
<string name="account_delete_dialog_message">این کار قابل بازگشت نیست.</string>
@@ -100,7 +104,7 @@
<string name="error_passwords_not_equals">گذرواژهها همتا نیستند</string>
<string name="restore_failed_dialog_title">بارگردانی شکست خورد</string>
<string name="restore_failed_dialog_msg">خطایی رخ داد</string>
- <string name="export_account_wait_title">لطفاً صبر کنید</string>
+ <string name="export_account_wait_title">لطفاً صبر کنید…</string>
<string name="export_account_wait_message">در حال انتشار اطّلاعات حساب نو</string>
<string name="account_export_end_decryption_message">نمیتوان قفل حسابتان را با گذواژهٔ فراهم شده گشود.</string>
<string name="account_export_end_network_title">خطای شبکه</string>
@@ -108,20 +112,30 @@
<string name="account_export_end_error_title">خطا</string>
<string name="account_export_end_error_message">نمیتوان حساب را برونریخت. خطایی ناشناخته رخ داد.</string>
<string name="account_enter_password">گذرواژه را وارد کنید</string>
+ <string name="account_share_body">با استفاده از «%1$s» روی بنسازهٔ ارتباطی تویعشدهٔ رینگ با من در تماس باشید: http://ring.cx</string>
+ <string name="account_share_body_with_username">با استفاده از «%1$s» یا نام کاربری عمومی «%2$s» روی بنسازهٔ ارتباطی تویعشدهٔ رینگ با من در تماس باشید: http://ring.cx</string>
<string name="account_contact_me">با من روی رینگ در تماس باشید!</string>
<string name="update_account">بهروز رسانی حساب</string>
+ <string name="account_migration">حساب کاربری شما میتواند بهروزر شود.\nلطفا گذرواژه خود را وارد کنید.</string>
<string name="ring_account">حساب رینگ</string>
+ <string name="ring_account_identity">هویت</string>
<string name="account_migration_title_dialog">مهاجرت حساب</string>
+ <string name="account_migration_message_dialog">حسابهایتان باید بهروز شوند. میخواهید برای انجام این عمل، به صفحهٔ مدیریت حساب بروید؟</string>
<string name="account_update_needed">نیاز به بهروز رسانی است</string>
<string name="account_creation_file_too_big">پرونده خیلی بزرگ است</string>
<string name="account_cannot_read">نمیتوان %1$s را خواند</string>
<string name="account_cannot_be_found_title">نمیتواند حساب را یافت</string>
<string name="account_cannot_be_found_message">حساب نتوانست روی شبکهٔ رینگ پیدا شود.\nمطمئن شوید از یک افزارهٔ موجود، روی رینگ برونریزی شده است و اعتبارنامههای فراهم شده درست هستند.</string>
+ <string name="account_sip_cannot_be_registered_message">میتوانید فرایند ایجاد حساب را ادامه داده یا در اینجا اطّلاعاتتان را ویرایش کنید. ویرایش همچنان بعداٍ در تنظیمات حساب ممکن است.</string>
<string name="account_no_network_title">نمیتوان به شبکه وصل شد</string>
<string name="account_no_network_message">نمیتوان حساب را افزود، زیرا رینگ نتوانست به شبکهٔ توزیع شده وصل شود. اتّصال شبکهتان را بررسی کنید.</string>
<string name="account_device_added_title">افزاره به حساب افزوده شد</string>
<string name="account_device_added_message">حساب رینگتان را موفقّیت روی این افزاره برپا کردید.</string>
<string name="account_device_updated_title">حساب افزاره بهروز شد</string>
+ <string name="account_device_updated_message">با موفّقیت حساب رینگتان را بهروز کردید.</string>
+ <string name="account_sip_success_title">حساب سیپ ثبت شد</string>
+ <string name="account_sip_success_message">حساب سیپتان را با موفّقیت ثبت کردید</string>
+ <string name="account_sip_register_anyway">در هر صورت ثبت نام کن</string>
<string name="account_link_button">پیوند این افزاره به یک حساب</string>
<string name="account_import_title">پیوند به یک حساب موجود</string>
<string name="account_link_prompt_pin">پین را وارد کنید</string>
@@ -145,10 +159,18 @@
<string name="register_username">ثبت نام کاربری عمومی (آزمایشی)</string>
<string name="username_already_taken">نام کاربری قبلاً برداشته شده</string>
<string name="invalid_username">نام کاربری نامعتبر</string>
- <string name="looking_for_username_availability">جستوجو برای موجود بودن نام کاربری…</string>
<string name="account_status_connecting">در حال اتّصال</string>
+ <string name="account_status_connection_error">خطای ارتباط</string>
+ <string name="account_status_online">برخط</string>
<string name="account_status_unknown">ناشناخته</string>
+ <string name="account_status_offline">خط</string>
<!--Create account-->
<string name="account_creation_home">به رینگ خوش آمدید</string>
<string name="account_creation_profile">نمایه خود را بسازید</string>
+ <string name="account_creation_ring">حساب کاربری رینگ خود را بسازید</string>
+ <string name="account_link_title">پیوند این افزاره</string>
+ <string name="account_sip_cannot_be_registered">نمیتوان حساب را ثبت کرد</string>
+ <!--Devices-->
+ <string name="enter_password">گذرواژه را وارد کنید</string>
+ <string name="revoke_device_wait_title">لطفاً صبر کنید…</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-fi/strings.xml b/ring-android/app/src/main/res/values-fi/strings.xml
index e7cbb24..a9347d7 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -45,8 +45,6 @@
<string name="transfer_no_other_call">Ei muita odottavia puheluita</string>
<string name="transfer_type_number">Kirjoita numero lähettääksesi: </string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Ohi mennyt puhelu %1$s</string>
- <string name="notif_missed_outgoing_call">Ohi mennyt lähtevä puhelu: %1$s</string>
<string name="notif_incoming_call_title">Saapuva puhelu %1$s</string>
<string name="notif_incoming_call">Saapuva puhelu</string>
<string name="notif_outgoing_call_title">Lähtevä puhelu %1$s</string>
@@ -109,4 +107,9 @@
<string name="unknown">Tuntematon</string>
<!--Share fragment-->
<string name="generic_error_migration">Virhe</string>
+ <!--Pending contact requests-->
+ <string name="accept">Hyväksy</string>
+ <string name="refuse">Kieltäydy</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Lähetä</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-fi/strings_account.xml b/ring-android/app/src/main/res/values-fi/strings_account.xml
index b3f2d93..609ffbb 100644
--- a/ring-android/app/src/main/res/values-fi/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fi/strings_account.xml
@@ -76,6 +76,7 @@
<string name="error_password_char_count">Vähintään 6 merkkiä</string>
<string name="error_passwords_not_equals">Salasanat eivät täsmää</string>
<string name="restore_failed_dialog_msg">Virhe tapahtui</string>
+ <string name="export_account_wait_title">Odota hetki...</string>
<string name="account_export_end_error_title">Virhe</string>
<string name="account_new_button">Luo Ring tunnus</string>
<!--Name registration-->
@@ -83,4 +84,6 @@
<string name="account_status_unknown">Tuntematon</string>
<!--Create account-->
<string name="account_creation_home">Tervetuloa Ringiin</string>
+ <!--Devices-->
+ <string name="revoke_device_wait_title">Odota hetki...</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings.xml b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
index 729d5ae..d0451d3 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
@@ -41,6 +41,7 @@
<item quantity="one">Conversations %d</item>
<item quantity="other">Conversations %d</item>
</plurals>
+ <string name="home_transfering">Transfert en cours de %1$s à %2$s</string>
<string name="home_transfer_complet">Transfert complété</string>
<!--ContactList Fragment-->
<string name="no_contact_found">Aucun contact trouvé</string>
@@ -53,8 +54,6 @@
<string name="transfer_no_other_call">Aucun appel en attente</string>
<string name="transfer_type_number">Entrer le numéro pour transférer à:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Appel manqué de %1$s</string>
- <string name="notif_missed_outgoing_call">Appel manqué de %1$s</string>
<string name="notif_incoming_call_title">Appel entrant de %1$s</string>
<string name="notif_incoming_call">Appel entrant</string>
<string name="notif_outgoing_call_title">Appel sortant à %1$s</string>
@@ -78,6 +77,7 @@
<string name="ab_action_contact_add_question">Ajouter aux contacts?</string>
<string name="ab_action_audio_call">Appel audio</string>
<string name="ab_action_video_call">Appel vidéo</string>
+ <string name="ab_action_change_screen_orientation">Modifier l\'orientation de l\'écran</string>
<string name="share_via">Partager par</string>
<string name="write_a_message">Écrire un message</string>
<string name="scan_qr">Numériser le code QR</string>
@@ -123,8 +123,10 @@
<string name="wizard_back">Précédent</string>
<!--MenuHeaderView-->
<string name="profile">Mon profil</string>
+ <string name="profile_message_warning">Votre profil est partagé avec vos contacts uniquement</string>
<string name="open_the_gallery">Ouvrir la galerie</string>
<string name="take_a_photo">Prendre un photo.</string>
+ <string name="profile_name_hint">Entrer votre nom (optionnel)</string>
<string name="unknown">Inconnu</string>
<!--Share fragment-->
<string name="share_message">Numériser ce code QR à partir du scan intégré de l\'application Ring qui veut communiquer avec vous.</string>
@@ -132,4 +134,6 @@
<string name="share_your_account_information">Partager mes informations de contact</string>
<string name="generic_error_migration">Erreur</string>
<string name="generic_error_migration_message">Une erreur s\'est produite durant la migration.</string>
+ <!--Pending contact requests-->
+ <!--Send contact requests-->
</resources>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml b/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
index 9f3282a..d530af3 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
@@ -128,6 +128,7 @@
<string name="account_device_added_message">Votre compte Ring a été configuré avec succès sur cet appareil.</string>
<string name="account_device_updated_title">Compte de l\'appareil mis à jour</string>
<string name="account_device_updated_message">Votre compte Ring a bien été mis à jour.</string>
+ <string name="account_cannot_be_updated_message">La mise à jour de l\'appareil associé au compte a échoué. S.v.p. vérifier votre mot de passe.</string>
<string name="account_sip_success_title">Compte Sip enregistré</string>
<string name="account_sip_success_message">Votre compte Sip a été enregistré avec succès.</string>
<string name="account_sip_register_anyway">S\'inscrire de toute façon</string>
@@ -154,7 +155,6 @@
<string name="register_username">Enregistrer un nom d\'utilisateur public (expérimental)</string>
<string name="username_already_taken">Nom d\'utilisateur non-disponible</string>
<string name="invalid_username">Nom d\'utilisateur invalide</string>
- <string name="looking_for_username_availability">Vérification de la disponibilité du nom d\'utilisateur</string>
<string name="account_status_connecting">Connexion en cours</string>
<string name="account_status_connection_error">Erreur de connexion</string>
<string name="account_status_online">En ligne</string>
@@ -166,4 +166,7 @@
<string name="account_creation_ring">Créer votre compte Ring</string>
<string name="account_link_title">Associer cet appareil</string>
<string name="account_sip_cannot_be_registered">Impossible d\'enregistrer le compte</string>
+ <!--Devices-->
+ <string name="enter_password">Entrer le mot de passe</string>
+ <string name="revoke_device_wait_title">Patienter s\'il vous plaît</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings.xml b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
index a556b02..764d058 100644
--- a/ring-android/app/src/main/res/values-fr-rFR/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
@@ -34,7 +34,6 @@
<item quantity="one">%d Conversations</item>
<item quantity="other">%d Conversations</item>
</plurals>
- <string name="home_transfering">Transfert de %1$s à %2$s</string>
<string name="home_transfer_complet">Le transfert est terminé</string>
<!--ContactList Fragment-->
<string name="no_contact_found">Aucun contact n\'a été trouvé</string>
@@ -47,8 +46,6 @@
<string name="transfer_no_other_call">Aucun appel en attente</string>
<string name="transfer_type_number">Saisir le numéro de téléphone sur lequel transféré l\'appel</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Appel manqué de %1$s</string>
- <string name="notif_missed_outgoing_call">Appel manqué à %1$s</string>
<string name="notif_incoming_call_title">Appel entrant de %1$s</string>
<string name="notif_incoming_call">Appel entrant</string>
<string name="notif_outgoing_call_title">Appel sortant à %1$s</string>
@@ -113,15 +110,21 @@
<string name="help_password_choose">Saisir un mot de passe sécuritaire facile à retenir pour protéger votre compte Ring</string>
<string name="help_password_enter">Entrer votre mot de passe pour votre compte Ring principal</string>
<string name="help_pin_enter">Entrer votre PIN (numéro d\'identification personnel) configuré sur un autre compte Ring. Utiliser la fonction \"exporter un compte dans Ring\" pour obtenir votre numéro d\'identification personnel.</string>
- <string name="account_device_updated_message">Votre profil Ring a bien été mis à jour.</string>
+ <string name="wizard_next">Suivant</string>
+ <string name="wizard_back">Retour</string>
<!--MenuHeaderView-->
<string name="profile">Mon profil</string>
- <string name="profile_message_warning">Partage fait avec vos contacts</string>
<string name="open_the_gallery">Ouvrir la galerie</string>
<string name="take_a_photo">Prendre une photo</string>
<string name="unknown">Inconnu</string>
<!--Share fragment-->
<string name="share_message">Scanner le code QR avec le scanner intégré du logiciel Ring pour pouvoir communiquer</string>
+ <string name="share_message_no_account">Sélectionnez un compte à partager.</string>
<string name="share_your_account_information">Partager mes coordonnées</string>
<string name="generic_error_migration">Erreur</string>
+ <string name="generic_error_migration_message">Une erreur est survenue lors de la migration</string>
+ <!--Pending contact requests-->
+ <string name="accept">Accepter</string>
+ <string name="refuse">Refuser</string>
+ <!--Send contact requests-->
</resources>
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml b/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
index 2013d05..604a62c 100644
--- a/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
@@ -10,7 +10,10 @@
<!--Basic Details-->
<string name="account_password_label">mot de passe</string>
<!--Audio Details-->
+ <string name="account_audio_label">Audio</string>
+ <string name="account_ringtone_label">Sonneries</string>
<!--Video Details-->
+ <string name="account_video_label">Vidéo</string>
<!--Advanced Details-->
<!--Security Details-->
<!--SRTP Details-->
@@ -18,9 +21,11 @@
<!--TLS Details-->
<!--restore/backup-->
<string name="account_export_end_error_title">Erreur</string>
+ <string name="account_device_updated_message">Votre profil Ring a bien été mis à jour.</string>
<string name="account_new_button">Créer un compte Ring</string>
<string name="account_link_export_button">Connecter un autre appareil à ce compte</string>
<!--Name registration-->
<string name="account_status_unknown">Inconnu</string>
<!--Create account-->
+ <!--Devices-->
</resources>
diff --git a/ring-android/app/src/main/res/values-fr/strings.xml b/ring-android/app/src/main/res/values-fr/strings.xml
index 3767c62..5d57cee 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -46,8 +46,6 @@
<string name="transfer_no_other_call">Aucun appel</string>
<string name="transfer_type_number">Entrez un numéro</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Appel manqué de %1$s</string>
- <string name="notif_missed_outgoing_call">Appel manqué vers %1$s</string>
<string name="notif_incoming_call_title">Appel entrant de %1$s</string>
<string name="notif_incoming_call">Appel entrant</string>
<string name="notif_outgoing_call_title">Appel sortant vers %1$s</string>
@@ -122,4 +120,9 @@
<string name="share_message">Scannez ce QRCode avec le scanner intégré de l\'application Ring qui souhaite communiquer avec vous.</string>
<string name="share_your_account_information">Partagez mes coordonnées</string>
<string name="generic_error_migration">Erreur</string>
+ <!--Pending contact requests-->
+ <string name="accept">Accepter</string>
+ <string name="refuse">Refuser</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Envoyer</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-fr/strings_account.xml b/ring-android/app/src/main/res/values-fr/strings_account.xml
index 50c80a0..87a967a 100644
--- a/ring-android/app/src/main/res/values-fr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr/strings_account.xml
@@ -99,7 +99,7 @@
<string name="error_passwords_not_equals">Mot de passe erronné</string>
<string name="restore_failed_dialog_title">Échec de la restauration</string>
<string name="restore_failed_dialog_msg">Une erreur s\'est produite</string>
- <string name="export_account_wait_title">Merci de patienter...</string>
+ <string name="export_account_wait_title">Veuillez patienter</string>
<string name="export_account_wait_message">Édition des informations du nouveau compte</string>
<string name="account_export_end_decryption_message">Impossible de déverrouiller votre compte en utilisant le mot de passe fourni.</string>
<string name="account_export_end_network_title">Erreur de réseau</string>
@@ -145,10 +145,12 @@
<string name="register_username">Enregistrer un nom d\'utilisateur public (expérimental)</string>
<string name="username_already_taken">Ce nom d\'utilisateur est déjà utilisé</string>
<string name="invalid_username">Nom d\'utilisateur incorrect</string>
- <string name="looking_for_username_availability">Vérification en cours de la disponibilité du nom d\'utilisateur...</string>
<string name="account_status_connecting">En cours de connexion</string>
<string name="account_status_unknown">Inconnu</string>
<!--Create account-->
<string name="account_creation_home">Bienvenue sur Ring</string>
<string name="account_creation_profile">Créer votre profil</string>
+ <!--Devices-->
+ <string name="enter_password">Entrer le mot de passe</string>
+ <string name="revoke_device_wait_title">Veuillez patienter</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-he/strings.xml b/ring-android/app/src/main/res/values-he/strings.xml
index 9367e35..a12692f 100644
--- a/ring-android/app/src/main/res/values-he/strings.xml
+++ b/ring-android/app/src/main/res/values-he/strings.xml
@@ -48,4 +48,8 @@
<!--MenuHeaderView-->
<!--Share fragment-->
<string name="generic_error_migration">שגיאה</string>
+ <!--Pending contact requests-->
+ <string name="accept">קבל</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">שלח</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-he/strings_account.xml b/ring-android/app/src/main/res/values-he/strings_account.xml
index 2aa3866..3ba401f 100644
--- a/ring-android/app/src/main/res/values-he/strings_account.xml
+++ b/ring-android/app/src/main/res/values-he/strings_account.xml
@@ -63,4 +63,5 @@
<string name="account_export_end_error_title">שגיאה</string>
<!--Name registration-->
<!--Create account-->
+ <!--Devices-->
</resources>
diff --git a/ring-android/app/src/main/res/values-hr/strings.xml b/ring-android/app/src/main/res/values-hr/strings.xml
index 5e7cf26..a3c74a4 100644
--- a/ring-android/app/src/main/res/values-hr/strings.xml
+++ b/ring-android/app/src/main/res/values-hr/strings.xml
@@ -1,5 +1,8 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="feedback_section">Povratna informacija</string>
+ <string name="report"><u>Pošaljite nam email</u></string>
+ <string name="section_license">Licenca</string>
<string name="sponsor_section">Ring je slobodi software koji razvijaju i podržavaju</string>
<string name="copyright_section">Autorska prava</string>
<string name="contribute_section">Doprinesite</string>
@@ -43,8 +46,6 @@
<string name="transfer_to_another_call">Prenesi na drugi razgovor:</string>
<string name="transfer_no_other_call">Nema dolazećih poziva</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Propušteni poziv od %1$s</string>
- <string name="notif_missed_outgoing_call">Propušteni poziv za %1$s</string>
<string name="notif_incoming_call_title">Dolazni poziv od %1$s</string>
<string name="notif_incoming_call">Dolazni poziv</string>
<string name="notif_outgoing_call_title">Odlazni poziv za %1$s</string>
@@ -67,6 +68,7 @@
<string name="ab_action_contact_add_question">Dodati u kontakte?</string>
<string name="ab_action_audio_call">Audio poziv</string>
<string name="ab_action_video_call">Video poziv</string>
+ <string name="ab_action_change_screen_orientation">Promjeni orijentaciju zaslona</string>
<string name="share_via">Dijeli putem</string>
<string name="write_a_message">Napiši poruku</string>
<string name="scan_qr">Skeniraj QR kod</string>
@@ -80,6 +82,8 @@
<string name="permission_dialog_camera_title">Dozvola kamere</string>
<string name="permission_dialog_camera_message">Video pozivi zahtjevaju dozvolu korištenja kamere. Molimo dozvolite aplikaciji korištenje kamere.</string>
<string name="ringtone_error_title">Greška</string>
+ <string name="ringtone_error_format_not_supported">Ovaj format nije podržan.</string>
+ <string name="ringtone_error_size_too_big">Ova datoteka je prevelika. Maksimalna veličina je %1$ikB.</string>
<!--Read contacts permission-->
<!--Write call log permission-->
<!--QRCode Scan-->
@@ -98,10 +102,23 @@
<!--Contacts-->
<string name="add_call_contact_number_to_contacts">Dodaj %1$s ?</string>
<string name="prompt_new_password">Nova lozinka</string>
+ <string name="prompt_new_password_repeat">Ponovite novu lozinku</string>
<string name="account_create_title">Napravite Ring račun</string>
+ <string name="prompt_new_username">Unesite novo korisničko ime</string>
+ <string name="help_password_choose">Izaberite jaku lozinku koju ćete zapamtiti za zaštitu vašega Ring računa.</string>
+ <string name="help_password_enter">Unesite vašu glavnu lozinku Ring računa</string>
<string name="wizard_next">Slijedeće</string>
+ <string name="wizard_back">Natrag</string>
<!--MenuHeaderView-->
+ <string name="profile">Moj profil</string>
+ <string name="profile_message_warning">Vaš profil je podjeljen samo sa vašim kontaktima</string>
+ <string name="open_the_gallery">Otvorite galeriju</string>
<string name="unknown">Nepoznato</string>
<!--Share fragment-->
<string name="generic_error_migration">Greška</string>
+ <!--Pending contact requests-->
+ <string name="accept">Prihvati</string>
+ <string name="refuse">Odbij</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Pošalji</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-hr/strings_account.xml b/ring-android/app/src/main/res/values-hr/strings_account.xml
index 4b58a73..e0ed7d0 100644
--- a/ring-android/app/src/main/res/values-hr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-hr/strings_account.xml
@@ -4,26 +4,34 @@
<string name="ic_delete_menu">Izbriši</string>
<string name="ic_advanced_menu">Napredne postavke</string>
<!--Strings related to account creation-->
+ <string name="add_ring_account_title">Dodaj Ring račun</string>
+ <string name="add_sip_account_title">Dodajte SIP račun</string>
<string name="prompt_alias">Alias</string>
<string name="prompt_hostname">Ime poslužitelja</string>
<string name="prompt_username">Korisničko ime</string>
<string name="prompt_password">Lozinka</string>
+ <string name="action_create">Napravi račun</string>
<string name="action_create_short">Registriraj</string>
<string name="error_field_required">Potrebno je ovo polje</string>
<string name="dialog_wait_create">Dodajem račun</string>
<string name="dialog_wait_create_details">Molim pričekajte dok se vaš novi račun ne doda...</string>
+ <string name="dialog_wait_update">Ažuriram račun</string>
+ <string name="dialog_wait_update_details">Molim pričekajte dok se vaš novi račun ne ažurira...</string>
<string name="dialog_warn_ip2ip_account_title">Kreirati prazan SIP račun?</string>
<string name="dialog_warn_ip2ip_account_message">kreirati ćete SIP račun bez pravilnog imena poslužitelja.
Moći ćete uspostavljati i primati samo direktne IP pozive.
Moćete urediti vaš račun kasnije</string>
+ <string name="account_type_ip2ip">IP račun</string>
<string name="help_sip_title">Dodajte vaš SIP račun</string>
<string name="help_sip">Konfigurirajte postojeći SIP račun.</string>
+ <string name="create_sip_account">Dodajte SIP račun</string>
<!--Strings related to account deletion-->
<string name="account_delete_dialog_title">Izbrisati račun?</string>
<string name="account_delete_dialog_message"> Ova se radnja ne može poništiti.</string>
<!--AccountManagementFragment-->
<string name="empty_account_list">Nema registriranih računa</string>
<string name="normal_accounts_titles">Računi</string>
+ <string name="normal_devices_titles">Poznati uređaji povezani sa ovim Ring računom</string>
<!--Basic Details-->
<string name="account_preferences_basic_tab">Opće</string>
<string name="account_basic_category">Osnovne postavke</string>
@@ -75,7 +83,14 @@
<string name="error_password_char_count">6 znakova minimum</string>
<string name="error_passwords_not_equals">Lozinke se ne podudaraju</string>
<string name="restore_failed_dialog_msg">Došlo je do greške</string>
+ <string name="export_account_wait_title">Molim pričekajte...</string>
+ <string name="account_export_end_network_title">Greška mreže</string>
<string name="account_export_end_error_title">Greška</string>
+ <string name="account_enter_password">Unesite lozinku</string>
+ <string name="update_account">Ažuriraj račun</string>
+ <string name="ring_account">Ring račun</string>
+ <string name="account_update_needed">Potrebno je ažuriranje</string>
+ <string name="account_creation_file_too_big">Datoteka je prevelika</string>
<string name="account_new_button">Napravite Ring račun</string>
<!--Name registration-->
<string name="account_status_connecting">Spajanje</string>
@@ -83,4 +98,7 @@
<!--Create account-->
<string name="account_creation_home">Dobrodošli u Ring</string>
<string name="account_creation_profile">Napravite vaš profil</string>
+ <!--Devices-->
+ <string name="enter_password">Unesite lozinku</string>
+ <string name="revoke_device_wait_title">Molim pričekajte...</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-hu/strings.xml b/ring-android/app/src/main/res/values-hu/strings.xml
index ad15f66..3e12a2e 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -45,8 +45,6 @@
<string name="transfer_no_other_call">Nincs más függő hívás</string>
<string name="transfer_type_number">Átirányítás a következő számra:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Nem fogadott hívás a következőtől: %1$s</string>
- <string name="notif_missed_outgoing_call">Nem fogadott hívás a következő felé: %1$s</string>
<string name="notif_incoming_call_title">Bejövő hívás a következőtől: %1$s</string>
<string name="notif_incoming_call">Bejövő hívás</string>
<string name="notif_outgoing_call_title">Kimenő hívás a következő felé: %1$s</string>
@@ -118,4 +116,7 @@
<!--Share fragment-->
<string name="share_your_account_information">Elérési adataim megosztása</string>
<string name="generic_error_migration">Hiba</string>
+ <!--Pending contact requests-->
+ <!--Send contact requests-->
+ <string name="send_request_button">Elküld</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-hu/strings_account.xml b/ring-android/app/src/main/res/values-hu/strings_account.xml
index 8f458de..3c00f34 100644
--- a/ring-android/app/src/main/res/values-hu/strings_account.xml
+++ b/ring-android/app/src/main/res/values-hu/strings_account.xml
@@ -41,4 +41,5 @@
<!--Name registration-->
<string name="account_status_unknown">Ismeretlen</string>
<!--Create account-->
+ <!--Devices-->
</resources>
diff --git a/ring-android/app/src/main/res/values-id/strings.xml b/ring-android/app/src/main/res/values-id/strings.xml
index 25069de..302233a 100644
--- a/ring-android/app/src/main/res/values-id/strings.xml
+++ b/ring-android/app/src/main/res/values-id/strings.xml
@@ -27,4 +27,7 @@
<string name="unknown">Tidak diketahui</string>
<!--Share fragment-->
<string name="generic_error_migration">Eror</string>
+ <!--Pending contact requests-->
+ <string name="accept">Terima</string>
+ <!--Send contact requests-->
</resources>
diff --git a/ring-android/app/src/main/res/values-id/strings_account.xml b/ring-android/app/src/main/res/values-id/strings_account.xml
index b6a5430..afeb7ab 100644
--- a/ring-android/app/src/main/res/values-id/strings_account.xml
+++ b/ring-android/app/src/main/res/values-id/strings_account.xml
@@ -17,4 +17,5 @@
<!--Name registration-->
<string name="account_status_unknown">Tidak diketahui</string>
<!--Create account-->
+ <!--Devices-->
</resources>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings.xml b/ring-android/app/src/main/res/values-it-rIT/strings.xml
index 0132adc..9c4e4d5 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings.xml
@@ -53,8 +53,6 @@
<string name="transfer_no_other_call">Nessuna chiamata in attesa</string>
<string name="transfer_type_number">Digita il numero al quale trasferire:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Chiamata persa da %1$s</string>
- <string name="notif_missed_outgoing_call">Chiamata persa a %1$s</string>
<string name="notif_incoming_call_title">Chiamata in arrivo da %1$s</string>
<string name="notif_incoming_call">Chiamata in arrivo</string>
<string name="notif_outgoing_call_title">Sto chiamando %1$s</string>
@@ -132,4 +130,9 @@
<string name="share_your_account_information">Condividi le mie informazioni di contatto</string>
<string name="generic_error_migration">Errore</string>
<string name="generic_error_migration_message">Si è verificato un errore durante la migrazione</string>
+ <!--Pending contact requests-->
+ <string name="accept">Accetta</string>
+ <string name="refuse">Rifiuto</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Invia</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
index 7001bc6..8d9f4c2 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
@@ -159,7 +159,6 @@
<string name="register_username">Registra un nome utente pubblico (sperimentale)</string>
<string name="username_already_taken">Il nome utente è già utilizzato</string>
<string name="invalid_username">Nome utente non valido</string>
- <string name="looking_for_username_availability">Controllo che il nome utente sia disponibile ...</string>
<string name="account_status_connecting">Collegamento</string>
<string name="account_status_connection_error">Errore di connessione</string>
<string name="account_status_online">In linea</string>
@@ -171,4 +170,7 @@
<string name="account_creation_ring">Crea il tuo account Ring</string>
<string name="account_link_title">Collega il dispositivo</string>
<string name="account_sip_cannot_be_registered">Impossibile registrare l\'account</string>
+ <!--Devices-->
+ <string name="enter_password">Inserire password</string>
+ <string name="revoke_device_wait_title">Prego attendere...</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-it/strings.xml b/ring-android/app/src/main/res/values-it/strings.xml
index a6a3f56..ff17395 100644
--- a/ring-android/app/src/main/res/values-it/strings.xml
+++ b/ring-android/app/src/main/res/values-it/strings.xml
@@ -46,8 +46,6 @@
<string name="transfer_no_other_call">Nessuna chiamata in corso</string>
<string name="transfer_type_number">Digita il numero a cui traferire</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Chiamata persa da %1$s</string>
- <string name="notif_missed_outgoing_call">Chiamata persa a %1$s</string>
<string name="notif_incoming_call_title">Chiamata in arrivo da %1$s</string>
<string name="notif_incoming_call">Chiamata in arrivo</string>
<string name="notif_outgoing_call_title">Chiamata in uscita per %1$s</string>
@@ -122,4 +120,8 @@
<string name="share_message">Scansiona questo QRCode con il scanner integrato nell\'applicazione Ring che vuole comunicare con te.</string>
<string name="share_your_account_information">Condividi le mie informazioni di contatto</string>
<string name="generic_error_migration">Errore</string>
+ <!--Pending contact requests-->
+ <string name="accept">Accettare</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Mandare</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-it/strings_account.xml b/ring-android/app/src/main/res/values-it/strings_account.xml
index 6c918d4..f978ed0 100644
--- a/ring-android/app/src/main/res/values-it/strings_account.xml
+++ b/ring-android/app/src/main/res/values-it/strings_account.xml
@@ -90,6 +90,7 @@
<string name="error_password_char_count">6 caratteri minimo</string>
<string name="error_passwords_not_equals">Le password no corrispondono</string>
<string name="restore_failed_dialog_msg">C\'è stato un errore</string>
+ <string name="export_account_wait_title">Aspettare</string>
<string name="account_export_end_error_title">Errore</string>
<string name="account_device_updated_message">Hai aggiornato con successo il tuo account Ring.</string>
<string name="account_wizard_title">Benvenuto a</string>
@@ -98,4 +99,6 @@
<string name="account_status_connecting">Connessione in corso </string>
<string name="account_status_unknown">Sconosciuto</string>
<!--Create account-->
+ <!--Devices-->
+ <string name="revoke_device_wait_title">Aspettare</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-ja/strings.xml b/ring-android/app/src/main/res/values-ja/strings.xml
index 297b9fc..88315a8 100644
--- a/ring-android/app/src/main/res/values-ja/strings.xml
+++ b/ring-android/app/src/main/res/values-ja/strings.xml
@@ -40,6 +40,7 @@
<plurals name="home_conferences_title">
<item quantity="other">%d 会話</item>
</plurals>
+ <string name="home_transfering">%1$s から %2$s へ転送中</string>
<string name="home_transfer_complet">転送完了</string>
<!--ContactList Fragment-->
<string name="no_contact_found">連作先が見つかりません</string>
@@ -52,8 +53,6 @@
<string name="transfer_no_other_call">他に保留中の通話はありません</string>
<string name="transfer_type_number">転送先の番号を入力してください:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">%1$s から不在着信</string>
- <string name="notif_missed_outgoing_call">%1$s への不在着信</string>
<string name="notif_incoming_call_title">%1$s から着信</string>
<string name="notif_incoming_call">着信</string>
<string name="notif_outgoing_call_title">%1$s への発信</string>
@@ -77,6 +76,7 @@
<string name="ab_action_contact_add_question">連絡先に追加しますか ?</string>
<string name="ab_action_audio_call">音声通話</string>
<string name="ab_action_video_call">ビデオ通話</string>
+ <string name="ab_action_change_screen_orientation">画面の向きを変更</string>
<string name="share_via">共有...</string>
<string name="write_a_message">メッセージを書く</string>
<string name="scan_qr">QR コードをスキャン</string>
@@ -122,8 +122,10 @@
<string name="wizard_back">戻る</string>
<!--MenuHeaderView-->
<string name="profile">マイ プロフィール</string>
+ <string name="profile_message_warning">あなたのプロフィールは連絡先とのみ共有されます</string>
<string name="open_the_gallery">ギャラリーを開く</string>
<string name="take_a_photo">写真を撮る</string>
+ <string name="profile_name_hint">名前を入力してください (オプション)</string>
<string name="unknown">不明</string>
<!--Share fragment-->
<string name="share_message">あなたと通信したいRingアプリケーションの組み込みスキャナで、このQRコードをスキャンします。</string>
@@ -131,4 +133,6 @@
<string name="share_your_account_information">連絡先情報を共有</string>
<string name="generic_error_migration">エラー</string>
<string name="generic_error_migration_message">移行中にエラーが発生しました。</string>
+ <!--Pending contact requests-->
+ <!--Send contact requests-->
</resources>
diff --git a/ring-android/app/src/main/res/values-ja/strings_account.xml b/ring-android/app/src/main/res/values-ja/strings_account.xml
index edf673f..35f4356 100644
--- a/ring-android/app/src/main/res/values-ja/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ja/strings_account.xml
@@ -104,7 +104,7 @@
<string name="error_passwords_not_equals">パスワードが一致しません</string>
<string name="restore_failed_dialog_title">復元に失敗しました</string>
<string name="restore_failed_dialog_msg">エラーが発生しました</string>
- <string name="export_account_wait_title">しばらくお待ちください...</string>
+ <string name="export_account_wait_title">しばらくお待ちください…</string>
<string name="export_account_wait_message">新しいアカウント情報を発行しています</string>
<string name="account_export_end_decryption_message">提供されたパスワードを使用してアカウントをロック解除できませんでした。</string>
<string name="account_export_end_network_title">ネットワークエラー</string>
@@ -133,6 +133,7 @@
<string name="account_device_added_message">このデバイスでRingアカウントを設定しました。</string>
<string name="account_device_updated_title">アカウントデバイスを更新しました</string>
<string name="account_device_updated_message">Ringアカウントを正常に更新しました。</string>
+ <string name="account_cannot_be_updated_message">アカウントのデバイスを更新できませんでした。パスワードを確認してください。</string>
<string name="account_sip_success_title">SIP アカウントを登録しました</string>
<string name="account_sip_success_message">SIPアカウントを正常に登録しました。</string>
<string name="account_sip_register_anyway">とにかく登録する</string>
@@ -159,7 +160,6 @@
<string name="register_username">公開ユーザー名を登録 (実験的)</string>
<string name="username_already_taken">名前はすでに取得されています</string>
<string name="invalid_username">無効なユーザー名</string>
- <string name="looking_for_username_availability">ユーザー名が利用可能か検索しています ...</string>
<string name="account_status_connecting">接続中</string>
<string name="account_status_connection_error">接続エラー</string>
<string name="account_status_online">オンライン</string>
@@ -171,4 +171,7 @@
<string name="account_creation_ring">Ringアカウントを作成</string>
<string name="account_link_title">このデバイスをリンク</string>
<string name="account_sip_cannot_be_registered">アカウントを登録できません</string>
+ <!--Devices-->
+ <string name="enter_password">パスワードを入力してください</string>
+ <string name="revoke_device_wait_title">しばらくお待ちください…</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-lt/strings.xml b/ring-android/app/src/main/res/values-lt/strings.xml
index 4d415cf..26a0202 100644
--- a/ring-android/app/src/main/res/values-lt/strings.xml
+++ b/ring-android/app/src/main/res/values-lt/strings.xml
@@ -42,8 +42,6 @@
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
<!--Notifications-->
- <string name="notif_missed_incoming_call">Praleistas skambutis nuo %1$s</string>
- <string name="notif_missed_outgoing_call">Neatsilieptas skambutis naudotojui %1$s</string>
<string name="notif_incoming_call_title">Gaunamasis skambutis nuo %1$s</string>
<string name="notif_incoming_call">Gaunamasis skambutis</string>
<string name="notif_outgoing_call_title">Išsiunčiamasis skambutis naudotojui %1$s</string>
@@ -109,4 +107,9 @@
<string name="share_message">Nuskenuokite šį QR kodą įtaisytu Ring programos, norinčios su jumis susisiekti, skeneriu.</string>
<string name="share_your_account_information">Bendrinti mano kontaktinę informaciją</string>
<string name="generic_error_migration">Klaida</string>
+ <!--Pending contact requests-->
+ <string name="accept">Priimti</string>
+ <string name="refuse">Atmesti</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Siųsti</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-lt/strings_account.xml b/ring-android/app/src/main/res/values-lt/strings_account.xml
index cce128d..9c66b7f 100644
--- a/ring-android/app/src/main/res/values-lt/strings_account.xml
+++ b/ring-android/app/src/main/res/values-lt/strings_account.xml
@@ -135,11 +135,12 @@
<string name="register_username">Registruoti viešąjį naudotojo vardą (eksperimentinis)</string>
<string name="username_already_taken">Naudotojo vardas jau užimtas</string>
<string name="invalid_username">Neteisingas naudotojo vardas</string>
- <string name="looking_for_username_availability">Tikrinamas naudotojo vardo prieinamumas...</string>
<string name="account_status_connecting">Sujungiama</string>
<string name="account_status_connection_error">Ryšio klaida</string>
<string name="account_status_unknown">Nežinomas</string>
<!--Create account-->
<string name="account_creation_home">Sveiki atvykę į Ring</string>
<string name="account_creation_profile">Susikurkite savo profilį</string>
+ <!--Devices-->
+ <string name="revoke_device_wait_title">Prašome palaukti...</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-ms/strings.xml b/ring-android/app/src/main/res/values-ms/strings.xml
index 3abd7dd..15068c5 100644
--- a/ring-android/app/src/main/res/values-ms/strings.xml
+++ b/ring-android/app/src/main/res/values-ms/strings.xml
@@ -45,8 +45,6 @@
<string name="transfer_no_other_call">Tiada panggilan lain yang belum selesai</string>
<string name="transfer_type_number">Taipkan nombor untuk memindahkan:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Panggilan tidak terjawab daripada %1$s</string>
- <string name="notif_missed_outgoing_call">Panggilan tidak terjawab kepada %1$s</string>
<string name="notif_incoming_call_title">Panggilan masuk daripada %1$s</string>
<string name="notif_incoming_call">Panggilan masuk</string>
<string name="notif_outgoing_call_title">Panggilan keluar kepada %1$s</string>
@@ -120,4 +118,7 @@
<string name="share_message">Imbas kod QR ini dengan pemgibas terbina dalam dari aplikasi Ring lain yang ingin berkomunikasi dengan anda.</string>
<string name="share_your_account_information">Sila pilih akaun untuk dikongsi</string>
<string name="generic_error_migration">Gagal</string>
+ <!--Pending contact requests-->
+ <string name="accept">Terima</string>
+ <!--Send contact requests-->
</resources>
diff --git a/ring-android/app/src/main/res/values-ms/strings_account.xml b/ring-android/app/src/main/res/values-ms/strings_account.xml
index bfd7568..7e06d07 100644
--- a/ring-android/app/src/main/res/values-ms/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ms/strings_account.xml
@@ -143,8 +143,10 @@
<string name="registered_username">Nama telah didaftarkan</string>
<string name="username_already_taken">Nama pengguna telah digunakan pengguna lain</string>
<string name="invalid_username">Nama pengguna tidak sah</string>
- <string name="looking_for_username_availability">Sedang mencari status nama pengguna ...</string>
<string name="account_status_connecting">Menyambung</string>
<string name="account_status_unknown">Tidak diketahui</string>
<!--Create account-->
+ <!--Devices-->
+ <string name="enter_password">Masukkan kata laluan</string>
+ <string name="revoke_device_wait_title">Sila tunggu...</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-nb/strings.xml b/ring-android/app/src/main/res/values-nb/strings.xml
index 45fee82..c7f95aa 100644
--- a/ring-android/app/src/main/res/values-nb/strings.xml
+++ b/ring-android/app/src/main/res/values-nb/strings.xml
@@ -43,8 +43,6 @@
<string name="transfer_no_other_call">Ingen andre samtaler som venter</string>
<string name="transfer_type_number">Type nummer å overføre til:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Tapt anrop fra %1$s</string>
- <string name="notif_missed_outgoing_call">Gikk glipp av samtale til %1$s</string>
<string name="notif_incoming_call_title">Innkommende samtale fra %1$s</string>
<string name="notif_incoming_call">Innkommende samtale</string>
<string name="notif_outgoing_call_title">Utgående samtale til %1$s</string>
@@ -104,4 +102,8 @@
<string name="unknown">Ukjent</string>
<!--Share fragment-->
<string name="generic_error_migration">Feil</string>
+ <!--Pending contact requests-->
+ <string name="accept">Aksepter</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Send</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-nb/strings_account.xml b/ring-android/app/src/main/res/values-nb/strings_account.xml
index 1d253f4..952138e 100644
--- a/ring-android/app/src/main/res/values-nb/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nb/strings_account.xml
@@ -87,10 +87,13 @@
<string name="error_password_char_count">minimum 6 tegn</string>
<string name="error_passwords_not_equals">Passordene stemmer ikke</string>
<string name="restore_failed_dialog_msg">Det skjedde en feil</string>
+ <string name="export_account_wait_title">Vennligst vent...</string>
<string name="account_export_end_error_title">Feil</string>
<string name="account_new_button">Opprett en Ring-konto</string>
<!--Name registration-->
<string name="account_status_connecting">Kobler opp</string>
<string name="account_status_unknown">Ukjent</string>
<!--Create account-->
+ <!--Devices-->
+ <string name="revoke_device_wait_title">Vennligst vent...</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings.xml b/ring-android/app/src/main/res/values-nl-rNL/strings.xml
index 0681a9f..8187e01 100644
--- a/ring-android/app/src/main/res/values-nl-rNL/strings.xml
+++ b/ring-android/app/src/main/res/values-nl-rNL/strings.xml
@@ -48,4 +48,6 @@
<!--Contacts-->
<!--MenuHeaderView-->
<!--Share fragment-->
+ <!--Pending contact requests-->
+ <!--Send contact requests-->
</resources>
diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml b/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml
index 69077f9..071745b 100644
--- a/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml
@@ -35,4 +35,5 @@
<!--restore/backup-->
<!--Name registration-->
<!--Create account-->
+ <!--Devices-->
</resources>
diff --git a/ring-android/app/src/main/res/values-nl/strings.xml b/ring-android/app/src/main/res/values-nl/strings.xml
index 69606fa..9e5c6cb 100644
--- a/ring-android/app/src/main/res/values-nl/strings.xml
+++ b/ring-android/app/src/main/res/values-nl/strings.xml
@@ -41,6 +41,7 @@
<item quantity="one">%d gesprek</item>
<item quantity="other">%d gesprekken</item>
</plurals>
+ <string name="home_transfering">%1$s wordt verstuurd naar %2$s</string>
<string name="home_transfer_complet">Overdracht compleet</string>
<!--ContactList Fragment-->
<string name="no_contact_found">Geen contacten gevonden</string>
@@ -53,8 +54,6 @@
<string name="transfer_no_other_call">Geen verdere oproepen in behandeling</string>
<string name="transfer_type_number">Nummer ingeven om naar te versturen:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Gemiste oproep van %1$s</string>
- <string name="notif_missed_outgoing_call">Mislukte oproep naar %1$s</string>
<string name="notif_incoming_call_title">Inkomende oproep van %1$s</string>
<string name="notif_incoming_call">Inkomende oproep</string>
<string name="notif_outgoing_call_title">Uitgaande oproep naar %1$s</string>
@@ -78,6 +77,7 @@
<string name="ab_action_contact_add_question">Aan contacten toevoegen?</string>
<string name="ab_action_audio_call">Audiogesprek</string>
<string name="ab_action_video_call">Videogesprek</string>
+ <string name="ab_action_change_screen_orientation">Schermoriëntatie aanpassen</string>
<string name="share_via">Delen via</string>
<string name="write_a_message">Schrijf een bericht</string>
<string name="scan_qr">QR-code scannen</string>
@@ -123,8 +123,10 @@
<string name="wizard_back">Terug</string>
<!--MenuHeaderView-->
<string name="profile">Mijn profiel</string>
+ <string name="profile_message_warning">Je profiel wordt enkel gedeeld met je contacten</string>
<string name="open_the_gallery">Galerij openen</string>
<string name="take_a_photo">Foto nemen</string>
+ <string name="profile_name_hint">Voer je naam in (optioneel)</string>
<string name="unknown">Onbekend</string>
<!--Share fragment-->
<string name="share_message">Scan deze QR-code met de ingebouwde scanner van de Ring-toepassing die met je wil communiceren.</string>
@@ -132,4 +134,9 @@
<string name="share_your_account_information">Deel mijn contactinformatie</string>
<string name="generic_error_migration">Fout</string>
<string name="generic_error_migration_message">Er is een fout opgetreden tijdens het migratieproces</string>
+ <!--Pending contact requests-->
+ <string name="accept">Aanvaarden</string>
+ <string name="refuse">Afwijzen</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Versturen</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-nl/strings_account.xml b/ring-android/app/src/main/res/values-nl/strings_account.xml
index 1f71b48..68ce229 100644
--- a/ring-android/app/src/main/res/values-nl/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_account.xml
@@ -133,6 +133,7 @@
<string name="account_device_added_message">Je Ring-account is met succes op dit apparaat ingesteld.</string>
<string name="account_device_updated_title">Accountapparaat bijgewerkt</string>
<string name="account_device_updated_message">Je Ring-account is met succes bijgewerkt.</string>
+ <string name="account_cannot_be_updated_message">Accountapparaat kon niet bijgewerkt worden. Controleer je wachtwoord.</string>
<string name="account_sip_success_title">SIP-account geregistreerd</string>
<string name="account_sip_success_message">Je SIP-account is met succes geregistreerd.</string>
<string name="account_sip_register_anyway">Toch registreren</string>
@@ -159,7 +160,6 @@
<string name="register_username">Registreer een publieke gebruikersnaam (experimenteel)</string>
<string name="username_already_taken">Gebruikersnaam reeds in gebruik</string>
<string name="invalid_username">Ongeldige gebruikersnaam</string>
- <string name="looking_for_username_availability">Beschikbaarheid van gebruikersnaam wordt gecontroleerd...</string>
<string name="account_status_connecting">Verbinden</string>
<string name="account_status_connection_error">Verbindingsfout</string>
<string name="account_status_online">Online</string>
@@ -171,4 +171,7 @@
<string name="account_creation_ring">Je Ring-account aanmaken</string>
<string name="account_link_title">Dit apparaat koppelen</string>
<string name="account_sip_cannot_be_registered">Account kan niet geregistreerd worden</string>
+ <!--Devices-->
+ <string name="enter_password">Voer wachtwoord in</string>
+ <string name="revoke_device_wait_title">Even geduld...</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-pa/strings.xml b/ring-android/app/src/main/res/values-pa/strings.xml
index 27b414c..9220674 100644
--- a/ring-android/app/src/main/res/values-pa/strings.xml
+++ b/ring-android/app/src/main/res/values-pa/strings.xml
@@ -29,4 +29,6 @@
<!--Contacts-->
<!--MenuHeaderView-->
<!--Share fragment-->
+ <!--Pending contact requests-->
+ <!--Send contact requests-->
</resources>
diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings.xml b/ring-android/app/src/main/res/values-pl-rPL/strings.xml
index 1f67679..d254b2e 100644
--- a/ring-android/app/src/main/res/values-pl-rPL/strings.xml
+++ b/ring-android/app/src/main/res/values-pl-rPL/strings.xml
@@ -26,4 +26,6 @@
<!--Contacts-->
<!--MenuHeaderView-->
<!--Share fragment-->
+ <!--Pending contact requests-->
+ <!--Send contact requests-->
</resources>
diff --git a/ring-android/app/src/main/res/values-pl/strings.xml b/ring-android/app/src/main/res/values-pl/strings.xml
index 953326b..89792c9 100644
--- a/ring-android/app/src/main/res/values-pl/strings.xml
+++ b/ring-android/app/src/main/res/values-pl/strings.xml
@@ -47,8 +47,6 @@
<string name="transfer_no_other_call">Żadne inne połączenia nie są oczekiwane</string>
<string name="transfer_type_number">Wpisz numer do którego chcesz się przełączyć</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Nieodebrane połączenie od %1$s</string>
- <string name="notif_missed_outgoing_call">Nieodebrane połączenie do %1$s</string>
<string name="notif_incoming_call_title">Połączenie przychodzące od %1$s</string>
<string name="notif_incoming_call">Połączenie przychodzące</string>
<string name="notif_outgoing_call_title">Połączenie wychodzące do %1$s</string>
@@ -111,4 +109,9 @@
<string name="unknown">Nieznane</string>
<!--Share fragment-->
<string name="generic_error_migration">Błąd</string>
+ <!--Pending contact requests-->
+ <string name="accept">Akceptuj</string>
+ <string name="refuse">Odmów</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Wyślij</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-pl/strings_account.xml b/ring-android/app/src/main/res/values-pl/strings_account.xml
index f227a13..49540e1 100644
--- a/ring-android/app/src/main/res/values-pl/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pl/strings_account.xml
@@ -90,6 +90,7 @@
<string name="error_password_char_count">minimum 6 znaków</string>
<string name="error_passwords_not_equals">Hasła nie pasują do siebie</string>
<string name="restore_failed_dialog_msg">Wystąpił błąd</string>
+ <string name="export_account_wait_title">Proszę czekać…</string>
<string name="account_export_end_error_title">Błąd</string>
<string name="account_new_button">Stwórz konto Ring</string>
<!--Name registration-->
@@ -97,4 +98,6 @@
<string name="account_status_unknown">Nieznane</string>
<!--Create account-->
<string name="account_creation_home">Witamy w Ring</string>
+ <!--Devices-->
+ <string name="revoke_device_wait_title">Proszę czekać…</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings.xml b/ring-android/app/src/main/res/values-pt-rBR/strings.xml
index c5f7150..98c33f3 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings.xml
@@ -53,8 +53,6 @@
<string name="transfer_no_other_call">Nenhuma outra chamada pendente</string>
<string name="transfer_type_number">Digite o número para transferir:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Chamada perdida de %1$s</string>
- <string name="notif_missed_outgoing_call">Chamada perdida para %1$s</string>
<string name="notif_incoming_call_title">Chamada recebida de %1$s</string>
<string name="notif_incoming_call">Chamada recebida</string>
<string name="notif_outgoing_call_title">Chamada efetuada para %1$s</string>
@@ -132,4 +130,9 @@
<string name="share_your_account_information">Compartilhar meus dados de contato</string>
<string name="generic_error_migration">Erro</string>
<string name="generic_error_migration_message">Um erro ocorreu durante a migração</string>
+ <!--Pending contact requests-->
+ <string name="accept">Aceitar</string>
+ <string name="refuse">Recusar</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Enviar</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
index c292129..df465a7 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
@@ -6,6 +6,7 @@
<!--Strings related to account creation-->
<string name="add_ring_account_title">Adicionar conta Ring</string>
<string name="add_sip_account_title">Adicionar conta SIP</string>
+ <string name="ring_account_default_name">Conta Ring %1$s</string>
<string name="prompt_alias">Apelido</string>
<string name="prompt_hostname">Servidor</string>
<string name="prompt_username">Nome de usuário</string>
@@ -33,6 +34,13 @@
<string name="empty_account_list">Nenhuma conta registrada</string>
<string name="normal_accounts_titles">Contas</string>
<string name="normal_devices_titles">Dispositivos conhecidos conectados à esta conta Ring</string>
+ <string name="account_device_revoke">Revogar dispositivo</string>
+ <string name="account_device_revocation_success_title">Sucesso</string>
+ <string name="account_device_revocation_success">Dispositivo foi revogado!</string>
+ <string name="account_device_revocation_error_title">Não é possível revogar dispositivo</string>
+ <string name="account_device_revocation_wrong_password">Senha Incorreta.</string>
+ <string name="account_device_revocation_unknown_device">Dispositivo desconhecido.</string>
+ <string name="account_device_revocation_error_unknown">Erro desconhecido.</string>
<!--Basic Details-->
<string name="account_preferences_basic_tab">Geral</string>
<string name="account_basic_category">Configurações básicas</string>
@@ -58,6 +66,7 @@
<string name="account_video_enable">Habilitar Vídeo</string>
<!--Advanced Details-->
<string name="account_preferences_advanced_tab">Avançado</string>
+ <string name="account_dht_public_in_calls_label">Permitir todas as chamadas/mensagens</string>
<string name="account_registration_exp_label">Registro expirou</string>
<string name="account_local_interface_label">Interface local</string>
<string name="account_local_port_label">Portal Local</string>
@@ -133,6 +142,7 @@
<string name="account_device_added_message">Você configurou sua conta Ring neste dispositivo com sucesso.</string>
<string name="account_device_updated_title">Dispositivo da conta atualizado</string>
<string name="account_device_updated_message">Você atualizou sua conta Ring com sucesso.</string>
+ <string name="account_cannot_be_updated_message">Conta do dispositivo não pode ser atualizada. Por favor cheque sua senha.</string>
<string name="account_sip_success_title">Conta SIP registrada</string>
<string name="account_sip_success_message">Você registrou sua conta SIP com sucesso.</string>
<string name="account_sip_register_anyway">Registrar mesmo assim</string>
@@ -159,7 +169,7 @@
<string name="register_username">Registrar usuário público (experimental)</string>
<string name="username_already_taken">Nome de usuário já em uso</string>
<string name="invalid_username">Nome de usuário inválido</string>
- <string name="looking_for_username_availability">Verificando disponibilidade de nome de usuário...</string>
+ <string name="looking_for_username_availability">Buscando disponibilidade de usuário...</string>
<string name="account_status_connecting">Conectando</string>
<string name="account_status_connection_error">Erro de conexão</string>
<string name="account_status_online">Online</string>
@@ -171,4 +181,17 @@
<string name="account_creation_ring">Criar sua conta Ring</string>
<string name="account_link_title">Conectar este dispositivo</string>
<string name="account_sip_cannot_be_registered">Impossível registrar conta.</string>
+ <!--Devices-->
+ <string name="account_revoke_device_hint">Digite senha para confirmar</string>
+ <string name="enter_password">Entre a senha</string>
+ <string name="revoke_device_title">Revogar dispositivo</string>
+ <string name="revoke_device_message">Tem certeza que você deseja revogar %1$s ?</string>
+ <string name="revoke_device_wait_title">Por favor, aguarde...</string>
+ <string name="revoke_device_wait_message">Revogando dispositivo</string>
+ <string name="rename_device_title">Renomear este dispositivo</string>
+ <string name="rename_device_message">Escolha um novo nome para identificar este dispositivo na sua conta Ring</string>
+ <string name="rename_device_button">Renomear dispositivo</string>
+ <string name="account_rename_device_hint">Escolher novo nome de dispositivo</string>
+ <string name="account_device_name_empty">Nome do dispositivo não pode estar vazio</string>
+ <string name="account_device_this_indicator">este dispositivo</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-pt/strings.xml b/ring-android/app/src/main/res/values-pt/strings.xml
index 4e28457..a269f5a 100644
--- a/ring-android/app/src/main/res/values-pt/strings.xml
+++ b/ring-android/app/src/main/res/values-pt/strings.xml
@@ -43,8 +43,6 @@
<string name="transfer_no_other_call">Sem chamadas pendentes</string>
<string name="transfer_type_number">Insira o número para onde pretende transferir:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Chamada perdida de %1$s</string>
- <string name="notif_missed_outgoing_call">Chamada perdida para %1$s</string>
<string name="notif_incoming_call_title">A receber chamada de %1$s</string>
<string name="notif_incoming_call">A receber chamada</string>
<string name="notif_current_call_title">Em chamada com %1$s</string>
@@ -113,4 +111,7 @@
<!--Share fragment-->
<string name="share_your_account_information">Partilhar a minha informação de contacto</string>
<string name="generic_error_migration">Erro</string>
+ <!--Pending contact requests-->
+ <!--Send contact requests-->
+ <string name="send_request_button">Enviar</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-pt/strings_account.xml b/ring-android/app/src/main/res/values-pt/strings_account.xml
index fd2e78d..89b2004 100644
--- a/ring-android/app/src/main/res/values-pt/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pt/strings_account.xml
@@ -39,4 +39,5 @@
<!--Name registration-->
<string name="account_status_unknown">Desconhecido</string>
<!--Create account-->
+ <!--Devices-->
</resources>
diff --git a/ring-android/app/src/main/res/values-ro/strings.xml b/ring-android/app/src/main/res/values-ro/strings.xml
index 0b7e355..06cb61d 100644
--- a/ring-android/app/src/main/res/values-ro/strings.xml
+++ b/ring-android/app/src/main/res/values-ro/strings.xml
@@ -32,7 +32,6 @@
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
<!--Notifications-->
- <string name="notif_missed_incoming_call">Apel pierdut de la %1$s</string>
<string name="notif_incoming_call_title">Apel pierdut de la %1$s</string>
<string name="notif_incoming_call">Apel de intrare</string>
<string name="notif_current_call_title">Apelul curent cu %1$s</string>
@@ -76,4 +75,6 @@
<string name="unknown">Necunoscut</string>
<!--Share fragment-->
<string name="generic_error_migration">Eroare</string>
+ <!--Pending contact requests-->
+ <!--Send contact requests-->
</resources>
diff --git a/ring-android/app/src/main/res/values-ro/strings_account.xml b/ring-android/app/src/main/res/values-ro/strings_account.xml
index 683690d..337c0ec 100644
--- a/ring-android/app/src/main/res/values-ro/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ro/strings_account.xml
@@ -36,9 +36,12 @@
<!--restore/backup-->
<string name="account_restore_account">Restabiliți contul</string>
<string name="restore_backup_wait">Așteptați vă rog...</string>
+ <string name="export_account_wait_title">Așteptați vă rog...</string>
<string name="account_export_end_error_title">Eroare</string>
<string name="account_new_button">Creați un cont Ring</string>
<!--Name registration-->
<string name="account_status_unknown">Necunoscut</string>
<!--Create account-->
+ <!--Devices-->
+ <string name="revoke_device_wait_title">Așteptați vă rog...</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings.xml b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
index b74f7d5..f5c5e0d 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
@@ -47,8 +47,6 @@
<string name="transfer_no_other_call">Отсутствуют ожидающие вызовы</string>
<string name="transfer_type_number">Укажите номер для перевода:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Пропущенный вызов от %1$s</string>
- <string name="notif_missed_outgoing_call">Пропущенный вызов для %1$s</string>
<string name="notif_incoming_call_title">Входящий вызов от %1$s</string>
<string name="notif_incoming_call">Входящий вызов</string>
<string name="notif_outgoing_call_title">Исходящий вызов на %1$s</string>
@@ -111,4 +109,8 @@
<string name="unknown">Неизвестно</string>
<!--Share fragment-->
<string name="generic_error_migration">Ошибка</string>
+ <!--Pending contact requests-->
+ <string name="accept">Принять</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Отправть</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml b/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
index 4bae57b..21ddbb2 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
@@ -87,6 +87,7 @@
<string name="error_password_char_count">Минимум 6 символов</string>
<string name="error_passwords_not_equals">Пароли не совпадают</string>
<string name="restore_failed_dialog_msg">Произошла ошибка</string>
+ <string name="export_account_wait_title">Пожалуйста, подождите...</string>
<string name="account_export_end_error_title">Ошибка</string>
<string name="account_wizard_title">Добро пожаловать в</string>
<string name="account_new_button">Создать Ring аккаунт</string>
@@ -95,4 +96,6 @@
<string name="account_status_unknown">Неизвестно</string>
<!--Create account-->
<string name="account_creation_home">Добро пожаловать в Ring</string>
+ <!--Devices-->
+ <string name="revoke_device_wait_title">Пожалуйста, подождите...</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-ru/strings.xml b/ring-android/app/src/main/res/values-ru/strings.xml
index 9d76f0d..9e265d9 100644
--- a/ring-android/app/src/main/res/values-ru/strings.xml
+++ b/ring-android/app/src/main/res/values-ru/strings.xml
@@ -1,11 +1,18 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="feedback_section">Обратная связь</string>
+ <string name="report"><u>Отправить нам письмо</u></string>
+ <string name="section_license">Лицензия</string>
<string name="sponsor_section">Ring — свободное программное обеспечение, разработанное и поддерживаемое</string>
<string name="copyright_section">Авторское право</string>
<string name="contribute_section">Внести вклад</string>
<string name="version_section">Версия</string>
- <string name="no_email_app_installed">Не найден почтовый клиент, установите его, чтобы отправить нам сообщение</string>
+ <string name="no_email_app_installed">Не найден почтовый клиент; установите его, чтобы отправить нам сообщение</string>
+ <string name="no_browser_app_installed">Не найден веб-браузер, установите его, чтобы просмотреть эту страницу</string>
<string name="email_chooser_title">Отправить письмо используя…</string>
+ <string name="website_chooser_title">Просмотреть веб-сайт с помощью…</string>
+ <string name="license">Это программное обеспечение предоставляется \"как есть\", без каких либо гарантий. Для получения дополнительной информации смотрите
+<u> Лицензию GNU General Public 3 или более поздней версии</u></string>
<!--RingActivity-->
<string name="title_activity_sflphone_home">Ring</string>
<string name="error_no_network">Нет подключения к сети</string>
@@ -31,12 +38,11 @@
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
<plurals name="home_conferences_title">
- <item quantity="one">%d Диалог</item>
- <item quantity="few">%d Диалогов</item>
- <item quantity="many">%d Диалогов</item>
- <item quantity="other">%d Диалогов</item>
+ <item quantity="one">%d диалог</item>
+ <item quantity="few">%d диалога</item>
+ <item quantity="many">%d диалогов</item>
+ <item quantity="other">%d диалогов</item>
</plurals>
- <string name="home_transfering">Передача %1$s в %2$s</string>
<string name="home_transfer_complet">Передача завершена</string>
<!--ContactList Fragment-->
<string name="no_contact_found">Контактов не найдено</string>
@@ -49,8 +55,6 @@
<string name="transfer_no_other_call">Нет ожидающих вызовов</string>
<string name="transfer_type_number">Тип номера для передачи:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Пропущенный вызов от %1$s</string>
- <string name="notif_missed_outgoing_call">Пропущенный вызов к %1$s</string>
<string name="notif_incoming_call_title">Входящий вызов от %1$s</string>
<string name="notif_incoming_call">Входящий вызов</string>
<string name="notif_outgoing_call_title">Исходящий вызов к %1$s</string>
@@ -65,7 +69,7 @@
<string name="ongoing_call">Исходящий вызов</string>
<string name="hist_in_call">Входящий звонок %1$s</string>
<string name="hist_out_call">Исходящий звонок %1$s</string>
- <string name="start_error_title">Невозможно запустить Ring !</string>
+ <string name="start_error_title">Невозможно запустить Ring!</string>
<string name="start_error_mic_required">Приложению Ring необходимо разрешение на использование микрофона.</string>
<string name="action_call_accept">Принять вызов</string>
<string name="action_call_decline">Отклонить</string>
@@ -82,10 +86,10 @@
<string name="send_message">Отправить сообщение</string>
<string name="message_sending">Отправка сообщения...</string>
<string name="time_just_now">Только сейчас</string>
- <string name="permission_read_denied">Приложению не было разрешено чтение данных из памяти. В связи с этим оно не может работать должным образом. Пожалуйста, рассмотрите возможность предоставления ему этого разрешения.</string>
+ <string name="permission_read_denied">Приложению не было разрешено чтение данных из памяти, поэтому оно не может работать должным образом. Пожалуйста, предоставьте ему это разрешение.</string>
<!--MediaPreferenceFragment-->
<string name="permission_dialog_camera_title">Разрешение на доступ к камере</string>
- <string name="permission_dialog_camera_message">Видеосвязь требует для работы разрешения на доступ к камере. Пожалуйста, рассмотрите возможность его предоставления.</string>
+ <string name="permission_dialog_camera_message">Видеосвязь требует для работы разрешения на доступ к камере. Пожалуйста, предоставьте его.</string>
<string name="ringtone_error_title">Ошибка</string>
<string name="ringtone_error_format_not_supported">Этот формат не поддерживается</string>
<string name="ringtone_error_size_too_big">Файл слишком большой. Максимальный размер — %1$i кБ.</string>
@@ -94,7 +98,7 @@
<!--Write call log permission-->
<string name="permission_dialog_write_call_log_message">Приложению требуется разрешение «Запись в журнал звонков», чтобы включить эту функцию. Пожалуйста, предоставьте его.</string>
<!--QRCode Scan-->
- <string name="scan_qr_account_message">Отсканируйте QR код аккаунта, который вы хотите добавить.</string>
+ <string name="scan_qr_account_message">Отсканируйте QR-код аккаунта, который вы хотите добавить.</string>
<!--Settings-->
<string name="clear_history_dialog_title">Очистить историю ?</string>
<string name="clear_history_dialog_message">Это действие нельзя отменить.</string>
@@ -107,7 +111,7 @@
<string name="conversation_action_copied_peer_number_clipboard">%1$s скопировано в буфер обмена</string>
<string name="conversation_action_select_peer_number">Выбрать номер</string>
<!--Contacts-->
- <string name="add_call_contact_number_to_contacts">Добавить %1$s ?</string>
+ <string name="add_call_contact_number_to_contacts">Добавить %1$s?</string>
<string name="prompt_new_password">Новый пароль</string>
<string name="prompt_new_password_repeat">Повторите новый пароль</string>
<string name="account_create_title">Создать аккаунт Ring</string>
@@ -116,15 +120,21 @@
<string name="help_password_enter">Введите пароль от вашего основного аккаунта Ring</string>
<string name="help_pin_enter">Введите PIN от настроенного аккаунта Ring. Используйте функцию «экспортировать аккаунт в Ring», чтобы получить PIN.</string>
<string name="wizard_next">Далее</string>
- <string name="account_device_updated_message">Вы успешно обновили ваш аккаунт Ring</string>
+ <string name="wizard_back">Назад</string>
<!--MenuHeaderView-->
<string name="profile">Мой профиль</string>
- <string name="profile_message_warning">К этому имеют доступ ваши контакты</string>
<string name="open_the_gallery">Открыть галерею</string>
<string name="take_a_photo">Сделать фото</string>
<string name="unknown">Неизвестно</string>
<!--Share fragment-->
- <string name="share_message">Отсканируйте этот QR код встроенным сканером приложения Ring, которое хочет с вами связаться.</string>
+ <string name="share_message">Отсканируйте этот QR-код встроенным сканером приложения Ring, которое хочет с вами связаться.</string>
+ <string name="share_message_no_account">Выберите аккаунт, которым хотите поделиться.</string>
<string name="share_your_account_information">Поделиться моей контактной информацией</string>
<string name="generic_error_migration">Ошибка</string>
+ <string name="generic_error_migration_message">В процессе переноса произошла ошибка</string>
+ <!--Pending contact requests-->
+ <string name="accept">Принять</string>
+ <string name="refuse">Отклонить</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Отправить</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-ru/strings_account.xml b/ring-android/app/src/main/res/values-ru/strings_account.xml
index aa6b258..4a9a83f 100644
--- a/ring-android/app/src/main/res/values-ru/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ru/strings_account.xml
@@ -2,9 +2,12 @@
<resources>
<!--Strings related to account edition screen-->
<string name="ic_delete_menu">Удалить</string>
+ <string name="ic_advanced_menu">Дополнительные настройки</string>
<!--Strings related to account creation-->
+ <string name="add_ring_account_title">Добавить аккаунт Ring</string>
+ <string name="add_sip_account_title">Добавить аккаунт SIP </string>
<string name="prompt_alias">Псевдоним</string>
- <string name="prompt_hostname">Имя хоста</string>
+ <string name="prompt_hostname">Имя узла</string>
<string name="prompt_username">Имя пользователя</string>
<string name="prompt_password">Пароль</string>
<string name="action_create">Создать аккаунт</string>
@@ -14,14 +17,15 @@
<string name="dialog_wait_create_details">Пожалуйста, подождите, пока ваш новый аккаунт добавляется…</string>
<string name="dialog_wait_update">Обновление аккаунта</string>
<string name="dialog_wait_update_details">Пожалуйста, подождите, пока ваш новый аккаунт обновляется…</string>
- <string name="dialog_warn_ip2ip_account_title">Создать пустой SIP аккаунт?</string>
+ <string name="dialog_warn_ip2ip_account_title">Создать пустой аккаунт SIP?</string>
<string name="dialog_warn_ip2ip_account_message">Вы собираетесь создать аккаунт SIP без допустимого имени сервера.
Вы сможете совершать и принимать звонки только напрямую по IP.
-Вы можете изменить свой аккаунт позднее.</string>
+Можно будет изменить аккаунт позднее.</string>
+ <string name="account_type_ip2ip">IP-аккаунт</string>
<string name="help_ring">Аккаунт Ring позволяет безопасно связываться с людьми напрямую через полностью распределённую сеть.</string>
- <string name="help_sip_title">Добавить ваш SIP аккаунт</string>
- <string name="help_sip">Настроить существующий SIP аккаунт</string>
- <string name="create_sip_account">Добавить</string>
+ <string name="help_sip_title">Добавить ваш SIP-аккаунт</string>
+ <string name="help_sip">Настроить существующий SIP-аккаунт</string>
+ <string name="create_sip_account">Добавить аккаунт SIP </string>
<!--Strings related to account deletion-->
<string name="account_delete_dialog_title">Удалить аккаунт?</string>
<string name="account_delete_dialog_message">Это действие нельзя отменить.</string>
@@ -33,7 +37,7 @@
<string name="account_preferences_basic_tab">Общее</string>
<string name="account_basic_category">Основные настройки</string>
<string name="account_alias_label">Имя аккаунта</string>
- <string name="account_hostname_label">Имя хоста</string>
+ <string name="account_hostname_label">Имя узла</string>
<string name="account_bootstrap_label">Инициализация</string>
<string name="account_username_label">Имя пользователя</string>
<string name="account_password_label">Пароль</string>
@@ -51,12 +55,12 @@
<string name="account_ringtone_custom_label">Использовать другую мелодию звонка</string>
<!--Video Details-->
<string name="account_video_label">Видео</string>
- <string name="account_video_enable">Включить Видео</string>
+ <string name="account_video_enable">Включить видео</string>
<!--Advanced Details-->
<string name="account_preferences_advanced_tab">Дополнительно</string>
- <string name="account_registration_exp_label">Срок Регистрации Истекает</string>
+ <string name="account_registration_exp_label">Срок регистрации истекает</string>
<string name="account_local_interface_label">Локальный интерфейс</string>
- <string name="account_local_port_label">Локальный Порт</string>
+ <string name="account_local_port_label">Локальный порт</string>
<string name="account_stun_enable_label">Использовать STUN</string>
<string name="account_stun_server_label">Сервер STUN</string>
<string name="account_turn_enable_label">Использовать TURN </string>
@@ -64,8 +68,8 @@
<string name="account_turn_username_label">Имя пользователя TURN</string>
<string name="account_turn_password_label">Пароль TURN</string>
<string name="account_published_same_as_local_label">Публикуемый аналогично локальному</string>
- <string name="account_published_port_label">Публикуемый Порт</string>
- <string name="account_published_address_label">Публикуемый Адрес</string>
+ <string name="account_published_port_label">Публикуемый порт</string>
+ <string name="account_published_address_label">Публикуемый адрес</string>
<!--Security Details-->
<string name="account_credentials_label">Идентификационные данные</string>
<string name="account_credentials_edit">Изменить идентификационные данные</string>
@@ -75,20 +79,20 @@
<!--SIP-->
<!--TLS Details-->
<string name="account_tls_transport_switch_label">Использовать TLS</string>
- <string name="account_tls_port_label">Прослушиваемый порт TLS</string>
- <string name="account_tls_certificate_list_label">Центры Сертификации</string>
- <string name="account_tls_certificate_file_label">Файл Сертификата</string>
- <string name="account_tls_private_key_file_label">Файл Закрытого Ключа</string>
- <string name="account_tls_password_label">Пароль Закрытого Ключа</string>
- <string name="account_tls_method_label">Метод TSL</string>
- <string name="account_tls_ciphers_label">TLS Шифрование</string>
- <string name="account_tls_server_name_label">Имя Сервера</string>
- <string name="account_tls_verify_server_label">Проверка Сервера</string>
- <string name="account_tls_verify_client_label">Проверка Клиента</string>
- <string name="account_tls_negotiation_timeout_sec">Таймаут Согласования (сек)</string>
+ <string name="account_tls_port_label">Порт TLS</string>
+ <string name="account_tls_certificate_list_label">Удостоверяющие центры</string>
+ <string name="account_tls_certificate_file_label">Файл сертификата</string>
+ <string name="account_tls_private_key_file_label">Файл закрытого ключа</string>
+ <string name="account_tls_password_label">Пароль закрытого ключа</string>
+ <string name="account_tls_method_label">Метод TLS</string>
+ <string name="account_tls_ciphers_label">Шифры TLS</string>
+ <string name="account_tls_server_name_label">Имя сервера</string>
+ <string name="account_tls_verify_server_label">Проверка сервера</string>
+ <string name="account_tls_verify_client_label">Проверка клиента</string>
+ <string name="account_tls_negotiation_timeout_sec">Тайм-аут согласования (сек)</string>
<string name="account_rtp_max_port">Максимум</string>
<string name="account_rtp_min_port">Минимум</string>
- <string name="account_rtp_port_range">Диапазон Портов для RTP Аудио</string>
+ <string name="account_rtp_port_range">Диапазон портов для RTP-аудио</string>
<!--restore/backup-->
<string name="account_restore_account">Восстановить аккаунт</string>
<string name="account_restore_message">Введите пароль для расшифровки файла.</string>
@@ -102,36 +106,46 @@
<string name="restore_failed_dialog_msg">Произошла ошибка</string>
<string name="export_account_wait_title">Пожалуйста, подождите…</string>
<string name="export_account_wait_message">Публикация информации о новом аккаунте</string>
- <string name="account_export_end_decryption_message">Не удалось разблокировать ваш аккаунт указанным паролем.</string>
+ <string name="account_export_end_decryption_message">Не удалось разблокировать аккаунт указанным паролем.</string>
<string name="account_export_end_network_title">Ошибка сети</string>
<string name="account_export_end_network_message">Не удалось экспортировать аккаунт по сети. Проверьте ваше сетевое соединение.</string>
<string name="account_export_end_error_title">Ошибка</string>
<string name="account_export_end_error_message">Не удалось экспортировать аккаунт. Произошла неизвестная ошибка.</string>
<string name="account_enter_password">Введите пароль</string>
- <string name="account_contact_me">Свяжись со мной в Ring!</string>
+ <string name="account_share_body">Свяжитесь со мной, используя \'%1$s\' в распределённой платформе общения Ring: http://ring.cx</string>
+ <string name="account_share_body_with_username">Свяжитесь со мной, используя \'%1$s\' или моё публичное им пользователя \'%2$s\' в распределённой платформе общения Ring: http://ring.cx</string>
+ <string name="account_contact_me">Свяжитесь со мной в Ring!</string>
<string name="update_account">Обновить аккаунт</string>
+ <string name="account_migration">Ваш аккаунт Ring может быть обновлен.\nПожалуйста, введите ваш пароль.</string>
<string name="ring_account">Аккаунт Ring</string>
+ <string name="ring_account_identity">Идентификатор</string>
<string name="account_migration_title_dialog">Перенос аккаунта</string>
+ <string name="account_migration_message_dialog">Ваш аккаунт требуется обновить. Хотите перейти на экран управления аккаунтом для выполнения этой операции?</string>
<string name="account_update_needed">Необходимо обновление</string>
<string name="account_creation_file_too_big">Файл слишком большой</string>
<string name="account_cannot_read">Не удалось прочитать %1$s</string>
<string name="account_cannot_be_found_title">Не удалось найти аккаунт</string>
- <string name="account_cannot_be_found_message">Не удалось найти аккаунт в сети Ring.\nУдостоверьетсь, что он был экспортирован в сеть Ring с существующего устройства, и что предоставленные идентификационные данные верны.</string>
- <string name="account_no_network_title">Не удалось подключиться к сети</string>
+ <string name="account_cannot_be_found_message">Не удалось найти аккаунт в сети Ring.\nУдостоверьтесь, что он был экспортирован в сеть Ring с существующего устройства, и что предоставленные идентификационные данные верны.</string>
+ <string name="account_sip_cannot_be_registered_message">Можно продолжить создание учетной записи или изменить информацию здесь. Редактирование будет возможно и позже в настройках аккаунта.</string>
+ <string name="account_no_network_title">Не удаётся подключиться к сети</string>
<string name="account_no_network_message">Не удалось добавить аккаунт, потому что Ring не смог подключиться к распределённой сети. Проверьте сетевое соединение вашего устройства.</string>
<string name="account_device_added_title">Устройство аккаунта добавлено</string>
- <string name="account_device_added_message">Вы успешно создали аккаунт Ring на этом устройстве.</string>
+ <string name="account_device_added_message">Вы успешно настроили аккаунт Ring на этом устройстве.</string>
<string name="account_device_updated_title">Устройство аккаунта обновлено</string>
+ <string name="account_device_updated_message">Вы успешно обновили ваш аккаунт Ring.</string>
+ <string name="account_sip_success_title">SIP-аккаунт зарегистрирован</string>
+ <string name="account_sip_success_message">Вы успешно зарегистрировали свой SIP-аккаунт.</string>
+ <string name="account_sip_register_anyway">Всё равно зарегистроваться</string>
<string name="account_link_button">Привязать это устройство к аккаунту</string>
<string name="account_import_title">Привязать к существующему аккаунту</string>
<string name="account_link_prompt_pin">Введите PIN</string>
<string name="account_wizard_title">Добро пожаловать в </string>
<string name="account_new_button">Создать аккаунт Ring</string>
<string name="account_link_export_button">Привязать другое устройство к этому аккаунту</string>
- <string name="account_link_export_info">Для использования этого аккаунта на других устройствах вам нужно сначала выставить его в сеть Ring. Это сгенерирует PIN код, который вам потребуется ввести на новом устройстве для настройки аккаунта. PIN код действителен в течение 10 минут.\n\nПожалуйста, укажите ваш пароль, чтобы начать:</string>
+ <string name="account_link_export_info">Для использования этого аккаунта на других устройствах нужно сначала выставить его в сеть Ring. Это сгенерирует PIN-код, который потребуется ввести на новом устройстве для настройки аккаунта. PIN-код действителен в течение 10 минут.\n\nПожалуйста, укажите ваш пароль, чтобы начать:</string>
<string name="account_start_export_button">Сгенерировать PIN</string>
<string name="account_end_export_button">закрыть</string>
- <string name="account_end_export_infos">Ваш PIN:\n\n%%\n\nДля завершения процесса вам нужно открыть Ring на новом устройстве и выбрать \"Привязать это устройство к аккаунту\". Ваш PIN действителен в течение 10 минут.</string>
+ <string name="account_end_export_infos">Ваш PIN:\n\n%%\n\nДля завершения процесса нужно открыть Ring на новом устройстве и выбрать \"Привязать это устройство к аккаунту\". Ваш PIN действителен в течение 10 минут.</string>
<!--Name registration-->
<string name="register_name_wrong_password">Не удалось зарегистрировать имя: неверный пароль аккаунта.</string>
<string name="register_name_invalid">Не удалось зарегистрировать имя: недопустимое имя.</string>
@@ -145,10 +159,18 @@
<string name="register_username">Зарегистрировать публичное имя (экспериментальная функция)</string>
<string name="username_already_taken">Имя пользователя уже занято</string>
<string name="invalid_username">Недопустимое имя пользователя</string>
- <string name="looking_for_username_availability">Проверка доступности имени пользователя…</string>
<string name="account_status_connecting">Подключение</string>
+ <string name="account_status_connection_error">Ошибка подключения</string>
+ <string name="account_status_online">В сети</string>
<string name="account_status_unknown">Неизвестно</string>
+ <string name="account_status_offline">Не в сети</string>
<!--Create account-->
<string name="account_creation_home">Добро пожаловать в Ring</string>
<string name="account_creation_profile">Создайте свой профиль</string>
+ <string name="account_creation_ring">Создать свой аккаунт Ring</string>
+ <string name="account_link_title">Привязать это устройство</string>
+ <string name="account_sip_cannot_be_registered">Не удалось зарегистрировать аккаунт</string>
+ <!--Devices-->
+ <string name="enter_password">Введите пароль</string>
+ <string name="revoke_device_wait_title">Пожалуйста, подождите…</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-ru/strings_content_description.xml b/ring-android/app/src/main/res/values-ru/strings_content_description.xml
index 4257d77..57127b2 100644
--- a/ring-android/app/src/main/res/values-ru/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-ru/strings_content_description.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<!--Strings for xml content description of images-->
- <string name="contact_quick_call_description">Быстрый Вызов</string>
- <string name="contact_picture_description">Фото Контакта</string>
+ <string name="contact_quick_call_description">Быстрый вызов</string>
+ <string name="contact_picture_description">Фото контакта</string>
<string name="dial_numeric_pad">Цифровая клавиатура</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-ru/strings_preferences.xml b/ring-android/app/src/main/res/values-ru/strings_preferences.xml
index 834f102..281b7a6 100644
--- a/ring-android/app/src/main/res/values-ru/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ru/strings_preferences.xml
@@ -7,9 +7,9 @@
<string name="pref_mobileData_title">Мобильные данные</string>
<string name="pref_mobileData_summary">Разрешить Ring использовать 3G/LTE сети в дополнение к Wi-Fi</string>
<string name="pref_systemContacts_title">Использовать контакты из адресной книги</string>
- <string name="pref_systemContacts_summary">Использовать данные из адресной книги для отображения деталей звонящего.</string>
- <string name="pref_systemDialer_title">Совершать системные звонки, используя Ring.</string>
- <string name="pref_systemDialer_summary">Совершать системные звонки, используя Ring тогда, когда это возможно.</string>
+ <string name="pref_systemContacts_summary">Использовать данные из адресной книги для отображения информации о звонящем.</string>
+ <string name="pref_systemDialer_title">Совершать системные звонки с помощью Ring</string>
+ <string name="pref_systemDialer_summary">Использовать Ring для системных звонков, если возможно.</string>
<string name="pref_startOnBoot_title">Запускать Ring при старте системы</string>
<string name="pref_startOnBoot_summary">Запускать Ring в фоновом режиме во время старта системы.</string>
<string name="pref_clearHistory_title">Очистить историю</string>
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings.xml b/ring-android/app/src/main/res/values-sk-rSK/strings.xml
index 11351ac..bf031c8 100644
--- a/ring-android/app/src/main/res/values-sk-rSK/strings.xml
+++ b/ring-android/app/src/main/res/values-sk-rSK/strings.xml
@@ -53,4 +53,6 @@
<!--Share fragment-->
<string name="share_your_account_information">Zdielaj </string>
<string name="generic_error_migration">Chyba</string>
+ <!--Pending contact requests-->
+ <!--Send contact requests-->
</resources>
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml b/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml
index a68f729..0c76620 100644
--- a/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml
@@ -27,4 +27,5 @@
<!--Name registration-->
<string name="account_status_unknown">Neznámy</string>
<!--Create account-->
+ <!--Devices-->
</resources>
diff --git a/ring-android/app/src/main/res/values-sl/strings.xml b/ring-android/app/src/main/res/values-sl/strings.xml
index 35d2194..c002f3e 100644
--- a/ring-android/app/src/main/res/values-sl/strings.xml
+++ b/ring-android/app/src/main/res/values-sl/strings.xml
@@ -29,4 +29,6 @@
<!--Contacts-->
<!--MenuHeaderView-->
<!--Share fragment-->
+ <!--Pending contact requests-->
+ <!--Send contact requests-->
</resources>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings.xml b/ring-android/app/src/main/res/values-sq-rAL/strings.xml
index d48206b..f91897a 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings.xml
@@ -52,8 +52,6 @@
<string name="transfer_no_other_call">S’ka thirrje të tjera pezull</string>
<string name="transfer_type_number">Shtypni numrin te i cili të shpërngulet:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Thirrje e humbur nga %1$s</string>
- <string name="notif_missed_outgoing_call">Thirrje për %1$s e humbur</string>
<string name="notif_incoming_call_title">Thirrje ardhëse nga %1$s</string>
<string name="notif_incoming_call">Thirrje ardhëse</string>
<string name="notif_outgoing_call_title">Thirrje për %1$s</string>
@@ -129,4 +127,8 @@
<string name="share_your_account_information">Ndaji me të tjerët të dhënat e mia të kontaktit</string>
<string name="generic_error_migration">Gabim</string>
<string name="generic_error_migration_message">Ndodhi një gabim gjatë migrimit</string>
+ <!--Pending contact requests-->
+ <string name="accept">Pranoje</string>
+ <string name="refuse">Hidhe tej</string>
+ <!--Send contact requests-->
</resources>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml b/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
index c15ae65..59db22f 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
@@ -149,4 +149,7 @@
<!--Create account-->
<string name="account_creation_home">Mirë se vini te Ring</string>
<string name="account_creation_profile">Krijoni profilin tuaj</string>
+ <!--Devices-->
+ <string name="enter_password">Jepni fjalëkalimin</string>
+ <string name="revoke_device_wait_title">Ju lutemi, pritni…</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-sv/strings.xml b/ring-android/app/src/main/res/values-sv/strings.xml
index e4d748d..cf5329a 100644
--- a/ring-android/app/src/main/res/values-sv/strings.xml
+++ b/ring-android/app/src/main/res/values-sv/strings.xml
@@ -26,6 +26,7 @@
<string name="drawer_close">Stäng navigeringspanelen</string>
<!--Sections-->
<string name="menu_item_home">Hem</string>
+ <string name="menu_item_contact_request">Kontaktförfrågningar</string>
<string name="menu_item_accounts">Hantera konton</string>
<string name="menu_item_settings">Inställningar</string>
<string name="menu_item_share">Dela min kontakt</string>
@@ -41,6 +42,7 @@
<item quantity="one">%d konversation</item>
<item quantity="other">%d konversationer</item>
</plurals>
+ <string name="home_transfering">Överför %1$s till %2$s</string>
<string name="home_transfer_complet">Överföring slutförd</string>
<!--ContactList Fragment-->
<string name="no_contact_found">Ingen kontakt hittades</string>
@@ -53,8 +55,8 @@
<string name="transfer_no_other_call">Inga andra samtal väntar</string>
<string name="transfer_type_number">Ange nummer att överföra till:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Missat samtal från %1$s</string>
- <string name="notif_missed_outgoing_call">Missat samtal till %1$s</string>
+ <string name="notif_missed_incoming_call">Missat inkommande samtal</string>
+ <string name="notif_missed_outgoing_call">Missat utgående samtal</string>
<string name="notif_incoming_call_title">Inkommande samtal från %1$s</string>
<string name="notif_incoming_call">Inkommande samtal</string>
<string name="notif_outgoing_call_title">Utgående samtal till %1$s</string>
@@ -78,6 +80,7 @@
<string name="ab_action_contact_add_question">Vill du lägga till i kontakter?</string>
<string name="ab_action_audio_call">Ljudsamtal</string>
<string name="ab_action_video_call">Videosamtal</string>
+ <string name="ab_action_change_screen_orientation">Ändra skärmorientering</string>
<string name="share_via">Dela via</string>
<string name="write_a_message">Skriv ett meddelande</string>
<string name="scan_qr">Skanna QR-kod</string>
@@ -110,6 +113,7 @@
<string name="conversation_action_copy_peer_number">Kopiera nummer</string>
<string name="conversation_action_copied_peer_number_clipboard">%1$s kopierat till urklipp</string>
<string name="conversation_action_select_peer_number">Välj ett nummer</string>
+ <string name="conversation_action_block_this">Blockera den här kontakten</string>
<!--Contacts-->
<string name="add_call_contact_number_to_contacts">Vill du lägga till %1$s ?</string>
<string name="prompt_new_password">Nytt lösenord</string>
@@ -123,8 +127,10 @@
<string name="wizard_back">Tillbaka</string>
<!--MenuHeaderView-->
<string name="profile">Min profil</string>
+ <string name="profile_message_warning">Din profil delas endast med dina kontakter</string>
<string name="open_the_gallery">Öppna galleriet</string>
<string name="take_a_photo">Ta ett foto</string>
+ <string name="profile_name_hint">Ange ditt namn (frivilligt)</string>
<string name="unknown">Okänd</string>
<!--Share fragment-->
<string name="share_message">Skanna denna QR-kod med den inbyggda skanner som finns i det Ring-program som vill kommunicera med dig.</string>
@@ -132,4 +138,16 @@
<string name="share_your_account_information">Dela min kontaktinformation</string>
<string name="generic_error_migration">Fel</string>
<string name="generic_error_migration_message">Ett fel inträffade vid migrering</string>
+ <!--Pending contact requests-->
+ <string name="accept">Acceptera</string>
+ <string name="refuse">Neka</string>
+ <string name="block">Blockera</string>
+ <string name="contact_request_title">Väntande kontaktförfrågan</string>
+ <string name="contact_request_msg">Du har %1$s väntande förfrågningar</string>
+ <string name="contact_request_account">För %1$s</string>
+ <string name="no_requests">0 kontaktförfrågningar</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Skicka</string>
+ <string name="send_request_title">Skicka en kontaktförfrågan</string>
+ <string name="send_request_msg">Du måste skicka en kontaktförfrågan för att kommunicera med den här användaren. Så länge din kontakt inte har accepterat förfrågan, kan du skicka meddelanden, men din kontakt kan inte läsa dem.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-sv/strings_account.xml b/ring-android/app/src/main/res/values-sv/strings_account.xml
index d3afb28..ebd849a 100644
--- a/ring-android/app/src/main/res/values-sv/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sv/strings_account.xml
@@ -6,6 +6,7 @@
<!--Strings related to account creation-->
<string name="add_ring_account_title">Lägg till Ring-konto</string>
<string name="add_sip_account_title">Lägg till SIP-konto</string>
+ <string name="ring_account_default_name">Ring-konto %1$s</string>
<string name="prompt_alias">Alias</string>
<string name="prompt_hostname">Värdnamn</string>
<string name="prompt_username">Användarnamn</string>
@@ -33,6 +34,13 @@
<string name="empty_account_list">Inget konto registrerat</string>
<string name="normal_accounts_titles">Konton</string>
<string name="normal_devices_titles">Kända enheter, länkade till detta Ring-konto</string>
+ <string name="account_device_revoke">Återkalla enhet</string>
+ <string name="account_device_revocation_success_title">Slutfört</string>
+ <string name="account_device_revocation_success">Enheten är inte återkallad!</string>
+ <string name="account_device_revocation_error_title">Kan inte återkalla enheten</string>
+ <string name="account_device_revocation_wrong_password">Fel lösenord.</string>
+ <string name="account_device_revocation_unknown_device">Okänd enhet.</string>
+ <string name="account_device_revocation_error_unknown">Okänt fel.</string>
<!--Basic Details-->
<string name="account_preferences_basic_tab">Allmänt</string>
<string name="account_basic_category">Grundläggande inställningar</string>
@@ -58,6 +66,7 @@
<string name="account_video_enable">Aktivera video</string>
<!--Advanced Details-->
<string name="account_preferences_advanced_tab">Avancerat</string>
+ <string name="account_dht_public_in_calls_label">Tillåt alla samtal/meddelanden</string>
<string name="account_registration_exp_label">Registreringen löper ut</string>
<string name="account_local_interface_label">Lokalt gränssnitt</string>
<string name="account_local_port_label">Lokal port</string>
@@ -133,6 +142,7 @@
<string name="account_device_added_message">Du har lyckats konfigurera ditt Ring-konto på denna enhet.</string>
<string name="account_device_updated_title">Kontoenhet uppdaterad</string>
<string name="account_device_updated_message">Du har lyckats uppdatera ditt Ring-konto.</string>
+ <string name="account_cannot_be_updated_message">Kontoenheten kunde inte uppdateras. Kontrollera ditt lösenord.</string>
<string name="account_sip_success_title">SIP-konto registrerat</string>
<string name="account_sip_success_message">Du har registrerat ditt SIP-konto.</string>
<string name="account_sip_register_anyway">Registrera i alla fall</string>
@@ -159,7 +169,7 @@
<string name="register_username">Registrera ett offentligt namn (experimentellt)</string>
<string name="username_already_taken">Användarnamnet finns redan</string>
<string name="invalid_username">Ogiltigt användarnamn</string>
- <string name="looking_for_username_availability">Kollar användarnamnets tillgänglighet...</string>
+ <string name="looking_for_username_availability">Söker efter användarnamnets tillgänglighet...</string>
<string name="account_status_connecting">Ansluter</string>
<string name="account_status_connection_error">Anslutningsfel</string>
<string name="account_status_online">Uppkopplad</string>
@@ -171,4 +181,17 @@
<string name="account_creation_ring">Skapa ditt Ring-konto</string>
<string name="account_link_title">Länka den här enheten</string>
<string name="account_sip_cannot_be_registered">Kan inte registrera konto</string>
+ <!--Devices-->
+ <string name="account_revoke_device_hint">Ange lösenord för att bekräfta</string>
+ <string name="enter_password">Ange lösenord</string>
+ <string name="revoke_device_title">Återkalla enhet</string>
+ <string name="revoke_device_message">Vill du verkligen återkalla %1$s?</string>
+ <string name="revoke_device_wait_title">Vänta...</string>
+ <string name="revoke_device_wait_message">Återkallar enheten</string>
+ <string name="rename_device_title">Byt namn på enheten</string>
+ <string name="rename_device_message">Välj ett namn för att identifiera denna enhet på ditt Ring-konto</string>
+ <string name="rename_device_button">Byt namn på enhet</string>
+ <string name="account_rename_device_hint">Välj nytt enhetsnamn</string>
+ <string name="account_device_name_empty">Enhetsnamnet kan inte lämnas tomt</string>
+ <string name="account_device_this_indicator">denna enhet</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-tr/strings.xml b/ring-android/app/src/main/res/values-tr/strings.xml
index 1e1309c..72f4aa4 100644
--- a/ring-android/app/src/main/res/values-tr/strings.xml
+++ b/ring-android/app/src/main/res/values-tr/strings.xml
@@ -41,6 +41,7 @@
<item quantity="one">%d Konuşma</item>
<item quantity="other">%d Konuşma</item>
</plurals>
+ <string name="home_transfering">%1$s den %2$s ye aktarılıyor</string>
<string name="home_transfer_complet">Aktarım tamamlandı</string>
<!--ContactList Fragment-->
<string name="no_contact_found">Kişi bulunamadı</string>
@@ -53,8 +54,6 @@
<string name="transfer_no_other_call">Bekleyen başka arama yok</string>
<string name="transfer_type_number">Aktarılacak numarayı girin:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">%1$s\'den yanıtsız arama</string>
- <string name="notif_missed_outgoing_call">%1$s\'e yanıtsız arama</string>
<string name="notif_incoming_call_title">%1$s\'dan gelen arama</string>
<string name="notif_incoming_call">Gelen arama</string>
<string name="notif_outgoing_call_title">%1$s\'a giden arama</string>
@@ -78,6 +77,7 @@
<string name="ab_action_contact_add_question">Kişilere eklensin mi?</string>
<string name="ab_action_audio_call">Sesli arama</string>
<string name="ab_action_video_call">Görüntülü arama</string>
+ <string name="ab_action_change_screen_orientation">Ekran Yönünü değiştir</string>
<string name="share_via">Paylaş</string>
<string name="write_a_message">Bir ileti yaz</string>
<string name="scan_qr">Kare Kod Tara</string>
@@ -123,8 +123,10 @@
<string name="wizard_back">Geri</string>
<!--MenuHeaderView-->
<string name="profile">Profilim</string>
+ <string name="profile_message_warning">Profiliniz sadece kayıtlı kişilerinizle paylaşılıyor</string>
<string name="open_the_gallery">Galeriyi aç</string>
<string name="take_a_photo">Fotoğraf çek</string>
+ <string name="profile_name_hint">Adınızı girin (isteğe bağlı)</string>
<string name="unknown">Bilinmeyen</string>
<!--Share fragment-->
<string name="share_message">Sizinle iletişime geçmek isteyenin Ring uygulamasının gömülü tarayıcısıyla bu QR kodu tarayın.</string>
@@ -132,4 +134,9 @@
<string name="share_your_account_information">İletişim bilgimi paylaş</string>
<string name="generic_error_migration">Hata</string>
<string name="generic_error_migration_message">Göç sırasında bir hata oluştu</string>
+ <!--Pending contact requests-->
+ <string name="accept">Kabul et</string>
+ <string name="refuse">Geri Çevir</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Gönder</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-tr/strings_account.xml b/ring-android/app/src/main/res/values-tr/strings_account.xml
index abc6f0d..99e04d6 100644
--- a/ring-android/app/src/main/res/values-tr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-tr/strings_account.xml
@@ -133,6 +133,7 @@
<string name="account_device_added_message">Bu aygıttaki Ring hesabınızı başarıyla kurdunuz.</string>
<string name="account_device_updated_title">Hesap aygıtı güncellendi</string>
<string name="account_device_updated_message">Ring hesabınızı başarıyla güncellediniz.</string>
+ <string name="account_cannot_be_updated_message">Hesap aygıtı güncellenemedi. Lütfen parolanızı kontrol edin</string>
<string name="account_sip_success_title">Sip hesabı kayıtlı</string>
<string name="account_sip_success_message">Sip hesabınızı başarıyla kaydettiniz.</string>
<string name="account_sip_register_anyway">Her koşulda kaydol</string>
@@ -159,7 +160,6 @@
<string name="register_username">Halka açık kullanıcı adı kaydet (deneysel)</string>
<string name="username_already_taken">Kullanıcı adı önceden alınmış</string>
<string name="invalid_username">Geçersiz kullanıcı adı</string>
- <string name="looking_for_username_availability">Kullanıcı adının uygunluğuna bakılıyor ...</string>
<string name="account_status_connecting">Bağlanılıyor</string>
<string name="account_status_connection_error">Bağlantı hatası</string>
<string name="account_status_online">Çevrimiçi</string>
@@ -171,4 +171,7 @@
<string name="account_creation_ring">Ring hesabınızı oluşturun</string>
<string name="account_link_title">Bu aygıtı bağla</string>
<string name="account_sip_cannot_be_registered">Hesap kaydedilemiyor</string>
+ <!--Devices-->
+ <string name="enter_password">Parolayı gir</string>
+ <string name="revoke_device_wait_title">Lütfen bekleyin...</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-uk/strings.xml b/ring-android/app/src/main/res/values-uk/strings.xml
index 5063323..99d3f73 100644
--- a/ring-android/app/src/main/res/values-uk/strings.xml
+++ b/ring-android/app/src/main/res/values-uk/strings.xml
@@ -46,8 +46,6 @@
<string name="transfer_no_other_call">Немає викликів, які очікуть</string>
<string name="transfer_type_number">Введіть номер отримувача:</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">Пропущений виклик від %1$s</string>
- <string name="notif_missed_outgoing_call">Пропущений виклик до %1$s</string>
<string name="notif_incoming_call_title">Вхідний виклик від %1$s</string>
<string name="notif_incoming_call">Вхідний виклик</string>
<string name="notif_outgoing_call_title">Вихідний виклик до %1$s</string>
@@ -110,4 +108,9 @@
<string name="unknown">Невідомий</string>
<!--Share fragment-->
<string name="generic_error_migration">Помилка</string>
+ <!--Pending contact requests-->
+ <string name="accept">Прийняти</string>
+ <string name="refuse">Скидання</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">Відправити</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-uk/strings_account.xml b/ring-android/app/src/main/res/values-uk/strings_account.xml
index 6c76dd8..2699ac8 100644
--- a/ring-android/app/src/main/res/values-uk/strings_account.xml
+++ b/ring-android/app/src/main/res/values-uk/strings_account.xml
@@ -90,6 +90,7 @@
<string name="error_password_char_count">мінімум 6 символів</string>
<string name="error_passwords_not_equals">Паролі не збігаються</string>
<string name="restore_failed_dialog_msg">Виникла помилка</string>
+ <string name="export_account_wait_title">Будь ласка зачекайте</string>
<string name="account_export_end_error_title">Помилка</string>
<string name="account_new_button">Створити обліковий запис Ring</string>
<!--Name registration-->
@@ -97,4 +98,6 @@
<string name="account_status_unknown">Невідомий</string>
<!--Create account-->
<string name="account_creation_home">Вітаємо у Ring</string>
+ <!--Devices-->
+ <string name="revoke_device_wait_title">Будь ласка зачекайте</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings.xml b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
index 82d1a38..e95fb61 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,6 +1,8 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="feedback_section">反馈</string>
+ <string name="report"><u>给我们发邮件</u></string>
+ <string name="section_license">许可</string>
<string name="sponsor_section">Ring是一个自由软件，开发者与维护者是</string>
<string name="copyright_section">版权所有</string>
<string name="contribute_section">贡献</string>
@@ -8,6 +10,8 @@
<string name="no_email_app_installed">未找到电子邮件客户端，请安装后再重试发送报告。</string>
<string name="no_browser_app_installed">未找到浏览器，请安装后再重试浏览该网页。</string>
<string name="email_chooser_title">使用…发送邮件</string>
+ <string name="website_chooser_title">用…浏览网站</string>
+ <string name="license">本软件由版权持有人及其他责任者“按原样”提供，不担保任何责任。详细信息请参见<u>GNU通用公共许可证，版本3或更新</u></string>
<!--RingActivity-->
<string name="title_activity_sflphone_home">Ring</string>
<string name="error_no_network">无网络连接</string>
@@ -35,6 +39,7 @@
<plurals name="home_conferences_title">
<item quantity="other">%d个会话</item>
</plurals>
+ <string name="home_transfering">正在传输从%1$s到%2$s</string>
<string name="home_transfer_complet">传输完成</string>
<!--ContactList Fragment-->
<string name="no_contact_found">未找到联系人</string>
@@ -47,8 +52,6 @@
<string name="transfer_no_other_call">无通话</string>
<string name="transfer_type_number">输入要切换至的号码：</string>
<!--Notifications-->
- <string name="notif_missed_incoming_call">未接来电：%1$s</string>
- <string name="notif_missed_outgoing_call">未接去电：%1$s</string>
<string name="notif_incoming_call_title">来电：%1$s</string>
<string name="notif_incoming_call">来电</string>
<string name="notif_outgoing_call_title">去电：%1$s</string>
@@ -72,6 +75,7 @@
<string name="ab_action_contact_add_question">添加至通讯录吗？</string>
<string name="ab_action_audio_call">语音通话</string>
<string name="ab_action_video_call">视频通话</string>
+ <string name="ab_action_change_screen_orientation">切换屏幕方向</string>
<string name="share_via">通过…共享</string>
<string name="write_a_message">写消息</string>
<string name="scan_qr">扫描二维码</string>
@@ -114,13 +118,23 @@
<string name="help_password_enter">输入您的Ring主帐户密码</string>
<string name="help_pin_enter">输入另一个Ring帐户的PIN（使用“导出Ring帐户”功能获取）。</string>
<string name="wizard_next">下一步</string>
+ <string name="wizard_back">上一步</string>
<!--MenuHeaderView-->
<string name="profile">我的帐户资料</string>
+ <string name="profile_message_warning">您的帐户资料仅与您的通讯录共享</string>
<string name="open_the_gallery">打开照片库</string>
<string name="take_a_photo">拍照</string>
+ <string name="profile_name_hint">输入您的名字（可选）</string>
<string name="unknown">未知</string>
<!--Share fragment-->
<string name="share_message">使用Ring扫描此二维码以建立连接。</string>
+ <string name="share_message_no_account">请选择要共享的帐户。</string>
<string name="share_your_account_information">共享我的通讯信息</string>
<string name="generic_error_migration">错误</string>
+ <string name="generic_error_migration_message">帐户迁移时发生错误</string>
+ <!--Pending contact requests-->
+ <string name="accept">接听</string>
+ <string name="refuse">拒接</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">发送</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
index b06702e..aebb46a 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
@@ -2,7 +2,10 @@
<resources>
<!--Strings related to account edition screen-->
<string name="ic_delete_menu">删除</string>
+ <string name="ic_advanced_menu">高级设置</string>
<!--Strings related to account creation-->
+ <string name="add_ring_account_title">添加Ring帐户</string>
+ <string name="add_sip_account_title">添加SIP帐户</string>
<string name="prompt_alias">别名</string>
<string name="prompt_hostname">主机名</string>
<string name="prompt_username">用户名</string>
@@ -18,9 +21,11 @@
<string name="dialog_warn_ip2ip_account_message">您正在创建一个主机名非法的SIP帐户。
该帐户拨出或接听通话将只能直接通过IP地址。
您可以稍后修改该帐户。</string>
+ <string name="account_type_ip2ip">IP帐户</string>
<string name="help_ring">Ring帐户使您在一个完全分布式的网络中，与他人进行安全的点对点通信。</string>
<string name="help_sip_title">添加您的SIP帐户</string>
<string name="help_sip">配置已有的SIP帐户。</string>
+ <string name="create_sip_account">添加SIP帐户</string>
<!--Strings related to account deletion-->
<string name="account_delete_dialog_title">删除帐户吗？</string>
<string name="account_delete_dialog_message">该操作不可撤销。</string>
@@ -107,31 +112,40 @@
<string name="account_export_end_error_title">错误</string>
<string name="account_export_end_error_message">无法导出帐户，发生未知错误。</string>
<string name="account_enter_password">输入密码</string>
+ <string name="account_share_body">使用\'%1$s\'在Ring分布式通讯平台上联系我：http://ring.cx</string>
+ <string name="account_share_body_with_username">使用\'%1$s\'或我的公共用户名\'%2$s\'，在Ring分布式通讯平台上联系我：http://ring.cx</string>
<string name="account_contact_me">在Ring上联系我！</string>
<string name="update_account">更新帐户</string>
+ <string name="account_migration">您的Ring帐户可以被更新。\n请输入您的密码。</string>
<string name="ring_account">Ring帐户</string>
+ <string name="ring_account_identity">身份</string>
<string name="account_migration_title_dialog">帐户迁移</string>
+ <string name="account_migration_message_dialog">您的帐户需要被更新。您想前往帐户管理界面进行该操作吗？</string>
<string name="account_update_needed">需要更新</string>
<string name="account_creation_file_too_big">文件过大</string>
<string name="account_cannot_read">无法读取%1$s</string>
<string name="account_cannot_be_found_title">无法找到帐户</string>
<string name="account_cannot_be_found_message">无法在Ring网络中找到帐户。\n请确认该帐户已从其他设备中导出，并且您提供了正确的认证信息。</string>
+ <string name="account_sip_cannot_be_registered_message">您可以前往下一步或在这里编辑您的信息。帐户创建后，您仍可在帐户设置中进行编辑。</string>
<string name="account_no_network_title">无法连接至网络</string>
<string name="account_no_network_message">无法添加帐户，因为Ring未连接到网络。请检查您的网络连接。</string>
<string name="account_device_added_title">帐户设备已添加</string>
<string name="account_device_added_message">已在这台设备成功设置了您的Ring帐户。</string>
<string name="account_device_updated_title">帐户设备已更新</string>
<string name="account_device_updated_message">您的Ring帐户已更新。</string>
- <string name="account_link_button">将这台设备与一个帐户进行连接</string>
+ <string name="account_cannot_be_updated_message">无法更新帐户设备。请检查您的密码。</string>
+ <string name="account_sip_success_title">SIP帐户已注册</string>
+ <string name="account_sip_success_message">您已成功注册了您的SIP帐户。</string>
+ <string name="account_link_button">将此设备与一个帐户进行连接</string>
<string name="account_import_title">与已有帐户进行连接</string>
<string name="account_link_prompt_pin">输入PIN</string>
<string name="account_wizard_title">欢迎来到</string>
<string name="account_new_button">创建Ring帐户</string>
- <string name="account_link_export_button">将另一台设备与该帐户进行连接</string>
+ <string name="account_link_export_button">将另一设备与该帐户进行连接</string>
<string name="account_link_export_info">要在其他设备上使用该帐户，您需要将其连接至Ring，在此过程中您会得到一个PIN，在10分钟内有效。请将其输入您的新设备以设置该帐户。\n\n首先，请输入您的密码：</string>
<string name="account_start_export_button">生成PIN</string>
<string name="account_end_export_button">关闭</string>
- <string name="account_end_export_infos">您的PIN是：\n\n%%\n\n要继续，请在新设备上打开Ring，点击“将这台设备与一个帐户进行连接”。您的PIN将在10分钟内有效。</string>
+ <string name="account_end_export_infos">您的PIN是：\n\n%%\n\n要继续，请在新设备上打开Ring，点击“将此设备与一个帐户进行连接”。您的PIN将在10分钟内有效。</string>
<!--Name registration-->
<string name="register_name_wrong_password">无法注册用户名：帐户密码错误。</string>
<string name="register_name_invalid">无法注册用户名：该用户名非法。</string>
@@ -145,10 +159,18 @@
<string name="register_username">注册公共用户名（试验性）</string>
<string name="username_already_taken">用户名已被占用</string>
<string name="invalid_username">非法用户名</string>
- <string name="looking_for_username_availability">正在检测用户名是否可用…</string>
<string name="account_status_connecting">正在连接</string>
+ <string name="account_status_connection_error">连接错误</string>
+ <string name="account_status_online">在线</string>
<string name="account_status_unknown">未知</string>
+ <string name="account_status_offline">离线</string>
<!--Create account-->
<string name="account_creation_home">欢迎来到Ring</string>
<string name="account_creation_profile">创建您的帐户资料</string>
+ <string name="account_creation_ring">创建您的Ring帐户</string>
+ <string name="account_link_title">连接此设备</string>
+ <string name="account_sip_cannot_be_registered">无法注册帐户</string>
+ <!--Devices-->
+ <string name="enter_password">输入密码</string>
+ <string name="revoke_device_wait_title">请稍等…</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings.xml b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
index 0db7ea5..1f38733 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
@@ -36,8 +36,6 @@
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
<!--Notifications-->
- <string name="notif_missed_incoming_call">未接來電從 %1$s</string>
- <string name="notif_missed_outgoing_call">未接通話到 %1$s</string>
<string name="notif_incoming_call_title">來電從 %1$s</string>
<string name="notif_incoming_call">來電</string>
<string name="notif_outgoing_call_title">撥出電話到 %1$s</string>
@@ -86,4 +84,7 @@
<string name="unknown">未知</string>
<!--Share fragment-->
<string name="generic_error_migration">錯誤</string>
+ <!--Pending contact requests-->
+ <!--Send contact requests-->
+ <string name="send_request_button">傳送</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
index 2e87df5..d95f3b6 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
@@ -93,4 +93,7 @@
<string name="account_status_connecting">連接中</string>
<string name="account_status_unknown">未知</string>
<!--Create account-->
+ <!--Devices-->
+ <string name="enter_password">輸入密碼</string>
+ <string name="revoke_device_wait_title">請等待...</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-zh/strings.xml b/ring-android/app/src/main/res/values-zh/strings.xml
index e5c3d9d..85b89eb 100644
--- a/ring-android/app/src/main/res/values-zh/strings.xml
+++ b/ring-android/app/src/main/res/values-zh/strings.xml
@@ -32,4 +32,8 @@
<!--MenuHeaderView-->
<string name="unknown">未知</string>
<!--Share fragment-->
+ <!--Pending contact requests-->
+ <string name="refuse">拒絕</string>
+ <!--Send contact requests-->
+ <string name="send_request_button">發送</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-zh/strings_account.xml b/ring-android/app/src/main/res/values-zh/strings_account.xml
index 9011595..f8c847e 100644
--- a/ring-android/app/src/main/res/values-zh/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh/strings_account.xml
@@ -38,4 +38,5 @@
<string name="account_status_unknown">未知</string>
<!--Create account-->
<string name="account_creation_home">歡迎使用Ring</string>
+ <!--Devices-->
</resources>