diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/dialog_verify_otr.xml | 2 | ||||
| -rw-r--r-- | res/layout/fragment_conversation.xml | 2 | ||||
| -rw-r--r-- | res/values-de/arrays.xml | 7 | ||||
| -rw-r--r-- | res/values-de/strings.xml | 2 | ||||
| -rw-r--r-- | res/values-iw/arrays.xml (renamed from res/values-he/arrays.xml) | 0 | ||||
| -rw-r--r-- | res/values-iw/strings.xml (renamed from res/values-he/strings.xml) | 0 |
6 files changed, 11 insertions, 2 deletions
diff --git a/res/layout/dialog_verify_otr.xml b/res/layout/dialog_verify_otr.xml index 831f06ed..499ef6cd 100644 --- a/res/layout/dialog_verify_otr.xml +++ b/res/layout/dialog_verify_otr.xml @@ -11,7 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingTop="8dp" - android:text="Jabber ID" + android:text="@string/account_settings_jabber_id" android:textColor="@color/primarytext" android:textSize="?attr/TextSizeHeadline" /> diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml index 0f5f692e..f9aae10a 100644 --- a/res/layout/fragment_conversation.xml +++ b/res/layout/fragment_conversation.xml @@ -37,7 +37,7 @@ android:layout_toLeftOf="@+id/textSendButton" android:background="@color/primarybackground" android:ems="10" - android:imeOptions="flagNoExtractUi" + android:imeOptions="flagNoExtractUi|actionSend" android:inputType="textShortMessage|textMultiLine|textCapSentences" android:minHeight="48dp" android:minLines="1" diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml index e468f478..9b429c5a 100644 --- a/res/values-de/arrays.xml +++ b/res/values-de/arrays.xml @@ -20,5 +20,12 @@ <item>524288</item> <item>1048576</item> </string-array> + <string-array name="mute_options_descriptions"> + <item>30 Minuten</item> + <item>eine Stunde</item> + <item>2 Stunden</item> + <item>8 Stunden</item> + <item>bis auf Widerruf</item> + </string-array> </resources>
\ No newline at end of file diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 14397e16..0c230ec6 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -259,5 +259,7 @@ <string name="pref_use_send_button_to_indicate_status">Absende-Knopf zeigt Online-Status an</string> <string name="pref_use_send_button_to_indicate_status_summary">Absende-Knopf einfärben, um den Online-Status des Kontakts zu signalisieren</string> <string name="pref_expert_options_other">Sonstiges</string> + <string name="pref_conference_name">Konferenz-Name</string> + <string name="pref_conference_name_summary">Konferenz-Thema statt Raum-JID als Name verwenden</string> </resources> diff --git a/res/values-he/arrays.xml b/res/values-iw/arrays.xml index 28768d6c..28768d6c 100644 --- a/res/values-he/arrays.xml +++ b/res/values-iw/arrays.xml diff --git a/res/values-he/strings.xml b/res/values-iw/strings.xml index fd8eaa0b..fd8eaa0b 100644 --- a/res/values-he/strings.xml +++ b/res/values-iw/strings.xml |