From 730a5c644bbacea3189479ef067b3ebbd7dcffd6 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 24 Aug 2015 21:15:47 +0200
Subject: renamed plain text to unencrypted. fixes #1331

---
 src/main/res/values-it/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/res/values-it/strings.xml')

diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 4e61aca72..35acf7f09 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -76,7 +76,7 @@
   <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">Messaggio non cifrato</string>
+  <string name="send_unencrypted_message">Messaggio non cifrato</string>
   <string name="send_otr_message">Messaggio OTR</string>
   <string name="send_pgp_message">Messaggio OpenPGP</string>
   <string name="your_nick_has_been_changed">Il tuo nome utente è stato cambiato</string>
@@ -147,7 +147,7 @@
   <string name="account_status_regis_not_sup">Il Server non supporta la registrazione</string>
   <string name="account_status_security_error">Errore di sicurezza</string>
   <string name="account_status_incompatible_server">Server non compatibile</string>
-  <string name="encryption_choice_none">Testo semplice</string>
+  <string name="encryption_choice_unencrypted">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>
-- 
cgit v1.2.3


From 98e7d9c74ea6f3c3ae4243efa14b1655432c2a02 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 24 Aug 2015 21:24:48 +0200
Subject: pulled translations from transifex

---
 src/main/res/values-it/strings.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/main/res/values-it/strings.xml')

diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 35acf7f09..b20117bfc 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -76,7 +76,6 @@
   <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_unencrypted_message">Messaggio non cifrato</string>
   <string name="send_otr_message">Messaggio OTR</string>
   <string name="send_pgp_message">Messaggio OpenPGP</string>
   <string name="your_nick_has_been_changed">Il tuo nome utente è stato cambiato</string>
@@ -147,7 +146,6 @@
   <string name="account_status_regis_not_sup">Il Server non supporta la registrazione</string>
   <string name="account_status_security_error">Errore di sicurezza</string>
   <string name="account_status_incompatible_server">Server non compatibile</string>
-  <string name="encryption_choice_unencrypted">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>
-- 
cgit v1.2.3