aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorkruks23 <scardenas@openmailbox.org>2014-05-18 19:10:52 +0200
committerkruks23 <scardenas@openmailbox.org>2014-05-18 19:10:52 +0200
commite27bb52575df02d21aa685705f11fcdf7f74889c (patch)
tree717985d47b4dd9f98112618dba960ed5f078eb1e /res
parentb79ff3af6c8f5de936eff26ee6235bcb5ca23b30 (diff)
parent590e2403ab6d9d8f3b0158bf5218802216e9cd50 (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'res')
-rw-r--r--res/menu/attachment_choices.xml3
-rw-r--r--res/values-de/strings.xml4
-rw-r--r--res/values/strings.xml4
3 files changed, 10 insertions, 1 deletions
diff --git a/res/menu/attachment_choices.xml b/res/menu/attachment_choices.xml
index 7e3ebbea..6a4f295a 100644
--- a/res/menu/attachment_choices.xml
+++ b/res/menu/attachment_choices.xml
@@ -9,5 +9,6 @@
android:title="@string/attach_take_picture"/>
<item
android:id="@+id/attach_record_voice"
- android:title="@string/attach_record_voice" />
+ android:title="@string/attach_record_voice"
+ android:visible="false"/>
</menu> \ No newline at end of file
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 88376842..292a81e8 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -164,5 +164,9 @@
<string name="mgmt_account_disable">Vorübergehend abschalten</string>
<string name="mgmt_account_enable">Anschalten</string>
<string name="attach_record_voice">Sprache aufzeichnen</string>
+ <string name="account_settings">Kontoeinstellungen</string>
+ <string name="save">Speichern</string>
+ <string name="passwords_do_not_match">Passwörter stimmen nicht überein</string>
+ <string name="invalid_jid">Ungültige Jabber ID</string>
</resources> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9841aa60..2b5c25f2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -164,5 +164,9 @@
<string name="mgmt_account_disable">Temporarily disable</string>
<string name="mgmt_account_enable">Enable</string>
<string name="attach_record_voice">Record voice</string>
+ <string name="account_settings">Account Settings</string>
+ <string name="save">Save</string>
+ <string name="passwords_do_not_match">Passwords do not match</string>
+ <string name="invalid_jid">This is not a valid Jabber ID</string>
</resources> \ No newline at end of file