From cb70df7a343d55196c9ad1d7ae3e30acae117fc6 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 27 Aug 2015 19:18:35 +0200
Subject: added XEP number for http file upload

---
 src/main/res/values-bg/strings.xml |  6 ++++++
 src/main/res/values-de/strings.xml |  9 ++++++---
 src/main/res/values-es/strings.xml |  6 ++++++
 src/main/res/values-eu/strings.xml |  6 ++++++
 src/main/res/values-sr/strings.xml |  6 ++++++
 src/main/res/values-sv/strings.xml | 10 ++++++++--
 src/main/res/values/strings.xml    |  4 ++--
 7 files changed, 40 insertions(+), 7 deletions(-)

(limited to 'src/main')

diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index ff5c090a..16932969 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -76,6 +76,7 @@
   <string name="delete_messages">Изтриване на съобщенията</string>
   <string name="also_end_conversation">Този разговор да приключи след това</string>
   <string name="choose_presence">Изберете присъствие за контакта</string>
+  <string name="send_unencrypted_message">Изпр. на нешифр. съобщение</string>
   <string name="send_otr_message">Изпр. на съобщение, шифр. чрез OTP</string>
   <string name="send_omemo_message">Изпр. на съобщение, шифр. чрез OMEMO</string>
   <string name="send_pgp_message">Изпр. на съобщение, шифр. чрез OpenPGP</string>
@@ -149,6 +150,7 @@
   <string name="account_status_regis_not_sup">Сървърът не поддържа регистриране</string>
   <string name="account_status_security_error">Грешка в сигурността</string>
   <string name="account_status_incompatible_server">Несъвместим сървър</string>
+  <string name="encryption_choice_unencrypted">Нешифровано</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="encryption_choice_omemo">OMEMO</string>
@@ -366,6 +368,8 @@
   <string name="purge_key">Изтриване на ключа</string>
   <string name="purge_key_desc_part1">Сигурни ли сте, че искате да изтриете този ключ?</string>
   <string name="purge_key_desc_part2">След това той ще бъде необратимо приет за грешен и повече няма да можете да създавате сесии с него.</string>
+  <string name="error_no_keys_to_trust">Няма ключове, които могат да бъдат използвани за този контакт. Ако сте изчистили някои от ключовете му, то той трябва да създаде нови.</string>
+  <string name="error_trustkeys_title">Грешка</string>
   <string name="fetching_history_from_server">Получаване на историята от сървъра</string>
   <string name="no_more_history_on_server">Няма повече история на сървъра</string>
   <string name="updating">Актуализиране...</string>
@@ -473,4 +477,6 @@
   <string name="download_failed_server_not_found">Неуспешно сваляне: Сървърът не е открит</string>
   <string name="download_failed_file_not_found">Неуспешно сваляне: Файлът не е открит</string>
   <string name="download_failed_could_not_connect">Неуспешно сваляне: Неуспешна връзка със сървъра</string>
+  <string name="pref_use_white_background">Използване на бял фон</string>
+  <string name="pref_use_white_background_summary">Показване на получените съобщения с черен текст на бял фон</string>
 </resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index ad793a6d..81aa6a75 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -76,12 +76,12 @@
   <string name="delete_messages">Nachrichten löschen</string>
   <string name="also_end_conversation">Diese Unterhaltung danach beenden</string>
   <string name="choose_presence">Ressource des Kontakts auswählen</string>
-  <string name="send_unencrypted_message">Sende unverschlüsselte Nachricht</string>
+  <string name="send_unencrypted_message">Unverschlüsselt schreiben…</string>
   <string name="send_otr_message">OTR-verschlüsselt schreiben…</string>
   <string name="send_omemo_message">OMEMO-verschlüsselt schreiben…</string>
   <string name="send_pgp_message">OpenPGP-verschlüsselt schreiben…</string>
   <string name="your_nick_has_been_changed">Dein Nickname wurde geändert</string>
-  <string name="send_unencrypted">Normal verschicken</string>
+  <string name="send_unencrypted">Unverschlüsselt verschicken</string>
   <string name="decryption_failed">Entschlüsselung fehlgeschlagen. Vielleicht hast du nicht den richtigen privaten Schlüssel.</string>
   <string name="openkeychain_required">OpenKeychain</string>
   <string name="openkeychain_required_long">Conversations benutzt eine Drittanwendung namens <b>OpenKeychain</b>, um Nachrichten zu ver- und entschlüsseln und um deine Schlüssel zu verwalten.\n\nOpenKeychain ist GPLv3-lizenziert und kann über F-Droid oder Google Play bezogen werden.\n\n<small>(Bitte starte Conversations danach neu.)</small></string>
@@ -189,7 +189,7 @@
   <string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
   <string name="server_info_stream_management">XEP-0198: Stream Management</string>
   <string name="server_info_pep">XEP-0163: PEP (Avatare)</string>
-  <string name="server_info_http_upload">XEP-xxxx: HTTP File Upload</string>
+  <string name="server_info_http_upload">XEP-0363: HTTP File Upload</string>
   <string name="server_info_available">ja</string>
   <string name="server_info_unavailable">nein</string>
   <string name="missing_public_keys">Öffentlicher Schlüssel fehlt</string>
@@ -369,6 +369,7 @@
   <string name="purge_key">Schlüssel löschen</string>
   <string name="purge_key_desc_part1">Soll dieser Schlüssel gelöscht werden?</string>
   <string name="purge_key_desc_part2">Dieser Vorgang kann nicht rückgängig gemacht werden und es kann nie wieder eine Verbindung mit diesem Schlüssel hergestellt werden.</string>
+  <string name="error_no_keys_to_trust">Es sind keine Schlüssel für diesen Kontakt verfügbar. Falls diese gelöscht wurden, müssen diese neu erstellt werden.</string>
   <string name="error_trustkeys_title">Fehler</string>
   <string name="fetching_history_from_server">Lade Chatverlauf…</string>
   <string name="no_more_history_on_server">Keine weiteren Nachrichten vorhanden</string>
@@ -477,4 +478,6 @@
   <string name="download_failed_server_not_found">Download fehlgeschlagen: Server nicht gefunden</string>
   <string name="download_failed_file_not_found">Download fehlgeschlagen: Datei nicht gefunden</string>
   <string name="download_failed_could_not_connect">Download fehlgeschlagen: keine Verbindung zum Host</string>
+  <string name="pref_use_white_background">Weißen Hintergrund benutzen</string>
+  <string name="pref_use_white_background_summary">Empfangene Nachrichten als schwarzen Text auf weißem Hintergrund anzeigen</string>
 </resources>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 9d6b9da6..7019a67e 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -76,6 +76,7 @@
   <string name="delete_messages">Borrar mensajes</string>
   <string name="also_end_conversation">Además, terminar esta conversación</string>
   <string name="choose_presence">Selecciona recurso del contacto</string>
+  <string name="send_unencrypted_message">Enviar mensaje sin cifrar</string>
   <string name="send_otr_message">Enviar mensaje cifrado con OTR</string>
   <string name="send_omemo_message">Enviar mensaje cifrado con OMEMO </string>
   <string name="send_pgp_message">Enviar mensaje cifrado con OpenPGP</string>
@@ -149,6 +150,7 @@
   <string name="account_status_regis_not_sup">El servidor no soporta registros</string>
   <string name="account_status_security_error">Error de seguridad</string>
   <string name="account_status_incompatible_server">Servidor incompatible</string>
+  <string name="encryption_choice_unencrypted">Sin cifrado</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="encryption_choice_omemo">OMEMO</string>
@@ -366,6 +368,8 @@
   <string name="purge_key">Eliminar clave</string>
   <string name="purge_key_desc_part1">¿Estás seguro de que quieres eliminar esta clave?</string>
   <string name="purge_key_desc_part2">Esto será irreversible y nunca podrás iniciar sesión con esta clave de nuevo.</string>
+  <string name="error_no_keys_to_trust">No hay claves usables disponibles para este contacto. Si has eliminado alguna de sus claves, tus contactos necesitarán generar nuevas claves.</string>
+  <string name="error_trustkeys_title">Error</string>
   <string name="fetching_history_from_server">Buscando historial en el servidor</string>
   <string name="no_more_history_on_server">No hay más historial en el servidor</string>
   <string name="updating">Actualizando…</string>
@@ -473,4 +477,6 @@
   <string name="download_failed_server_not_found">Error al descargar: Servidor no encontrado</string>
   <string name="download_failed_file_not_found">Error al descargar: Archivo no encontrado</string>
   <string name="download_failed_could_not_connect">Error al descargar: No se ha podido conectar con el servidor</string>
+  <string name="pref_use_white_background">Usar fondo blanco</string>
+  <string name="pref_use_white_background_summary">Mostrar mensajes recibidos en texto negro con fondo blanco</string>
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index c0bfc10b..b6c3b306 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -76,6 +76,7 @@
   <string name="delete_messages">Mezuak ezabatu</string>
   <string name="also_end_conversation">Elkarrizketa hau jarraian amaitu</string>
   <string name="choose_presence">Hautatu agerpena kontaktuarentzat</string>
+  <string name="send_unencrypted_message">Enkriptatu gabeko mezua bidali</string>
   <string name="send_otr_message">OTRz enkriptatutako mezua bidali</string>
   <string name="send_omemo_message">OMEMOz enkriptatutako mezua bidali</string>
   <string name="send_pgp_message">OpenPGPz enkriptatutako mezua bidali</string>
@@ -149,6 +150,7 @@
   <string name="account_status_regis_not_sup">Zerbitzariak ez du erregistratzea onartzen</string>
   <string name="account_status_security_error">Segurtasun akatsa</string>
   <string name="account_status_incompatible_server">Zerbitzari ez bateragarria</string>
+  <string name="encryption_choice_unencrypted">Enkriptatu gabe</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="encryption_choice_omemo">OMEMO</string>
@@ -366,6 +368,8 @@
   <string name="purge_key">Gakoa purgatu</string>
   <string name="purge_key_desc_part1">Ziur al zaude gako hau purgatu nahi duzulaz?</string>
   <string name="purge_key_desc_part2">Modu itzulezinean arriskutsutzat hartuko da, eta ezingo duzu gakoarekin berriro saio berri bat sortu.</string>
+  <string name="error_no_keys_to_trust">Kontaktu honetarako gako erabilgarririk ez dago. Bere gakoak purgatu badituzu, berri batzuk sortu behar dituzte.</string>
+  <string name="error_trustkeys_title">Akatsa</string>
   <string name="fetching_history_from_server">Mezuak zerbitzaritik eskuratzen</string>
   <string name="no_more_history_on_server">Mezu gehiagorik ez zerbitzarian</string>
   <string name="updating">Eguneratzen...</string>
@@ -473,4 +477,6 @@
   <string name="download_failed_server_not_found">Deskargak huts egin du: zerbitzaria ez da aurkitu</string>
   <string name="download_failed_file_not_found">Deskargak huts egin du: fitxategia ez da aurkitu</string>
   <string name="download_failed_could_not_connect">Deskargak huts egin du: ezin izan da ostalarira konektatu</string>
+  <string name="pref_use_white_background">Atzeko-planoan kolore zuria erabili</string>
+  <string name="pref_use_white_background_summary">Jasotako mezuak testu beltza atzeko-plano zuri baten gainean bezala erakutsi</string>
 </resources>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 5bf39f19..232f5fcc 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -76,6 +76,7 @@
   <string name="delete_messages">Обриши поруке</string>
   <string name="also_end_conversation">Окончај ову преписку након тога</string>
   <string name="choose_presence">Избор присутности за контакта</string>
+  <string name="send_unencrypted_message">Пошаљи нешифровану поруку</string>
   <string name="send_otr_message">Пошаљи ОТР шифровану поруку</string>
   <string name="send_omemo_message">Пошаљи ОМЕМО шифровану поруку</string>
   <string name="send_pgp_message">Пошаљи ОпенПГП шифровану поруку</string>
@@ -149,6 +150,7 @@
   <string name="account_status_regis_not_sup">Сервер не подржава регистрацију</string>
   <string name="account_status_security_error">Безбедносна грешка</string>
   <string name="account_status_incompatible_server">Некомпатибилан сервер</string>
+  <string name="encryption_choice_unencrypted">Нешифровано</string>
   <string name="encryption_choice_otr">ОТР</string>
   <string name="encryption_choice_pgp">ОпенПГП</string>
   <string name="encryption_choice_omemo">ОМЕМО</string>
@@ -366,6 +368,8 @@
   <string name="purge_key">Очисти кључ</string>
   <string name="purge_key_desc_part1">Желите ли заиста да очистите овај кључ?</string>
   <string name="purge_key_desc_part2">Неповратно ће бити сматран компровитованим, и њиме више никад нећете моћи да успоставите сесију.</string>
+  <string name="error_no_keys_to_trust">Нема употребљивих кључева за овај контакт. Ако сте очистили било који од тих кључева, контакт мора да генерише нови.</string>
+  <string name="error_trustkeys_title">Грешка</string>
   <string name="fetching_history_from_server">Добављам историјат са сервера</string>
   <string name="no_more_history_on_server">Нема више историјата на серверу</string>
   <string name="updating">Ажурирам…</string>
@@ -475,4 +479,6 @@
   <string name="download_failed_server_not_found">Преузимање није успело: сервер није нађен</string>
   <string name="download_failed_file_not_found">Преузимање није успело: фајл није нађен</string>
   <string name="download_failed_could_not_connect">Преузимање није успело: не могу да се повежем са домаћином</string>
+  <string name="pref_use_white_background">Користи белу позадину</string>
+  <string name="pref_use_white_background_summary">Приказ примљених порука црним текстом на белој позадини</string>
 </resources>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index d1e3265a..5daf4cf6 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -76,6 +76,7 @@
   <string name="delete_messages">Ta bort meddelanden</string>
   <string name="also_end_conversation">Avsluta sedan denna konversation</string>
   <string name="choose_presence">Välj tillgänglighet till kontakt</string>
+  <string name="send_unencrypted_message">Skicka okrypterat meddelande</string>
   <string name="send_otr_message">Skicka OTR-krypterat meddelande</string>
   <string name="send_omemo_message">Skicka OMEMO-krypterat meddelande</string>
   <string name="send_pgp_message">Skicka OpenPGP-krypterat meddelande</string>
@@ -149,6 +150,7 @@
   <string name="account_status_regis_not_sup">Servern stödjer inte registrering</string>
   <string name="account_status_security_error">Säkerhetsfel</string>
   <string name="account_status_incompatible_server">Inkompatibel server</string>
+  <string name="encryption_choice_unencrypted">Okrypterat</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
   <string name="encryption_choice_omemo">OMEMO</string>
@@ -181,11 +183,11 @@
   <string name="muc_details_other_members">Andra medlemmar</string>
   <string name="server_info_show_more">Server info</string>
   <string name="server_info_mam">XEP-0313: Message Archive</string>
-  <string name="server_info_carbon_messages">Carbon Messages</string>
+  <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
   <string name="server_info_csi">XEP-0352: Client State Indication</string>
   <string name="server_info_blocking">XEP-0191: Blocking Command</string>
   <string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
-  <string name="server_info_stream_management">Stream Management</string>
+  <string name="server_info_stream_management">XEP-0198: Stream Management</string>
   <string name="server_info_pep">XEP-0163: PEP (Avatarbilder)</string>
   <string name="server_info_available">tillgänglig</string>
   <string name="server_info_unavailable">otillgänglig</string>
@@ -366,6 +368,8 @@
   <string name="purge_key">Rensa nyckel</string>
   <string name="purge_key_desc_part1">Är du säker på att du vill rensa denna nyckel?</string>
   <string name="purge_key_desc_part2">Den kommer att antas oåterkalleligt komprometterat och du kommer aldrig kunna bygga en session med den igen.</string>
+  <string name="error_no_keys_to_trust">Det finns inga användbara nycklar tillgängliga för den här kontakten. Om du har rensat någon av dennes nycklar behöver de generera nya.</string>
+  <string name="error_trustkeys_title">Fel</string>
   <string name="fetching_history_from_server">Hämtar historik från server</string>
   <string name="no_more_history_on_server">Ingen mer historik på server</string>
   <string name="updating">Uppdaterar…</string>
@@ -473,4 +477,6 @@
   <string name="download_failed_server_not_found">Nerladdning gick fel: Server hittades inte</string>
   <string name="download_failed_file_not_found">Nerladdning gick fel: Filen hittades inte</string>
   <string name="download_failed_could_not_connect">Nerladdningen gick fel: Kunder inte ansluta till server</string>
+  <string name="pref_use_white_background">Använd vit bakgrund</string>
+  <string name="pref_use_white_background_summary">Visa mottagna meddelanden som svart text på vit bakgrund</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 0ee8676d..ae2a38dc 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -190,8 +190,8 @@
 	<string name="server_info_blocking">XEP-0191: Blocking Command</string>
 	<string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
 	<string name="server_info_stream_management">XEP-0198: Stream Management</string>
-	<string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
-	<string name="server_info_http_upload">XEP-xxxx: HTTP File Upload</string>
+	<string name="server_info_pep">XEP-0163: PEP (Avatars / OMEMO)</string>
+	<string name="server_info_http_upload">XEP-0363: HTTP File Upload</string>
 	<string name="server_info_available">available</string>
 	<string name="server_info_unavailable">unavailable</string>
 	<string name="missing_public_keys">Missing public key announcements</string>
-- 
cgit v1.2.3