[Android] Fix wrong string ids

Nicolas Pomepuy git at videolan.org
Mon Sep 23 18:10:40 CEST 2019


vlc-android | branch: 3.2.x | Nicolas Pomepuy <nicolas.pomepuy at gmail.com> | Mon Sep 16 09:19:11 2019 +0200| [313c78bc610827149559b17e956ab893f57b2078] | committer: Geoffrey Métais

Fix wrong string ids

Fixes #1008

(cherry picked from commit dd0c4d9698ca7dda84c91c207e5dfc25502f05d7)

> https://code.videolan.org/videolan/vlc-android/commit/313c78bc610827149559b17e956ab893f57b2078
---

 vlc-android/flavors/debug/res/xml/shortcuts.xml | 4 ++--
 vlc-android/res/menu/activity_option.xml        | 2 +-
 vlc-android/res/values/strings.xml              | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/vlc-android/flavors/debug/res/xml/shortcuts.xml b/vlc-android/flavors/debug/res/xml/shortcuts.xml
index b17e1f0c1..7e514584f 100644
--- a/vlc-android/flavors/debug/res/xml/shortcuts.xml
+++ b/vlc-android/flavors/debug/res/xml/shortcuts.xml
@@ -6,8 +6,8 @@
         android:shortcutId="last_playlist"
         android:enabled="true"
         android:icon="@drawable/ic_queue_music"
-        android:shortcutShortLabel="@string/last_playlist_shortcut"
-        android:shortcutLongLabel="@string/last_playlist" >
+            android:shortcutShortLabel="@string/resume_playback"
+            android:shortcutLongLabel="@string/resume_playback_long_shortcut">
         <intent
             android:action="vlc.shortcut.resume"
             android:targetPackage="org.videolan.vlc.debug"
diff --git a/vlc-android/res/menu/activity_option.xml b/vlc-android/res/menu/activity_option.xml
index 87b63c07b..2aa9282a5 100644
--- a/vlc-android/res/menu/activity_option.xml
+++ b/vlc-android/res/menu/activity_option.xml
@@ -21,7 +21,7 @@
             android:orderInCategory="2"
             android:id="@+id/ml_menu_last_playlist"
             android:icon="@drawable/ic_menu_lastplaylist"
-            android:title="@string/last_playlist"
+            android:title="@string/resume_playback"
             vlc:showAsAction="ifRoom|collapseActionView"
             android:visible="false"/>
     <item
diff --git a/vlc-android/res/values/strings.xml b/vlc-android/res/values/strings.xml
index 44345b65e..66b8d5f2a 100644
--- a/vlc-android/res/values/strings.xml
+++ b/vlc-android/res/values/strings.xml
@@ -47,8 +47,8 @@
     <string name="insert_next">Insert next</string>
     <string name="play_all">Play all</string>
     <string name="append_all">Append all</string>
-    <string name="last_playlist">Resume playback</string>
-    <string name="last_playlist_shortcut"> Resume playback of last playlist</string>
+    <string name="resume_playback">Resume playback</string>
+    <string name="resume_playback_long_shortcut"> Resume playback of last playlist</string>
     <string name="delete">Delete</string>
     <string name="remove">Remove</string>
     <string name="set_song">Set as ringtone</string>



More information about the Android mailing list