diff options
author | Christian S <christian@pix-art.de> | 2016-04-15 22:02:52 +0200 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-04-15 22:02:52 +0200 |
commit | 115a3a3396ac608a1ba855ab72a2ed5ecf28dc29 (patch) | |
tree | b5862a7ffaa9bdd15661f636669778ace05b6b7c /src/main/res | |
parent | 26850fe48b1c772cb078276c3e8b4287689d17b6 (diff) | |
parent | e9494af098e6d3dad4f0a5328ae7342664ce853c (diff) |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Diffstat (limited to 'src/main/res')
-rw-r--r-- | src/main/res/values/strings.xml | 5 | ||||
-rw-r--r-- | src/main/res/xml/preferences.xml | 37 |
2 files changed, 27 insertions, 15 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 49ecbf89e..eb17fe863 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -104,6 +104,9 @@ <string name="pref_xmpp_resource_summary">The name this client identifies itself with</string> <string name="pref_accept_files">Accept files</string> <string name="pref_accept_files_summary">Automatically accept files smaller than…</string> + <string name="pref_attachments">Attachments</string> + <string name="pref_return_to_previous">Quick Sharing</string> + <string name="pref_return_to_previous_summary">Immediately return to previous activity instead of opening the conversation after sharing something</string> <string name="pref_notification_settings">Notification</string> <string name="pref_notifications">Notifications</string> <string name="pref_notifications_summary">Notify when a new message arrives</string> @@ -602,6 +605,8 @@ <string name="shared_image_with_x">Shared image with %s</string> <string name="no_storage_permission">Pix-Art Messenger needs access to external storage</string> <string name="shared_images_with_x">Shared images with %s</string> + <string name="shared_text_with_x">Shared text with %s</string> + <string name="no_storage_permission">Pix-Art Messenger need access to external storage</string> <string name="sync_with_contacts">Synchronize with contacts</string> <string name="sync_with_contacts_long">Pix-Art Messenger wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nPix-Art Messenger will only read your contacts and match them locally without uploading them to your server.\n\nYou will now be asked to grant permission to access your contacts.</string> <string name="certificate_information">Certificate Information</string> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index d8aaa00a7..5da8217eb 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -8,20 +8,6 @@ android:summary="@string/pref_grant_presence_updates_summary" android:title="@string/pref_grant_presence_updates"/> - <ListPreference - android:defaultValue="1048576" - android:entries="@array/filesizes" - android:entryValues="@array/filesizes_values" - android:key="auto_accept_file_size" - android:summary="@string/pref_accept_files_summary" - android:title="@string/pref_accept_files"/> - <ListPreference - android:defaultValue="auto" - android:entries="@array/picture_compression_entries" - android:entryValues="@array/picture_compression_values" - android:key="picture_compression" - android:summary="@string/pref_picture_compression_summary" - android:title="@string/pref_picture_compression"/> <CheckBoxPreference android:defaultValue="true" android:key="confirm_messages" @@ -85,7 +71,28 @@ android:ringtoneType="notification" android:summary="@string/pref_sound_summary" android:title="@string/pref_sound"/> - + </PreferenceCategory> + <PreferenceCategory + android:title="@string/pref_attachments"> + <ListPreference + android:defaultValue="1048576" + android:entries="@array/filesizes" + android:entryValues="@array/filesizes_values" + android:key="auto_accept_file_size" + android:summary="@string/pref_accept_files_summary" + android:title="@string/pref_accept_files"/> + <ListPreference + android:defaultValue="auto" + android:entries="@array/picture_compression_entries" + android:entryValues="@array/picture_compression_values" + android:key="picture_compression" + android:summary="@string/pref_picture_compression_summary" + android:title="@string/pref_picture_compression"/> + <CheckBoxPreference + android:defaultValue="false" + android:key="return_to_previous" + android:title="@string/pref_return_to_previous" + android:summary="@string/pref_return_to_previous_summary"/> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_ui_options"> <CheckBoxPreference |