projects / pub / Android / ownCloud.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 296df1b)
OC-2966: Change name of the action from 'Share' to 'Send'
authormasensio <masensio@solidgear.es>
Fri, 14 Feb 2014 11:13:58 +0000 (12:13 +0100)
committermasensio <masensio@solidgear.es>
Fri, 14 Feb 2014 11:13:58 +0000 (12:13 +0100)
owncloud-android-library patch | blob | blame | history
res/menu/file_actions_menu.xml patch | blob | blame | history
res/values-de-rCH/strings.xml patch | blob | blame | history
res/values-de-rDE/strings.xml patch | blob | blame | history
res/values-de/strings.xml patch | blob | blame | history
res/values/strings.xml patch | blob | blame | history
src/com/owncloud/android/ui/fragment/OCFileListFragment.java patch | blob | blame | history
src/com/owncloud/android/ui/preview/PreviewImageFragment.java patch | blob | blame | history

diff --git a/owncloud-android-library b/owncloud-android-library
index 815fbba..985b005 160000 (submodule)
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit 815fbba48677e40bff2c3c114c4ce8dd1e35bc17
+Subproject commit 985b005995429f52446dc5bb66abd236595e627e
diff --git a/res/menu/file_actions_menu.xml b/res/menu/file_actions_menu.xml
index e944390..73adda7 100644 (file)
--- a/res/menu/file_actions_menu.xml
+++ b/res/menu/file_actions_menu.xml
@@ -28,6 +28,6 @@
        <item   android:id="@+id/action_rename_file"                    android:title="@string/common_rename"                           android:icon="@android:drawable/ic_menu_set_as"                                 android:orderInCategory="1" />
     <item      android:id="@+id/action_remove_file"                    android:title="@string/common_remove"                           android:icon="@android:drawable/ic_menu_delete"                                 android:orderInCategory="1" />
     <item      android:id="@+id/action_see_details"                    android:title="@string/actionbar_see_details"           android:icon="@android:drawable/ic_menu_info_details"                   android:orderInCategory="1" />
        <item   android:id="@+id/action_rename_file"                    android:title="@string/common_rename"                           android:icon="@android:drawable/ic_menu_set_as"                                 android:orderInCategory="1" />
     <item      android:id="@+id/action_remove_file"                    android:title="@string/common_remove"                           android:icon="@android:drawable/ic_menu_delete"                                 android:orderInCategory="1" />
     <item      android:id="@+id/action_see_details"                    android:title="@string/actionbar_see_details"           android:icon="@android:drawable/ic_menu_info_details"                   android:orderInCategory="1" />
-    <item      android:id="@+id/action_share_file"                             android:title="@string/actionbar_share_file"            android:icon="@android:drawable/ic_menu_info_details"                   android:orderInCategory="1" />
+    <item      android:id="@+id/action_send_file"                              android:title="@string/actionbar_send_file"                     android:icon="@android:drawable/ic_menu_info_details"                   android:orderInCategory="1" />
     
 </menu>
     
 </menu>
diff --git a/res/values-de-rCH/strings.xml b/res/values-de-rCH/strings.xml
index c5d7ce4..f09e75c 100644 (file)
--- a/res/values-de-rCH/strings.xml
+++ b/res/values-de-rCH/strings.xml
@@ -10,7 +10,7 @@
   <string name="actionbar_mkdir">Ordner anlegen</string>
   <string name="actionbar_settings">Einstellungen</string>
   <string name="actionbar_see_details">Details</string>
   <string name="actionbar_mkdir">Ordner anlegen</string>
   <string name="actionbar_settings">Einstellungen</string>
   <string name="actionbar_see_details">Details</string>
-  <string name="actionbar_share_file">Teile Datei</string>
+  <string name="actionbar_send_file">Datei Senden</string>
   <string name="prefs_category_general">Allgemein</string>
   <string name="prefs_category_more">Mehr</string>
   <string name="prefs_accounts">Konten</string>
   <string name="prefs_category_general">Allgemein</string>
   <string name="prefs_category_more">Mehr</string>
   <string name="prefs_accounts">Konten</string>
diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml
index 97a67e9..64b43cb 100644 (file)
--- a/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@@ -10,7 +10,7 @@
   <string name="actionbar_mkdir">Ordner anlegen</string>
   <string name="actionbar_settings">Einstellungen</string>
   <string name="actionbar_see_details">Details</string>
   <string name="actionbar_mkdir">Ordner anlegen</string>
   <string name="actionbar_settings">Einstellungen</string>
   <string name="actionbar_see_details">Details</string>
-  <string name="actionbar_share_file">Teile Datei</string>
+  <string name="actionbar_send_file">Datei senden</string>
   <string name="prefs_category_general">Allgemein</string>
   <string name="prefs_category_more">Mehr</string>
   <string name="prefs_accounts">Konten</string>
   <string name="prefs_category_general">Allgemein</string>
   <string name="prefs_category_more">Mehr</string>
   <string name="prefs_accounts">Konten</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 06f49d4..95d370d 100644 (file)
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -10,7 +10,7 @@
   <string name="actionbar_mkdir">Ordner anlegen</string>
   <string name="actionbar_settings">Einstellungen</string>
   <string name="actionbar_see_details">Details</string>
   <string name="actionbar_mkdir">Ordner anlegen</string>
   <string name="actionbar_settings">Einstellungen</string>
   <string name="actionbar_see_details">Details</string>
-  <string name="actionbar_share_file">Teile Datei</string>
+  <string name="actionbar_send_file">Datei Senden</string>
   <string name="prefs_category_general">Allgemein</string>
   <string name="prefs_category_more">Mehr</string>
   <string name="prefs_accounts">Konten</string>
   <string name="prefs_category_general">Allgemein</string>
   <string name="prefs_category_more">Mehr</string>
   <string name="prefs_accounts">Konten</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 028b4f4..cc88433 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11,7 +11,7 @@
     <string name="actionbar_mkdir">Create directory</string>
     <string name="actionbar_settings">Settings</string>
     <string name="actionbar_see_details">Details</string>
     <string name="actionbar_mkdir">Create directory</string>
     <string name="actionbar_settings">Settings</string>
     <string name="actionbar_see_details">Details</string>
-    <string name="actionbar_share_file">Share</string>
+    <string name="actionbar_send_file">Send</string>
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">More</string>
     <string name="prefs_accounts">Accounts</string>
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">More</string>
     <string name="prefs_accounts">Accounts</string>
diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 301bf93..ad4d2bc 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -351,7 +351,7 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
                 ((FileFragment.ContainerActivity)getActivity()).showDetails(mTargetFile);
                 return true;
             }
                 ((FileFragment.ContainerActivity)getActivity()).showDetails(mTargetFile);
                 return true;
             }
-            case R.id.action_share_file: {
+            case R.id.action_send_file: {
                 Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
                 // set MimeType
                 sharingIntent.setType(mTargetFile.getMimetype());
                 Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
                 // set MimeType
                 sharingIntent.setType(mTargetFile.getMimetype());
diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index 636ce18..dcf5ea1 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@ -265,7 +265,7 @@ public class PreviewImageFragment extends FileFragment implements   OnRemoteOper
                 seeDetails();
                 return true;
             }
                 seeDetails();
                 return true;
             }
-            case R.id.action_share_file: {
+            case R.id.action_send_file: {
                 shareFile();
                 return true;
             }
                 shareFile();
                 return true;
             }
ownCloud Android App