translations: fix tx config file and update
This patch fixes the tx configuration file. There were unwanted
characters preventing the update. It also take care of new locales
that mess with Android Studio.
Finally, an update of the translations is done. This update fixes the
issue #775 reporting a misleading translation.
Tuleap: #775
Change-Id: I2c7d01f50f97c8455c3115b31d1b1790f1e95850
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 dc0f780..2144e7a 100644
--- a/ring-android/app/src/main/res/values-ar/strings.xml
+++ b/ring-android/app/src/main/res/values-ar/strings.xml
@@ -1,6 +1,11 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="section_licence">الترخيص</string>
+ <string name="sponsor_section">Ring برمجية حرّة طوّرت ودعمت بواسطة</string>
+ <string name="copyright_section">الحقوق محفوظة</string>
+ <string name="contribute_section">مساهمة</string>
<string name="version_section">الإصدار</string>
+ <string name="email_chooser_title">إرسال بريد إلكتروني باستخدام...</string>
<!--RingActivity-->
<string name="title_section0">إتصل</string>
<string name="title_activity_sflphone_home">Ring</string>
@@ -51,6 +56,7 @@
<string name="transfer_type_number">إكتب الرقم الذي تريد التحويل إليه:</string>
<!--Notifications-->
<string name="notif_incoming_call">مكالمة واردة</string>
+ <string name="notif_current_call">المكالمات الحالية</string>
<!--Call Fragment-->
<string name="me">أنا</string>
<string name="you_txt_prefix">أنت:</string>
@@ -69,11 +75,18 @@
<string name="ab_action_speakerphone">فعل مكبرالصوت</string>
<string name="ab_action_contact_add">أضف إلى الاتصالات المعروفة</string>
<string name="ab_action_audio_call">مكالمة صوتية</string>
+ <string name="ab_action_video_call">مكالمة فيديو</string>
+ <string name="share_via">مشاركة عبر</string>
+ <string name="ab_action_flipcamera">قلب الكاميرا</string>
<!--Text messages-->
<string name="send_message">إبعث رسالة</string>
+ <string name="time_just_now">للتوّ</string>
<!--MediaPreferenceFragment-->
<!--Read contacts permission-->
<!--Write call log permission-->
<!--QRCode Scan-->
<!--Settings-->
+ <!--Conversation-->
+ <string name="conversation_action_copy_peer_number">نسخ الرقم</string>
+ <!--Contacts-->
</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 a30019b..a40a8a7 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
@@ -10,11 +10,6 @@
<string name="error_field_required">هذا الحقل مطلوب</string>
<string name="dialog_wait_create">في طور إضافة حساب</string>
<string name="dialog_wait_create_details">الرجاء الإنتظار في حين نظيف حسابك</string>
- <string-array name="accountType">
- <item>RING</item>
- <item>SIP</item>
- <item>IAX</item>
- </string-array>
<string name="help_sip">ترتيب حساب SIP موجود</string>
<string name="create_sip_account">أضف</string>
<string name="share_number">تقاسم رقم</string>
@@ -58,6 +53,7 @@
<!--SRTP Details-->
<string name="account_preferences_security_tab">تأمين</string>
<string name="account_srtp_deactivated">باطلة المفعول</string>
+ <!--SIP-->
<!--TLS Details-->
<string name="account_tls_transport_switch_label">إستعمل المواصلات TLS</string>
<string name="account_tls_port_label">منفذ المستمع (TLS listener port) </string>
@@ -75,4 +71,5 @@
<string name="account_rtp_min_port">الحد الأدنى</string>
<string name="account_rtp_port_range">نطاق المنفذ RTP الصوتي</string>
<!--Import/export-->
+ <string name="account_export">تصدير</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-ar/strings_call.xml b/ring-android/app/src/main/res/values-ar/strings_call.xml
new file mode 100644
index 0000000..664530a
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ar/strings_call.xml
@@ -0,0 +1,35 @@
+<?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">يرنّ</string>
+ <string name="call_human_state_ringing">يتّصل</string>
+ <string name="call_human_state_current">يتم التكلم</string>
+ <string name="call_human_state_hungup">فوق</string>
+ <string name="call_human_state_busy">مشغول</string>
+ <string name="call_human_state_failure">فشل</string>
+ <string name="call_human_state_hold">توقف مؤقت</string>
+ <string name="call_human_state_unhold">استئنف</string>
+ <string name="call_human_state_over">فوق</string>
+ <string name="conference_human_state_hold">توقف مؤقت</string>
+ </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-ar/strings_preferences.xml b/ring-android/app/src/main/res/values-ar/strings_preferences.xml
index d311703..700191f 100644
--- a/ring-android/app/src/main/res/values-ar/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ar/strings_preferences.xml
@@ -1,4 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="pref_category_network">الشبكة</string>
<string name="pref_category_contacts">الاتصالات</string>
+ <string name="pref_category_system">النظام</string>
+ <string name="pref_category_privacy">الخصوصية</string>
+ <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_startOnBoot_title">بدأ Ring عند بدأ التشغيل</string>
+ <string name="pref_startOnBoot_summary">تشغيل Ring في الخلفية عندما يبدأ النظام</string>
+ <string name="pref_clearHistory_title">مسح السجل</string>
+ <string name="pref_clearHistory_summary">مسح كل سجل المحادثات، هذا الإختيار لايمكن التراجع عنه</string>
</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 67a454f..ce8d865 100644
--- a/ring-android/app/src/main/res/values-bg/strings.xml
+++ b/ring-android/app/src/main/res/values-bg/strings.xml
@@ -1,6 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="section_licence">Лиценз</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="email_chooser_title">Изпращане на е-писмо чрез…</string>
<!--RingActivity-->
<string name="title_section0">Набиране</string>
<string name="title_activity_sflphone_home">Ring</string>
@@ -11,9 +17,11 @@
<string name="ab_action_chat">Текстово съобщение</string>
<!--Left Drawer-->
<!--Accessibility-->
+ <string name="drawer_open">Отваряне на менюто</string>
+ <string name="drawer_close">Затваряне на менюто</string>
<!--Sections-->
<string name="menu_item_home">Начало</string>
- <string name="menu_item_accounts">Управление на акаунти</string>
+ <string name="menu_item_accounts">Управление на акаунтите</string>
<string name="menu_item_settings">Настройки</string>
<string name="menu_item_about">Относно Ring</string>
<!--Dialing Fragment-->
@@ -68,16 +76,36 @@
<string name="action_call_decline">Отказ</string>
<string name="ab_action_speakerphone">Включване на колонката</string>
<string name="ab_action_contact_add">Добавяне към контактите</string>
+ <string name="ab_action_contact_add_question">Добавяне към контактите?</string>
<string name="ab_action_audio_call">Гласово обаждане</string>
<string name="share_via">Споделяне чрез</string>
<string name="write_a_message">Напишете съобщение</string>
- <string name="scan_qr">Сканиране на QR код</string>
+ <string name="scan_qr">Сканиране на QR-код</string>
<string name="ab_action_flipcamera">Обръщане на камерата</string>
<!--Text messages-->
<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_write_denied">Не беше позволено на приложението да записва в мястото за съхранение на данни, така че не може да работи правилно. Моля, дайте това право на приложението.</string>
<!--MediaPreferenceFragment-->
+ <string name="permission_dialog_camera_title">Право за използване на камерата</string>
+ <string name="permission_dialog_camera_message">Разговорите с видео изискват правото за използване на камерата. Моля, дайте това право на приложението.</string>
<!--Read contacts permission-->
+ <string name="permission_dialog_read_contacts_message">Ring се нуждае от правото за четене на контактите, за да работи тази функционалност. Моля, разрешете го.</string>
<!--Write call log permission-->
+ <string name="permission_dialog_write_call_log_message">Ring се нуждае от правото за запис в историята на обажданията, за да работи тази функционалност. Моля, разрешете го.</string>
<!--QRCode Scan-->
+ <string name="scan_qr_account_message">Сканирайте QR-кода на акаунта, който искате да добавите.</string>
<!--Settings-->
+ <string name="clear_history_dialog_title">Изчистване на историята?</string>
+ <string name="clear_history_dialog_message">Това действие е необратимо.</string>
+ <string name="clear_history_completed">Историята беше изчистена.</string>
+ <!--Conversation-->
+ <string name="conversation_action_delete_this">Изтриване на този разговор</string>
+ <string name="conversation_action_delete_this_title">Изтриване на този разговор?</string>
+ <string name="conversation_action_delete_this_message">Това действие е необратимо.</string>
+ <string name="conversation_action_copy_peer_number">Копиране на номера</string>
+ <!--Contacts-->
+ <string name="add_call_contact_number_to_contacts">Добавяне на %1$s?</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 a307d40..19b00ec 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
@@ -10,15 +10,15 @@
<string name="error_field_required">Това поле е задължително</string>
<string name="dialog_wait_create">Добавяне на акаунт</string>
<string name="dialog_wait_create_details">Моля, изчакайте докато новият Ви акаунт бъде добавен…</string>
- <string-array name="accountType">
- <item>RING</item>
- <item>SIP</item>
- <item>IAX</item>
- </string-array>
+ <string name="help_ring_title">Създаване на акаунт за Ring</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="share_number">Споделяне на номера</string>
<!--Strings related to account deletion-->
+ <string name="account_delete_dialog_title">Изтриване на акаунта?</string>
+ <string name="account_delete_dialog_message">Това действие е необратимо. Ако не сте го направили вече, ще е добре да изнесете данните за акаунта си, преди да го изтриете.</string>
<!--AccountManagementFragment-->
<string name="empty_account_list">Няма регистриран акаунт</string>
<string name="normal_accounts_titles">Акаунти</string>
@@ -34,6 +34,7 @@
<string name="account_proxy_field">Прокси</string>
<!--Audio Details-->
<string name="account_audio_label">Звук</string>
+ <string name="account_preferences_media_tab">Звук и видео</string>
<string name="account_ringtone_label">Тонове за звънене</string>
<string name="account_ringtone_enabled_label">Включване на тоновете за звънене</string>
<string name="account_ringtone_path_label">Път към тоновете за звънене</string>
@@ -45,6 +46,8 @@
<string name="account_registration_exp_label">Срок на регистрацията</string>
<string name="account_local_interface_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>
<string name="account_turn_server_label">Сървър за TURN</string>
<string name="account_turn_username_label">Потребителско име за TURN</string>
@@ -59,6 +62,7 @@
<!--SRTP Details-->
<string name="account_preferences_security_tab">Сигурност</string>
<string name="account_srtp_deactivated">Изключен</string>
+ <!--SIP-->
<!--TLS Details-->
<string name="account_tls_transport_switch_label">Използване на TLS</string>
<string name="account_tls_port_label">Порт за слушане на TLS</string>
@@ -75,4 +79,24 @@
<string name="account_rtp_max_port">Максимален</string>
<string name="account_rtp_min_port">Минимален</string>
<!--Import/export-->
+ <string name="account_export">Изнасяне</string>
+ <string name="account_import_account">Внасяне на акаунт</string>
+ <string name="account_export_title">Изнасяне на акаунт</string>
+ <string name="account_import_title">Внасяне на акаунти</string>
+ <string name="account_import_explanation">Можете да внесете предварително изнесените данни за акаунти.</string>
+ <string name="account_export_message">Запазете настройките на акаунта и данните за удостоверяване, шифрирани с парола.</string>
+ <string name="account_export_new_password">Нова парола</string>
+ <string name="account_export_confirm_password">Потвърдете паролата</string>
+ <string name="account_import_message">Въведете парола за дешифриране на файла.</string>
+ <string name="account_import_decryption_password">Парола за дешифриране</string>
+ <string name="import_dialog_title">Внасяне</string>
+ <string name="import_export_wait">Моля, изчакайте…</string>
+ <string name="export_dialog_title">Изнасяне на акаунта</string>
+ <string name="account_export_result">Данните за акаунта бяха изнесени в %1$s</string>
+ <string name="export_failed_dialog_title">Неуспешно изнасяне</string>
+ <string name="export_failed_dialog_msg">Възникна грешка</string>
+ <string name="error_password_char_count">Най-малко 6 знака</string>
+ <string name="error_passwords_not_equals">Паролите не съвпадат</string>
+ <string name="import_failed_dialog_title">Неуспешно внасяне</string>
+ <string name="import_failed_dialog_msg">Възникна грешка</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-bg/strings_call.xml b/ring-android/app/src/main/res/values-bg/strings_call.xml
new file mode 100644
index 0000000..99a3ce0
--- /dev/null
+++ b/ring-android/app/src/main/res/values-bg/strings_call.xml
@@ -0,0 +1,35 @@
+<?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">Позвъняване</string>
+ <string name="call_human_state_ringing">Обаждане</string>
+ <string name="call_human_state_current">Говорене</string>
+ <string name="call_human_state_hungup">Край</string>
+ <string name="call_human_state_busy">Зает</string>
+ <string name="call_human_state_failure">Неуспешно</string>
+ <string name="call_human_state_hold">Задържане</string>
+ <string name="call_human_state_unhold">Подновяване</string>
+ <string name="call_human_state_over">Край</string>
+ <string name="conference_human_state_hold">Задържане</string>
+ </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-bg/strings_preferences.xml b/ring-android/app/src/main/res/values-bg/strings_preferences.xml
index c581902..41a2693 100644
--- a/ring-android/app/src/main/res/values-bg/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-bg/strings_preferences.xml
@@ -3,11 +3,15 @@
<string name="pref_category_network">Мрежа</string>
<string name="pref_category_contacts">Контакти</string>
<string name="pref_category_system">Система</string>
+ <string name="pref_category_privacy">Поверителност</string>
<string name="pref_mobileData_title">Мобилни данни</string>
+ <string name="pref_mobileData_summary">Позволяване на работата на Ring на мрежи от вида 3G/LTE, в допълнение към безжичните мрежи</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_startOnBoot_title">Пускане на Ring при включване</string>
<string name="pref_startOnBoot_summary">Пускане на Ring на заден фон когато системата се включва.</string>
+ <string name="pref_clearHistory_title">Изчистване на историята</string>
+ <string name="pref_clearHistory_summary">Изчистване на цялата история на разговорите. Това действие е необратимо.</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
new file mode 100644
index 0000000..667dd14
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ca/strings.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <!--RingActivity-->
+ <!--AB menus-->
+ <!--Left Drawer-->
+ <!--Accessibility-->
+ <!--Sections-->
+ <string name="menu_item_settings">Opcions</string>
+ <!--Dialing Fragment-->
+ <string name="dial_action_call">Trucada</string>
+ <!--History Fragment-->
+ <!--DetailsHistory Fragment-->
+ <!--Home Fragment-->
+ <!--ContactList Fragment-->
+ <!--FileExplorerDFragement-->
+ <!--TransferDFragment-->
+ <!--Notifications-->
+ <string name="notif_incoming_call">Trucada entrant</string>
+ <!--Call Fragment-->
+ <string name="action_settings">Opcions</string>
+ <!--Text messages-->
+ <!--MediaPreferenceFragment-->
+ <!--Read contacts permission-->
+ <!--Write call log permission-->
+ <!--QRCode Scan-->
+ <!--Settings-->
+ <!--Conversation-->
+ <!--Contacts-->
+</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 cc30210..46669bd 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
@@ -1,15 +1,33 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<!--Strings related to account creation-->
+ <string name="prompt_alias">Àlies</string>
+ <string name="prompt_hostname">Nom d\'amfitrió</string>
+ <string name="prompt_username">Nom d\'usuari</string>
+ <string name="prompt_password">Contrasenya</string>
<!--Strings related to account deletion-->
<!--AccountManagementFragment-->
+ <string name="normal_accounts_titles">Comptes</string>
<!--Basic Details-->
+ <string name="account_preferences_basic_tab">General</string>
+ <string name="account_hostname_label">Nom d\'amfitrió</string>
+ <string name="account_bootstrap_label">Bootstrap</string>
+ <string name="account_username_label">Nom d\'usuari</string>
+ <string name="account_password_label">Contrasenya</string>
+ <string name="account_proxy_field">Intermediari</string>
<!--Audio Details-->
+ <string name="account_audio_label">Àudio</string>
+ <string name="account_preferences_media_tab">Mitjans</string>
<!--Video Details-->
+ <string name="account_video_label">Vídeo</string>
+ <string name="account_video_enable">Habilita el vídeo</string>
<!--Advanced Details-->
+ <string name="account_preferences_advanced_tab">Avançat</string>
+ <string name="account_turn_enable_label">Utilitza TURN</string>
<!--Security Details-->
<!--SRTP Details-->
<string name="account_preferences_security_tab">Seguretat</string>
+ <!--SIP-->
<!--TLS Details-->
<!--Import/export-->
</resources>
diff --git a/ring-android/app/src/main/res/values-ca/strings_call.xml b/ring-android/app/src/main/res/values-ca/strings_call.xml
new file mode 100644
index 0000000..a8ae3f6
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ca/strings_call.xml
@@ -0,0 +1,26 @@
+<?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>
+ <string name="call_human_state_hold">En espera</string>
+ <string name="conference_human_state_hold">En espera</string>
+ </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-ca/strings_preferences.xml b/ring-android/app/src/main/res/values-ca/strings_preferences.xml
new file mode 100644
index 0000000..5c1e32f
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ca/strings_preferences.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <string name="pref_category_contacts">Contactes</string>
+</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 f4d50c0..a88ec01 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
@@ -30,4 +30,7 @@
<!--Write call log permission-->
<!--QRCode Scan-->
<!--Settings-->
+ <!--Conversation-->
+ <string name="conversation_action_copy_peer_number">Zkopírovat číslo</string>
+ <!--Contacts-->
</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 e056350..3706512 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
@@ -24,6 +24,7 @@
<!--Security Details-->
<!--SRTP Details-->
<string name="account_preferences_security_tab">Zabezpečení</string>
+ <!--SIP-->
<!--TLS Details-->
<string name="account_rtp_port_range">Rozsah portů pro zvuk RTP</string>
<!--Import/export-->
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_call.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings_call.xml
new file mode 100644
index 0000000..2750811
--- /dev/null
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings_call.xml
@@ -0,0 +1,32 @@
+<?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>
+ <string name="call_human_state_current">Probíhá hovor</string>
+ <string name="call_human_state_hungup">Hovor skončil</string>
+ <string name="call_human_state_busy">Zaneprázdněn</string>
+ <string name="call_human_state_failure">Hovor selhal</string>
+ <string name="call_human_state_hold">Hovor pozastaven</string>
+ <string name="call_human_state_unhold">Pokračovat v hovoru</string>
+ <string name="call_human_state_over">Hovor skončil</string>
+ <string name="conference_human_state_hold">Hovor pozastaven</string>
+ </resources>
\ No newline at end of file
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 d783de3..e8cdaff 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,6 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="section_licence">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, installerer en for at sende os en rapport</string>
+ <string name="email_chooser_title">Send mail ved brug af...</string>
<!--RingActivity-->
<string name="title_section0">Indtast</string>
<string name="title_activity_sflphone_home">Ring</string>
@@ -71,7 +77,9 @@
<string name="action_call_decline">Afvis</string>
<string name="ab_action_speakerphone">Aktiver højtaler</string>
<string name="ab_action_contact_add">Tilføj til kontakt</string>
+ <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="share_via">Del via</string>
<string name="write_a_message">Skriv en besked</string>
<string name="scan_qr">Scan QR-kode</string>
@@ -80,9 +88,25 @@
<string name="send_message">Send besked</string>
<string name="message_sending">Sender besked...</string>
<string name="time_just_now">Lige nu</string>
+ <string name="permission_read_denied">Mangler tilladelse til at læse fra lageret, og kan dermed ikke fungere ordentligt. Overvej venligst at give denne tilladelse</string>
+ <string name="permission_write_denied">Mangler tilladelse til at skrive til lageret, og kan dermed ikke fungere ordentligt. Overvej venligst at give denne tilladelse</string>
<!--MediaPreferenceFragment-->
+ <string name="permission_dialog_camera_title">Kamera-tilladelse</string>
+ <string name="permission_dialog_camera_message">Video-samtaler kræver kamera-tilladelse for at fungere. Overvej venligst at give denne tilladelse.</string>
<!--Read contacts permission-->
+ <string name="permission_dialog_read_contacts_message">Ring har brug for \"Læs kontakter\"-tilladelse for at kunne udføre denne funktion. Vær venlig at tillade den.</string>
<!--Write call log permission-->
+ <string name="permission_dialog_write_call_log_message">Ring har brug for \"Skriv opkaldsliste\"-tilladelse for at kunne udføre denne funktion. Vær venlig at tillade den.</string>
<!--QRCode Scan-->
+ <string name="scan_qr_account_message">Skan QR-koden for kontoen du vil tilføje.</string>
<!--Settings-->
+ <string name="clear_history_dialog_title">Ryd historikken?</string>
+ <string name="clear_history_dialog_message">Denne handling kan ikke fortrydes.</string>
+ <string name="clear_history_completed">Historikken er blevet ryddet.</string>
+ <!--Conversation-->
+ <string name="conversation_action_delete_this">Slet denne samtale</string>
+ <string name="conversation_action_delete_this_title">Slet denne samtale?</string>
+ <string name="conversation_action_delete_this_message">Denne handling kan ikke fortrydes.</string>
+ <!--Contacts-->
+ <string name="add_call_contact_number_to_contacts">Tilføj %1$s ?</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 c54af3c..23aa4e6 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
@@ -10,15 +10,15 @@
<string name="error_field_required">Dette felt er obligatorisk</string>
<string name="dialog_wait_create">Tilføjer konto</string>
<string name="dialog_wait_create_details">Vent venligst mens din nye konto tilføjes...</string>
- <string-array name="accountType">
- <item>RING</item>
- <item>SIP</item>
- <item>IAX</item>
- </string-array>
+ <string name="help_ring_title">Opret en Ring-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</string>
<string name="share_number">Del nummer</string>
<!--Strings related to account deletion-->
+ <string name="account_delete_dialog_title">Slet konto</string>
+ <string name="account_delete_dialog_message">Dette kan ikke fortrydes. Hvis du ikke har gjort det endnu, bør du overveje at eksportere din konto før du sletter den.</string>
<!--AccountManagementFragment-->
<string name="empty_account_list">Ingen konto registreret</string>
<string name="normal_accounts_titles">Konti</string>
@@ -64,6 +64,7 @@
<!--SRTP Details-->
<string name="account_preferences_security_tab">Sikkerhed</string>
<string name="account_srtp_deactivated">Deaktiveret</string>
+ <!--SIP-->
<!--TLS Details-->
<string name="account_tls_transport_switch_label">Brug TLS-transport</string>
<string name="account_tls_port_label">TLS-lytteport</string>
@@ -81,5 +82,24 @@
<string name="account_rtp_min_port">Minimum</string>
<string name="account_rtp_port_range">Portinterval for Lyd-RTP</string>
<!--Import/export-->
+ <string name="account_export">Eksporter</string>
+ <string name="account_import_account">Importer en konto</string>
+ <string name="account_export_title">Eksporter en konto</string>
<string name="account_import_title">Importer konti</string>
+ <string name="account_import_explanation">Du kan importere en tidligere eksporteret konto.</string>
+ <string name="account_export_message">Gem konto-indstillinger og autorisationer, beskyttet af kodeord.</string>
+ <string name="account_export_new_password">Nyt kodeord</string>
+ <string name="account_export_confirm_password">Bekræft kodeord</string>
+ <string name="account_import_message">Indtast kodeord for at dekryptere filen.</string>
+ <string name="account_import_decryption_password">Dekrypteringskodeord</string>
+ <string name="import_dialog_title">Importerer</string>
+ <string name="import_export_wait">Vent venligt...</string>
+ <string name="export_dialog_title">Eksporterer konto</string>
+ <string name="account_export_result">Konto eksporteret til %1$s</string>
+ <string name="export_failed_dialog_title">Fejl under eksport</string>
+ <string name="export_failed_dialog_msg">Der skete en fejl</string>
+ <string name="error_password_char_count">Mindst 6 tegn</string>
+ <string name="error_passwords_not_equals">Kodeord stemmer ikke overens</string>
+ <string name="import_failed_dialog_title">Import fejlede</string>
+ <string name="import_failed_dialog_msg">Der skete en fejl</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-da-rDK/strings_call.xml b/ring-android/app/src/main/res/values-da-rDK/strings_call.xml
new file mode 100644
index 0000000..017fdf9
--- /dev/null
+++ b/ring-android/app/src/main/res/values-da-rDK/strings_call.xml
@@ -0,0 +1,35 @@
+<?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">Ringer</string>
+ <string name="call_human_state_ringing">Ringer op</string>
+ <string name="call_human_state_current">Taler</string>
+ <string name="call_human_state_hungup">Ovre</string>
+ <string name="call_human_state_busy">Optaget</string>
+ <string name="call_human_state_failure">Fejlede</string>
+ <string name="call_human_state_hold">Parkeret</string>
+ <string name="call_human_state_unhold">Uparker</string>
+ <string name="call_human_state_over">Ovre</string>
+ <string name="conference_human_state_hold">Parkeret</string>
+ </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-da-rDK/strings_preferences.xml b/ring-android/app/src/main/res/values-da-rDK/strings_preferences.xml
index dec15cc..bad9d26 100644
--- a/ring-android/app/src/main/res/values-da-rDK/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-da-rDK/strings_preferences.xml
@@ -3,12 +3,15 @@
<string name="pref_category_network">Netværk</string>
<string name="pref_category_contacts">Kontakter</string>
<string name="pref_category_system">System</string>
+ <string name="pref_category_privacy">Privatliv</string>
<string name="pref_mobileData_title">Mobildata</string>
<string name="pref_mobileData_summary">Tillad Ring på 3G/LTE netværk i tilllæg til Wi-Fi</string>
<string name="pref_systemContacts_title">Brug systemkontakter</string>
<string name="pref_systemContacts_summary">Brug systemkontakter til at vise opkaldsdetaljer</string>
<string name="pref_systemDialer_title">Foretag systemopkald med Ring</string>
- <string name="pref_systemDialer_summary">Brug Ring til at foretage systemopkald når nuligt.</string>
+ <string name="pref_systemDialer_summary">Brug Ring til at foretage systemopkald når muligt.</string>
<string name="pref_startOnBoot_title">Kør Ring ved opstart</string>
<string name="pref_startOnBoot_summary">Kør Ring i baggrunden når systemet starter.</string>
+ <string name="pref_clearHistory_title">Ryd historiken</string>
+ <string name="pref_clearHistory_summary">Ryd al samtale-historik. Denne handling kan ikke fortrydes.</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 d7a40e3..1e86474 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -1,6 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="section_licence">Lizenz</string>
+ <string name="sponsor_section">Ring ist freie Software, entwickelt und unterstützt durch</string>
+ <string name="copyright_section">Copyright</string>
+ <string name="contribute_section">Beitragen</string>
<string name="version_section">Version</string>
+ <string name="no_email_app_installed">Es konnte eine Email-Anwendung gefunden werden, installieren sie eine um uns einen Bericht senden zu können</string>
+ <string name="email_chooser_title">Mail wird gesendet mit...</string>
<!--RingActivity-->
<string name="title_section0">Wählen</string>
<string name="title_activity_sflphone_home">Ring</string>
@@ -71,7 +77,9 @@
<string name="action_call_decline">Ablehnen</string>
<string name="ab_action_speakerphone">Lautsprecher einschalten</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="share_via">Teilen mit</string>
<string name="write_a_message">Sende eine Nachricht</string>
<string name="scan_qr">QR-Code scannen</string>
@@ -80,9 +88,26 @@
<string name="send_message">Nachricht senden</string>
<string name="message_sending">Nachricht wird gesendet…</string>
<string name="time_just_now">Grade eben</string>
+ <string name="permission_read_denied">Die App hat keine Berechtigung den Speicher zu lesen und funktioniert deswegen nicht Richtig. Bitte schalten Sie diese Funktion frei.</string>
+ <string name="permission_write_denied">Die App hat keine Berechtigung in den Speicher zu schreiben und funktioniert deswegen nicht Richtig. Bitte schalten Sie diese Funktion frei.</string>
<!--MediaPreferenceFragment-->
+ <string name="permission_dialog_camera_title">Kamera Berechtigung</string>
+ <string name="permission_dialog_camera_message">Für Video-Konversationen benötigt die App Zugriff auf die Kamera. Bitte geben Sie diese Berechtigung frei.</string>
<!--Read contacts permission-->
+ <string name="permission_dialog_read_contacts_message">Ring muss Kontaktdaten lesen um richtig zu funktionieren. Bitte aktiviere die Berechtigung \"Kontaktdaten lesen\".</string>
<!--Write call log permission-->
+ <string name="permission_dialog_write_call_log_message">Ring muss Anruflisten schreiben um richtig zu funktionieren. Bitte aktiviere die Berechtigung \"Anruflisten schreiben\".</string>
<!--QRCode Scan-->
+ <string name="scan_qr_account_message">Scanne den QR-Code des Kontos das du hinzufügen möchtest.</string>
<!--Settings-->
+ <string name="clear_history_dialog_title">Verlauf löschen?</string>
+ <string name="clear_history_dialog_message">Diese Aktion kann nicht rückgängig gemacht werden.</string>
+ <string name="clear_history_completed">Der Verlauf wurde gelöscht.</string>
+ <!--Conversation-->
+ <string name="conversation_action_delete_this">Diese Unterhaltung löschen</string>
+ <string name="conversation_action_delete_this_title">Diese Unterhaltung löschen?</string>
+ <string name="conversation_action_delete_this_message">Diese Aktion kann nicht rückgängig gemacht werden.</string>
+ <string name="conversation_action_copy_peer_number">Nummer kopieren</string>
+ <!--Contacts-->
+ <string name="add_call_contact_number_to_contacts">%1$s hinzufügen?</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 cfce118..60423ea 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
@@ -10,15 +10,15 @@
<string name="error_field_required">Dieses Feld ist erforderlich</string>
<string name="dialog_wait_create">Konto hinzufügen</string>
<string name="dialog_wait_create_details">Bitte warten während das neue Konto eingerichtet wird...</string>
- <string-array name="accountType">
- <item>RING</item>
- <item>SIP</item>
- <item>IAX</item>
- </string-array>
+ <string name="help_ring_title">Ein Ring-Konto erstellen</string>
+ <string name="help_ring">Ein Ring-Konto erlaubt es ihnen andere Menschen auf sichere Art direkt über ein verteiltes Netzwerk zu erreichen</string>
+ <string name="help_sip_title">Ihr SIP-Konto hinzufgügen</string>
<string name="help_sip">Mit bereits bestehendem SIP-Konto anmelden.</string>
<string name="create_sip_account">Hinzufügen</string>
<string name="share_number">Nummer weitergeben</string>
<!--Strings related to account deletion-->
+ <string name="account_delete_dialog_title">Konto lôschen</string>
+ <string name="account_delete_dialog_message">Diese Aktion kann nicht rückgängig gemacht werden. Falls sie sie noch nicht ausgeführt haben sollten sie in Betracht ziehen das Konto zu exportieren bevor sie es löschen.</string>
<!--AccountManagementFragment-->
<string name="empty_account_list">Kein Konto registriert</string>
<string name="normal_accounts_titles">Konten</string>
@@ -64,6 +64,7 @@
<!--SRTP Details-->
<string name="account_preferences_security_tab">Sicherheit</string>
<string name="account_srtp_deactivated">Deaktiviert</string>
+ <!--SIP-->
<!--TLS Details-->
<string name="account_tls_transport_switch_label">TLS-Transportverschlüsselung benutzen</string>
<string name="account_tls_port_label">TLS Listener Port</string>
@@ -81,5 +82,24 @@
<string name="account_rtp_min_port">Minimum</string>
<string name="account_rtp_port_range">Audio RTP Portbereich</string>
<!--Import/export-->
+ <string name="account_export">Export</string>
+ <string name="account_import_account">Ein Konto importieren</string>
+ <string name="account_export_title">Ein Konto exportieren</string>
<string name="account_import_title">Konten importieren</string>
+ <string name="account_import_explanation">Die kannst vorher exportierte Konten wieder importieren.</string>
+ <string name="account_export_message">Speichere Kontoeinstellungen und Zugangsdaten, verschlüsselt mit Passwort</string>
+ <string name="account_export_new_password">Neues Passwort</string>
+ <string name="account_export_confirm_password">Passwort bestätigen</string>
+ <string name="account_import_message">Passwort eingeben um die Datei zu entschlüsseln</string>
+ <string name="account_import_decryption_password">Passwort zum Entschlüsseln</string>
+ <string name="import_dialog_title">Import</string>
+ <string name="import_export_wait">Bitte warten…</string>
+ <string name="export_dialog_title">Konto exportieren</string>
+ <string name="account_export_result">Konto wurde exportiert nach %1$s</string>
+ <string name="export_failed_dialog_title">Der Export ist fehlgeschlagen</string>
+ <string name="export_failed_dialog_msg">Ein Fehler ist aufgetreten</string>
+ <string name="error_password_char_count">Mindestens 6 Zeichen</string>
+ <string name="error_passwords_not_equals">Die Passwörter stimmen nciht überein</string>
+ <string name="import_failed_dialog_title">Der Import ist fehlgeschlagen</string>
+ <string name="import_failed_dialog_msg">Ein Fehler ist aufgetreten</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-de/strings_call.xml b/ring-android/app/src/main/res/values-de/strings_call.xml
new file mode 100644
index 0000000..9bcfabc
--- /dev/null
+++ b/ring-android/app/src/main/res/values-de/strings_call.xml
@@ -0,0 +1,35 @@
+<?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">Klingelnd</string>
+ <string name="call_human_state_ringing">Rufaufbau</string>
+ <string name="call_human_state_current">Sprechend</string>
+ <string name="call_human_state_hungup">Über</string>
+ <string name="call_human_state_busy">Beschäftigt</string>
+ <string name="call_human_state_failure">Fehlgeschlagen</string>
+ <string name="call_human_state_hold">Halten</string>
+ <string name="call_human_state_unhold">Halten aufheben</string>
+ <string name="call_human_state_over">Über</string>
+ <string name="conference_human_state_hold">Halten</string>
+ </resources>
\ No newline at end of file
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 a4279a6..696e2c1 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
@@ -3,6 +3,7 @@
<string name="pref_category_network">Netzwerk</string>
<string name="pref_category_contacts">Kontakte</string>
<string name="pref_category_system">System</string>
+ <string name="pref_category_privacy">Privatsphäre</string>
<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>
@@ -11,4 +12,6 @@
<string name="pref_systemDialer_summary">Ring für normale Anrufe verwenden</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 leeren</string>
+ <string name="pref_clearHistory_summary">Alle Konversationen aus dem Verlauf löschen. Diese Aktion kann nicht rückgängig gemacht werden.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-el/strings.xml b/ring-android/app/src/main/res/values-el/strings.xml
new file mode 100644
index 0000000..3bc0c38
--- /dev/null
+++ b/ring-android/app/src/main/res/values-el/strings.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <!--RingActivity-->
+ <!--AB menus-->
+ <!--Left Drawer-->
+ <!--Accessibility-->
+ <!--Sections-->
+ <!--Dialing Fragment-->
+ <!--History Fragment-->
+ <!--DetailsHistory Fragment-->
+ <!--Home Fragment-->
+ <!--ContactList Fragment-->
+ <!--FileExplorerDFragement-->
+ <!--TransferDFragment-->
+ <!--Notifications-->
+ <!--Call Fragment-->
+ <string name="me">Εγώ</string>
+ <string name="action_call_conference">Συνδιάσκεψη</string>
+ <!--Text messages-->
+ <!--MediaPreferenceFragment-->
+ <!--Read contacts permission-->
+ <!--Write call log permission-->
+ <!--QRCode Scan-->
+ <!--Settings-->
+ <!--Conversation-->
+ <!--Contacts-->
+</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
new file mode 100644
index 0000000..e8b0613
--- /dev/null
+++ b/ring-android/app/src/main/res/values-el/strings_account.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <!--Strings related to account creation-->
+ <string name="prompt_hostname">Hostname</string>
+ <!--Strings related to account deletion-->
+ <!--AccountManagementFragment-->
+ <!--Basic Details-->
+ <string name="account_hostname_label">Hostname</string>
+ <!--Audio Details-->
+ <!--Video Details-->
+ <!--Advanced Details-->
+ <!--Security Details-->
+ <!--SRTP Details-->
+ <!--SIP-->
+ <!--TLS Details-->
+ <!--Import/export-->
+</resources>
diff --git a/ring-android/app/src/main/res/values-el/strings_call.xml b/ring-android/app/src/main/res/values-el/strings_call.xml
new file mode 100644
index 0000000..c24725d
--- /dev/null
+++ b/ring-android/app/src/main/res/values-el/strings_call.xml
@@ -0,0 +1,34 @@
+<?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">Κουδουνίζει</string>
+ <string name="call_human_state_ringing">Καλεί</string>
+ <string name="call_human_state_current">Μιλά</string>
+ <string name="call_human_state_hungup">Τέλος</string>
+ <string name="call_human_state_busy">Απασχολημένο</string>
+ <string name="call_human_state_failure">Απέτυχε</string>
+ <string name="call_human_state_hold">Αναμονή</string>
+ <string name="call_human_state_over">Τέλος</string>
+ <string name="conference_human_state_hold">Αναμονή</string>
+ </resources>
\ No newline at end of file
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
new file mode 100644
index 0000000..4806eb4
--- /dev/null
+++ b/ring-android/app/src/main/res/values-el/strings_preferences.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <string name="pref_category_contacts">Επαφές</string>
+</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 ef348df..2372982 100644
--- a/ring-android/app/src/main/res/values-eo/strings.xml
+++ b/ring-android/app/src/main/res/values-eo/strings.xml
@@ -37,4 +37,7 @@
<!--Write call log permission-->
<!--QRCode Scan-->
<!--Settings-->
+ <!--Conversation-->
+ <string name="conversation_action_copy_peer_number">Kopii numeron</string>
+ <!--Contacts-->
</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 348fd85..b90b261 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
@@ -30,6 +30,7 @@
<!--Security Details-->
<!--SRTP Details-->
<string name="account_preferences_security_tab">Sekurigo</string>
+ <!--SIP-->
<!--TLS Details-->
<string name="account_rtp_port_range">Porda amplekso de aŭdia RTP</string>
<!--Import/export-->
diff --git a/ring-android/app/src/main/res/values-eo/strings_call.xml b/ring-android/app/src/main/res/values-eo/strings_call.xml
new file mode 100644
index 0000000..fa76223
--- /dev/null
+++ b/ring-android/app/src/main/res/values-eo/strings_call.xml
@@ -0,0 +1,32 @@
+<?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>
+ <string name="call_human_state_current">Parolanta</string>
+ <string name="call_human_state_hungup">Finita</string>
+ <string name="call_human_state_busy">Okupata</string>
+ <string name="call_human_state_failure">Fiaskinta</string>
+ <string name="call_human_state_hold">Deteni</string>
+ <string name="call_human_state_unhold">Maldeteni</string>
+ <string name="call_human_state_over">Finita</string>
+ <string name="conference_human_state_hold">Deteni</string>
+ </resources>
\ No newline at end of file
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 e16050f..f448f22 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -1,6 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="section_licence">Licencia</string>
+ <string name="sponsor_section">Ring es software libre desarrollado y mantenido por</string>
+ <string name="copyright_section">Derechos de autor</string>
+ <string name="contribute_section">Contribuir</string>
<string name="version_section">Versión</string>
+ <string name="no_email_app_installed">No se ha encontrado ninguna aplicación de correo, por favor instale una para enviarnos el informe</string>
+ <string name="email_chooser_title">Enviar correo usando...</string>
<!--RingActivity-->
<string name="title_section0">Marcar</string>
<string name="title_activity_sflphone_home">Ring</string>
@@ -71,16 +77,37 @@
<string name="action_call_decline">Declinar</string>
<string name="ab_action_speakerphone">Activar el altavoz</string>
<string name="ab_action_contact_add">Agregar a contactos</string>
+ <string name="ab_action_contact_add_question">¿Añadir a contactos?</string>
<string name="ab_action_audio_call">Llamada de voz</string>
+ <string name="ab_action_video_call">Videollamada</string>
<string name="share_via">Compatir via</string>
<string name="write_a_message">Escribir un mensaje</string>
<string name="scan_qr">Leer Codigo de Lectura Rapida</string>
<string name="ab_action_flipcamera">Cambiar de camara</string>
<!--Text messages-->
<string name="send_message">Enviar mensaje</string>
+ <string name="message_sending">Enviando mensaje...</string>
+ <string name="time_just_now">Justo ahora</string>
+ <string name="permission_read_denied">La aplicación no tiene permiso para leer sus archivos. Por esto no puede funcionar como debería. Por favor considere darle los permisos necesarios</string>
+ <string name="permission_write_denied">La aplicación no tiene permiso para modificar sus archivos. Por esto no puede funcionar como debería. Por favor considere darle los permisos necesarios</string>
<!--MediaPreferenceFragment-->
+ <string name="permission_dialog_camera_title">Permiso de cámara</string>
+ <string name="permission_dialog_camera_message">Las conversaciones con vídeo requieren el permiso de utilizar la cámara para funcionar. Por favor considere concederlo.</string>
<!--Read contacts permission-->
+ <string name="permission_dialog_read_contacts_message">Ring necesita el permiso de \"Leer los contactos\" para habilitar esta funcionalidad. Por favor conceda este permiso.</string>
<!--Write call log permission-->
+ <string name="permission_dialog_write_call_log_message">Ring necesita el permiso de \"Escribir en el registro de llamadas\" para habilitar esta funcionalidad. Por favor conceda este permiso.</string>
<!--QRCode Scan-->
+ <string name="scan_qr_account_message">Escanear el código QR de la cuenta que quieres añadir.</string>
<!--Settings-->
+ <string name="clear_history_dialog_title">¿Limpiar historial?</string>
+ <string name="clear_history_dialog_message">Esta acción no puede deshacerse.</string>
+ <string name="clear_history_completed">El historial se ha limpiado.</string>
+ <!--Conversation-->
+ <string name="conversation_action_delete_this">Borrar esta conversación</string>
+ <string name="conversation_action_delete_this_title">¿Borrar esta conversación?</string>
+ <string name="conversation_action_delete_this_message">Esta acción no puede deshacerse.</string>
+ <string name="conversation_action_copy_peer_number">Copiar Número</string>
+ <!--Contacts-->
+ <string name="add_call_contact_number_to_contacts">¿Añadir %1$s ?</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 3d4c5af..c27337b 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
@@ -10,15 +10,15 @@
<string name="error_field_required">Este campo es obligatorio</string>
<string name="dialog_wait_create">Agregando Cuenta</string>
<string name="dialog_wait_create_details">Por favor espere mientras su nueva cuenta es agregada</string>
- <string-array name="accountType">
- <item>RING</item>
- <item>SIP</item>
- <item>IAX</item>
- </string-array>
+ <string name="help_ring_title">Crear una cuenta en Ring</string>
+ <string name="help_ring">Una cuenta en Ring le permite comunicarse con gente de forma segura a través de una red P2P completamente distribuida.</string>
+ <string name="help_sip_title">Añadir su cuenta SIP</string>
<string name="help_sip">Configurar una cuenta SIP existente</string>
<string name="create_sip_account">Agregar</string>
<string name="share_number">Compartir número</string>
<!--Strings related to account deletion-->
+ <string name="account_delete_dialog_title">¿Borrar cuenta?</string>
+ <string name="account_delete_dialog_message">Esta acción no puede deshacerse. Si no lo has hecho ya, deberías considerar exportar tu cuenta antes de borrarla.</string>
<!--AccountManagementFragment-->
<string name="empty_account_list">No hay cuentas registradas</string>
<string name="normal_accounts_titles">Cuentas</string>
@@ -51,6 +51,9 @@
<string name="account_stun_enable_label">Usar Stun</string>
<string name="account_stun_server_label">Servidor STUN</string>
<string name="account_turn_enable_label">Utilizar TURN</string>
+ <string name="account_turn_server_label">Servidor TURN</string>
+ <string name="account_turn_username_label">Nombre de usuario en TURN</string>
+ <string name="account_turn_password_label">Contraseña TURN</string>
<string name="account_published_same_as_local_label">Publicar el mismo como local</string>
<string name="account_published_port_label">Puerto Publicado</string>
<string name="account_published_address_label">Dirección IP Publicada</string>
@@ -61,6 +64,7 @@
<!--SRTP Details-->
<string name="account_preferences_security_tab">Seguridad</string>
<string name="account_srtp_deactivated">Desactivado</string>
+ <!--SIP-->
<!--TLS Details-->
<string name="account_tls_transport_switch_label">Usar Transporte TLS</string>
<string name="account_tls_port_label">TLS Puerto de escucha</string>
@@ -78,4 +82,24 @@
<string name="account_rtp_min_port">Mínimo</string>
<string name="account_rtp_port_range">Rango de Puertos RTP</string>
<!--Import/export-->
+ <string name="account_export">Exportar</string>
+ <string name="account_import_account">Importar una cuenta</string>
+ <string name="account_export_title">Exportar una cuenta</string>
+ <string name="account_import_title">Importar cuentas</string>
+ <string name="account_import_explanation">Puede importar cuentas exportadas previamente.</string>
+ <string name="account_export_message">Guardar configuración y credenciales de la cuenta, contraseña cifrada.</string>
+ <string name="account_export_new_password">Contraseña nueva</string>
+ <string name="account_export_confirm_password">Confirmar contraseña</string>
+ <string name="account_import_message">Introduzca la contraseña para descifrar el archivo.</string>
+ <string name="account_import_decryption_password">Contraseña de descifrado</string>
+ <string name="import_dialog_title">Importando</string>
+ <string name="import_export_wait">Por favor espere...</string>
+ <string name="export_dialog_title">Exportando cuenta</string>
+ <string name="account_export_result">Cuenta exportada a %1$s</string>
+ <string name="export_failed_dialog_title">Fallo en la exportación</string>
+ <string name="export_failed_dialog_msg">Ha ocurrido un error</string>
+ <string name="error_password_char_count">6 caracteres mínimo</string>
+ <string name="error_passwords_not_equals">Las contraseñas no coinciden</string>
+ <string name="import_failed_dialog_title">La importación falló</string>
+ <string name="import_failed_dialog_msg">Ha ocurrido un error</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-es/strings_call.xml b/ring-android/app/src/main/res/values-es/strings_call.xml
new file mode 100644
index 0000000..0459c03
--- /dev/null
+++ b/ring-android/app/src/main/res/values-es/strings_call.xml
@@ -0,0 +1,35 @@
+<?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">Sonando</string>
+ <string name="call_human_state_ringing">Llamando</string>
+ <string name="call_human_state_current">Hablando</string>
+ <string name="call_human_state_hungup">Terminado</string>
+ <string name="call_human_state_busy">Ocupado</string>
+ <string name="call_human_state_failure">Falló</string>
+ <string name="call_human_state_hold">Espera</string>
+ <string name="call_human_state_unhold">Reanudar</string>
+ <string name="call_human_state_over">Terminado</string>
+ <string name="conference_human_state_hold">Espera</string>
+ </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-es/strings_preferences.xml b/ring-android/app/src/main/res/values-es/strings_preferences.xml
index e7485e4..da22b8f 100644
--- a/ring-android/app/src/main/res/values-es/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-es/strings_preferences.xml
@@ -3,6 +3,7 @@
<string name="pref_category_network">Red</string>
<string name="pref_category_contacts">Contactos</string>
<string name="pref_category_system">Sistema</string>
+ <string name="pref_category_privacy">Privacidad</string>
<string name="pref_mobileData_title">Datos móviles</string>
<string name="pref_mobileData_summary">Permitir a Ring usar redes 3G/LTE a demás de Wi-Fi</string>
<string name="pref_systemContacts_title">Usar contactos del sistema</string>
@@ -11,4 +12,6 @@
<string name="pref_systemDialer_summary">Usar Ring para las llamadas por defecto del sistema cuando sea posible.</string>
<string name="pref_startOnBoot_title">Iniciar Ring al inicio</string>
<string name="pref_startOnBoot_summary">Iniciar Ring en segundo plano al inicio del sistema.</string>
+ <string name="pref_clearHistory_title">Limpiar historial</string>
+ <string name="pref_clearHistory_summary">Limpiar todo el historial de conversaciones. Esta acción no se puede deshacer.</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 9a079b1..8523205 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
@@ -83,4 +83,6 @@
<!--Write call log permission-->
<!--QRCode Scan-->
<!--Settings-->
+ <!--Conversation-->
+ <!--Contacts-->
</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 a2f9a47..f57966f 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
@@ -10,11 +10,6 @@
<string name="error_field_required">این زمینه مورد نیاز است</string>
<string name="dialog_wait_create">در حال افزودن حساب</string>
<string name="dialog_wait_create_details">لطفاً صبر کنید تا حساب جدیدتان افزوده شود…</string>
- <string-array name="accountType">
- <item>رینگ</item>
- <item>سیپ</item>
- <item>IAX</item>
- </string-array>
<string name="help_sip">پیکربندی یک حساب سیپ موجود.</string>
<string name="create_sip_account">افزودن</string>
<string name="share_number">همرسانی شماره</string>
@@ -64,6 +59,7 @@
<!--SRTP Details-->
<string name="account_preferences_security_tab">امنیت</string>
<string name="account_srtp_deactivated">غیرفعّال شده</string>
+ <!--SIP-->
<!--TLS Details-->
<string name="account_tls_transport_switch_label">استفاده از جابهجایی TLS</string>
<string name="account_tls_port_label">درگاه شنوندهٔ TLS</string>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_call.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_call.xml
new file mode 100644
index 0000000..7fbf3fe
--- /dev/null
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings_call.xml
@@ -0,0 +1,26 @@
+<?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>
+ <string name="call_human_state_hold">نگه داشتن</string>
+ <string name="conference_human_state_hold">نگه داشتن</string>
+ </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-fi/strings.xml b/ring-android/app/src/main/res/values-fi/strings.xml
new file mode 100644
index 0000000..bd85e10
--- /dev/null
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <string name="section_licence">Lisenssi</string>
+ <string name="sponsor_section">Ring on vapaa ohjelma jonka on kehittänyt ja jota tukee</string>
+ <string name="copyright_section">Tekijänoikeus</string>
+ <string name="contribute_section">Tuo panoksesi</string>
+ <string name="version_section">Versio</string>
+ <string name="no_email_app_installed">Sähköpostiohjelmaa ei löydetty, asenna sellainen lähettääksesi meille raportin</string>
+ <string name="email_chooser_title">Lähetä sähköpostia käyttäen...</string>
+ <!--RingActivity-->
+ <string name="title_section0">Numeristo</string>
+ <!--AB menus-->
+ <!--Left Drawer-->
+ <!--Accessibility-->
+ <!--Sections-->
+ <!--Dialing Fragment-->
+ <!--History Fragment-->
+ <!--DetailsHistory Fragment-->
+ <!--Home Fragment-->
+ <!--ContactList Fragment-->
+ <!--FileExplorerDFragement-->
+ <!--TransferDFragment-->
+ <!--Notifications-->
+ <!--Call Fragment-->
+ <!--Text messages-->
+ <!--MediaPreferenceFragment-->
+ <!--Read contacts permission-->
+ <!--Write call log permission-->
+ <!--QRCode Scan-->
+ <!--Settings-->
+ <!--Conversation-->
+ <!--Contacts-->
+</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
new file mode 100644
index 0000000..25910d3
--- /dev/null
+++ b/ring-android/app/src/main/res/values-fi/strings_account.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <!--Strings related to account creation-->
+ <!--Strings related to account deletion-->
+ <!--AccountManagementFragment-->
+ <!--Basic Details-->
+ <!--Audio Details-->
+ <string name="account_audio_label">Ääni</string>
+ <string name="account_ringtone_label">Soittoäänet</string>
+ <!--Video Details-->
+ <string name="account_video_label">Video</string>
+ <!--Advanced Details-->
+ <!--Security Details-->
+ <!--SRTP Details-->
+ <!--SIP-->
+ <!--TLS Details-->
+ <!--Import/export-->
+</resources>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml b/ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
index dc977a4..f87e2c9 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
@@ -4,7 +4,7 @@
<string name="pref_category_contacts">Contacts</string>
<string name="pref_category_system">Système</string>
<string name="pref_mobileData_title">Données mobiles</string>
- <string name="pref_mobileData_summary">Autoriser Ring à passer par le réseau 3G/LTE ou le Wi-Fi</string>
+ <string name="pref_mobileData_summary">Autoriser Ring à passer par le réseau 3G/LTE en plus du Wi-Fi</string>
<string name="pref_systemContacts_title">Utiliser le système de contacts</string>
<string name="pref_systemContacts_summary">Montrer les informations de l\'appelant en utilisant le système des contacts</string>
<string name="pref_startOnBoot_summary">Lancer Ring quand le système démarre.</string>
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml b/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml
new file mode 100644
index 0000000..725afc8
--- /dev/null
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml
@@ -0,0 +1,26 @@
+<?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>
+ <string name="call_human_state_hungup">Terminé</string>
+ <string name="call_human_state_over">Terminé</string>
+ </resources>
\ No newline at end of file
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 2ffcc58..17fe258 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -1,6 +1,11 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="section_licence">Licence</string>
+ <string name="sponsor_section">Ring est un logiciel libre développé et soutenu par</string>
+ <string name="copyright_section">Copyright</string>
+ <string name="contribute_section">Contribuer</string>
<string name="version_section">Version</string>
+ <string name="email_chooser_title">Envoi du courriel à travers ...</string>
<!--RingActivity-->
<string name="title_section0">Numéroter</string>
<string name="title_activity_sflphone_home">Ring</string>
@@ -19,7 +24,7 @@
<string name="menu_item_settings">Paramètres</string>
<string name="menu_item_about">À propos de Ring</string>
<!--Dialing Fragment-->
- <string name="dial_action_call">Appeler</string>
+ <string name="dial_action_call">Appelez</string>
<string name="dial_number">Composez un numéro</string>
<string name="dial_hint">Entrez un numéro</string>
<!--History Fragment-->
@@ -71,7 +76,9 @@
<string name="action_call_decline">Décliner</string>
<string name="ab_action_speakerphone">Activer haut-parleur</string>
<string name="ab_action_contact_add">Ajouter aux contacts</string>
+ <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="share_via">Partager</string>
<string name="write_a_message">Ecrire un message</string>
<string name="scan_qr">Scanner un code QR</string>
@@ -84,5 +91,15 @@
<!--Read contacts permission-->
<!--Write call log permission-->
<!--QRCode Scan-->
+ <string name="scan_qr_account_message">Numérisez le code QR de votre interlocuteur.</string>
<!--Settings-->
+ <string name="clear_history_dialog_title">Effacer le journal d\'appels ?</string>
+ <string name="clear_history_dialog_message">Cette action est irréversible.</string>
+ <string name="clear_history_completed">Le journal d\'appels a été effacé.</string>
+ <!--Conversation-->
+ <string name="conversation_action_delete_this">Supprimer la conversation</string>
+ <string name="conversation_action_delete_this_title">Supprimer la conversation ?</string>
+ <string name="conversation_action_delete_this_message">Cette action est irréversible.</string>
+ <string name="conversation_action_copy_peer_number">Copier le numéro ou identifiant Ring</string>
+ <!--Contacts-->
</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 1e58b91..b97c048 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
@@ -10,15 +10,13 @@
<string name="error_field_required">Ce champ est requis</string>
<string name="dialog_wait_create">Ajout du compte</string>
<string name="dialog_wait_create_details">Merci de patienter pendant l\'ajout de votre compte…</string>
- <string-array name="accountType">
- <item>RING</item>
- <item>SIP</item>
- <item>IAX</item>
- </string-array>
+ <string name="help_sip_title">Ajouter votre compte SIP</string>
<string name="help_sip">Configurez un compte SIP existant.</string>
<string name="create_sip_account">Ajouter</string>
<string name="share_number">Partager votre identifiant Ring</string>
<!--Strings related to account deletion-->
+ <string name="account_delete_dialog_title">Supprimer le compte ?</string>
+ <string name="account_delete_dialog_message">Cette action est irréversible. Si vous ne l\'avez pas déjà fait, nous vous sugérons d\'exporter votre compte avant de poursuivre.</string>
<!--AccountManagementFragment-->
<string name="empty_account_list">Aucun compte enregistré</string>
<string name="normal_accounts_titles">Comptes</string>
@@ -64,6 +62,7 @@
<!--SRTP Details-->
<string name="account_preferences_security_tab">Sécurité</string>
<string name="account_srtp_deactivated">Désactivé</string>
+ <!--SIP-->
<!--TLS Details-->
<string name="account_tls_transport_switch_label">Utiliser le transport TLS</string>
<string name="account_tls_port_label">Port TLS Global</string>
@@ -81,5 +80,11 @@
<string name="account_rtp_min_port">Minimum</string>
<string name="account_rtp_port_range">Plage de port RTP pour l\'audio</string>
<!--Import/export-->
+ <string name="account_export">Exporter</string>
+ <string name="account_import_account">Importer un compte</string>
+ <string name="account_export_title">Exporter un compte</string>
<string name="account_import_title">Importer compte</string>
+ <string name="account_export_new_password">Nouveau mot de passe</string>
+ <string name="account_export_confirm_password">Confirmer le mot de passe</string>
+ <string name="account_import_message">Entrer le mot de passe pour déchiffrer le fichier.</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-fr/strings_call.xml b/ring-android/app/src/main/res/values-fr/strings_call.xml
new file mode 100644
index 0000000..92d8021
--- /dev/null
+++ b/ring-android/app/src/main/res/values-fr/strings_call.xml
@@ -0,0 +1,35 @@
+<?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">Sonne</string>
+ <string name="call_human_state_ringing">Appel en cours</string>
+ <string name="call_human_state_current">En cours</string>
+ <string name="call_human_state_hungup">Terminé</string>
+ <string name="call_human_state_busy">Occupé</string>
+ <string name="call_human_state_failure">Échec</string>
+ <string name="call_human_state_hold">Mettre en attente</string>
+ <string name="call_human_state_unhold">Reprendre</string>
+ <string name="call_human_state_over">Terminé</string>
+ <string name="conference_human_state_hold">Mettre en attente</string>
+ </resources>
\ No newline at end of file
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 8ff6195..550d4bc 100644
--- a/ring-android/app/src/main/res/values-he/strings.xml
+++ b/ring-android/app/src/main/res/values-he/strings.xml
@@ -46,4 +46,7 @@
<!--Write call log permission-->
<!--QRCode Scan-->
<!--Settings-->
+ <!--Conversation-->
+ <string name="conversation_action_copy_peer_number">העתק מספר</string>
+ <!--Contacts-->
</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 85d11e6..1b2e7fc 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
@@ -47,6 +47,7 @@
<!--SRTP Details-->
<string name="account_preferences_security_tab">אבטחה</string>
<string name="account_srtp_deactivated">מנוטרל</string>
+ <!--SIP-->
<!--TLS Details-->
<string name="account_tls_transport_switch_label">השתמש בטרנספורט TLS</string>
<string name="account_tls_certificate_list_label">רשויות אישור</string>
diff --git a/ring-android/app/src/main/res/values-he/strings_call.xml b/ring-android/app/src/main/res/values-he/strings_call.xml
new file mode 100644
index 0000000..1cfa4b0
--- /dev/null
+++ b/ring-android/app/src/main/res/values-he/strings_call.xml
@@ -0,0 +1,26 @@
+<?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>
+ <string name="call_human_state_hold">החזק</string>
+ <string name="conference_human_state_hold">החזק</string>
+ </resources>
\ No newline at end of file
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 7c3b7c9..504a217 100644
--- a/ring-android/app/src/main/res/values-hr/strings.xml
+++ b/ring-android/app/src/main/res/values-hr/strings.xml
@@ -1,6 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="section_licence">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>
+ <string name="version_section">Verzija</string>
+ <string name="no_email_app_installed">Nijedna email aplikacija nije pronađena, instalairajte jednu da biste nam poslali izvješće</string>
+ <string name="email_chooser_title">Pošalji mail koristeći...</string>
<!--RingActivity-->
+ <string name="title_section0">Biraj</string>
<string name="title_activity_sflphone_home">Ring</string>
<string name="error_no_network">Veza nedostupna</string>
<!--AB menus-->
@@ -17,23 +25,72 @@
<!--Dialing Fragment-->
<string name="dial_action_call">Nazovi</string>
<string name="dial_number">Pozovi broj</string>
+ <string name="dial_hint">Utipkajte telefonski broj</string>
<!--History Fragment-->
+ <string name="hist_replay_button">Odgovori</string>
<string name="hist_replay_button_stop">Prekini</string>
<string name="hist_no_history">Nema povijesti</string>
<!--DetailsHistory Fragment-->
+ <string name="detail_hist_call_number">Zovi %1$s</string>
<!--Home Fragment-->
+ <plurals name="home_conferences_title">
+ <item quantity="one">%d razgovor</item>
+ <item quantity="few">%d razgovora</item>
+ <item quantity="other">%d razgovora</item>
+ </plurals>
+ <string name="home_transfering">Prenosim %1$s u %1$s</string>
+ <string name="home_transfer_complet">Prijenos dovršen</string>
<!--ContactList Fragment-->
+ <string name="no_contact_found">Nijedan kontakt nije nađen</string>
+ <string name="starred_contacts_title">Omiljeni</string>
+ <string name="searchbar_hint">Unesite ime ili telefonski broj...</string>
+ <string name="choose_number">Izaberite broj</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
<!--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>
+ <string name="notif_outgoing_call">Odlazni poziv</string>
+ <string name="notif_current_call_title">Trenutni poziv sa %1$s</string>
+ <string name="notif_current_call">Trenutni poziv</string>
<!--Call Fragment-->
+ <string name="me">Ja</string>
+ <string name="you_txt_prefix">Ti:</string>
<string name="action_call_hangup">Poklopi</string>
<string name="action_settings">Postavke</string>
+ <string name="ongoing_call">Poziv koji je u tijeku</string>
+ <string name="start_error_title">Ne može zvoniti!</string>
+ <string name="start_error_mic_required">Zvonu je potrebna dozvola mikrofona da bi radilo.</string>
+ <string name="action_call_accept">Preuzmi poziv</string>
+ <string name="ab_action_speakerphone">Omogući zvučnik</string>
<string name="ab_action_contact_add">Dodaj u kontakte</string>
+ <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="share_via">Dijeli putem</string>
+ <string name="write_a_message">Napiši poruku</string>
+ <string name="ab_action_flipcamera">Okreni kameru</string>
<!--Text messages-->
+ <string name="send_message">Pošalji poruku</string>
+ <string name="message_sending">Šaljem poruku...</string>
+ <string name="time_just_now">Upravo sada</string>
<!--MediaPreferenceFragment-->
+ <string name="permission_dialog_camera_title">Dozvola kamere</string>
<!--Read contacts permission-->
<!--Write call log permission-->
<!--QRCode Scan-->
<!--Settings-->
+ <string name="clear_history_dialog_title">Očistiti povijest?</string>
+ <string name="clear_history_dialog_message"> Ova se radnja ne može poništiti.</string>
+ <string name="clear_history_completed">Povijest je očišćena.</string>
+ <!--Conversation-->
+ <string name="conversation_action_delete_this">Izbrišite ovaj razgovor</string>
+ <string name="conversation_action_delete_this_title">Izbrisati ovaj razgovor?</string>
+ <string name="conversation_action_delete_this_message"> Ova se radnja ne može poništiti.</string>
+ <string name="conversation_action_copy_peer_number">Kopiraj broj</string>
+ <!--Contacts-->
+ <string name="add_call_contact_number_to_contacts">Dodaj %1$s ?</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 a849b12..d891238 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
@@ -3,21 +3,72 @@
<!--Strings related to account creation-->
<string name="prompt_alias">Alias</string>
<string name="prompt_username">Korisničko ime</string>
+ <string name="prompt_password">Lozinka</string>
+ <string name="action_create">Dodaj 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="help_ring_title">Napravite Ring 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">Dodaj</string>
+ <string name="share_number">Dijeli broj</string>
<!--Strings related to account deletion-->
+ <string name="account_delete_dialog_title">Izbrisati račun?</string>
<!--AccountManagementFragment-->
+ <string name="empty_account_list">Nema registriranih računa</string>
<string name="normal_accounts_titles">Računi</string>
<!--Basic Details-->
<string name="account_preferences_basic_tab">Opće</string>
+ <string name="account_basic_category">Osnovne postavke</string>
+ <string name="account_alias_label">Ime računa</string>
<string name="account_username_label">Korisničko ime</string>
+ <string name="account_password_label">Lozinka</string>
+ <string name="account_proxy_field">Proxy</string>
<!--Audio Details-->
<string name="account_audio_label">Zvuk</string>
+ <string name="account_preferences_media_tab">Medij</string>
<string name="account_ringtone_label">Melodije zvona</string>
+ <string name="account_ringtone_enabled_label">Aktivirajte melodije zvona</string>
+ <string name="account_ringtone_path_label">Putanja melodije zvona</string>
<!--Video Details-->
<string name="account_video_label">Video</string>
+ <string name="account_video_enable">Omogući video</string>
<!--Advanced Details-->
<string name="account_preferences_advanced_tab">Napredno</string>
+ <string name="account_local_interface_label">Lokalno sučelje</string>
+ <string name="account_local_port_label">Lokalni port</string>
+ <string name="account_turn_enable_label">Koristi TURN</string>
+ <string name="account_turn_server_label">TURN poslužitelj</string>
+ <string name="account_turn_username_label">TURN korisničko ime</string>
+ <string name="account_turn_password_label">TURN lozinka</string>
<!--Security Details-->
<!--SRTP Details-->
+ <string name="account_preferences_security_tab">Sigurnost</string>
+ <string name="account_srtp_deactivated">Deaktivirano</string>
+ <!--SIP-->
<!--TLS Details-->
+ <string name="account_tls_method_label">TLS metoda</string>
+ <string name="account_tls_server_name_label">Ime poslužitelja</string>
+ <string name="account_rtp_max_port">Maksimum</string>
+ <string name="account_rtp_min_port">Minimum</string>
<!--Import/export-->
+ <string name="account_export">Izvezi</string>
+ <string name="account_import_account">Uvezi račun</string>
+ <string name="account_export_title">Izvezi račun</string>
+ <string name="account_import_title">Uvezi račune</string>
+ <string name="account_import_explanation">Možete uvesti prethodno izvezene račune.</string>
+ <string name="account_export_new_password">Nova lozinka</string>
+ <string name="account_export_confirm_password">Potvrdi lozinku</string>
+ <string name="import_dialog_title">Uvozim</string>
+ <string name="import_export_wait">Molim pričekajte...</string>
+ <string name="export_dialog_title">izvozim račun</string>
+ <string name="account_export_result">Račun izvezen u %1$s</string>
+ <string name="export_failed_dialog_title">Neuspjeli izvoz</string>
+ <string name="export_failed_dialog_msg">Došlo je do greške</string>
+ <string name="error_password_char_count">6 znakova minimum</string>
+ <string name="error_passwords_not_equals">Lozinke se ne podudaraju</string>
+ <string name="import_failed_dialog_title">Neuspjeli uvoz</string>
+ <string name="import_failed_dialog_msg">Došlo je do greške</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-hr/strings_call.xml b/ring-android/app/src/main/res/values-hr/strings_call.xml
new file mode 100644
index 0000000..7529ce6
--- /dev/null
+++ b/ring-android/app/src/main/res/values-hr/strings_call.xml
@@ -0,0 +1,32 @@
+<?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">Zvonjenje</string>
+ <string name="call_human_state_ringing">Zovem</string>
+ <string name="call_human_state_current">Razgovaram</string>
+ <string name="call_human_state_busy">Zauzeto</string>
+ <string name="call_human_state_failure">Neuspjelo</string>
+ <string name="call_human_state_hold">Na čekanje</string>
+ <string name="conference_human_state_hold">Na čekanje</string>
+ </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-hr/strings_preferences.xml b/ring-android/app/src/main/res/values-hr/strings_preferences.xml
new file mode 100644
index 0000000..c839262
--- /dev/null
+++ b/ring-android/app/src/main/res/values-hr/strings_preferences.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <string name="pref_category_network">Mreža</string>
+ <string name="pref_category_contacts">Kontakti</string>
+ <string name="pref_category_system">Sustav</string>
+ <string name="pref_category_privacy">Privatnost</string>
+ <string name="pref_systemContacts_title">Koristi kontakte sustava</string>
+ <string name="pref_systemContacts_summary">Koristi kontakte sustava za prikaz pojedinosti pozivatelja.</string>
+ <string name="pref_clearHistory_title">Očisti povijest</string>
+ <string name="pref_clearHistory_summary">Očisti povijest svih razgovora. Ova se radnja ne može poništiti.</string>
+</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 3cc0438..64b4391 100644
--- a/ring-android/app/src/main/res/values-id/strings.xml
+++ b/ring-android/app/src/main/res/values-id/strings.xml
@@ -21,4 +21,6 @@
<!--Write call log permission-->
<!--QRCode Scan-->
<!--Settings-->
+ <!--Conversation-->
+ <!--Contacts-->
</resources>
diff --git a/ring-android/app/src/main/res/values-id/strings_call.xml b/ring-android/app/src/main/res/values-id/strings_call.xml
new file mode 100644
index 0000000..5016e07
--- /dev/null
+++ b/ring-android/app/src/main/res/values-id/strings_call.xml
@@ -0,0 +1,28 @@
+<?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>
+ <string name="call_human_state_current">Bicara</string>
+ <string name="call_human_state_failure">Gagal</string>
+ <string name="call_human_state_hold">Tahan</string>
+ <string name="conference_human_state_hold">Tahan</string>
+ </resources>
\ No newline at end of file
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 083b813..e3923a7 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
@@ -11,6 +11,7 @@
<!--Accessibility-->
<!--Sections-->
<!--Dialing Fragment-->
+ <string name="dial_action_call">Chiamata</string>
<!--History Fragment-->
<!--DetailsHistory Fragment-->
<!--Home Fragment-->
@@ -18,6 +19,7 @@
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
<!--Notifications-->
+ <string name="notif_incoming_call">Chiamata in ingresso</string>
<!--Call Fragment-->
<!--Text messages-->
<!--MediaPreferenceFragment-->
@@ -25,4 +27,6 @@
<!--Write call log permission-->
<!--QRCode Scan-->
<!--Settings-->
+ <!--Conversation-->
+ <!--Contacts-->
</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
new file mode 100644
index 0000000..ccf8ac3
--- /dev/null
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <!--Strings related to account creation-->
+ <string name="prompt_alias">Alias</string>
+ <string name="prompt_hostname">Hostname</string>
+ <string name="prompt_username">Utente</string>
+ <string name="prompt_password">Password</string>
+ <!--Strings related to account deletion-->
+ <!--AccountManagementFragment-->
+ <!--Basic Details-->
+ <string name="account_preferences_basic_tab">Generale</string>
+ <string name="account_hostname_label">Hostname</string>
+ <string name="account_bootstrap_label">Avvio</string>
+ <string name="account_username_label">Utente</string>
+ <string name="account_password_label">Password</string>
+ <string name="account_proxy_field">Proxy</string>
+ <!--Audio Details-->
+ <string name="account_audio_label">Audio</string>
+ <!--Video Details-->
+ <string name="account_video_label">Video</string>
+ <!--Advanced Details-->
+ <string name="account_preferences_advanced_tab">Avanzato</string>
+ <string name="account_turn_enable_label">Utilizza TURN</string>
+ <!--Security Details-->
+ <!--SRTP Details-->
+ <string name="account_preferences_security_tab">Sicurezza</string>
+ <!--SIP-->
+ <!--TLS Details-->
+ <!--Import/export-->
+</resources>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml b/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
new file mode 100644
index 0000000..470d41f
--- /dev/null
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <string name="pref_category_contacts">Contatti</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 dd44e96..05bd174 100644
--- a/ring-android/app/src/main/res/values-lt/strings.xml
+++ b/ring-android/app/src/main/res/values-lt/strings.xml
@@ -40,6 +40,7 @@
<string name="action_call_decline">Atmesti</string>
<string name="ab_action_speakerphone">Įjungti garsiakalbį</string>
<string name="ab_action_contact_add">Pridėti prie kontaktų</string>
+ <string name="ab_action_contact_add_question">Pridėti prie kontaktų ?</string>
<string name="ab_action_audio_call">Garso skambutis</string>
<string name="ab_action_video_call">Vaizdo skambutis</string>
<string name="scan_qr">Skenuoti QR kodą</string>
@@ -56,4 +57,8 @@
<string name="clear_history_dialog_title">Išvalyti istoriją ?</string>
<string name="clear_history_dialog_message">Šio veiksmo negalima bus atšaukti.</string>
<string name="clear_history_completed">Istorija išvalyta.</string>
+ <!--Conversation-->
+ <string name="conversation_action_delete_this_message">Šio veiksmo negalima bus atšaukti.</string>
+ <string name="conversation_action_copy_peer_number">Kopijuoti numerį</string>
+ <!--Contacts-->
</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 ce31e16..cf4eaff 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
@@ -9,11 +9,6 @@
<string name="error_field_required">Šis laukas yra būtinas</string>
<string name="dialog_wait_create">Pridedama paskyra</string>
<string name="dialog_wait_create_details">Prašome palaukti, kol jūsų nauja paskyra yra pridedama</string>
- <string-array name="accountType">
- <item>RING</item>
- <item>SIP</item>
- <item>IAX</item>
- </string-array>
<string name="help_ring_title">Sukurti Ring paskyrą</string>
<string name="help_sip">Konfigūruokite esamą SIP paskyrą.</string>
<string name="create_sip_account">Pridėti</string>
@@ -57,6 +52,7 @@
<!--Security Details-->
<!--SRTP Details-->
<string name="account_preferences_security_tab">Saugumas</string>
+ <!--SIP-->
<!--TLS Details-->
<string name="account_tls_private_key_file_label">Privataus rakto failas</string>
<string name="account_tls_password_label">Privataus rakto slaptažodis</string>
@@ -65,6 +61,7 @@
<string name="account_tls_server_name_label">Serverio pavadinimas</string>
<string name="account_tls_verify_server_label">Tikrinti serverį</string>
<string name="account_tls_verify_client_label">Tikrinti klientą</string>
+ <string name="account_tls_negotiation_timeout_sec">Derėjimuisi skirtas laikas (sek.)</string>
<string name="account_rtp_port_range">Garso RTP prievadų rėžis</string>
<!--Import/export-->
<string name="account_export">Eksportuoti</string>
diff --git a/ring-android/app/src/main/res/values-lt/strings_call.xml b/ring-android/app/src/main/res/values-lt/strings_call.xml
new file mode 100644
index 0000000..15b925c
--- /dev/null
+++ b/ring-android/app/src/main/res/values-lt/strings_call.xml
@@ -0,0 +1,32 @@
+<?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>
+ <string name="call_human_state_ringing">Skambinama</string>
+ <string name="call_human_state_current">Kalbama</string>
+ <string name="call_human_state_hungup">Baigta</string>
+ <string name="call_human_state_busy">Užimta</string>
+ <string name="call_human_state_failure">Nepavyko</string>
+ <string name="call_human_state_hold">Užlaikyta</string>
+ <string name="call_human_state_over">Baigta</string>
+ <string name="conference_human_state_hold">Užlaikyta</string>
+ </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-nb/strings.xml b/ring-android/app/src/main/res/values-nb/strings.xml
new file mode 100644
index 0000000..23b85bc
--- /dev/null
+++ b/ring-android/app/src/main/res/values-nb/strings.xml
@@ -0,0 +1,110 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <string name="section_licence">Lisens</string>
+ <string name="sponsor_section">Ring er fri programvare utviklet og støttet av</string>
+ <string name="copyright_section">Opphavsrett</string>
+ <string name="contribute_section">Bidra</string>
+ <string name="version_section">Versjon</string>
+ <string name="no_email_app_installed">Fant ingen epost-app. Installer en for å sende oss en rapport</string>
+ <string name="email_chooser_title">Send epost vha...</string>
+ <!--RingActivity-->
+ <string name="title_section0">Slå nummer</string>
+ <string name="title_activity_sflphone_home">Ring</string>
+ <string name="error_no_network">Mangler nettverksforbindelse</string>
+ <!--AB menus-->
+ <string name="ab_account_creation">Ny konto</string>
+ <string name="ab_account_edition_1">Slett</string>
+ <string name="ab_action_chat">Tekstmelding</string>
+ <!--Left Drawer-->
+ <!--Accessibility-->
+ <string name="drawer_open">Åpne navigasjonsskuff</string>
+ <string name="drawer_close">Lukk navigasjonsskuff</string>
+ <!--Sections-->
+ <string name="menu_item_home">Hjem</string>
+ <string name="menu_item_accounts">Styr kontoer</string>
+ <string name="menu_item_settings">Innstillinger</string>
+ <string name="menu_item_about">Om Ring</string>
+ <!--Dialing Fragment-->
+ <string name="dial_action_call">Ring</string>
+ <string name="dial_number">Slå et nummer</string>
+ <string name="dial_hint">Skriv inn telefonnummer</string>
+ <!--History Fragment-->
+ <string name="hist_replay_button_stop">Stopp</string>
+ <string name="hist_no_history">Ingen historikk</string>
+ <!--DetailsHistory Fragment-->
+ <string name="detail_hist_call_number">Ring %1$s</string>
+ <!--Home Fragment-->
+ <plurals name="home_conferences_title">
+ <item quantity="one">%d samtale</item>
+ <item quantity="other">%d samtaler</item>
+ </plurals>
+ <string name="home_transfering">Overfører %1$s til %1$s</string>
+ <string name="home_transfer_complet">Overføring er ferdig</string>
+ <!--ContactList Fragment-->
+ <string name="no_contact_found">Fant ingen kontakter</string>
+ <string name="starred_contacts_title">Favoritter</string>
+ <string name="searchbar_hint">Skriv inn navn eller telefonnummer...</string>
+ <string name="choose_number">Velg et nummer</string>
+ <!--FileExplorerDFragement-->
+ <!--TransferDFragment-->
+ <string name="transfer_to_another_call">Overfør til en annen pågående samtale:</string>
+ <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>
+ <string name="notif_outgoing_call">Utgående samtale</string>
+ <string name="notif_current_call_title">Pågående samtale med %1$s</string>
+ <string name="notif_current_call">Pågående samtale</string>
+ <!--Call Fragment-->
+ <string name="me">Meg</string>
+ <string name="you_txt_prefix">Deg:</string>
+ <string name="action_call_attended_transfer">Deltagende overføring</string>
+ <string name="action_call_conference">Konferanse</string>
+ <string name="action_call_hangup">Legg på</string>
+ <string name="action_settings">Innstillinger</string>
+ <string name="ongoing_call">Pågående samtale</string>
+ <string name="hist_in_call">Innkommende samtale med %1$s</string>
+ <string name="hist_out_call">Utgående samtale med %1$s</string>
+ <string name="start_error_title">Klarer ikke starte Ring!</string>
+ <string name="start_error_mic_required">Ring krever tilgang til mikrofonen for å virke.</string>
+ <string name="action_call_accept">Ta samtale</string>
+ <string name="action_call_decline">Avslå</string>
+ <string name="ab_action_speakerphone">Aktiver høytaler</string>
+ <string name="ab_action_contact_add">Legg til kontakter</string>
+ <string name="ab_action_contact_add_question">Legg til kontakter?</string>
+ <string name="ab_action_audio_call">Talesamtale</string>
+ <string name="ab_action_video_call">Videosamtale</string>
+ <string name="share_via">Del via</string>
+ <string name="write_a_message">Skriv en melding</string>
+ <string name="scan_qr">Scan QR-kode</string>
+ <string name="ab_action_flipcamera">Snu kamera</string>
+ <!--Text messages-->
+ <string name="send_message">Send melding</string>
+ <string name="message_sending">Sender melding...</string>
+ <string name="time_just_now">Akkurat nå</string>
+ <string name="permission_read_denied">Denne app-en fikk ikke lov til å lese fra lagringsområdet ditt. Dermed kan den ikke fungere som det skal. Vær så snill å vurder om den kan få lov til dette.</string>
+ <string name="permission_write_denied">Denne app-en fikk ikke lov til å skrive til lagringsområdet ditt. Dermed kan den ikke fungere som det skal. Vær så snill å vurder om den kan få lov til dette.</string>
+ <!--MediaPreferenceFragment-->
+ <string name="permission_dialog_camera_title">Kamerarettigheter</string>
+ <string name="permission_dialog_camera_message">Videosamtaler krever tilgang til kameraet for å virke. Vurder å aktivere det.</string>
+ <!--Read contacts permission-->
+ <string name="permission_dialog_read_contacts_message">Ring trenger tillatelsen \"Lese kontakter\" for å aktivere denne egenskapet. Vær så snill å tillat dette.</string>
+ <!--Write call log permission-->
+ <string name="permission_dialog_write_call_log_message">Ring trenger tillatelsen \"Skriv i samtalelogg\" for å aktivere denne egenskapen. Vær så snill å tillat dette.</string>
+ <!--QRCode Scan-->
+ <string name="scan_qr_account_message">Les av QR-koden for kontoen du ønsker å legge til.</string>
+ <!--Settings-->
+ <string name="clear_history_dialog_title">Nullstill historikk?</string>
+ <string name="clear_history_dialog_message">Denne handlingen kan ikke gjøres om.</string>
+ <string name="clear_history_completed">Historikken har blitt nullstilt.</string>
+ <!--Conversation-->
+ <string name="conversation_action_delete_this">Slett denne samtalen</string>
+ <string name="conversation_action_delete_this_title">Slett denne samtalen?</string>
+ <string name="conversation_action_delete_this_message">Denne handlingen kan ikke gjøres om.</string>
+ <!--Contacts-->
+ <string name="add_call_contact_number_to_contacts">Legg til %1$s?</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
new file mode 100644
index 0000000..403c804
--- /dev/null
+++ b/ring-android/app/src/main/res/values-nb/strings_account.xml
@@ -0,0 +1,101 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <!--Strings related to account creation-->
+ <string name="prompt_alias">Alias</string>
+ <string name="prompt_hostname">Vertsnavn</string>
+ <string name="prompt_username">Brukernavn</string>
+ <string name="prompt_password">Passord</string>
+ <string name="action_create">Legg til konto</string>
+ <string name="action_create_short">Registrer</string>
+ <string name="error_field_required">Dette feltet er påkrevd</string>
+ <string name="dialog_wait_create">Legger til konto</string>
+ <string name="dialog_wait_create_details">Vent litt mens din nye konto blir lagt til...</string>
+ <string name="help_ring_title">Opprett en Ring-konto</string>
+ <string name="help_ring">En Ring-konto lar deg na folk på sikkert via mellom likemenn via et fullstendig distribuert nettverk.</string>
+ <string name="help_sip_title">Legg til SIP-kontoen din</string>
+ <string name="help_sip">Sett opp en eksisterende SIP-konto.</string>
+ <string name="create_sip_account">Legg til</string>
+ <string name="share_number">Del nummer</string>
+ <!--Strings related to account deletion-->
+ <string name="account_delete_dialog_title">Slett konto?</string>
+ <string name="account_delete_dialog_message">Denne handlingen kan ikke gjøres om. Hvis du ikke allerede har gjort det, så bør du vurdere å eksportere kontoen din før du sletter den.</string>
+ <!--AccountManagementFragment-->
+ <string name="empty_account_list">Ingen konto registrert</string>
+ <string name="normal_accounts_titles">Kontoer</string>
+ <!--Basic Details-->
+ <string name="account_preferences_basic_tab">Generell</string>
+ <string name="account_basic_category">Grunnleggende oppsett</string>
+ <string name="account_alias_label">Kontonavn</string>
+ <string name="account_hostname_label">Vertsnavn</string>
+ <string name="account_bootstrap_label">Bootstrap</string>
+ <string name="account_username_label">Brukernavn</string>
+ <string name="account_password_label">Passord</string>
+ <string name="account_optionnal_category">Valgfritt oppsett</string>
+ <string name="account_useragent_label">Brukeragent</string>
+ <string name="account_autoanswer_label">Autosvar</string>
+ <string name="account_proxy_field">Proxy</string>
+ <!--Audio Details-->
+ <string name="account_audio_label">Lyd</string>
+ <string name="account_preferences_media_tab">Media</string>
+ <string name="account_ringtone_label">Ringetoner</string>
+ <string name="account_ringtone_enabled_label">Aktiver ringetoner</string>
+ <string name="account_ringtone_path_label">Ringetonesti</string>
+ <!--Video Details-->
+ <string name="account_video_label">Video</string>
+ <string name="account_video_enable">Aktiver video</string>
+ <!--Advanced Details-->
+ <string name="account_preferences_advanced_tab">Avansert</string>
+ <string name="account_registration_exp_label">Registreringstidsgrense</string>
+ <string name="account_local_interface_label">Lokalt grensesnitt</string>
+ <string name="account_local_port_label">Lokal port</string>
+ <string name="account_stun_enable_label">Bruk Stun</string>
+ <string name="account_stun_server_label">Stun-tjener</string>
+ <string name="account_turn_enable_label">Bruk TURN</string>
+ <string name="account_turn_server_label">TURN-tjener</string>
+ <string name="account_turn_username_label">TURN-brukernavn</string>
+ <string name="account_turn_password_label">TURN-passord</string>
+ <string name="account_published_same_as_local_label">Publisert lik den lokale</string>
+ <string name="account_published_port_label">Publisert port</string>
+ <string name="account_published_address_label">Publisert adresse</string>
+ <!--Security Details-->
+ <!--SRTP Details-->
+ <string name="account_preferences_security_tab">Sikkerhet</string>
+ <string name="account_srtp_deactivated">Avslått</string>
+ <!--SIP-->
+ <!--TLS Details-->
+ <string name="account_tls_transport_switch_label">Bruk TLS-transport</string>
+ <string name="account_tls_port_label">TLS-lytteport</string>
+ <string name="account_tls_certificate_list_label">Sertifikatautoriteter</string>
+ <string name="account_tls_certificate_file_label">Sertifikatfil</string>
+ <string name="account_tls_private_key_file_label">Privat nøkkelfil</string>
+ <string name="account_tls_password_label">Privat nøkkel-passord</string>
+ <string name="account_tls_method_label">TLS-metoder</string>
+ <string name="account_tls_ciphers_label">TLS-sifer</string>
+ <string name="account_tls_server_name_label">Tjenernavn</string>
+ <string name="account_tls_verify_server_label">Kontroller tjener</string>
+ <string name="account_tls_verify_client_label">Kontroller klient</string>
+ <string name="account_tls_negotiation_timeout_sec">Tidsbegresning på forhandling (sek)</string>
+ <string name="account_rtp_max_port">Maksimum</string>
+ <string name="account_rtp_min_port">Minimum</string>
+ <string name="account_rtp_port_range">RTP-portintervall for tale</string>
+ <!--Import/export-->
+ <string name="account_export">Eksporter</string>
+ <string name="account_import_account">Importer en konto</string>
+ <string name="account_export_title">Eksporter en konto</string>
+ <string name="account_import_title">Importer kontoer</string>
+ <string name="account_import_explanation">Du kan importere kontoer du tidligere har eksportert</string>
+ <string name="account_export_new_password">Nytt passord</string>
+ <string name="account_export_confirm_password">Bekreft passord</string>
+ <string name="account_import_message">Skriv inn passord for å dekryptere filen.</string>
+ <string name="account_import_decryption_password">Dekrypteringspassord</string>
+ <string name="import_dialog_title">Importerer</string>
+ <string name="import_export_wait">Vennligst vent...</string>
+ <string name="export_dialog_title">Eksporterer konto</string>
+ <string name="account_export_result">Konto eksportert til %1$s</string>
+ <string name="export_failed_dialog_title">Eksport feilet</string>
+ <string name="export_failed_dialog_msg">Det skjedde en feil</string>
+ <string name="error_password_char_count">minimum 6 tegn</string>
+ <string name="error_passwords_not_equals">Passordene stemmer ikke</string>
+ <string name="import_failed_dialog_title">Importen feilet</string>
+ <string name="import_failed_dialog_msg">Det skjedde en feil</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-nb/strings_call.xml b/ring-android/app/src/main/res/values-nb/strings_call.xml
new file mode 100644
index 0000000..c526d08
--- /dev/null
+++ b/ring-android/app/src/main/res/values-nb/strings_call.xml
@@ -0,0 +1,35 @@
+<?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">Ringer</string>
+ <string name="call_human_state_ringing">Kaller opp</string>
+ <string name="call_human_state_current">Snakker</string>
+ <string name="call_human_state_hungup">Over</string>
+ <string name="call_human_state_busy">Opptatt</string>
+ <string name="call_human_state_failure">Feilet</string>
+ <string name="call_human_state_hold">Parker</string>
+ <string name="call_human_state_unhold">Gjenoppta parkert</string>
+ <string name="call_human_state_over">Over</string>
+ <string name="conference_human_state_hold">Parker</string>
+ </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-nb/strings_content_description.xml b/ring-android/app/src/main/res/values-nb/strings_content_description.xml
new file mode 100644
index 0000000..7bc6f8a
--- /dev/null
+++ b/ring-android/app/src/main/res/values-nb/strings_content_description.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <!--Strings for xml content description of images-->
+ <string name="contact_quick_call_description">Kjapp samtale</string>
+ <string name="contact_picture_description">Kontaktbilde</string>
+ <string name="dial_numeric_pad">Numerisk tasteflate</string>
+ <string name="dial_alphabetic_pad">Alfabetisk tasteflate</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-nb/strings_preferences.xml b/ring-android/app/src/main/res/values-nb/strings_preferences.xml
new file mode 100644
index 0000000..dff36ee
--- /dev/null
+++ b/ring-android/app/src/main/res/values-nb/strings_preferences.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <string name="pref_category_network">Nettverk</string>
+ <string name="pref_category_contacts">Kontakter</string>
+ <string name="pref_category_system">System</string>
+ <string name="pref_category_privacy">Privatliv</string>
+ <string name="pref_mobileData_title">Mobildata</string>
+ <string name="pref_mobileData_summary">Tillat Ring på 3G/LTE-nettverk i tillegg til Wi-Fi</string>
+ <string name="pref_systemContacts_title">Bruk systemkontakter</string>
+ <string name="pref_systemContacts_summary">Bruk systemkontakter for å vise innringerdetaljer</string>
+ <string name="pref_systemDialer_title">Gjennomfør systemsamtaler ved hjelp av Ring</string>
+ <string name="pref_systemDialer_summary">Bruk Ring til å gjennomføre systemsamtaler når det er mulig.</string>
+ <string name="pref_startOnBoot_title">Start Ring under oppstart</string>
+ <string name="pref_startOnBoot_summary">Kjør Ring i bakgrunnen når systemet starter.</string>
+ <string name="pref_clearHistory_title">Slett historikk</string>
+ <string name="pref_clearHistory_summary">Slett all konversasjonshistorikk. Dette kan ikke endres tilbake.</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
new file mode 100644
index 0000000..0a4285b
--- /dev/null
+++ b/ring-android/app/src/main/res/values-nl-rNL/strings.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <!--RingActivity-->
+ <string name="title_activity_sflphone_home">Bellen</string>
+ <!--AB menus-->
+ <!--Left Drawer-->
+ <!--Accessibility-->
+ <!--Sections-->
+ <!--Dialing Fragment-->
+ <!--History Fragment-->
+ <!--DetailsHistory Fragment-->
+ <!--Home Fragment-->
+ <!--ContactList Fragment-->
+ <!--FileExplorerDFragement-->
+ <!--TransferDFragment-->
+ <!--Notifications-->
+ <!--Call Fragment-->
+ <!--Text messages-->
+ <!--MediaPreferenceFragment-->
+ <!--Read contacts permission-->
+ <!--Write call log permission-->
+ <!--QRCode Scan-->
+ <!--Settings-->
+ <!--Conversation-->
+ <!--Contacts-->
+</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
new file mode 100644
index 0000000..99187ba
--- /dev/null
+++ b/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <!--Strings related to account creation-->
+ <!--Strings related to account deletion-->
+ <!--AccountManagementFragment-->
+ <string name="normal_accounts_titles">Accounts</string>
+ <!--Basic Details-->
+ <string name="account_preferences_basic_tab">Algemeen</string>
+ <!--Audio Details-->
+ <string name="account_audio_label">Geluid</string>
+ <string name="account_preferences_media_tab">Media</string>
+ <string name="account_ringtone_label">Ringtones</string>
+ <!--Video Details-->
+ <string name="account_video_label">Video</string>
+ <!--Advanced Details-->
+ <string name="account_preferences_advanced_tab">Gevorderd</string>
+ <!--Security Details-->
+ <!--SRTP Details-->
+ <string name="account_preferences_security_tab">Beveiliging</string>
+ <!--SIP-->
+ <!--TLS Details-->
+ <!--Import/export-->
+</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 df7d4ba..c7ed585 100644
--- a/ring-android/app/src/main/res/values-nl/strings.xml
+++ b/ring-android/app/src/main/res/values-nl/strings.xml
@@ -1,25 +1,113 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="section_licence">Licentie</string>
+ <string name="sponsor_section">Ring is een vrije software ontwikkelend en ondersteund door</string>
+ <string name="copyright_section">Auteursrecht</string>
+ <string name="contribute_section">Bijdragen</string>
+ <string name="version_section">Versie</string>
+ <string name="no_email_app_installed">Geen email applicatie gevonden, installeer er één om ons een rapport te kunnen sturen</string>
+ <string name="email_chooser_title">Verstuur email met...</string>
<!--RingActivity-->
+ <string name="title_section0">Kiezen</string>
+ <string name="title_activity_sflphone_home">Ring</string>
+ <string name="error_no_network">Geen netwerkverbinding</string>
<!--AB menus-->
+ <string name="ab_account_creation">Account aanmaken</string>
+ <string name="ab_account_edition_1">Verwijderen</string>
+ <string name="ab_action_chat">Tekstberichten</string>
<!--Left Drawer-->
<!--Accessibility-->
+ <string name="drawer_open">Navigatielade openen</string>
+ <string name="drawer_close">Navigatielade sluiten</string>
<!--Sections-->
+ <string name="menu_item_home">Thuis</string>
+ <string name="menu_item_accounts">Accounts beheren</string>
+ <string name="menu_item_settings">Instelllingen</string>
+ <string name="menu_item_about">Over Ring</string>
<!--Dialing Fragment-->
<string name="dial_action_call">Oproep</string>
+ <string name="dial_number">Nummer kiezen</string>
+ <string name="dial_hint">Telefoonnummer ingeven</string>
<!--History Fragment-->
+ <string name="hist_replay_button">Opnieuw afspelen</string>
+ <string name="hist_replay_button_stop">Stoppen</string>
+ <string name="hist_no_history">Geen geschiedenis</string>
<!--DetailsHistory Fragment-->
+ <string name="detail_hist_call_number">%1$s bellen</string>
<!--Home Fragment-->
+ <plurals name="home_conferences_title">
+ <item quantity="one">%d Conversatie</item>
+ <item quantity="other">%d Conversaties</item>
+ </plurals>
+ <string name="home_transfering">Versturen van %1$s naar %1$s</string>
+ <string name="home_transfer_complet">Overdracht compleet</string>
<!--ContactList Fragment-->
+ <string name="no_contact_found">Geen contacten gevonden</string>
+ <string name="starred_contacts_title">Favorieten</string>
+ <string name="searchbar_hint">Naam of telefoonnummer ingeven...</string>
+ <string name="choose_number">Nummer kiezen</string>
<!--FileExplorerDFragement-->
<!--TransferDFragment-->
+ <string name="transfer_to_another_call">Versturen naar een andere lopende oproep:</string>
+ <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">Binnenkomende oproep van %1$s</string>
<string name="notif_incoming_call">Binnenkomende oproep</string>
+ <string name="notif_outgoing_call_title">Uitgaande oproep naar %1$s</string>
+ <string name="notif_outgoing_call">Uitgaande oproep</string>
+ <string name="notif_current_call_title">Huidige oproep met %1$s</string>
+ <string name="notif_current_call">Huidige oproep</string>
<!--Call Fragment-->
+ <string name="me">Ik</string>
+ <string name="you_txt_prefix">U:</string>
+ <string name="action_call_attended_transfer">Bijgewoonde Overdracht</string>
+ <string name="action_call_conference">Vergadering</string>
+ <string name="action_call_hangup">Ophangen</string>
+ <string name="action_settings">Instelllingen</string>
+ <string name="help_gestures">Dit scherm helpt gebruikers met de verschillende interacties tijdens oproepen. Verschillende acties worden beschreven; Lang aanraken; fling, swype etc.</string>
+ <string name="ongoing_call">Lopende oproep</string>
+ <string name="hist_in_call">Binnenkomende oproep van %1$s</string>
+ <string name="hist_out_call">Uitgaande oproep van %1$s</string>
+ <string name="start_error_title">Ring kan niet opgestart worden!</string>
+ <string name="start_error_mic_required">Ring vereist toestemming om de microfoon te kunnen gebruiken.</string>
+ <string name="action_call_accept">Oproep aannemen</string>
+ <string name="action_call_decline">Weigeren</string>
+ <string name="ab_action_speakerphone">Luidspreker inschakelen</string>
+ <string name="ab_action_contact_add">Aan contacten toevoegen</string>
+ <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="share_via">Delen via</string>
+ <string name="write_a_message">Schrijf een bericht</string>
+ <string name="scan_qr">QR Code Scannen</string>
+ <string name="ab_action_flipcamera">Camera draaien</string>
<!--Text messages-->
+ <string name="send_message">Bericht versturen</string>
+ <string name="message_sending">Bericht wordt verstuurd...</string>
+ <string name="time_just_now">Zojuist</string>
+ <string name="permission_read_denied">De applicatie heeft geen machtiging om uw opslag te lezen, deze kan daardoor niet correct functioneren. Gelieve overwegen om deze machtiging alsnog toe te kennen.</string>
+ <string name="permission_write_denied">De applicatie heeft geen machtiging om naar uw opslag te schrijven, deze kan daardoor niet correct functioneren. Gelieve overwegen om deze machtiging alsnog toe te kennen.</string>
<!--MediaPreferenceFragment-->
+ <string name="permission_dialog_camera_title">Camera machtiging</string>
+ <string name="permission_dialog_camera_message">Video gesprekken vereisen machtiging voor gebruik van de camera. Gelieve overwegen om deze machtiging alsnog toe te kennen.</string>
<!--Read contacts permission-->
+ <string name="permission_dialog_read_contacts_message">Ring vereist de \"Contacten\" machtiging voor deze feature. Gelieve deze machtiging toekennen.</string>
<!--Write call log permission-->
+ <string name="permission_dialog_write_call_log_message">Ring vereist de \"Oproepgeschiedenis\" machtiging voor deze feature. Gelieve deze machtiging toekennen.</string>
<!--QRCode Scan-->
+ <string name="scan_qr_account_message">Scan de QR Code van het toe te voegen account.</string>
<!--Settings-->
+ <string name="clear_history_dialog_title">Geschiedenis wissen?</string>
+ <string name="clear_history_dialog_message">Handeling kan niet ongedaan gemaakt worden.</string>
+ <string name="clear_history_completed">Geschiedenis is gewist.</string>
+ <!--Conversation-->
+ <string name="conversation_action_delete_this">Deze conversatie verwijderen</string>
+ <string name="conversation_action_delete_this_title">Deze conversatie verwijderen?</string>
+ <string name="conversation_action_delete_this_message">Handeling kan niet ongedaan gemaakt worden.</string>
+ <string name="conversation_action_copy_peer_number">Nummer kopiëren</string>
+ <!--Contacts-->
+ <string name="add_call_contact_number_to_contacts">%1$s toevoegen?</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 ed52f0f..11c411a 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
@@ -9,26 +9,97 @@
<string name="action_create_short">Registreren</string>
<string name="error_field_required">Verplicht veld</string>
<string name="dialog_wait_create">Account wordt toegevoegd</string>
- <string name="dialog_wait_create_details">Wacht aub tot het account is toegevoegd...</string>
+ <string name="dialog_wait_create_details">Even geduld aub terwijl uw nieuwe account wordt toegevoegd...</string>
+ <string name="help_ring_title">Een Ring account aanmaken</string>
+ <string name="help_ring">Een Ring account stelt u in staat andere mensen veilig te bereiken in peer to peer middels een volledig gedistribueerd netwerk.</string>
+ <string name="help_sip_title">Uw SIP account toevoegen</string>
+ <string name="help_sip">Een bestaand SIP account configureren</string>
+ <string name="create_sip_account">Toevoegen</string>
+ <string name="share_number">Nummer delen</string>
<!--Strings related to account deletion-->
+ <string name="account_delete_dialog_title">Account verwijderen?</string>
+ <string name="account_delete_dialog_message">Deze handeling kan niet ongedaan gemaakt worden. In het geval u uw account nog niet geëxporteerd heeft, raden wij u aan dat eerst te doen. </string>
<!--AccountManagementFragment-->
+ <string name="empty_account_list">Geen account geregistreerd</string>
+ <string name="normal_accounts_titles">Accounts</string>
<!--Basic Details-->
<string name="account_preferences_basic_tab">Algemeen</string>
+ <string name="account_basic_category">Basis Instellingen</string>
+ <string name="account_alias_label">Accountnaam</string>
<string name="account_hostname_label">Hostnaam</string>
<string name="account_bootstrap_label">Bootstrap</string>
<string name="account_username_label">Gebruikersnaam</string>
<string name="account_password_label">Wachtwoord</string>
+ <string name="account_optionnal_category">Optionele Instellingen</string>
+ <string name="account_useragent_label">User Agent</string>
+ <string name="account_autoanswer_label">Automatisch beantwoorden</string>
<string name="account_proxy_field">Proxy</string>
<!--Audio Details-->
<string name="account_audio_label">Geluid</string>
+ <string name="account_preferences_media_tab">Media</string>
+ <string name="account_ringtone_label">Beltonen</string>
+ <string name="account_ringtone_enabled_label">Beltonen inschakelen</string>
+ <string name="account_ringtone_path_label">Beltonen pad</string>
<!--Video Details-->
<string name="account_video_label">Video</string>
+ <string name="account_video_enable">Video inschakelen</string>
<!--Advanced Details-->
<string name="account_preferences_advanced_tab">Geavanceerd</string>
+ <string name="account_registration_exp_label">Verval Registratie</string>
+ <string name="account_local_interface_label">Lokale Interface</string>
+ <string name="account_local_port_label">Lokale Poort</string>
+ <string name="account_stun_enable_label">Stun Gebruiken</string>
+ <string name="account_stun_server_label">Stun Server</string>
<string name="account_turn_enable_label">TURN gebruiken</string>
+ <string name="account_turn_server_label">TURN server</string>
+ <string name="account_turn_username_label">TURN gebruikersnaam</string>
+ <string name="account_turn_password_label">TURN wachtwoord</string>
+ <string name="account_published_same_as_local_label">Gepubliceerd gelijk aan lokaal</string>
+ <string name="account_published_port_label">Gepubliceerde Poort</string>
+ <string name="account_published_address_label">Gepubliceerde Adres</string>
<!--Security Details-->
+ <string name="account_credentials_label">Legitimatie</string>
+ <string name="account_credentials_edit">Legitimatie wijzigen</string>
+ <string name="account_credentials_add">Legitimatie toevoegen</string>
<!--SRTP Details-->
<string name="account_preferences_security_tab">Beveiliging</string>
+ <string name="account_srtp_deactivated">Uitgeschakeld</string>
+ <!--SIP-->
<!--TLS Details-->
+ <string name="account_tls_transport_switch_label">TLS Transport Gebruiken</string>
+ <string name="account_tls_port_label">TLS Luister Poort</string>
+ <string name="account_tls_certificate_list_label">Certificeringsinstanties</string>
+ <string name="account_tls_certificate_file_label">Certificaatbestand</string>
+ <string name="account_tls_private_key_file_label">Bestand Persoonlijke Sleutel</string>
+ <string name="account_tls_password_label">Wachtwoord Persoonlijke Sleutel</string>
+ <string name="account_tls_method_label">TLS Methode</string>
+ <string name="account_tls_ciphers_label">TLS Sleutels</string>
+ <string name="account_tls_server_name_label">Server Naam</string>
+ <string name="account_tls_verify_server_label">Server Verifiëren</string>
+ <string name="account_tls_verify_client_label">Client Verifiëren</string>
+ <string name="account_tls_negotiation_timeout_sec">Tijdslimiet Onderhandeling (sec)</string>
+ <string name="account_rtp_max_port">Maximum</string>
+ <string name="account_rtp_min_port">Minimum</string>
+ <string name="account_rtp_port_range">Audio RTP Poortenreeks</string>
<!--Import/export-->
+ <string name="account_export">Exporteren</string>
+ <string name="account_import_account">Account importeren</string>
+ <string name="account_export_title">Account exporteren</string>
+ <string name="account_import_title">Accounts importeren</string>
+ <string name="account_import_explanation">U kunt voorheen geëxporteerde accounts importeren.</string>
+ <string name="account_export_message">Accountinstellingen, legitimatie en wachtwoord versleuteld opslaan.</string>
+ <string name="account_export_new_password">Nieuw wachtwoord</string>
+ <string name="account_export_confirm_password">Wachtwoord bevestigen</string>
+ <string name="account_import_message">Wachtwoord ingeven om bestand te ontsleutelen</string>
+ <string name="account_import_decryption_password">Ontsleutelwachtwoord</string>
+ <string name="import_dialog_title">Importeren</string>
+ <string name="import_export_wait">Even geduld aub...</string>
+ <string name="export_dialog_title">Account exporteren</string>
+ <string name="account_export_result">Account geëxporteerd naar %1$s</string>
+ <string name="export_failed_dialog_title">Export mislukt</string>
+ <string name="export_failed_dialog_msg">Er is een fout opgetreden</string>
+ <string name="error_password_char_count">Minimaal 6 karakters</string>
+ <string name="error_passwords_not_equals">Wachtwoorden komen niet overeen</string>
+ <string name="import_failed_dialog_title">Import mislukt</string>
+ <string name="import_failed_dialog_msg">Er is een fout opgetreden</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-nl/strings_call.xml b/ring-android/app/src/main/res/values-nl/strings_call.xml
new file mode 100644
index 0000000..9226bbf
--- /dev/null
+++ b/ring-android/app/src/main/res/values-nl/strings_call.xml
@@ -0,0 +1,35 @@
+<?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">Ringen</string>
+ <string name="call_human_state_ringing">Bellen</string>
+ <string name="call_human_state_current">Praten</string>
+ <string name="call_human_state_hungup">Over</string>
+ <string name="call_human_state_busy">Bezig</string>
+ <string name="call_human_state_failure">Mislukt</string>
+ <string name="call_human_state_hold">In wacht zetten</string>
+ <string name="call_human_state_unhold">Uit wacht halen</string>
+ <string name="call_human_state_over">Over</string>
+ <string name="conference_human_state_hold">In wacht zetten</string>
+ </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-nl/strings_content_description.xml b/ring-android/app/src/main/res/values-nl/strings_content_description.xml
new file mode 100644
index 0000000..489dce4
--- /dev/null
+++ b/ring-android/app/src/main/res/values-nl/strings_content_description.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <!--Strings for xml content description of images-->
+ <string name="contact_quick_call_description">Snel Bellen</string>
+ <string name="contact_picture_description">Contactfoto</string>
+ <string name="dial_numeric_pad">Numeriek toetsenbord</string>
+ <string name="dial_alphabetic_pad">Alfabetisch toetsenbord</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-nl/strings_preferences.xml b/ring-android/app/src/main/res/values-nl/strings_preferences.xml
index fb3b97a..75943ae 100644
--- a/ring-android/app/src/main/res/values-nl/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_preferences.xml
@@ -1,4 +1,17 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="pref_category_network">Netwerk</string>
<string name="pref_category_contacts">Contacten</string>
+ <string name="pref_category_system">Systeem</string>
+ <string name="pref_category_privacy">Privacy</string>
+ <string name="pref_mobileData_title">Mobiele data</string>
+ <string name="pref_mobileData_summary">Ring toestaan om 3G/LTE netwerken te gebruiken naast Wi-Fi</string>
+ <string name="pref_systemContacts_title">Systeemcontacten gebruiken</string>
+ <string name="pref_systemContacts_summary">Systeemcontacten gebruiken om details beller te tonen</string>
+ <string name="pref_systemDialer_title">Systeemoproepen plaatsen met Ring</string>
+ <string name="pref_systemDialer_summary">Ring gebruiken voor systeemoproepen wanneer mogelijk</string>
+ <string name="pref_startOnBoot_title">Ring automatisch starten</string>
+ <string name="pref_startOnBoot_summary">Ring in achtergrond uitvoeren wanneer apparaat ingeschakeld wordt.</string>
+ <string name="pref_clearHistory_title">Geschiedenis wissen</string>
+ <string name="pref_clearHistory_summary">Geschiedenis van alle conversaties wissen. Deze handeling kan niet ongedaan gemaakt worden.</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 da178fe..90ad685 100644
--- a/ring-android/app/src/main/res/values-pa/strings.xml
+++ b/ring-android/app/src/main/res/values-pa/strings.xml
@@ -28,4 +28,6 @@
<!--Write call log permission-->
<!--QRCode Scan-->
<!--Settings-->
+ <!--Conversation-->
+ <!--Contacts-->
</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 cacf7ad..23fa67d 100644
--- a/ring-android/app/src/main/res/values-pl/strings.xml
+++ b/ring-android/app/src/main/res/values-pl/strings.xml
@@ -1,6 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="section_licence">Licencja</string>
+ <string name="sponsor_section">Ring jest wolnym oprogramowaniem stworzonym przez</string>
+ <string name="copyright_section">Prawa autorskie</string>
+ <string name="contribute_section">Współpracuj</string>
<string name="version_section">Wersja</string>
+ <string name="no_email_app_installed">Nie znaleziono aplikacji e-mail. Zainstaluj jedną aby wysłać nam raport.</string>
+ <string name="email_chooser_title">Wyślij e-mail używając...</string>
<!--RingActivity-->
<string name="title_section0">Wykręć</string>
<string name="title_activity_sflphone_home">Ring</string>
@@ -14,7 +20,7 @@
<string name="drawer_open">Otwórz szufladę nawigacyjną</string>
<string name="drawer_close">Zamknij szufladę nawigacyjną</string>
<!--Sections-->
- <string name="menu_item_home">Przycisk domowy</string>
+ <string name="menu_item_home">Ekran główny</string>
<string name="menu_item_accounts">Ustawienia kont</string>
<string name="menu_item_settings">Ustawienia</string>
<string name="menu_item_about">o Ring</string>
@@ -27,7 +33,7 @@
<string name="hist_replay_button_stop">Zatrzymaj</string>
<string name="hist_no_history">Brak histori</string>
<!--DetailsHistory Fragment-->
- <string name="detail_hist_call_number">Dzwoń do %1$s</string>
+ <string name="detail_hist_call_number">Zadzwoń do %1$s</string>
<!--Home Fragment-->
<plurals name="home_conferences_title">
<item quantity="one">%d Rozmowa</item>
@@ -62,34 +68,47 @@
<string name="action_call_conference">Konferencja</string>
<string name="action_call_hangup">Odłoż słuchawkę</string>
<string name="action_settings">Ustawienia</string>
- <string name="help_gestures">Ten ekran pomoże użytkownikom z wieloma interakcjami w czasie rozmów. Różne ruchy będą przedstawione na przykład: długie przyciśnięcie, rzut, i tak dalej.</string>
+ <string name="help_gestures">Ten widok pomaga użytkownikom z różnymi interakcjami podczas rozmów. Różne akcje będą opisane; Przytrzymaj, przeciągnij, itd.</string>
<string name="ongoing_call">Trwa połączenie</string>
<string name="hist_in_call">Czas przychodzączego połączenia: %1$s</string>
<string name="hist_out_call">Czas wychodzączego połączenia: %1$s</string>
- <string name="start_error_title">Nie da się uruchomić Ring !</string>
- <string name="start_error_mic_required">Ring wymaga pozwolenie do mikrofonu aby działać.</string>
- <string name="action_call_accept">Weź połączenie</string>
+ <string name="start_error_title">Ring nie może się uruchomić!</string>
+ <string name="start_error_mic_required">Do działania Ring potrzebuje zezwolenia na wykorzystanie mikrofonu.</string>
+ <string name="action_call_accept">Odbierz</string>
<string name="action_call_decline">Odrzuć</string>
<string name="ab_action_speakerphone">Włącz głośnik</string>
<string name="ab_action_contact_add">Dodaj do kontaków</string>
- <string name="ab_action_audio_call">Połączenie audio</string>
- <string name="share_via">Podziel się poprzez</string>
+ <string name="ab_action_contact_add_question">Czy dodać do kontkatów?</string>
+ <string name="ab_action_audio_call">Połączenie głosowe</string>
+ <string name="ab_action_video_call">Połączenie wideo</string>
+ <string name="share_via">Wyślij przez</string>
<string name="write_a_message">Napisz wiadomość</string>
<string name="scan_qr">Zeskanuj kod QR</string>
- <string name="ab_action_flipcamera">Przerzuć kamerę</string>
+ <string name="ab_action_flipcamera">Zamień kamerę</string>
<!--Text messages-->
<string name="send_message">Wyślij wiadomość</string>
<string name="message_sending">Trwa wysyłanie wiadomości...</string>
- <string name="time_just_now">Właśnie teraz</string>
- <string name="permission_read_denied">Aplikacja nie może czytać twoją przechowalnie. W związku z tym, nie może funkcjonować prawidłowo. Proszę rozważ przyznanie tej aplikacji tego uprawnienia</string>
- <string name="permission_write_denied">Aplikacja nie może pisać do twojej przechowalni. W związku z tym, nie może funkcjonować prawidłowo. Proszę rozważ przyznanie tej aplikacji tego uprawnienia</string>
+ <string name="time_just_now">W tej chwili</string>
+ <string name="permission_read_denied">Aplikacja nie może odczytać pamięci. Stąd, nie może funkcjonować prawidłowo. Proszę rozważyć przydzielenie jej uprawnień</string>
+ <string name="permission_write_denied">Aplikacja nie może odczytać pamięci. Stąd, nie może funkcjonować prawidłowo. Proszę rozważyć przydzielenie jej uprawnień</string>
<!--MediaPreferenceFragment-->
- <string name="permission_dialog_camera_title">Pozwolenie kamery</string>
- <string name="permission_dialog_camera_message">Rozmowy wideo wymaga uzyskania zezwolenia na pracę kamery. Należy włączenie go.</string>
+ <string name="permission_dialog_camera_title">Uprawnienia do aparatu</string>
+ <string name="permission_dialog_camera_message">Wideorozmowa wymaga przyznania uprawnień dla aparatu. Proszę rozważyć odblokowanie jej.</string>
<!--Read contacts permission-->
- <string name="permission_dialog_read_contacts_message">Ring potrzebuje pozwolenie \"Czytaj kontakty.\" Proszę udziel go.</string>
+ <string name="permission_dialog_read_contacts_message">Ring potrzebuje pozwolenia \"Kontakty\" żeby odblokować tą funkcję. Proszę udzielić go.</string>
<!--Write call log permission-->
- <string name="permission_dialog_write_call_log_message">Ring potrzebuje pozwolenie \"Pisanie dziennika połączeń.\" Proszę udziel go.</string>
+ <string name="permission_dialog_write_call_log_message">Ring potrzebuje pozwolenie \"Zapisywanie dziennika połączeń\" żeby odblokować tą funkcję. Proszę udzielić go.</string>
<!--QRCode Scan-->
+ <string name="scan_qr_account_message">Zeskanuj kod QR konta, które chcesz dodać.</string>
<!--Settings-->
+ <string name="clear_history_dialog_title">Wyczyścić historię?</string>
+ <string name="clear_history_dialog_message">Tego działania nie można cofnąć.</string>
+ <string name="clear_history_completed">Historia została wyczyszczona.</string>
+ <!--Conversation-->
+ <string name="conversation_action_delete_this">Usuń tę rozmowę</string>
+ <string name="conversation_action_delete_this_title">Czy usunąć tę rozmowę?</string>
+ <string name="conversation_action_delete_this_message">Tego działania nie można cofnąć.</string>
+ <string name="conversation_action_copy_peer_number">Skopiuj numer</string>
+ <!--Contacts-->
+ <string name="add_call_contact_number_to_contacts">Dodać %1$s ?</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 a435255..522f80d 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
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<!--Strings related to account creation-->
- <string name="prompt_alias">Alias</string>
+ <string name="prompt_alias">Nazwa konta</string>
<string name="prompt_hostname">Nazwa hosta</string>
<string name="prompt_username">Nazwa użytkownika</string>
<string name="prompt_password">Hasło</string>
@@ -10,18 +10,15 @@
<string name="error_field_required">To pole jest wymagane</string>
<string name="dialog_wait_create">Dodawanie konta</string>
<string name="dialog_wait_create_details">Proszę poczekaj aż twoje nowe konto jest dodane...</string>
- <string-array name="accountType">
- <item>RING</item>
- <item>SIP</item>
- <item>IAX</item>
- </string-array>
<string name="help_ring_title">Stwórz konto Ring</string>
+ <string name="help_ring">Konto Ring pozwala Ci na dotarcie do ludzi bezpośrednio za pomocą sieci peer to peer w sieci całkowicie rozdzielonej.</string>
<string name="help_sip_title">Dodaj twoje konto SIP</string>
<string name="help_sip">Skonfiguruj istniejące konto SIP.</string>
<string name="create_sip_account">Dodaj</string>
<string name="share_number">Podziel się numerem</string>
<!--Strings related to account deletion-->
<string name="account_delete_dialog_title">Usuń konto ?</string>
+ <string name="account_delete_dialog_message">Ta akcja nie może być cofnięta. Jeśli tego jeszcze nie zrobiłeś, powinieneś rozważyć eksportowanie konta, zanim je usuniesz.</string>
<!--AccountManagementFragment-->
<string name="empty_account_list">Nie masz zarejestrowanego konta</string>
<string name="normal_accounts_titles">Konta</string>
@@ -67,6 +64,7 @@
<!--SRTP Details-->
<string name="account_preferences_security_tab">Zabezpieczenia</string>
<string name="account_srtp_deactivated">Wyłączone</string>
+ <!--SIP-->
<!--TLS Details-->
<string name="account_tls_transport_switch_label">Korzystaj z transportu TLS</string>
<string name="account_tls_port_label">TLS Port Słuchujący</string>
@@ -88,11 +86,13 @@
<string name="account_import_account">Importuj konto</string>
<string name="account_export_title">Wyeksportuj konto</string>
<string name="account_import_title">Importuj konta</string>
+ <string name="account_import_explanation">Możesz importować poprzednio wyeksportowane konta.</string>
<string name="account_export_message">Zapisz ustawienia konta i detale, oraz szyfrowane hasło.</string>
<string name="account_export_new_password">Nowe hasło</string>
<string name="account_export_confirm_password">Potwierdź hasło</string>
<string name="account_import_message">Wprowadź hasło, aby odszyfrować plik.</string>
<string name="account_import_decryption_password">Hasło rozszyfrowania</string>
+ <string name="import_dialog_title">Importowanie</string>
<string name="import_export_wait">Proszę czekać…</string>
<string name="export_dialog_title">Eksportuję konto</string>
<string name="account_export_result">Konto zostało wyeksportowane do %1$s</string>
diff --git a/ring-android/app/src/main/res/values-pl/strings_call.xml b/ring-android/app/src/main/res/values-pl/strings_call.xml
new file mode 100644
index 0000000..fe5554d
--- /dev/null
+++ b/ring-android/app/src/main/res/values-pl/strings_call.xml
@@ -0,0 +1,35 @@
+<?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">Dzwonienie</string>
+ <string name="call_human_state_ringing">Dzwonienie</string>
+ <string name="call_human_state_current">Rozmawianie</string>
+ <string name="call_human_state_hungup">Koniec</string>
+ <string name="call_human_state_busy">Zajęty</string>
+ <string name="call_human_state_failure">Nie powiodła się</string>
+ <string name="call_human_state_hold">Czekanie</string>
+ <string name="call_human_state_unhold">Wznów</string>
+ <string name="call_human_state_over">Koniec</string>
+ <string name="conference_human_state_hold">Czekanie</string>
+ </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-pl/strings_preferences.xml b/ring-android/app/src/main/res/values-pl/strings_preferences.xml
index 3a774e6..d347d38 100644
--- a/ring-android/app/src/main/res/values-pl/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pl/strings_preferences.xml
@@ -3,6 +3,7 @@
<string name="pref_category_network">Sieć</string>
<string name="pref_category_contacts">Kontakty</string>
<string name="pref_category_system">System</string>
+ <string name="pref_category_privacy">Prywatność</string>
<string name="pref_mobileData_title">Dane mobilne</string>
<string name="pref_mobileData_summary">Pozwól Ring na sieciach 3G / LTE poza Wi-Fi</string>
<string name="pref_systemContacts_title">Użyj kontakty z systemu</string>
@@ -11,4 +12,6 @@
<string name="pref_systemDialer_summary">Użyj Ring żeby zastąpić rozmowy które zazwyczaj idą przez system kiedy mozliwe</string>
<string name="pref_startOnBoot_title">Uruchom Ring przy Starcie</string>
<string name="pref_startOnBoot_summary">Uruchom Ring w tle podczas uruchomienia systemu.</string>
+ <string name="pref_clearHistory_title">Wyczyść historię</string>
+ <string name="pref_clearHistory_summary">Wyczyść całą historię konwersacji. Ta czynność nie może być cofnięta.</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 fb41d91..5373119 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
@@ -1,6 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="section_licence">Licença</string>
+ <string name="sponsor_section">Ring é um software livre desenvolvido e mantido por</string>
+ <string name="copyright_section">Copyright</string>
+ <string name="contribute_section">Contribua</string>
<string name="version_section">Versão</string>
+ <string name="no_email_app_installed">Aplicação de e-mail não encontrada. Instale uma para nos enviar um relatório de erros.</string>
+ <string name="email_chooser_title">Enviar e-mail usando...</string>
<!--RingActivity-->
<string name="title_section0">Discar</string>
<string name="title_activity_sflphone_home">Ring</string>
@@ -46,6 +52,8 @@
<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>
@@ -69,12 +77,37 @@
<string name="action_call_decline">Rejeitar</string>
<string name="ab_action_speakerphone">Habilitar viva-voz</string>
<string name="ab_action_contact_add">Adicionar aos contatos</string>
+ <string name="ab_action_contact_add_question">Adicionar aos contatos?</string>
<string name="ab_action_audio_call">Voz da chamada</string>
+ <string name="ab_action_video_call">Chamada de Vídeo</string>
+ <string name="share_via">Compartilhar via</string>
+ <string name="write_a_message">Escrever uma mensagem</string>
+ <string name="scan_qr">Escanear QR Code</string>
+ <string name="ab_action_flipcamera">Virar câmera</string>
<!--Text messages-->
<string name="send_message">Enviar mensagem</string>
+ <string name="message_sending">Enviando mensagem...</string>
+ <string name="time_just_now">Agora há pouco</string>
+ <string name="permission_read_denied">Não foi permitido acessar o armazenamento. Por isso, o aplicativo não pôde funcionar corretamente. Considere permitir este acesso.</string>
+ <string name="permission_write_denied">Não foi permitido alterar o armazenamento. Por isso, o aplicativo não pôde funcionar corretamente. Considere permitir este acesso.</string>
<!--MediaPreferenceFragment-->
+ <string name="permission_dialog_camera_title">Permissão de câmera</string>
+ <string name="permission_dialog_camera_message">Conversas de vídeo requerem permissão para acesso à câmera. Considere habilitá-la.</string>
<!--Read contacts permission-->
+ <string name="permission_dialog_read_contacts_message">O Ring precisa de permissão para \"Acessar contatos\" para habilitar esta função. Permita, por favor.</string>
<!--Write call log permission-->
+ <string name="permission_dialog_write_call_log_message">Ring precisa de permissão para \'Escrever registro de chamadas\' para ativar esse recurso. Por favor, conceda-o.</string>
<!--QRCode Scan-->
+ <string name="scan_qr_account_message">Escanear o QR Code da conta que deseja adicionar.</string>
<!--Settings-->
+ <string name="clear_history_dialog_title">Limpar histórico?</string>
+ <string name="clear_history_dialog_message">Esta ação não pode ser revista.</string>
+ <string name="clear_history_completed">O histórico foi apagado.</string>
+ <!--Conversation-->
+ <string name="conversation_action_delete_this">Deletar conversa</string>
+ <string name="conversation_action_delete_this_title">Deletar esta conversa ?</string>
+ <string name="conversation_action_delete_this_message">Esta ação não pode ser revista.</string>
+ <string name="conversation_action_copy_peer_number">Copiar número</string>
+ <!--Contacts-->
+ <string name="add_call_contact_number_to_contacts">Adicionar %1$s ?</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 c9df748..9507431 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
@@ -10,21 +10,22 @@
<string name="error_field_required">Este campo é obrigatório</string>
<string name="dialog_wait_create">Adicionando conta</string>
<string name="dialog_wait_create_details">Por favor, aguarde enquanto sua nova conta é adicionada...</string>
- <string-array name="accountType">
- <item>RING</item>
- <item>SIP</item>
- <item>IAX</item>
- </string-array>
+ <string name="help_ring_title">Criar uma conta no Ring</string>
+ <string name="help_ring">Uma conta do Ring permite que você entre em contato com pessoas de forma segura em uma rede peer-to-peer totalmente distribuída.</string>
+ <string name="help_sip_title">Adicionar sua conta SIP</string>
<string name="help_sip">Configurar uma conta SIP existente.</string>
<string name="create_sip_account">Adicionar</string>
<string name="share_number">Compartilhar o número</string>
<!--Strings related to account deletion-->
+ <string name="account_delete_dialog_title">Deletar conta?</string>
+ <string name="account_delete_dialog_message">Esta ação não pode ser revista. Se você ainda não o fez, considere exportar sua conta antes de deletá-la.</string>
<!--AccountManagementFragment-->
<string name="empty_account_list">Nenhuma conta registrada</string>
<string name="normal_accounts_titles">Contas</string>
<!--Basic Details-->
<string name="account_preferences_basic_tab">Geral</string>
<string name="account_basic_category">Configurações básicas</string>
+ <string name="account_alias_label">Nome da conta</string>
<string name="account_hostname_label">Servidor</string>
<string name="account_bootstrap_label">Inicialização</string>
<string name="account_username_label">Nome de usuário</string>
@@ -50,14 +51,20 @@
<string name="account_stun_enable_label">Usar Stun</string>
<string name="account_stun_server_label">Server Stun</string>
<string name="account_turn_enable_label">Usar TURN</string>
+ <string name="account_turn_server_label">Servidor TURN</string>
+ <string name="account_turn_username_label">Nome de usuário TURN</string>
+ <string name="account_turn_password_label">Senha TURN</string>
<string name="account_published_same_as_local_label">Publicado como local</string>
<string name="account_published_port_label">Porta publicada</string>
<string name="account_published_address_label">Endereço publicado</string>
<!--Security Details-->
<string name="account_credentials_label">Credenciais</string>
+ <string name="account_credentials_edit">Editar credenciais</string>
+ <string name="account_credentials_add">Adicionar credenciais</string>
<!--SRTP Details-->
<string name="account_preferences_security_tab">Segurança</string>
<string name="account_srtp_deactivated">Desativado</string>
+ <!--SIP-->
<!--TLS Details-->
<string name="account_tls_transport_switch_label">Use transporte TLS</string>
<string name="account_tls_port_label">Ouvinte da porta TLS</string>
@@ -68,11 +75,31 @@
<string name="account_tls_method_label">Método TLS</string>
<string name="account_tls_ciphers_label">Cifras TLS</string>
<string name="account_tls_server_name_label">Nome do servidor</string>
- <string name="account_tls_verify_server_label">Verificar servidor</string>
+ <string name="account_tls_verify_server_label">Verificar Servidor</string>
<string name="account_tls_verify_client_label">Verificar Cliente</string>
<string name="account_tls_negotiation_timeout_sec">Tempo espera negociação(sec)</string>
<string name="account_rtp_max_port">Máximo</string>
<string name="account_rtp_min_port">Mínimo</string>
<string name="account_rtp_port_range">Variação de portas de audio RTP</string>
<!--Import/export-->
+ <string name="account_export">Exportar</string>
+ <string name="account_import_account">Importar conta</string>
+ <string name="account_export_title">Exportar conta</string>
+ <string name="account_import_title">Importar contas</string>
+ <string name="account_import_explanation">Você pode importar contas já exportadas.</string>
+ <string name="account_export_message">Salvar configurações de conta e credenciais, senha criptografada.</string>
+ <string name="account_export_new_password">Nova senha</string>
+ <string name="account_export_confirm_password">Confirmar senha</string>
+ <string name="account_import_message">Digite a senha para descriptografar o arquivo.</string>
+ <string name="account_import_decryption_password">Senha de descriptografia</string>
+ <string name="import_dialog_title">Importando</string>
+ <string name="import_export_wait">Por favor, aguarde...</string>
+ <string name="export_dialog_title">Exportando conta</string>
+ <string name="account_export_result">Conta exportada para %1$s</string>
+ <string name="export_failed_dialog_title">Falha ao exportar</string>
+ <string name="export_failed_dialog_msg">Um erro ocorreu</string>
+ <string name="error_password_char_count">Pelo menos 6 caracteres</string>
+ <string name="error_passwords_not_equals">Senhas não correspondem</string>
+ <string name="import_failed_dialog_title">Falha ao importar</string>
+ <string name="import_failed_dialog_msg">Um erro ocorreu</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_call.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_call.xml
new file mode 100644
index 0000000..34a1c3f
--- /dev/null
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings_call.xml
@@ -0,0 +1,35 @@
+<?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">Tocando</string>
+ <string name="call_human_state_ringing">Chamando</string>
+ <string name="call_human_state_current">Falando</string>
+ <string name="call_human_state_hungup">Sobre</string>
+ <string name="call_human_state_busy">Ocupado</string>
+ <string name="call_human_state_failure">Falhou</string>
+ <string name="call_human_state_hold">Modo de espera</string>
+ <string name="call_human_state_unhold">Soltar</string>
+ <string name="call_human_state_over">Sobre</string>
+ <string name="conference_human_state_hold">Modo de espera</string>
+ </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml
index 9fb55bb..c1dd1b5 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml
@@ -2,8 +2,16 @@
<resources>
<string name="pref_category_network">Rede</string>
<string name="pref_category_contacts">Contatos</string>
+ <string name="pref_category_system">Sistema</string>
+ <string name="pref_category_privacy">Privacidade</string>
<string name="pref_mobileData_title">Dados do Celular</string>
<string name="pref_mobileData_summary">Permitir tocar em redes 3G/LTE junto ao Wi-Fi</string>
<string name="pref_systemContacts_title">Usar contatos do sistema</string>
<string name="pref_systemContacts_summary">Usar contatos do sistema para mostrar detalhes da chamada</string>
+ <string name="pref_systemDialer_title">Sistema de chamadas usando Ring</string>
+ <string name="pref_systemDialer_summary">Usar Ring para chamadas do sistema sempre que possível.</string>
+ <string name="pref_startOnBoot_title">Inicializar o Ring automaticamente</string>
+ <string name="pref_startOnBoot_summary">Executar o Ring em segundo plano ao inicializar o sistema.</string>
+ <string name="pref_clearHistory_title">Limpar histórico</string>
+ <string name="pref_clearHistory_summary">Limpar todo o histórico de conversas. Esta ação não pode ser revista.</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 ab298a1..7a8b241 100644
--- a/ring-android/app/src/main/res/values-pt/strings.xml
+++ b/ring-android/app/src/main/res/values-pt/strings.xml
@@ -25,4 +25,6 @@
<!--Write call log permission-->
<!--QRCode Scan-->
<!--Settings-->
+ <!--Conversation-->
+ <!--Contacts-->
</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 be0477c..c398cb2 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
@@ -27,6 +27,7 @@
<!--Security Details-->
<!--SRTP Details-->
<string name="account_preferences_security_tab">Segurança</string>
+ <!--SIP-->
<!--TLS Details-->
<!--Import/export-->
</resources>
diff --git a/ring-android/app/src/main/res/values-pt/strings_call.xml b/ring-android/app/src/main/res/values-pt/strings_call.xml
new file mode 100644
index 0000000..6038be5
--- /dev/null
+++ b/ring-android/app/src/main/res/values-pt/strings_call.xml
@@ -0,0 +1,26 @@
+<?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>
+ <string name="call_human_state_hold">Espera</string>
+ <string name="conference_human_state_hold">Espera</string>
+ </resources>
\ No newline at end of file
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 675995e..8ecd785 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
@@ -85,4 +85,6 @@
<!--Write call log permission-->
<!--QRCode Scan-->
<!--Settings-->
+ <!--Conversation-->
+ <!--Contacts-->
</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 c7dfba2..487a9de 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
@@ -27,6 +27,7 @@
<!--Security Details-->
<!--SRTP Details-->
<string name="account_preferences_security_tab">Безопасность</string>
+ <!--SIP-->
<!--TLS Details-->
<!--Import/export-->
</resources>
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings_call.xml b/ring-android/app/src/main/res/values-ru-rRU/strings_call.xml
new file mode 100644
index 0000000..1bcf997
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings_call.xml
@@ -0,0 +1,32 @@
+<?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>
+ <string name="call_human_state_current">Говорить</string>
+ <string name="call_human_state_hungup">Окончен</string>
+ <string name="call_human_state_busy">Занят</string>
+ <string name="call_human_state_failure">Сбой</string>
+ <string name="call_human_state_hold">Удержать</string>
+ <string name="call_human_state_unhold">Возврат</string>
+ <string name="call_human_state_over">Окончен</string>
+ <string name="conference_human_state_hold">Удержать</string>
+ </resources>
\ No newline at end of file
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 6bd9c7c..26c6386 100644
--- a/ring-android/app/src/main/res/values-ru/strings.xml
+++ b/ring-android/app/src/main/res/values-ru/strings.xml
@@ -85,4 +85,7 @@
<!--Write call log permission-->
<!--QRCode Scan-->
<!--Settings-->
+ <!--Conversation-->
+ <string name="conversation_action_copy_peer_number">Копировать номер</string>
+ <!--Contacts-->
</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 115c02d..2373fcd 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
@@ -10,11 +10,6 @@
<string name="error_field_required">Это поле обязательно для заполнения</string>
<string name="dialog_wait_create">Добавление учётной записи</string>
<string name="dialog_wait_create_details">Ожидайте создания вашей учётной записи</string>
- <string-array name="accountType">
- <item>RING</item>
- <item>SIP</item>
- <item>IAX</item>
- </string-array>
<string name="help_sip">Настроить существующую учётную запись SIP</string>
<string name="create_sip_account">Добавить</string>
<string name="share_number">Поделиться номером</string>
@@ -59,6 +54,7 @@
<!--SRTP Details-->
<string name="account_preferences_security_tab">Безопасность</string>
<string name="account_srtp_deactivated">Деактивирован</string>
+ <!--SIP-->
<!--TLS Details-->
<string name="account_tls_transport_switch_label">Использовать TLS</string>
<string name="account_tls_port_label">Прослушиваемый порт TLS</string>
diff --git a/ring-android/app/src/main/res/values-ru/strings_call.xml b/ring-android/app/src/main/res/values-ru/strings_call.xml
new file mode 100644
index 0000000..4d32a88
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ru/strings_call.xml
@@ -0,0 +1,32 @@
+<?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>
+ <string name="call_human_state_current">Говорить</string>
+ <string name="call_human_state_hungup">Окончен</string>
+ <string name="call_human_state_busy">Занят</string>
+ <string name="call_human_state_failure">Сбой</string>
+ <string name="call_human_state_hold">Удержать</string>
+ <string name="call_human_state_unhold">Удержать</string>
+ <string name="call_human_state_over">Окончен</string>
+ <string name="conference_human_state_hold">Удержать</string>
+ </resources>
\ No newline at end of file
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 ae970d4..1a5076b 100644
--- a/ring-android/app/src/main/res/values-sv/strings.xml
+++ b/ring-android/app/src/main/res/values-sv/strings.xml
@@ -11,6 +11,7 @@
<string name="title_section0">Ring upp</string>
<string name="title_activity_sflphone_home">Ring</string>
<string name="error_no_network">Ingen nätverksanslutning</string>
+ <string name="error_mobile_network_available_but_disabled">Bevilja tillgång till mobilnätet på inställningssidan.</string>
<!--AB menus-->
<string name="ab_account_creation">Nytt konto</string>
<string name="ab_account_edition_1">Ta bort</string>
@@ -77,6 +78,7 @@
<string name="action_call_decline">Avslå</string>
<string name="ab_action_speakerphone">Aktivera högtalare</string>
<string name="ab_action_contact_add">Lägg till i kontakter</string>
+ <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="share_via">Dela via</string>
@@ -102,4 +104,13 @@
<string name="clear_history_dialog_title">Vill du rensa historiken?</string>
<string name="clear_history_dialog_message">Denna åtgärd kan inte ångras.</string>
<string name="clear_history_completed">Historiken har rensats bort.</string>
+ <!--Conversation-->
+ <string name="conversation_action_delete_this">Ta bort den här konversationen</string>
+ <string name="conversation_action_delete_this_title">Vill du ta bort den här konversationen?</string>
+ <string name="conversation_action_delete_this_message">Denna åtgärd kan inte ångras.</string>
+ <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>
+ <!--Contacts-->
+ <string name="add_call_contact_number_to_contacts">Vill du lägga till %1$s ?</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 0352798..0f88f9e 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
@@ -10,10 +10,13 @@
<string name="error_field_required">Det här fältet är obligatoriskt</string>
<string name="dialog_wait_create">Lägger till konto</string>
<string name="dialog_wait_create_details">Vänta medan ditt nya konto läggs till...</string>
+ <string name="dialog_warn_ip2ip_account_title">Vill du skapa ett tomt SIP-konto?</string>
+ <string name="dialog_warn_ip2ip_account_message">Du håller på att skapa ett SIP-konto utan giltigt värdnamn.
+Du kommer bara att kunna ringa och ta emot direkta IP-samtal.
+Du kan ändra kontot senare.</string>
<string-array name="accountType">
<item>RING</item>
<item>SIP</item>
- <item>IAX</item>
</string-array>
<string name="help_ring_title">Skapa ett Ring-konto</string>
<string name="help_ring">Ett Ring-konto låter dig nå folk säkert via P2P, i ett fullständigt distribuerat närverk.</string>
@@ -38,6 +41,7 @@
<string name="account_optionnal_category">Extra inställningar</string>
<string name="account_useragent_label">Användaragent</string>
<string name="account_autoanswer_label">Autosvar</string>
+ <string name="account_upnp_label">Aktivera UPnP</string>
<string name="account_proxy_field">Proxy</string>
<!--Audio Details-->
<string name="account_audio_label">Ljud</string>
@@ -69,6 +73,7 @@
<!--SRTP Details-->
<string name="account_preferences_security_tab">Säkerhet</string>
<string name="account_srtp_deactivated">Inaktiverad</string>
+ <!--SIP-->
<!--TLS Details-->
<string name="account_tls_transport_switch_label">Använd TLS-transport</string>
<string name="account_tls_port_label">TLS lyssningsport</string>
diff --git a/ring-android/app/src/main/res/values-sv/strings_call.xml b/ring-android/app/src/main/res/values-sv/strings_call.xml
new file mode 100644
index 0000000..9e87409
--- /dev/null
+++ b/ring-android/app/src/main/res/values-sv/strings_call.xml
@@ -0,0 +1,38 @@
+<?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">Ringer</string>
+ <string name="call_human_state_connecting">Ansluter</string>
+ <string name="call_human_state_ringing">Ringer</string>
+ <string name="call_human_state_current">Talar</string>
+ <string name="call_human_state_hungup">Över</string>
+ <string name="call_human_state_busy">Upptagen</string>
+ <string name="call_human_state_failure">Misslyckades</string>
+ <string name="call_human_state_hold">Parkera</string>
+ <string name="call_human_state_unhold">Återuppta</string>
+ <string name="call_human_state_over">Över</string>
+ <string name="call_human_state_none">Ingen</string>
+ <string name="conference_human_state_hold">Parkera</string>
+ <string name="conference_human_state_default">Ingen</string>
+</resources>
\ No newline at end of file
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 41b23e2..6b144ae 100644
--- a/ring-android/app/src/main/res/values-tr/strings.xml
+++ b/ring-android/app/src/main/res/values-tr/strings.xml
@@ -1,6 +1,11 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="section_licence">Lisans</string>
+ <string name="copyright_section">Telif Hakkı</string>
+ <string name="contribute_section">Katkı Yap</string>
<string name="version_section">Sürüm</string>
+ <string name="no_email_app_installed">E-posta uygulaması bulunamadı, bize rapor gönderebilmek için bir tane yükleyin</string>
+ <string name="email_chooser_title">Şunu kullanarak posta gönder...</string>
<!--RingActivity-->
<string name="title_section0">Çevir</string>
<string name="title_activity_sflphone_home">Ring</string>
@@ -79,8 +84,17 @@
<string name="message_sending">İleti gönderiliyor...</string>
<string name="time_just_now">Şimdi</string>
<!--MediaPreferenceFragment-->
+ <string name="permission_dialog_camera_title">Kamera izni</string>
<!--Read contacts permission-->
<!--Write call log permission-->
<!--QRCode Scan-->
<!--Settings-->
+ <string name="clear_history_dialog_title">Geçmişi temizle ?</string>
+ <string name="clear_history_dialog_message">Bu eylem geri alınamaz.</string>
+ <!--Conversation-->
+ <string name="conversation_action_delete_this">Bu konuşmayı sil</string>
+ <string name="conversation_action_delete_this_title">Bu konuşmayı sil ?</string>
+ <string name="conversation_action_delete_this_message">Bu eylem geri alınamaz.</string>
+ <string name="conversation_action_copy_peer_number">Numarayı kopyala</string>
+ <!--Contacts-->
</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 e91146f..441219a 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
@@ -10,15 +10,15 @@
<string name="error_field_required">Bu alan gerekli</string>
<string name="dialog_wait_create">Hesap ekleniyor</string>
<string name="dialog_wait_create_details">Yeni hesabınız eklenirken lütfen bekleyin...</string>
- <string-array name="accountType">
- <item>RING</item>
- <item>SIP</item>
- <item>IAX</item>
- </string-array>
+ <string name="help_ring_title">Bir Ring hesabı oluştur</string>
+ <string name="help_ring">Bir Ring hesabı bütünüyle dağıtık ağ üzerinden insanlara uçtan uca güvenle ulaşmanızı sağlar.</string>
+ <string name="help_sip_title">SIP hesabınızı ekleyin</string>
<string name="help_sip">Varolan SIP hesabını yapılandır</string>
<string name="create_sip_account">Ekle</string>
<string name="share_number">Numara paylaş</string>
<!--Strings related to account deletion-->
+ <string name="account_delete_dialog_title">Hesabı sil ?</string>
+ <string name="account_delete_dialog_message">Bu eylem geri alınamaz. Eğer daha bitirmediyseniz silmeden önce hesabınızı dışa aktarmayı düşünmelisiniz.</string>
<!--AccountManagementFragment-->
<string name="empty_account_list">Kayıtlı hesap yok</string>
<string name="normal_accounts_titles">Hesaplar</string>
@@ -54,13 +54,14 @@
<string name="account_turn_server_label">TURN sunucusu</string>
<string name="account_turn_username_label">TURN kullanıcı adı</string>
<string name="account_turn_password_label">TURN parolası</string>
- <string name="account_published_same_as_local_label">Yayılanan yerel ile aynı</string>
+ <string name="account_published_same_as_local_label">Yayınlanan yerel ile aynı</string>
<string name="account_published_port_label">Yayınlanan Delik</string>
<string name="account_published_address_label">Yayınlanan Yer</string>
<!--Security Details-->
<!--SRTP Details-->
<string name="account_preferences_security_tab">Güvenlik</string>
<string name="account_srtp_deactivated">Devre dışı</string>
+ <!--SIP-->
<!--TLS Details-->
<string name="account_tls_transport_switch_label">TLS taşıyıcı kullan</string>
<string name="account_tls_port_label">TLS Dinleyici Deliği</string>
@@ -77,5 +78,17 @@
<string name="account_rtp_min_port">Asgari</string>
<string name="account_rtp_port_range">Ses RTP Delik Aralığı</string>
<!--Import/export-->
+ <string name="account_export">Dışa aktar</string>
+ <string name="account_import_account">Hesabı içe aktar</string>
+ <string name="account_export_title">Hesabı dışa aktar</string>
<string name="account_import_title">Hesapları içe aktar</string>
+ <string name="account_import_explanation">Daha önceden dışa aktarılan hesapları içe aktarabilirsiniz.</string>
+ <string name="import_dialog_title">İçe aktarılıyor</string>
+ <string name="import_export_wait">Lütfen bekleyin...</string>
+ <string name="export_dialog_title">Hesap dışa aktarılıyor</string>
+ <string name="export_failed_dialog_title">Dışa aktarma başarısız</string>
+ <string name="export_failed_dialog_msg">Bir hata oluştu</string>
+ <string name="error_password_char_count">En az 6 harf</string>
+ <string name="import_failed_dialog_title">İçe aktarma başarısız</string>
+ <string name="import_failed_dialog_msg">Bir hata oluştu</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-tr/strings_call.xml b/ring-android/app/src/main/res/values-tr/strings_call.xml
new file mode 100644
index 0000000..b66f304
--- /dev/null
+++ b/ring-android/app/src/main/res/values-tr/strings_call.xml
@@ -0,0 +1,30 @@
+<?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>
+ <string name="call_human_state_ringing">Aranıyor</string>
+ <string name="call_human_state_current">Konuşuyor</string>
+ <string name="call_human_state_busy">Meşgul</string>
+ <string name="call_human_state_failure">Başarısız</string>
+ <string name="call_human_state_hold">Beklet</string>
+ <string name="conference_human_state_hold">Beklet</string>
+ </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-tr/strings_preferences.xml b/ring-android/app/src/main/res/values-tr/strings_preferences.xml
index 2902533..fa480f9 100644
--- a/ring-android/app/src/main/res/values-tr/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-tr/strings_preferences.xml
@@ -3,10 +3,13 @@
<string name="pref_category_network">Ağ</string>
<string name="pref_category_contacts">Kişiler</string>
<string name="pref_category_system">Düzen</string>
+ <string name="pref_category_privacy">Gizlilik</string>
<string name="pref_mobileData_title">Hücresel veri</string>
<string name="pref_mobileData_summary">Ring\'i Wi-Fi\'ye ek olarak 3G/LTE ağlarında da çalıştır</string>
<string name="pref_systemContacts_title">Düzen kişilerini kullan</string>
<string name="pref_systemContacts_summary">Arayan detaylarını göstermek için düzen kişilerini kullan</string>
<string name="pref_startOnBoot_title">Ring\'i başlangıçta çalıştır</string>
<string name="pref_startOnBoot_summary">Düzen başladığında arka planda Ring\'i çalıştır.</string>
+ <string name="pref_clearHistory_title">Geçmişi temizle</string>
+ <string name="pref_clearHistory_summary">Konuşma geçmişini temizle. Bu eylem geri alınamaz.</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 34b0db0..7b6f939 100644
--- a/ring-android/app/src/main/res/values-uk/strings.xml
+++ b/ring-android/app/src/main/res/values-uk/strings.xml
@@ -1,6 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="section_licence">Ліцензія</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="email_chooser_title">Надіслати повідомлення за допомогою...</string>
<!--RingActivity-->
<string name="title_section0">Виклик</string>
<string name="title_activity_sflphone_home">Ring</string>
@@ -47,7 +53,14 @@
<string name="transfer_no_other_call">Немає викликів, які очікуть</string>
<string name="transfer_type_number">Введіть номер отримувача:</string>
<!--Notifications-->
- <string name="notif_incoming_call">Вхідний дзвінок</string>
+ <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>
+ <string name="notif_outgoing_call">Вихідний виклик</string>
+ <string name="notif_current_call_title">Діючий виклик з %1$s</string>
+ <string name="notif_current_call">Діючий виклик</string>
<!--Call Fragment-->
<string name="me">Я</string>
<string name="you_txt_prefix">Ви:</string>
@@ -65,12 +78,37 @@
<string name="action_call_decline">Відмовитися</string>
<string name="ab_action_speakerphone">Увімкнути гучномовець</string>
<string name="ab_action_contact_add">Додати контакти</string>
+ <string name="ab_action_contact_add_question">Додати до контактів?</string>
<string name="ab_action_audio_call">Голосовий виклик</string>
+ <string name="ab_action_video_call">Відео виклик</string>
+ <string name="share_via">Поділитися за допомогою</string>
+ <string name="write_a_message">Написати повідомлення</string>
+ <string name="scan_qr">Сканувати QR код</string>
+ <string name="ab_action_flipcamera">Фліп камера</string>
<!--Text messages-->
<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_write_denied">Додатоку не було дозволено записувати на ваш пристрій зберігання. Отже, він не може функціонувати належним чином. Будь ласка, розгляньте питання про надання йому такого дозволу</string>
<!--MediaPreferenceFragment-->
+ <string name="permission_dialog_camera_title">Дозволи для камери</string>
+ <string name="permission_dialog_camera_message">Для здійснення відерозмови необхідно надати дозвіл на роботу камери. Будь ласка, розглянути можливість її увімкнення.</string>
<!--Read contacts permission-->
+ <string name="permission_dialog_read_contacts_message">Ring потребує права \"Зчитування контактів\" для включення цього функціоналу. Будь ласка надайте це право.</string>
<!--Write call log permission-->
+ <string name="permission_dialog_write_call_log_message">Ring потребує права \"Запис журналу викликів \" для включення цього функціоналу. Будь ласка надайте це право.</string>
<!--QRCode Scan-->
+ <string name="scan_qr_account_message">Сканування QR-коду облікового запису який ви хочете додати.</string>
<!--Settings-->
+ <string name="clear_history_dialog_title">Очистити історію?</string>
+ <string name="clear_history_dialog_message">Ця дія не може бути скасована.</string>
+ <string name="clear_history_completed">Історія була очищена.</string>
+ <!--Conversation-->
+ <string name="conversation_action_delete_this">Видалити цю розмову</string>
+ <string name="conversation_action_delete_this_title">Видалити цю розмову?</string>
+ <string name="conversation_action_delete_this_message">Ця дія не може бути скасована.</string>
+ <string name="conversation_action_copy_peer_number">Копіювати номер</string>
+ <!--Contacts-->
+ <string name="add_call_contact_number_to_contacts">Додати %1$s ?</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 684ad0b..cb30529 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
@@ -10,21 +10,22 @@
<string name="error_field_required">Це поле обов’язкове</string>
<string name="dialog_wait_create">Додання аккаунту</string>
<string name="dialog_wait_create_details">Почекайте пока ваш аккаунт створюється.</string>
- <string-array name="accountType">
- <item>RING</item>
- <item>SIP</item>
- <item>IAX</item>
- </string-array>
+ <string name="help_ring_title">Створити обліковий запис Ring</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="share_number">Поділитися номером</string>
<!--Strings related to account deletion-->
+ <string name="account_delete_dialog_title">Видалити акаунт?</string>
+ <string name="account_delete_dialog_message">Ця дія не може бути скасована. Якщо ви ще не зробили цього, слід розглянути можливість експортувати свій обліковий запис перед його видаленням.</string>
<!--AccountManagementFragment-->
<string name="empty_account_list">Немає зареєстрованного аккаунту</string>
<string name="normal_accounts_titles">Аккаунти</string>
<!--Basic Details-->
<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_bootstrap_label">Початкове завантаження</string>
<string name="account_username_label">Ім’я</string>
@@ -50,25 +51,55 @@
<string name="account_stun_enable_label">Використовувати STUN</string>
<string name="account_stun_server_label">Призупинити сервер</string>
<string name="account_turn_enable_label">Використовувати TURN</string>
+ <string name="account_turn_server_label">Обрати сервер</string>
+ <string name="account_turn_username_label">Обрати ім\'я</string>
+ <string name="account_turn_password_label">Обрати пароль</string>
+ <string name="account_published_same_as_local_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>
+ <string name="account_credentials_add">Додати облікові дані</string>
<!--SRTP Details-->
<string name="account_preferences_security_tab">Безпека</string>
<string name="account_srtp_deactivated">Деактивований</string>
+ <!--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">Метод 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>
<!--Import/export-->
+ <string name="account_export">Експортувати</string>
+ <string name="account_import_account">Імпортувати акаунт</string>
+ <string name="account_export_title">Експортувати акаунт</string>
+ <string name="account_import_title">Імпортувати акаунти</string>
+ <string name="account_import_explanation">Ви можете імпортувати попередньо експортовані акаунти.</string>
+ <string name="account_export_message">Зберегти налаштування облікового запису та облікові дані, пароль в зашифрованому вигляді.</string>
+ <string name="account_export_new_password">Новий пароль</string>
+ <string name="account_export_confirm_password">Підтвердити пароль</string>
+ <string name="account_import_message">Введіть пароль для розшифрування файлу.</string>
+ <string name="account_import_decryption_password">Розшифрування паролю</string>
+ <string name="import_dialog_title">Імпортування</string>
+ <string name="import_export_wait">Будь ласка зачекайте</string>
+ <string name="export_dialog_title">Експортувати акаунт</string>
+ <string name="account_export_result">Акаунт експортовано до %1$s</string>
+ <string name="export_failed_dialog_title">Невдалий експорт</string>
+ <string name="export_failed_dialog_msg">Виникла помилка</string>
+ <string name="error_password_char_count">мінімум 6 символів</string>
+ <string name="error_passwords_not_equals">Паролі не збігаються</string>
+ <string name="import_failed_dialog_title">Невдалий імпорт</string>
+ <string name="import_failed_dialog_msg">Виникла помилка</string>
</resources>
diff --git a/ring-android/app/src/main/res/values-uk/strings_call.xml b/ring-android/app/src/main/res/values-uk/strings_call.xml
new file mode 100644
index 0000000..a933b5b
--- /dev/null
+++ b/ring-android/app/src/main/res/values-uk/strings_call.xml
@@ -0,0 +1,35 @@
+<?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">Дзвінок</string>
+ <string name="call_human_state_ringing">Дзвінок</string>
+ <string name="call_human_state_current">Розмовляння</string>
+ <string name="call_human_state_hungup">Понад</string>
+ <string name="call_human_state_busy">Зайнятий</string>
+ <string name="call_human_state_failure">Невдало</string>
+ <string name="call_human_state_hold">Режим очікування</string>
+ <string name="call_human_state_unhold">Зняти з утримування</string>
+ <string name="call_human_state_over">Понад</string>
+ <string name="conference_human_state_hold">Режим очікування</string>
+ </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-uk/strings_preferences.xml b/ring-android/app/src/main/res/values-uk/strings_preferences.xml
index df4b8a7..19c8bc5 100644
--- a/ring-android/app/src/main/res/values-uk/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-uk/strings_preferences.xml
@@ -2,8 +2,16 @@
<resources>
<string name="pref_category_network">Мережа</string>
<string name="pref_category_contacts">Контакти</string>
+ <string name="pref_category_system">Система</string>
+ <string name="pref_category_privacy">Приватність</string>
<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_startOnBoot_title">Запускати Ring після заупску системи</string>
+ <string name="pref_startOnBoot_summary">Запуск Ring у фоновому режимі під час запуску системи.</string>
+ <string name="pref_clearHistory_title">Видалити історію</string>
+ <string name="pref_clearHistory_summary">Видалити всю історію розмов. Ця дія не може бути скасована.</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 201b077..d810732 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
@@ -26,4 +26,6 @@
<!--Write call log permission-->
<!--QRCode Scan-->
<!--Settings-->
+ <!--Conversation-->
+ <!--Contacts-->
</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 f887337..dc4ade1 100644
--- a/ring-android/app/src/main/res/values-zh/strings.xml
+++ b/ring-android/app/src/main/res/values-zh/strings.xml
@@ -22,4 +22,6 @@
<!--Write call log permission-->
<!--QRCode Scan-->
<!--Settings-->
+ <!--Conversation-->
+ <!--Contacts-->
</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 bbe3c09..7c81286 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
@@ -23,6 +23,7 @@
<!--Security Details-->
<!--SRTP Details-->
<string name="account_preferences_security_tab">安全</string>
+ <!--SIP-->
<!--TLS Details-->
<!--Import/export-->
</resources>
diff --git a/ring-android/app/src/main/res/values-zh/strings_call.xml b/ring-android/app/src/main/res/values-zh/strings_call.xml
new file mode 100644
index 0000000..47a4f33
--- /dev/null
+++ b/ring-android/app/src/main/res/values-zh/strings_call.xml
@@ -0,0 +1,26 @@
+<?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>
+ <string name="call_human_state_hold">保持通話</string>
+ <string name="conference_human_state_hold">保持通話</string>
+ </resources>
\ No newline at end of file