Improve translability of some items.

In particular, don't assume a certain word order, e.g. in 'Delete
album?'.

Change-Id: I8271ea80c36763869a2c4643509b773e17d10e6c

diff --git a/res/values/strings.xml b/res/values/strings.xml
index dc8d3c4..43bf86a 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -74,6 +74,7 @@
     <string name="overwrite">Overwrite</string>
     <string name="new_playlist_name_template">Playlist <xliff:g id="number">%d</xliff:g></string>
     <string name="create_playlist_prompt" msgid="942607395076646686">"Playlist name"</string>
+    <string name="delete_dialog_title">Delete <xliff:g id="item" example="album">%s</xliff:g>?</string>
     <string name="cannot_be_undone">This cannot be undone</string>
     <string name="delete_warning">This will permanently delete the cached image entries</string>
     <string name="new_photo">Choose photo from Gallery</string>
@@ -105,11 +106,11 @@
     <string name="accessibility_repeat_one">Repeat one</string>
 
     <!-- Toast messages -->
-    <string name="pinned_to_home_screen">pinned to your Home screen</string>
-    <string name="could_not_be_pinned_to_home_screen">could not be pinned to your Home screen</string>
+    <string name="pinned_to_home_screen"><xliff:g id="name">%s</xliff:g> pinned to your home screen</string>
+    <string name="could_not_be_pinned_to_home_screen"><xliff:g id="name">%s</xliff:g> could not be pinned to your home screen</string>
     <string name="set_as_ringtone">\"<xliff:g id="name" example="Alarm Bell">%s</xliff:g>\" set as ringtone</string>
     <string name="playlist_renamed">Playlist renamed</string>
-    <string name="theme_set">set as the theme</string>
+    <string name="theme_set"><xliff:g id="name">%s</xliff:g> set as the theme</string>
 
     <!-- Settings -->
     <string name="settings_ui_category">Interface</string>
@@ -137,10 +138,8 @@
     <string name="settings_version_title">Version number</string>
 
     <!-- Share Intent -->
-    <string name="now_listening_to">#NowPlaying</string>
-    <string name="by">by</string>
+    <string name="now_listening_to">#NowPlaying <xliff:g id="title">%1$s</xliff:g> by <xliff:g id="artist">%2$s</xliff:g> #Apollo</string>
     <string name="share_track_using">Share track using:</string>
-    <string name="hash_apollo">#Apollo</string>
 
     <!-- ColorPicker -->
     <string name="color_picker_title">Color scheme</string>

diff --git a/src/com/andrew/apollo/menu/DeleteDialog.java b/src/com/andrew/apollo/menu/DeleteDialog.java
index 632408e..1d4bbff 100644 (file)
--- a/src/com/andrew/apollo/menu/DeleteDialog.java
+++ b/src/com/andrew/apollo/menu/DeleteDialog.java
@@ -78,10 +78,11 @@ public class DeleteDialog extends DialogFragment {
         mItemList = arguments.getLongArray("items");\r
         // Get the dialog title\r
         final String title = arguments.getString(Config.NAME);\r
+        final String dialogTitle = getString(R.string.delete_dialog_title, title);\r
         // Initialize the image cache\r
         mFetcher = ApolloUtils.getImageFetcher(getActivity());\r
         // Build the dialog\r
-        return new AlertDialog.Builder(getActivity()).setTitle(delete + " " + title)\r
+        return new AlertDialog.Builder(getActivity()).setTitle(dialogTitle)\r
                 .setMessage(R.string.cannot_be_undone)\r
                 .setPositiveButton(delete, new OnClickListener() {\r
 \r

diff --git a/src/com/andrew/apollo/ui/activities/AudioPlayerActivity.java b/src/com/andrew/apollo/ui/activities/AudioPlayerActivity.java
index e444df3..deb4620 100644 (file)
--- a/src/com/andrew/apollo/ui/activities/AudioPlayerActivity.java
+++ b/src/com/andrew/apollo/ui/activities/AudioPlayerActivity.java
@@ -723,9 +723,8 @@ public class AudioPlayerActivity extends FragmentActivity implements ServiceConn
             return;\r
         }\r
         final Intent shareIntent = new Intent();\r
-        final String shareMessage = getString(R.string.now_listening_to) + " "\r
-                + MusicUtils.getTrackName() + " " + getString(R.string.by) + " "\r
-                + MusicUtils.getArtistName() + " " + getString(R.string.hash_apollo);\r
+        final String shareMessage = getString(R.string.now_listening_to,\r
+                MusicUtils.getTrackName(), MusicUtils.getArtistName());\r
 \r
         shareIntent.setAction(Intent.ACTION_SEND);\r
         shareIntent.setType("text/plain");\r

diff --git a/src/com/andrew/apollo/ui/fragments/PlaylistFragment.java b/src/com/andrew/apollo/ui/fragments/PlaylistFragment.java
index 17ad7f0..95ea94b 100644 (file)
--- a/src/com/andrew/apollo/ui/fragments/PlaylistFragment.java
+++ b/src/com/andrew/apollo/ui/fragments/PlaylistFragment.java
@@ -312,7 +312,7 @@ public class PlaylistFragment extends Fragment implements LoaderCallbacks<List<P
      */\r
     private final AlertDialog buildDeleteDialog() {\r
         return new AlertDialog.Builder(getActivity())\r
-                .setTitle(getString(R.string.context_menu_delete) + " " + mPlaylist.mPlaylistName)\r
+                .setTitle(getString(R.string.delete_dialog_title, mPlaylist.mPlaylistName))\r
                 .setPositiveButton(R.string.context_menu_delete, new OnClickListener() {\r
 \r
                     @Override\r

diff --git a/src/com/andrew/apollo/ui/fragments/ThemeFragment.java b/src/com/andrew/apollo/ui/fragments/ThemeFragment.java
index 46bfa47..823f9ae 100644 (file)
--- a/src/com/andrew/apollo/ui/fragments/ThemeFragment.java
+++ b/src/com/andrew/apollo/ui/fragments/ThemeFragment.java
@@ -193,7 +193,7 @@ public class ThemeFragment extends Fragment implements OnItemClickListener {
             final long id) {\r
         mTheme.setThemePackageName(mValues[position]);\r
         AppMsg.makeText(getActivity(),\r
-                mEntries[position] + " " + getString(R.string.theme_set), AppMsg.STYLE_CONFIRM)\r
+                getString(R.string.theme_set, mEntries[position]), AppMsg.STYLE_CONFIRM)\r
                 .show();\r
     }\r
 \r

diff --git a/src/com/andrew/apollo/utils/ApolloUtils.java b/src/com/andrew/apollo/utils/ApolloUtils.java
index 9ca768e..c5ff8f7 100644 (file)
--- a/src/com/andrew/apollo/utils/ApolloUtils.java
+++ b/src/com/andrew/apollo/utils/ApolloUtils.java
@@ -308,14 +308,13 @@ public final class ApolloUtils {
             intent.setAction("com.android.launcher.action.INSTALL_SHORTCUT");\r
             context.sendBroadcast(intent);\r
             AppMsg.makeText(context,\r
-                    displayName + " " + context.getString(R.string.pinned_to_home_screen),\r
+                    context.getString(R.string.pinned_to_home_screen, displayName),\r
                     AppMsg.STYLE_CONFIRM).show();\r
         } catch (final Exception e) {\r
             Log.e("ApolloUtils", "createShortcutIntent", e);\r
             AppMsg.makeText(\r
                     context,\r
-                    displayName + " "\r
-                            + context.getString(R.string.could_not_be_pinned_to_home_screen),\r
+                    context.getString(R.string.could_not_be_pinned_to_home_screen, displayName),\r
                     AppMsg.STYLE_ALERT).show();\r
         }\r
     }\r