[Android] Translate more of the sidebar

[Edward Wang]

android | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Sat Aug 11 20:22:11 2012 -0400| [010705ea38aca1d5ef0ad4eacda85b0e05d6df70] | committer: Edward Wang

Translate more of the sidebar

> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=010705ea38aca1d5ef0ad4eacda85b0e05d6df70
---

 vlc-android/res/values-fr/strings.xml                    |    5 ++++-
 vlc-android/res/values-zh-rCN/strings.xml                |    7 ++++---
 vlc-android/res/values/strings.xml                       |    3 ++-
 vlc-android/src/org/videolan/vlc/gui/SearchActivity.java |    2 +-
 vlc-android/src/org/videolan/vlc/gui/SidebarAdapter.java |    6 +++---
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/vlc-android/res/values-fr/strings.xml b/vlc-android/res/values-fr/strings.xml
index 12b5fd2..2bf7ac1 100644
--- a/vlc-android/res/values-fr/strings.xml
+++ b/vlc-android/res/values-fr/strings.xml
@@ -10,7 +10,7 @@
     <string name="sortby_name">Nom</string>
     <string name="sortby_length">Durée</string>
     <string name="searchable_hint">Recherche…</string>
-    <string name="search_history">Historique</string>
+    <string name="history">Historique</string>
     <plurals name="search_found_results_quantity">
         <item quantity="one">%d résultat trouvé</item>
         <item quantity="other">%d résultats trouvés</item>
@@ -48,6 +48,9 @@
         <item quantity="other">%d sous-répertoires</item>
     </plurals>
     <string name="parent_folder">Répertoire parent</string>
+    <string name="audio">Audio</string>
+    <string name="video">Vidéo</string>
+    <string name="bookmarks">Signets</string>
     <string name="all_albums">Tous les albums</string>
     <string name="genres">Genres</string>
     <string name="playlists">Listes</string>
diff --git a/vlc-android/res/values-zh-rCN/strings.xml b/vlc-android/res/values-zh-rCN/strings.xml
index 1c805dd..52fa23f 100644
--- a/vlc-android/res/values-zh-rCN/strings.xml
+++ b/vlc-android/res/values-zh-rCN/strings.xml
@@ -10,7 +10,7 @@
   <string name="sortby_name">名称</string>
   <string name="sortby_length">长度</string>
   <string name="searchable_hint">搜索…</string>
-  <string name="search_history">历史</string>
+  <string name="history">历史</string>
   <string name="search_found_results">找到 %1$d 条结果</string>
   <string name="show_player">显示播放器</string>
   <string name="hide_mini_player">隐藏迷你播放器</string>
@@ -45,10 +45,12 @@
     <item quantity="other">%d 个子文件夹</item>
   </plurals>
   <string name="parent_folder">转到上级目录</string>
+  <string name="audio">音频</string>
+  <string name="video">视频</string>
+  <string name="bookmarks">书签</string>
   <string name="all_albums">所有专辑</string>
   <string name="genres">流派</string>
   <string name="playlists">播放列表</string>
-  <string name="time_0">0:00</string>
   <string name="title">标题</string>
   <string name="artist">艺术家</string>
   <string name="album">专辑</string>
@@ -115,5 +117,4 @@
   <string name="aout_audiotrack">AudioTrack 类 (原生)</string>
   <string name="aout_audiotrack_java">AudioTrack 类 (Java)</string>
   <string name="aout_opensles">OpenSL ES</string>
-  <string name="error_no_neon">抱歉，此版本的 VLC for Android™ 尚不支持您的设备</string>
 </resources>
diff --git a/vlc-android/res/values/strings.xml b/vlc-android/res/values/strings.xml
index 7dd4492..93088cc 100644
--- a/vlc-android/res/values/strings.xml
+++ b/vlc-android/res/values/strings.xml
@@ -10,7 +10,7 @@
     <string name="sortby_name">Name</string>
     <string name="sortby_length">Length</string>
     <string name="searchable_hint">Search…</string>
-    <string name="search_history">History</string>
+    <string name="history">History</string>
     <plurals name="search_found_results_quantity">
         <item quantity="one">%d result found</item>
         <item quantity="other">%d results found</item>
@@ -52,6 +52,7 @@
     <string name="parent_folder">Up to parent folder</string>
     <string name="audio">Audio</string>
     <string name="video">Video</string>
+    <string name="bookmarks">Bookmarks</string>
     <string name="all_albums">All albums</string>
     <string name="genres">Genres</string>
     <string name="playlists">Playlists</string>
diff --git a/vlc-android/src/org/videolan/vlc/gui/SearchActivity.java b/vlc-android/src/org/videolan/vlc/gui/SearchActivity.java
index d596d1e..5719ae9 100644
--- a/vlc-android/src/org/videolan/vlc/gui/SearchActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/SearchActivity.java
@@ -159,7 +159,7 @@ public class SearchActivity extends ListActivity {
     private void showSearchHistory() {
 
         // Add header to the history
-        String headerText = getString(R.string.search_history);
+        String headerText = getString(R.string.history);
         showListHeader(headerText);
 
         DatabaseManager db = DatabaseManager.getInstance(this);
diff --git a/vlc-android/src/org/videolan/vlc/gui/SidebarAdapter.java b/vlc-android/src/org/videolan/vlc/gui/SidebarAdapter.java
index 3ba9dd2..3e0b014 100644
--- a/vlc-android/src/org/videolan/vlc/gui/SidebarAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/SidebarAdapter.java
@@ -70,9 +70,9 @@ public class SidebarAdapter extends BaseAdapter {
             new SidebarEntry( "audio", R.string.audio, R.drawable.header_icon_audio ),
             new SidebarEntry( "video", R.string.video, R.drawable.header_icon_video ),
             new SidebarEntry( "directories", R.string.directories, R.drawable.ic_folder ),
-            new SidebarEntry( "history", "History", android.R.drawable.ic_menu_recent_history ),
-            new SidebarEntry( "bookmarks", "Bookmarks", R.drawable.ic_bookmarks ),
-            new SidebarEntry( "playlists", "Playlists", R.drawable.icon ),
+            new SidebarEntry( "history", R.string.history, android.R.drawable.ic_menu_recent_history ),
+            new SidebarEntry( "bookmarks", R.string.bookmarks, R.drawable.ic_bookmarks ),
+            new SidebarEntry( "playlists", R.string.playlists, R.drawable.icon ),
         };
         entries = Arrays.asList(entries2);
     }