[Android] res: translate the equivalent of sdcard

Edward Wang git at videolan.org
Mon Nov 26 22:59:46 CET 2012


vlc-ports/android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Mon Nov 26 16:59:36 2012 -0500| [fffb05c2197523d7eb8f92bb4fbeb698973edada] | committer: Edward Wang

res: translate the equivalent of sdcard

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=fffb05c2197523d7eb8f92bb4fbeb698973edada
---

 vlc-android/res/values/strings.xml                         |    2 +-
 vlc-android/src/org/videolan/vlc/gui/BrowserAdapter.java   |    2 +-
 vlc-android/src/org/videolan/vlc/gui/DirectoryAdapter.java |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vlc-android/res/values/strings.xml b/vlc-android/res/values/strings.xml
index 1f69ecd..93e98a6 100644
--- a/vlc-android/res/values/strings.xml
+++ b/vlc-android/res/values/strings.xml
@@ -55,6 +55,7 @@
         <item quantity="other">%d subfolders</item>
     </plurals>
 
+    <string name="internal_memory">Internal memory</string>
     <string name="parent_folder">Up to parent folder</string>
     <string name="audio">Audio</string>
     <string name="video">Video</string>
@@ -123,7 +124,6 @@
     <string name="load_1_period" translatable="false">.</string>
     <string name="load_2_period" translatable="false">..</string>
     <string name="load_3_period" translatable="false">...</string>
-    <string name="sdcard">sdcard</string>
 
     <!-- About -->
     <string name="app_name_full">VLC for Android™</string>
diff --git a/vlc-android/src/org/videolan/vlc/gui/BrowserAdapter.java b/vlc-android/src/org/videolan/vlc/gui/BrowserAdapter.java
index 79c398b..4420728 100644
--- a/vlc-android/src/org/videolan/vlc/gui/BrowserAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/BrowserAdapter.java
@@ -140,7 +140,7 @@ public class BrowserAdapter extends ArrayAdapter<File>
         if (android.os.Build.VERSION.SDK_INT >= 17) {
             // Show "sdcard" for the user's folder when running in multi-user
             if (file.getAbsolutePath().equals(Environment.getExternalStorageDirectory().getPath())) {
-                return VLCApplication.getAppContext().getString(R.string.sdcard);
+                return VLCApplication.getAppContext().getString(R.string.internal_memory);
             }
         }
         return file.getName();
diff --git a/vlc-android/src/org/videolan/vlc/gui/DirectoryAdapter.java b/vlc-android/src/org/videolan/vlc/gui/DirectoryAdapter.java
index b6eb2cc..65cc8a0 100644
--- a/vlc-android/src/org/videolan/vlc/gui/DirectoryAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/DirectoryAdapter.java
@@ -400,7 +400,7 @@ public class DirectoryAdapter extends BaseAdapter {
         if (android.os.Build.VERSION.SDK_INT >= 17) {
             // Show "sdcard" for the user's folder when running in multi-user
             if (file.getAbsolutePath().equals(Environment.getExternalStorageDirectory().getPath())) {
-                return VLCApplication.getAppContext().getString(R.string.sdcard);
+                return VLCApplication.getAppContext().getString(R.string.internal_memory);
             }
         }
         return file.getName();



More information about the Android mailing list