diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-10-20 19:45:26 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-10-20 19:45:26 +0200 |
| commit | 59e861ee6904296cbe8dd43c4a29513c2e928981 (patch) | |
| tree | a3bf768814ece1c377caefca35bc535c758a47c5 /src/main/res | |
| parent | 2860088f0ea1cd5753756861c71cc7c118094f32 (diff) | |
| parent | 9ec29bb1dcf664fea606105b7e700641a4b44ae4 (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/message_sent.xml | 12 | ||||
| -rw-r--r-- | src/main/res/menu/message_context.xml | 4 | ||||
| -rw-r--r-- | src/main/res/values-de/strings.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 5 |
4 files changed, 22 insertions, 0 deletions
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index 0edbab51..30003309 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -103,6 +103,18 @@ android:gravity="center_vertical" android:src="@drawable/ic_received_indicator" /> </LinearLayout> + + <TextView + android:id="@+id/remote_file_status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:gravity="right" + android:text="" + android:textColor="@color/secondaryText" + android:textSize="?attr/TextSizeInfo" + android:visibility="gone" + android:textStyle="italic"/> </LinearLayout> </LinearLayout> diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml index 0c7d8eef..da7f0636 100644 --- a/src/main/res/menu/message_context.xml +++ b/src/main/res/menu/message_context.xml @@ -36,4 +36,8 @@ android:id="@+id/delete_file" android:title="@string/delete_x_file" android:visible="false"/> + <item + android:id="@+id/msg_ctx_menu_delete_remote_file" + android:title="@string/delete_remote_file_x" + android:visible="false"/> </menu>
\ No newline at end of file diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index b8729940..02a9c9ee 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -634,4 +634,5 @@ <string name="no_keys_just_confirm">Du vertraust diesem Kontakt bereits. Durch Auswählen von \"Fertig\" bestätigst du, dass %s Teil dieser Konferenz ist.</string> <string name="select_image_and_crop">Bild auswählen und zuschneiden</string> <string name="this_account_is_disabled">Du hast diesen Account deaktiviert</string> + <string name="cplus_are_you_sure">Bist du dir sicher?</string> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 77e4fc8c..16494044 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -674,4 +674,9 @@ <string name="security_error_invalid_file_access">Security error: Invalid file access</string> <string name="no_application_to_share_uri">No application found to share URI</string> <string name="share_uri_with">Share URI with…</string> + <string name="delete_remote_file_x">Delete remote file</string> + <string name="cplus_are_you_sure">Are you sure?</string> + <string name="remote_filestatus_delete_failed">Failed to delete remote file</string> + <string name="remote_filestatus_delete_success">Remote file deleted</string> + <string name="remote_filestatus_delete_inprogress">Deleting remote file...</string> </resources> |