aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--res/values-de/strings.xml24
-rw-r--r--res/values-eu/arrays.xml16
-rw-r--r--res/values-eu/strings.xml31
-rw-r--r--res/values-it/arrays.xml39
-rw-r--r--res/values-it/strings.xml260
-rw-r--r--res/values-ru/strings.xml106
-rw-r--r--res/values/strings.xml6
-rw-r--r--src/eu/siacs/conversations/utils/UIHelper.java10
9 files changed, 442 insertions, 52 deletions
diff --git a/README.md b/README.md
index f4c0a37a..ec510c15 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ These XEPs are - as of now:
* [Benoit Bouvarel](https://github.com/BenoitBouvarel) (French)
* [Daniel Gultsch](https://github.com/iNPUTmice) (German)
* [Aitor Beriain](https://github.com/beriain) (Basque)
-* [Ilia Rostovtsev](https://github.com/rostovtsev) (Russian)
+* [Ilia Rostovtsev](https://github.com/qooob) (Russian)
* [Jelmer Vernooij](https://github.com/jelmer) (Dutch)
* [Anders Sandblad](https://github.com/andersruneson) (Swedish)
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e653147d..1dbfdf10 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -232,5 +232,29 @@
<string name="additional_information">Zusätzliche Informationen</string>
<string name="skip">Überspringen</string>
<string name="pref_ui_options">Benutzeroberfläche</string>
+ <string name="disable_notifications">Benachrichtigungen deaktivieren</string>
+ <string name="disable_notifications_for_this_conversation">Benachrichtigungen für diese Unterhaltung deaktivieren</string>
+ <string name="notifications_disabled">Benachrichtigungen sind deaktiviert</string>
+ <string name="enable">Aktivieren</string>
+ <string name="conference_requires_password">Konferenz ist passwortgeschützt</string>
+ <string name="enter_password">Passwort eingeben</string>
+ <string name="missing_presence_updates">Fehlender Online-Status vom Kontakt</string>
+ <string name="request_presence_updates">Bitte erst Anwesenheitsbenachrichtigungen vom Kontakt anfordern.\n\n</string>
+ <string name="request_now">Jetzt anfordern</string>
+ <string name="delete_fingerprint">Fingerabdruck löschen</string>
+ <string name="sure_delete_fingerprint">Soll dieser Fingerabdruck definitiv gelöscht werden?</string>
+ <string name="ignore">Ignorieren</string>
+ <string name="without_mutual_presence_updates"><b>Achtung:</b> Es kann zu unerwarteten Problemen führen, dies ohne gegenseitige Anwesenheitsbenachrichtigungen abzusenden.\n\n<small>Bitte die Online-Status-Abonnements in den Kontaktdetails prüfen.</small></string>
+ <string name="pref_encryption_settings">Verschlüsselungs-Einstellungen</string>
+ <string name="pref_force_encryption">Ende-zu-Ende-Verschlüsselung forcieren</string>
+ <string name="pref_force_encryption_summary">Nachrichten immer verschlüsseln (außer für Konferenzen)</string>
+ <string name="pref_dont_save_encrypted">Verschlüsselte Nachrichten nicht speichern</string>
+ <string name="pref_dont_save_encrypted_summary">Achtung: Kann zu Nachrichtenverlust führen</string>
+ <string name="pref_expert_options">Einstellungen für Experten</string>
+ <string name="pref_expert_options_summary">Hier bitte vorsichtig sein</string>
+ <string name="pref_use_larger_font">Schriftgröße erhöhen</string>
+ <string name="pref_use_larger_font_summary">Überall in der App eine größere Schrift verwenden</string>
+ <string name="pref_use_send_button_to_indicate_status">Absende-Knopf zeigt Online-Status an</string>
+ <string name="pref_use_send_button_to_indicate_status_summary">Absende-Knopf einfärben, um den Online-Status des Kontakts zu signalisieren</string>
</resources> \ No newline at end of file
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index eed87d35..cb1c20fd 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -20,5 +20,19 @@
<item>524288</item>
<item>1048576</item>
</string-array>
+ <string-array name="mute_options_descriptions">
+ <item>30 minutu</item>
+ <item>ordu bat</item>
+ <item>2 ordu</item>
+ <item>8 ordu</item>
+ <item>abisatu arte</item>
+ </string-array>
+ <integer-array name="mute_options_durations">
+ <item>1800</item>
+ <item>3600</item>
+ <item>7200</item>
+ <item>28800</item>
+ <item>-1</item>
+ </integer-array>
-</resources> \ No newline at end of file
+</resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 2ca26c3d..72737284 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -108,6 +108,7 @@
<string name="pref_never_send_crash_summary">Akats harraskak bidaliz Conversationsen garapenean laguntzen duzu</string>
<string name="pref_confirm_messages">Mezuak egiaztatu</string>
<string name="pref_confirm_messages_summary">Zure kontaktuak mezu bat noiz jaso eta irakurri duzun jakin dezan baimendu</string>
+ <string name="pref_ui_options">Erabiltzaile-interfazearen aukerak</string>
<string name="openpgp_error">OpenKeychainek akats baten berri eman du</string>
<string name="error_decrypting_file">Sarrera/Irteera akatsa fitxategia desenkriptatzerakoan</string>
<string name="accept">Onartu</string>
@@ -213,6 +214,7 @@
<string name="contact_added_you">Kontaktuak bere zerrendara gehitu zaitu</string>
<string name="add_back">Bera gehitu</string>
<string name="contact_has_read_up_to_this_point">%s(e)k puntu honetaraino irakurri du</string>
+ <string name="publish">Argitaratu</string>
<string name="touch_to_choose_picture">Ukitu profileko argazkia irudi bat galeriatik hautatzeko</string>
<string name="publish_avatar_explanation">Adi: Zure presentzia eguneraketetara harpidetutako edonork irudi hau ikusi ahal izango du.</string>
<string name="publishing">Argitaratzen&#8230;</string>
@@ -230,6 +232,29 @@
<string name="server_info_session_established">Uneko saioa ezarri da</string>
<string name="additional_information">Informazio gehiago</string>
<string name="skip">Orain ez</string>
- <string name="pref_ui_options">Erabiltzaile-interfazearen aukerak</string>
-
-</resources> \ No newline at end of file
+ <string name="disable_notifications">Jakinarazpenak ezgaitu</string>
+ <string name="disable_notifications_for_this_conversation">Elkarrizketa honetarako jakinarazpenak ezgaitu</string>
+ <string name="notifications_disabled">Jakinarazpenak ezgaituta daude</string>
+ <string name="enable">Gaitu</string>
+ <string name="conference_requires_password">Konferentziak pasahitza behar du</string>
+ <string name="enter_password">Sartu pasahitza</string>
+ <string name="missing_presence_updates">Kontaktuaren presentzia eguneraketak falta dira</string>
+ <string name="request_presence_updates">Mesedez eskatu lehenago zure kontaktuaren presentzia eguneraketak.\n\n<small>Kontaktuak erabiltzen ari den bezeroa(k) zehazteko erabilika da hau.</small></string>
+ <string name="request_now">Eskatu orain</string>
+ <string name="delete_fingerprint">Hatz-marka ezabatu</string>
+ <string name="sure_delete_fingerprint">Ziur al zaude hatz-marka hau ezabatu nahi duzulaz?</string>
+ <string name="ignore">Kasurik ez egin</string>
+ <string name="without_mutual_presence_updates"><b>Adi:</b> Bien arteko presentzia eguneraketarik gabe hau bidaltzeak ustekabeko arazoak sor litzake.\n\n<small>Joan zaitez kontaktuaren xehetasunetara zure presentzia eguneraketak egiaztatzeko.</small></string>
+ <string name="pref_encryption_settings">Enkriptazio ezarpenak</string>
+ <string name="pref_force_encryption">End-to-end enkriptazioa behartu</string>
+ <string name="pref_force_encryption_summary">Mezuak beti enkriptatuta bidali (konferentzietan izan ezik)</string>
+ <string name="pref_dont_save_encrypted">Ez gorde enkriptatutako mezuak</string>
+ <string name="pref_dont_save_encrypted_summary">Adi: Honek mezuen galera ekar lezake</string>
+ <string name="pref_expert_options">Adituentzako aukerak</string>
+ <string name="pref_expert_options_summary">Mesedez kontuz ibili hauekin</string>
+ <string name="pref_use_larger_font">Letraren tamaina handitu</string>
+ <string name="pref_use_larger_font_summary">Letra tamaina handiagoa erabili aplikazio osoan zehar</string>
+ <string name="pref_use_send_button_to_indicate_status">Bidaltze botoiak egoera adierazten du</string>
+ <string name="pref_use_send_button_to_indicate_status_summary">Bidaltze botoia koloreztatu kontaktu baten egoera adierazteko</string>
+
+</resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
new file mode 100644
index 00000000..24a079f5
--- /dev/null
+++ b/res/values-it/arrays.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+ <string-array name="resources">
+ <item>Cellulare</item>
+ <item>Telefono</item>
+ <item>Tablet</item>
+ <item>Conversations</item>
+ <item>Android</item>
+ </string-array>
+ <string-array name="filesizes">
+ <item>mai</item>
+ <item>256 KB</item>
+ <item>512 KB</item>
+ <item>1 MB</item>
+ </string-array>
+ <string-array name="filesizes_values">
+ <item>0</item>
+ <item>262144</item>
+ <item>524288</item>
+ <item>1048576</item>
+ </string-array>
+ <string-array name="mute_options_descriptions">
+ <item>30 minuti</item>
+ <item>un'ora</item>
+ <item>2 ore</item>
+ <item>8 ore</item>
+ <item>fino avviso ulteriore</item>
+ </string-array>
+
+ <integer-array name="mute_options_durations">
+ <item>1800</item>
+ <item>3600</item>
+ <item>7200</item>
+ <item>28800</item>
+ <item>-1</item>
+ </integer-array>
+
+</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
new file mode 100644
index 00000000..ea972f4e
--- /dev/null
+++ b/res/values-it/strings.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+ <string name="app_name">Conversations</string>
+ <string name="action_settings">Impostazioni</string>
+ <string name="action_add">Nuova conversazione</string>
+ <string name="action_accounts">Gestisci utenti</string>
+ <string name="action_end_conversation">Termina questa conversazione</string>
+ <string name="action_contact_details">Dettagli del contatto</string>
+ <string name="action_muc_details">Dettagli conferenza</string>
+ <string name="action_secure">Conversazione sicura</string>
+ <string name="action_add_account">Aggiungi utente</string>
+ <string name="action_edit_contact">Modifica il nome</string>
+ <string name="action_add_phone_book">Aggiungi alla rubrica</string>
+ <string name="action_delete_contact">Cancella dalla lista</string>
+ <string name="title_activity_manage_accounts">Gestisci Utenti</string>
+ <string name="title_activity_settings">Impostazioni</string>
+ <string name="title_activity_conference_details">Dettagli conferenza</string>
+ <string name="title_activity_contact_details">Dettagli del contatto</string>
+ <string name="title_activity_conversations">Conversations</string>
+ <string name="title_activity_sharewith">Condividi con Conversation</string>
+ <string name="title_activity_start_conversation">Inizia una Conversazione</string>
+ <string name="title_activity_choose_contact">Scegli contatto</string>
+ <string name="just_now">adesso</string>
+ <string name="minute_ago">1 min fa</string>
+ <string name="minutes_ago">%d min fa</string>
+ <string name="unread_conversations">Conversazioni non lette</string>
+ <string name="sending">invio&#8230;</string>
+ <string name="encrypted_message">Decifrazione del messaggio. Attendere prego&#8230;</string>
+ <string name="nick_in_use">Nome utente già in uso</string>
+ <string name="admin">Amministratore</string>
+ <string name="owner">Proprietario</string>
+ <string name="moderator">Moderatore</string>
+ <string name="participant">Partecipante</string>
+ <string name="visitor">Visitatore</string>
+ <string name="remove_contact_text">Vuoi rimuovere %s dalla tua lista contatti? La conversazione associata con questo contatto non sarà rimossa.</string>
+ <string name="remove_bookmark_text">Vuoi rimuovere il segnalibro %s? La conversazione associata con questo contatto non sarà rimossa.</string>
+ <string name="register_account">Registra un nuovo account sul server</string>
+ <string name="share_with">Condividi con</string>
+ <string name="start_conversation">Inizia Conversazione</string>
+ <string name="invite_contact">Invita Contatto</string>
+ <string name="contacts">Contatti</string>
+ <string name="cancel">Cancella</string>
+ <string name="add">Aggiungi</string>
+ <string name="edit">Modifica</string>
+ <string name="delete">Elimina</string>
+ <string name="save">Salva</string>
+ <string name="ok">OK</string>
+ <string name="crash_report_title">Conversations è crashato</string>
+ <string name="crash_report_message">Se scegli di inviare una segnalazione dell'errore aiuterai lo sviluppo di Conversations\n<b>Attenzione:</b> Questo utilizzerà il tuo account XMPP per inviare la segnalazione agli sviluppatori.</string>
+ <string name="send_now">Invia adesso</string>
+ <string name="send_never">Non chiedere mai più</string>
+ <string name="problem_connecting_to_account">Impossibile collegarsi all'utente</string>
+ <string name="problem_connecting_to_accounts">Impossibile collegarsi a più utenti</string>
+ <string name="touch_to_fix">Tocca qui per gestire i tuoi utenti</string>
+ <string name="attach_file">Allega file</string>
+ <string name="not_in_roster">Il contatto non è nella tua lista. Vuoi aggiungerlo?</string>
+ <string name="add_contact">Aggiungi contatto</string>
+ <string name="send_failed">Invio fallito</string>
+ <string name="send_rejected">rifiutato</string>
+ <string name="receiving_image">Ricezione di un'immagine. Attendere prego&#8230;</string>
+ <string name="preparing_image">Preparazioone immagine per la trasmissione</string>
+ <string name="action_clear_history">Pulisci la cronologia</string>
+ <string name="clear_conversation_history">Pulisci la cronologia della Conversazione</string>
+ <string name="clear_histor_msg">Vuoi cancellare tutti i messaggi di questa Conversazione?\n\n<b>Attenzione:</b> Questo non influenzerà i messaggi presenti su altri dispositivi o server.</string>
+ <string name="delete_messages">Elimina messaggi</string>
+ <string name="also_end_conversation">Termina questa conversazione in seguito</string>
+ <string name="choose_presence">Choose presence to contact</string>
+ <string name="send_plain_text_message">Invia messaggio di testo semplice</string>
+ <string name="send_otr_message">Invia messaggio cifrato con OTR</string>
+ <string name="send_pgp_message">Invia messaggio cifrato con OpenPGP</string>
+ <string name="your_nick_has_been_changed">Il tuo nome utente èstato cambiato</string>
+ <string name="download_image">Scarica Immagine</string>
+ <string name="image_offered_for_download"><i>Immagine disponibile per il download</i></string>
+ <string name="send_unencrypted">Invia non cifrato</string>
+ <string name="decryption_failed">Decifrazione fallita. Forse non disponi della chiave privata corretta.</string>
+ <string name="openkeychain_required">OpenKeychain</string>
+ <string name="openkeychain_required_long">Conversations usa una app di terze parti chiamata <b>OpenKeychain</b> per cifrare e decifrare i messaggi per gestire le tue chiavi pubbliche.\n\nOpenKeychain è rilasciato secondo i termini della GPLv3 ed è disponibile sia su F-Droid, che su Google Play.\n\n<small>(Riavvia Conversations in seguito.)</small></string>
+ <string name="restart">Riavvia</string>
+ <string name="install">Installa</string>
+ <string name="offering">offrendo&#8230;</string>
+ <string name="waiting">in attesa&#8230;</string>
+ <string name="no_pgp_key">Nessuna chiave OpenPGP trovata</string>
+ <string name="contact_has_no_pgp_key">Conversations non è in grado di cifrare i tuoi messaggi perchè il contatto non sta annunciando la sua chiave pubblica.\n\n<small>Per favore chiedi al tuo contatto di configurare OpenPGP.</small></string>
+ <string name="no_pgp_keys">Nessuna chiave OpenPGP trovata</string>
+ <string name="contacts_have_no_pgp_keys">Conversations non è in grado di cifrare i tuoi messaggi perchè i contatti non stanno annunciando la propria chiave pubblica.\n\n<small>Per favore chiedi ai tuoi contatti di configurare OpenPGP.</small></string>
+ <string name="encrypted_message_received"><i>Messaggio cifrato ricevuto. Tocca per decifrare.</i></string>
+ <string name="encrypted_image_received"><i>Immagine cifrata ricevuta. Tocca per decifrare e mostrare.</i></string>
+ <string name="image_file"><i>Immagine ricevuta. Tocca per mostrare</i></string>
+ <string name="pref_general">Generale</string>
+ <string name="pref_xmpp_resource">Risorsa XMPP</string>
+ <string name="pref_xmpp_resource_summary">Il nome con il quale questo client si identifica</string>
+ <string name="pref_accept_files">Accetta i file</string>
+ <string name="pref_accept_files_summary">Accetta automaticamente i file più piccoli di&#8230;</string>
+ <string name="pref_notification_settings">Impostazioni di Notifica</string>
+ <string name="pref_notifications">Notifiche</string>
+ <string name="pref_notifications_summary">Notifica quando arriva un nuovo messaggio</string>
+ <string name="pref_vibrate">Vibra</string>
+ <string name="pref_vibrate_summary">Vibra anche quando arriva un nuovo messaggio</string>
+ <string name="pref_sound">Suono</string>
+ <string name="pref_sound_summary">Riproduci una suoneria con la notifica</string>
+ <string name="pref_conference_notifications">Notifiche Conferenze</string>
+ <string name="pref_conference_notifications_summary">Notifica sempre quando arriva un nuovo messaggio da una conferenza, invece che solo quando in primo piano</string>
+ <string name="pref_notification_grace_period">Periodo tra notifiche</string>
+ <string name="pref_notification_grace_period_summary">Disabilita le notifiche per un breve lasso di tempo dopo che un messaggio è stato ricevuto</string>
+ <string name="pref_advanced_options">Opzioni Avanzate</string>
+ <string name="pref_never_send_crash">Non inviare mai segnalazioni di errore</string>
+ <string name="pref_never_send_crash_summary">Se scegli di inviare una segnalazione dell'errore aiuterai lo sviluppo di Conversations</string>
+ <string name="pref_confirm_messages">Conferma Messaggi</string>
+ <string name="pref_confirm_messages_summary">Fai sapere ai tuoi contatti quando hai ricevuto il messaggio e l'hai letto</string>
+ <string name="pref_ui_options">Opzioni Interfaccia</string>
+ <string name="openpgp_error">OpenKeychain ha riportato un errore</string>
+ <string name="error_decrypting_file">Errore di I/O nel decifrare il file</string>
+ <string name="accept">Accetta</string>
+ <string name="error">Si è verificato un errore</string>
+ <string name="pref_grant_presence_updates">Concedi aggiornamenti della presenza</string>
+ <string name="pref_grant_presence_updates_summary">Concedi e chiedi preventivamente la sottoscrizione della presenza ai contatti che hai creato</string>
+ <string name="subscriptions">Sottoscrizioni</string>
+ <string name="your_account">Il tuo utente</string>
+ <string name="keys">Chiavi</string>
+ <string name="send_presence_updates">Invia aggiornamenti della presenza</string>
+ <string name="receive_presence_updates">Ricevi aggiornamenti della presenza</string>
+ <string name="ask_for_presence_updates">Chiedi aggiornamenti della presenza</string>
+ <string name="attach_choose_picture">Scegli un'immagine</string>
+ <string name="attach_take_picture">Foto</string>
+ <string name="preemptively_grant">Concedi aggiornamenti della presenza preventivamente</string>
+ <string name="error_not_an_image_file">Il file selezionato non è un'immagine</string>
+ <string name="error_compressing_image">Errore durante la conversione dell'immagine</string>
+ <string name="error_file_not_found">File non trovato</string>
+ <string name="error_io_exception">Errore di I/O generico. Forse hai esaurito lo spazio?</string>
+ <string name="error_security_exception_during_image_copy">L'app che hai usato per selezionare questa immagine non ci ha fornito permessi sufficienti per leggere il file.\n\n<small>Usa un file manager differente per scegliere un'immagine</small></string>
+ <string name="account_status_unknown">Sconosciuto</string>
+ <string name="account_status_disabled">Disabilitato temporaneamente</string>
+ <string name="account_status_online">Online</string>
+ <string name="account_status_connecting">In connessione\u2026</string>
+ <string name="account_status_offline">Offline</string>
+ <string name="account_status_unauthorized">Non autorizzato</string>
+ <string name="account_status_not_found">Server non trovato</string>
+ <string name="account_status_no_internet">Connettività assente</string>
+ <string name="account_status_regis_fail">Registrazione fallita</string>
+ <string name="account_status_regis_conflict">Nome utente già in uso</string>
+ <string name="account_status_regis_success">Registrazione completata</string>
+ <string name="account_status_regis_not_sup">Il Server non supporta la registrazione</string>
+ <string name="encryption_choice_none">Testo semplice</string>
+ <string name="encryption_choice_otr">OTR</string>
+ <string name="encryption_choice_pgp">OpenPGP</string>
+ <string name="mgmt_account_edit">Modifica utente</string>
+ <string name="mgmt_account_delete">Elimina utente</string>
+ <string name="mgmt_account_disable">Disabilita temporaneamente</string>
+ <string name="mgmt_account_publish_avatar">Pubblica avatar</string>
+ <string name="mgmt_account_publish_pgp">Pubblica chiave pubblica OpenPGP</string>
+ <string name="mgmt_account_enable">Abilita utente</string>
+ <string name="mgmt_account_are_you_sure">Sei sicuro?</string>
+ <string name="mgmt_account_delete_confirm_text">Se cancelli il tuo utente la cronologia delle tue conversazioni verrà persa</string>
+ <string name="attach_record_voice">Registra la voce</string>
+ <string name="account_settings_jabber_id">ID Jabber</string>
+ <string name="account_settings_password">Password</string>
+ <string name="account_settings_example_jabber_id">utente@esempio.com</string>
+ <string name="account_settings_confirm_password">Conferma password</string>
+ <string name="password">Password</string>
+ <string name="confirm_password">Conferma password</string>
+ <string name="passwords_do_not_match">Le Password non corrispondono</string>
+ <string name="invalid_jid">Questo non è un ID Jabber valido</string>
+ <string name="error_out_of_memory">Memoria esaurita. L'immagine è tropppo grande</string>
+ <string name="add_phone_book_text">Vuoi aggiungere %s alla rubrica del telefono?</string>
+ <string name="contact_status_online">online</string>
+ <string name="contact_status_free_to_chat">vuole chattare</string>
+ <string name="contact_status_away">assente</string>
+ <string name="contact_status_extended_away">assenza prolungata</string>
+ <string name="contact_status_do_not_disturb">non disturbare</string>
+ <string name="contact_status_offline">offline</string>
+ <string name="muc_details_conference">Conferenza</string>
+ <string name="muc_details_other_members">Altri Membri</string>
+ <string name="server_info_carbon_messages">XEP-0280: Message Carbons</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_available">disponibile</string>
+ <string name="server_info_unavailable">non disponibile</string>
+ <string name="missing_public_keys">Annuncio chiave pubblica non effettuato</string>
+ <string name="last_seen_now">visto adesso</string>
+ <string name="last_seen_min">visto 1 minuto fa</string>
+ <string name="last_seen_mins">visto %d minuti fa</string>
+ <string name="last_seen_hour">visto 1 ora fa</string>
+ <string name="last_seen_hours">visto %d ore fa</string>
+ <string name="last_seen_day">visto 1 giorno fa</string>
+ <string name="last_seen_days">visto %d giorni fa</string>
+ <string name="never_seen">mai visto</string>
+ <string name="install_openkeychain">Messaggio cifrato. Installa OpenKeychain per decifrare.</string>
+ <string name="unknown_otr_fingerprint">Impronta OTR sconosciuta</string>
+ <string name="openpgp_messages_found">Messaggi cifrati con OpenPGP trovati</string>
+ <string name="reception_failed">Ricezione fallita</string>
+ <string name="your_fingerprint">La tua impronta</string>
+ <string name="otr_fingerprint">Impronta OTR</string>
+ <string name="verify">Verifica</string>
+ <string name="decrypt">Decripta</string>
+ <string name="conferences">Conferenze</string>
+ <string name="search">Cerca</string>
+ <string name="create_contact">Crea Contatto</string>
+ <string name="join_conference">Entra in Conferenza</string>
+ <string name="delete_contact">Elimina Contatto</string>
+ <string name="view_contact_details">Mostra dettagli contatto</string>
+ <string name="create">Crea</string>
+ <string name="contact_already_exists">Il contatto esiste già</string>
+ <string name="join">Entra</string>
+ <string name="conference_address">Indirizzo conferenza</string>
+ <string name="conference_address_example">room@conference.example.com</string>
+ <string name="save_as_bookmark">Salva come segnalibro</string>
+ <string name="delete_bookmark">Elimina segnalibro</string>
+ <string name="bookmark_already_exists">Questo segnalibro esiste già</string>
+ <string name="you">Tu</string>
+ <string name="action_edit_subject">Modifica soggetto conferenza</string>
+ <string name="conference_not_found">Conferenza non trovata</string>
+ <string name="leave">Abbandona</string>
+ <string name="contact_added_you">Il contatto ti ha aggiunto alla sua lista contatti</string>
+ <string name="add_back">Add back</string>
+ <string name="contact_has_read_up_to_this_point">%s ha letto fino a questo punto</string>
+ <string name="publish">Pubblica</string>
+ <string name="touch_to_choose_picture">Tocca l'avatar per selezionare l'immagine dalla gallaria</string>
+ <string name="publish_avatar_explanation">Nota bene: tutti i contatti sottoscritti agli aggiornamenti della tua presenza avranno il permesso di vedere questa immagine.</string>
+ <string name="publishing">Pubblicazione&#8230;</string>
+ <string name="error_publish_avatar_server_reject">Il server ha rifiutato la tua pubblicazione</string>
+ <string name="error_publish_avatar_converting">Qualcosa è andato storto durante la conversione della tua immagine</string>
+ <string name="error_saving_avatar">Impossibile salvare l'avatar sulla memoria interna</string>
+ <string name="or_long_press_for_default">(O premi a lungo per ripristinare le impostazioni di default)</string>
+ <string name="error_publish_avatar_no_server_support">Il tuo server non supporta la pubblicazione degli avatar</string>
+ <string name="private_message">sussurrato</string>
+ <string name="private_message_to">a %s</string>
+ <string name="send_private_message_to">Invia messaggio privato a %s</string>
+ <string name="connect">Connetti</string>
+ <string name="account_already_exists">Questo utente esiste già</string>
+ <string name="next">Successivo</string>
+ <string name="server_info_session_established">Sessione corrente stabilita</string>
+ <string name="additional_information">Informazioni Aggiuntive</string>
+ <string name="skip">Salta</string>
+ <string name="disable_notifications">Disabilita le notifiche</string>
+ <string name="disable_notifications_for_this_conversation">Disabilita le notifiche per questa conversazione</string>
+ <string name="notifications_disabled">Le notifiche sono disabilitate</string>
+ <string name="enable">Abilita</string>
+ <string name="conference_requires_password">La conferenza richiede una password</string>
+ <string name="enter_password">Inserisci la password</string>
+ <string name="missing_presence_updates">Aggiornamenti della presenza del contatto mancanti</string>
+ <string name="request_presence_updates">Richiedi gli aggiornamenti della presenza dal tuo contatto.\n\n<small>Questo verrà usato per determinare quali client sta usando il tuo contatto.</small></string>
+ <string name="request_now">Rechiedi adesso</string>
+ <string name="delete_fingerprint">Elimina Impronta</string>
+ <string name="sure_delete_fingerprint">Sei sicuro di voler eliminare questa impronta?</string>
+ <string name="ignore">Ignora</string>
+ <string name="without_mutual_presence_updates"><b>Attenzione:</b> Inviando questo messaggio senza aggiornamenti della presenza reciproci potrebbe causare problemi inaspettati.\n\n<small>Vai nei dettagli del contatto per verificare le tue sottoscrizioni alla presenza.</small></string>
+ <string name="pref_encryption_settings">Impostazioni di cifratura</string>
+ <string name="pref_force_encryption">Forza cifratura end-to-end</string>
+ <string name="pref_force_encryption_summary">Manda sempre messaggi cifrati (ad eccezione delle conferenze)</string>
+ <string name="pref_dont_save_encrypted">Non salvare i messaggi cifrati</string>
+ <string name="pref_dont_save_encrypted_summary">Attenzione: Questo potrebbe comportare la perdita di messaggi</string>
+ <string name="pref_expert_options">Opzioni da Esperto</string>
+ <string name="pref_expert_options_summary">Fai attenzione con queste impostazioni</string>
+ <string name="pref_use_larger_font">Aumenta la dimensione dei font</string>
+ <string name="pref_use_larger_font_summary">Usa font più grandi in tutta l'app</string>
+ <string name="pref_use_send_button_to_indicate_status">Il pulsante di invio indica lo stato</string>
+ <string name="pref_use_send_button_to_indicate_status_summary">Colora il pulsante di invio per indicare lo stato di un contatto</string>
+
+</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9f3992f2..2aa26b0b 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1,44 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="next">Далее</string>
- <string name="publish_avatar_explanation">Пожалуйста, обратите внимание, что этот аватар смогут увидеть все ваши подписчики</string>
- <string name="server_info_unavailable">недоступен</string>
- <string name="mgmt_account_publish_pgp">Анонсировать OpenPGP ключ</string>
- <string name="additional_information">Дополнительная информация</string>
- <string name="server_info_pep">XEP-0163: PEP (Аватары)</string>
- <string name="skip">Пропустить</string>
- <string name="problem_connecting_to_account">Не удается подключиться к аккаунту</string>
- <string name="problem_connecting_to_accounts">Не удается подключиться к аккаунтам</string>
- <string name="account_status_connecting">Соединение\u2026</string>
- <string name="account_status_no_internet">Нет подключения к сети</string>
- <string name="connect">Подключиться</string>
- <string name="account_already_exists">Эта учетная запись уже существует</string>
- <string name="private_message_to">отправить %s</string>
- <string name="send_private_message_to">Отправить личное сообщение для %s</string>
- <string name="touch_to_choose_picture">Нажмите на аватар, чтобы выбрать новую фотографию из галереи</string>
- <string name="mgmt_account_publish_avatar">Разместить аватар</string>
- <string name="error_publish_avatar_server_reject">Сервер не смог разместить аватар</string>
- <string name="error_publish_avatar_converting">В процессе преобразования фотографии возникла ошибка</string>
- <string name="error_publish_avatar_no_server_support">Ваш сервер не поддерживает публикацию аватаров</string>
- <string name="publishing">Установка&#8230;</string>
- <string name="error_saving_avatar">Не удалось сохранить аватар</string>
- <string name="server_info_session_established">Текущий сеанс установлен</string>
- <string name="or_long_press_for_default">(Или долгое нажатие, чтобы вернуть значения по умолчанию)</string>
- <string name="server_info_available">доступен</string>
- <string name="pref_general">Общие</string>
- <string name="invite_contact">Пригласить собеседника</string>
- <string name="you">Вы</string>
- <string name="conference_not_found">Конференция не найдена</string>
- <string name="pref_accept_files">Принимать файлы</string>
- <string name="pref_accept_files_summary">Автоматический прием файлов&#8230;</string>
- <string name="title_activity_choose_contact">Выберите собеседника</string>
- <string name="contact_added_you">Собеседник добавил вас в контакт лист</string>
- <string name="remove_bookmark_text">Вы хотели бы удалить %s из закладок? Беседы связанные с данной закладкой не будут удалены.</string>
- <string name="action_edit_subject">Редактировать тему конференции</string>
- <string name="leave">Покинуть</string>
- <string name="add_back">Добавить в ответ</string>
- <string name="contact_has_read_up_to_this_point">%s видела сообщения до этого момента</string>
<string name="app_name">Conversations</string>
<string name="action_settings">Настройки</string>
<string name="action_add">Новая беседа</string>
@@ -58,6 +20,7 @@
<string name="title_activity_conversations">Conversations</string>
<string name="title_activity_sharewith">Поделиться</string>
<string name="title_activity_start_conversation">Начать беседу</string>
+ <string name="title_activity_choose_contact">Выберите собеседника</string>
<string name="just_now">только что</string>
<string name="minute_ago">1 минуту назад</string>
<string name="minutes_ago">%d мин. назад</string>
@@ -71,9 +34,11 @@
<string name="participant">Участник</string>
<string name="visitor">Посетитель</string>
<string name="remove_contact_text">Вы хотите удалить %s из своего списка? Беседы, связанные с этим аккаунтом будут сохранены.</string>
+ <string name="remove_bookmark_text">Вы хотите удалить %s из избранного? Беседы, связанные с данной закладкой будут сохранены</string>
<string name="register_account">Создать новый аккаунт на сервере</string>
<string name="share_with">Поделиться с</string>
<string name="start_conversation">Начать беседу</string>
+ <string name="invite_contact">Пригласить собеседника</string>
<string name="contacts">Контакты</string>
<string name="cancel">Отмена</string>
<string name="add">Добавить</string>
@@ -85,6 +50,8 @@
<string name="crash_report_message">Отправляя отчеты об ошибках, вы помогаете исправить и улучшить программу, поддерживая дальнейшее развитие программы\n<b>Предупреждение:</b>Отчет об ошибке будет отправлен разработчику, используя ваш аккаунт XMPP.</string>
<string name="send_now">Отправить сейчас</string>
<string name="send_never">Больше не спрашивать</string>
+ <string name="problem_connecting_to_account">Не удается подключиться к аккаунту</string>
+ <string name="problem_connecting_to_accounts">Не удается подключиться к аккаунтам</string>
<string name="touch_to_fix">Нажмите здесь, чтобы настроить свои аккаунты</string>
<string name="attach_file">Прикрепить файл</string>
<string name="not_in_roster">Контакт не находится в вашем списке. Хотите добавить его?</string>
@@ -120,8 +87,11 @@
<string name="encrypted_message_received"><i>Зашифрованное сообщение получено. Нажмите здесь, чтобы расшифровать и посмотреть сообщение.</i></string>
<string name="encrypted_image_received"><i>Зашифрованное изображение получено. Нажмите здесь, чтобы расшифровать и посмотреть изображение.</i></string>
<string name="image_file"><i>Изображение получено. Нажмите здесь, чтобы посмотреть.</i></string>
+ <string name="pref_general">Общие</string>
<string name="pref_xmpp_resource">Название ресурса</string>
<string name="pref_xmpp_resource_summary">Имя которым Conversations идентифицирует себя</string>
+ <string name="pref_accept_files">Принимать файлы</string>
+ <string name="pref_accept_files_summary">Автоматический прием файлов&#8230;</string>
<string name="pref_notification_settings">Настройки Уведомлений</string>
<string name="pref_notifications">Уведомление</string>
<string name="pref_notifications_summary">Использовать звуковое уведомление когда приходят новые сообщения</string>
@@ -138,6 +108,7 @@
<string name="pref_never_send_crash_summary">Отправляя отчеты об ошибках, вы помогаете исправить и улучшить Conversations, поддерживая дальнейшее развитие программы</string>
<string name="pref_confirm_messages">Отчеты о получении</string>
<string name="pref_confirm_messages_summary">Разрешить уведомлять отправителя, когда вы получили и прочитали сообщение</string>
+ <string name="pref_ui_options">Параметры интерфейса</string>
<string name="openpgp_error">Возникла ошибка в OpenKeychain</string>
<string name="error_decrypting_file">Ошибка расшифровки файла</string>
<string name="accept">Принять</string>
@@ -162,8 +133,10 @@
<string name="account_status_disabled">Временно отключен</string>
<string name="account_status_online">В сети</string>
<string name="account_status_offline">Не в сети</string>
+ <string name="account_status_connecting">Соединение\u2026</string>
<string name="account_status_unauthorized">Неавторизован</string>
<string name="account_status_not_found">Сервер не найден</string>
+ <string name="account_status_no_internet">Нет подключения к сети</string>
<string name="account_status_regis_fail">Регистрация не удалась</string>
<string name="account_status_regis_conflict">Имя пользователя уже используется</string>
<string name="account_status_regis_success">Регистрация завершена</string>
@@ -174,6 +147,8 @@
<string name="mgmt_account_edit">Редактировать аккаунт</string>
<string name="mgmt_account_delete">Удалить</string>
<string name="mgmt_account_disable">Отключить</string>
+ <string name="mgmt_account_publish_avatar">Разместить аватар</string>
+ <string name="mgmt_account_publish_pgp">Анонсировать OpenPGP ключ</string>
<string name="mgmt_account_enable">Включить</string>
<string name="mgmt_account_are_you_sure">Вы уверены?</string>
<string name="mgmt_account_delete_confirm_text">Если вы удалите свой аккаунт, вся ваша история будет потеряна</string>
@@ -198,6 +173,9 @@
<string name="muc_details_other_members">Другие участники</string>
<string name="server_info_carbon_messages">Дублирование сообщений</string>
<string name="server_info_stream_management">Управление потоками</string>
+ <string name="server_info_pep">XEP-0163: PEP (Аватары)</string>
+ <string name="server_info_available">доступен</string>
+ <string name="server_info_unavailable">недоступен</string>
<string name="missing_public_keys">Отсутствие анонсирования открытых ключей</string>
<string name="last_seen_now">Присутствие: только что</string>
<string name="last_seen_min">Присутствие: 1 минуту назад</string>
@@ -229,6 +207,54 @@
<string name="save_as_bookmark">Сохранить закладку</string>
<string name="delete_bookmark">Удалить закладку</string>
<string name="bookmark_already_exists">Такая закладка уже существует</string>
- <string name="pref_ui_options">Параметры интерфейса</string>
+ <string name="you">Вы</string>
+ <string name="action_edit_subject">Редактировать тему конференции</string>
+ <string name="conference_not_found">Конференция не найдена</string>
+ <string name="leave">Покинуть</string>
+ <string name="contact_added_you">Собеседник добавил вас в список контактов</string>
+ <string name="add_back">Добавить в ответ</string>
+ <string name="contact_has_read_up_to_this_point">%s прочит. сообщ. до этого момента</string>
+ <string name="publish">Опубликовать</string>
+ <string name="touch_to_choose_picture">Нажмите на аватар, чтобы выбрать новую фотографию из галереи</string>
+ <string name="publish_avatar_explanation">Пожалуйста, обратите внимание, что этот аватар смогут увидеть все ваши подписчики</string>
+ <string name="publishing">Установка&#8230;</string>
+ <string name="error_publish_avatar_server_reject">Сервер отклонил размещение аватара</string>
+ <string name="error_publish_avatar_converting">В процессе преобразования фотографии возникла ошибка</string>
+ <string name="error_saving_avatar">Не удалось сохранить аватар</string>
+ <string name="or_long_press_for_default">(Или долгое прикосновение, чтобы вернуть значения по умолчанию)</string>
+ <string name="error_publish_avatar_no_server_support">Ваш сервер не поддерживает публикацию аватаров</string>
+ <string name="private_message">Отправить личное сообщение для %s</string>
+ <string name="private_message_to">отправить %s</string>
+ <string name="send_private_message_to">Отправить личное сообщение для %s</string>
+ <string name="connect">Подключиться</string>
+ <string name="account_already_exists">Эта учетная запись уже существует</string>
+ <string name="next">Далее</string>
+ <string name="server_info_session_established">Текущий сеанс установлен</string>
+ <string name="additional_information">Дополнительная информация</string>
+ <string name="skip">Пропустить</string>
+ <string name="disable_notifications">Отключить уведомления</string>
+ <string name="disable_notifications_for_this_conversation">Отключить уведомления для текущей беседы</string>
+ <string name="notifications_disabled">Уведомления отключены</string>
+ <string name="enable">Включить</string>
+ <string name="conference_requires_password">Конференция требует авторизации</string>
+ <string name="enter_password">Введите пароль</string>
+ <string name="missing_presence_updates">Обновления присутствия недоступны</string>
+ <string name="request_presence_updates">Пожалуйста, прежде запросите обновления присутствия у вашего собеседника.\n\n<small>Эта информация будет использоваться для определения того, каким клиентом(ами) пользуетя ваш собеседник.</small></string>
+ <string name="request_now">Запросить сейчас</string>
+ <string name="delete_fingerprint">Удалить Контрольную Сумму</string>
+ <string name="sure_delete_fingerprint">Вы уверены, что хотите удалить данную контрольную сумму?</string>
+ <string name="ignore">Отменить</string>
+ <string name="without_mutual_presence_updates"><b>Внимание:</b> Если обновления присутствия не включены на обеих сторонах, это может привести к возникновению неожиданных проблемам.\n\n<small>Уточните сведения о контакте, проверив настройки обновлений присутствия.</small></string>
+ <string name="pref_encryption_settings">Настройки шифрования</string>
+ <string name="pref_force_encryption">Обязательное сквозное шифрование</string>
+ <string name="pref_force_encryption_summary">Всегда отправлять сообщения зашифрованными (за исключением конференций)</string>
+ <string name="pref_dont_save_encrypted">Не сохранять зашифрованные сообщения</string>
+ <string name="pref_dont_save_encrypted_summary">Внимание: Это может привести к потере сообщений</string>
+ <string name="pref_expert_options">Расширенные настройки</string>
+ <string name="pref_expert_options_summary">Пожалуйста, будьте осторожны с данными настройками</string>
+ <string name="pref_use_larger_font">Увеличить размер шрифта</string>
+ <string name="pref_use_larger_font_summary">Установите больший размер шрифта по всей программе</string>
+ <string name="pref_use_send_button_to_indicate_status">Использовать кнопку-индикатор</string>
+ <string name="pref_use_send_button_to_indicate_status_summary">Раскрасить кнопку отправить, указывая текущий статус собеседника</string>
-</resources> \ No newline at end of file
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 75eb3b4d..c3e465ac 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -247,7 +247,7 @@
<string name="without_mutual_presence_updates"><b>Warning:</b> Sending this without mutual presence updates could cause unexpected problems.\n\n<small>Go to contact details to verify your presence subscriptions.</small></string>
<string name="pref_encryption_settings">Encryption settings</string>
<string name="pref_force_encryption">Force end-to-end encryption</string>
- <string name="pref_force_encryption_summary">Always send messages encrypted (execpt for conferences)</string>
+ <string name="pref_force_encryption_summary">Always send messages encrypted (except for conferences)</string>
<string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
<string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
<string name="pref_expert_options">Expert options</string>
@@ -255,6 +255,6 @@
<string name="pref_use_larger_font">Increase font size</string>
<string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>
<string name="pref_use_send_button_to_indicate_status">Send button indicates status</string>
- <string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate a contacs status</string>
+ <string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string>
-</resources> \ No newline at end of file
+</resources>
diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java
index 54c370ef..56248234 100644
--- a/src/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/eu/siacs/conversations/utils/UIHelper.java
@@ -353,14 +353,15 @@ public class UIHelper {
Pattern highlight = generateNickHighlightPattern(nick);
Matcher m = highlight.matcher(currentCon.getLatestMessage()
.getBody());
- notify = m.find();
+ notify = m.find()
+ || (currentCon.getLatestMessage().getType() == Message.TYPE_PRIVATE);
}
List<Conversation> unread = new ArrayList<Conversation>();
for (Conversation conversation : conversations) {
if (conversation.getMode() == Conversation.MODE_MULTI) {
if ((!conversation.isRead())
- && ((wasHighlighted(conversation) || (alwaysNotify)))) {
+ && ((wasHighlightedOrPrivate(conversation) || (alwaysNotify)))) {
unread.add(conversation);
}
} else {
@@ -466,7 +467,7 @@ public class UIHelper {
}
}
- private static boolean wasHighlighted(Conversation conversation) {
+ private static boolean wasHighlightedOrPrivate(Conversation conversation) {
List<Message> messages = conversation.getMessages();
String nick = conversation.getMucOptions().getActualNick();
Pattern highlight = generateNickHighlightPattern(nick);
@@ -475,7 +476,8 @@ public class UIHelper {
break;
} else {
Matcher m = highlight.matcher(messages.get(i).getBody());
- if (m.find()) {
+ if (m.find()
+ || messages.get(i).getType() == Message.TYPE_PRIVATE) {
return true;
}
}