From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 28 Jan 2014 09:15:23 +0000 (+0100)
Subject: Merge branch 'share_link_show_shared_files' into share_link__new_share
X-Git-Tag: oc-android-1.5.5~35^2~43^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c86d4d63cc4a00ebecb712da671e8f876ffcfeaa?hp=0fe14f74575a42238776d4daa871e72b4b77145d

Merge branch 'share_link_show_shared_files' into share_link__new_share
---

diff --git a/res/menu/file_actions_menu.xml b/res/menu/file_actions_menu.xml
index 1aa2823e..dcd451c4 100644
--- a/res/menu/file_actions_menu.xml
+++ b/res/menu/file_actions_menu.xml
@@ -19,7 +19,8 @@
 -->
 <menu 	xmlns:android="http://schemas.android.com/apk/res/android">
     
-	<item 	android:id="@+id/action_open_file_with"			android:title="@string/actionbar_open_with"			android:icon="@android:drawable/ic_menu_edit"					android:orderInCategory="1" />
+	<item 	android:id="@+id/action_share_file"				android:title="@string/action_share_file"			android:icon="@android:drawable/ic_menu_share"					android:orderInCategory="1" />
+    <item 	android:id="@+id/action_open_file_with"			android:title="@string/actionbar_open_with"			android:icon="@android:drawable/ic_menu_edit"					android:orderInCategory="1" />
 	<item 	android:id="@+id/action_download_file" 			android:title="@string/filedetails_download"		android:icon="@drawable/ic_action_download"						android:orderInCategory="1" />
     <item 	android:id="@+id/action_sync_file"				android:title="@string/filedetails_sync_file"		android:icon="@drawable/ic_action_refresh"						android:orderInCategory="1" />
 	<item 	android:id="@+id/action_cancel_download"		android:title="@string/common_cancel_download"	 	android:icon="@android:drawable/ic_menu_close_clear_cancel"		android:orderInCategory="1" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2c06bb82..7ae67dc1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -59,6 +59,7 @@
     <string name="filedetails_download">Download</string>
     <string name="filedetails_sync_file">Refresh file</string>
     <string name="filedetails_renamed_in_upload_msg">File was renamed to %1$s during upload</string>
+    <string name="action_share_file">Share link</string>
     <string name="common_yes">Yes</string>
     <string name="common_no">No</string>
     <string name="common_ok">OK</string>