aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values-it/strings.xml
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-10-16 21:48:33 +0200
committerChristian S <christian@pix-art.de>2015-10-16 21:48:33 +0200
commit662b9e60da4605d954c50d80f12e348723b5c61e (patch)
tree1588b44c16ef0aa7ffe26be9f93feb19b91bf906 /src/main/res/values-it/strings.xml
parent98c15fbc50f5f08a569355742e4d22b739151405 (diff)
parentc1716a35e359cf9b2e8d1b75cc4f0bac413bee5b (diff)
Merge remote-tracking branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/values-it/strings.xml')
-rw-r--r--src/main/res/values-it/strings.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 210e6e8ae..31d4a29ef 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -74,7 +74,6 @@
<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_otr_message">Messaggio OTR</string>
<string name="send_pgp_message">Messaggio OpenPGP</string>