aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/dialog_verify_otr.xml3
-rw-r--r--res/layout/edit_account_dialog.xml2
-rw-r--r--res/menu/attachment_choices.xml4
-rw-r--r--res/values-de/strings.xml3
-rw-r--r--res/values/strings.xml1
5 files changed, 7 insertions, 6 deletions
diff --git a/res/layout/dialog_verify_otr.xml b/res/layout/dialog_verify_otr.xml
index 41ce3b07..6dfe149d 100644
--- a/res/layout/dialog_verify_otr.xml
+++ b/res/layout/dialog_verify_otr.xml
@@ -20,7 +20,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
- android:text="julia@jabber.example.com"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
@@ -35,7 +34,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
- android:text="2674D6A0 0B1421B1 BFC42AEC C56F3719 672437D8"
android:textSize="14sp"
android:typeface="monospace"/>
<TextView
@@ -51,7 +49,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
- android:text="2674D6A0 0B1421B1 BFC42AEC C56F3719 672437D8"
android:textSize="14sp"
android:typeface="monospace"/>
</LinearLayout>
diff --git a/res/layout/edit_account_dialog.xml b/res/layout/edit_account_dialog.xml
index 0a86039d..a5733cfe 100644
--- a/res/layout/edit_account_dialog.xml
+++ b/res/layout/edit_account_dialog.xml
@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textEmailAddress"
- android:hint="username@jabber.example.com">
+ android:hint="username@example.com">
</EditText>
diff --git a/res/menu/attachment_choices.xml b/res/menu/attachment_choices.xml
index 84e777b6..7e3ebbea 100644
--- a/res/menu/attachment_choices.xml
+++ b/res/menu/attachment_choices.xml
@@ -7,5 +7,7 @@
<item
android:id="@+id/attach_take_picture"
android:title="@string/attach_take_picture"/>
-
+ <item
+ android:id="@+id/attach_record_voice"
+ android:title="@string/attach_record_voice" />
</menu> \ No newline at end of file
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 221e747d..88376842 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -4,7 +4,7 @@
<string name="app_name">Conversations</string>
<string name="action_settings">Einstellungen</string>
<string name="action_add">Neue Unterhaltung</string>
- <string name="action_accounts">Kontos verwalten</string>
+ <string name="action_accounts">Konten verwalten</string>
<string name="action_refresh">Kontaktliste neu laden</string>
<string name="action_end_conversation">Unterhaltung beenden</string>
<string name="action_contact_details">Kontaktdetails</string>
@@ -163,5 +163,6 @@
<string name="mgmt_account_delete">Löschen</string>
<string name="mgmt_account_disable">Vorübergehend abschalten</string>
<string name="mgmt_account_enable">Anschalten</string>
+ <string name="attach_record_voice">Sprache aufzeichnen</string>
</resources> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 040382f8..9841aa60 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -163,5 +163,6 @@
<string name="mgmt_account_delete">Delete</string>
<string name="mgmt_account_disable">Temporarily disable</string>
<string name="mgmt_account_enable">Enable</string>
+ <string name="attach_record_voice">Record voice</string>
</resources> \ No newline at end of file