aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values-id
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-id
parent98c15fbc50f5f08a569355742e4d22b739151405 (diff)
parentc1716a35e359cf9b2e8d1b75cc4f0bac413bee5b (diff)
Merge remote-tracking branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/values-id')
-rw-r--r--src/main/res/values-id/strings.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index dde7c88d3..6c22c1323 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -74,7 +74,6 @@
<string name="clear_conversation_history">Hapus Riwayat Percakapan</string>
<string name="clear_histor_msg">Apakah Anda ingin menghapus semua pesan dalam Percakapan ini\n\n<b>Peringatan:</b>ini tidak akan mempengaruhi pesan yang disimpan pada perangkat atau server lain.</string>
<string name="delete_messages">Hapus pesan</string>
- <string name="also_end_conversation">Akhiri percakapan setelahnya</string>
<string name="choose_presence">Pilih kehadiran untuk kontak</string>
<string name="send_otr_message">Kirim pesan terenskripsi OTR</string>
<string name="send_pgp_message">Kirim pesan terenskripsi OpenPGP</string>