Avoid duplicate attribute name to simplify the work of translators

vlc-android/res/values-cs/strings.xml

@@ -33,7 +33,7 @@
   <string name="songs">Písničky</string>
   <string name="artists">Umělci</string>
   <string name="albums">Alba</string>
-  <plurals name="subfolders">
+  <plurals name="subfolders_quantity">
     <item quantity="one">1 podsložka</item>
     <item quantity="few">%d podsložky</item>
     <item quantity="other">%d podsložek</item>
@@ -69,7 +69,7 @@
   <string name="track_unknown">Neznámá stopa</string>
   <string name="track_codec_info">Kodek: %1$s\n</string>
   <string name="track_language_info">Jazyk: %1$s\n</string>
-  <plurals name="track_channels_info">
+  <plurals name="track_channels_info_quantity">
     <item quantity="one">1 kanál\n</item>
     <item quantity="few">%1$d kanály\n</item>
     <item quantity="other">%1$d kanálů\n</item>

vlc-android/res/values-de/strings.xml

@@ -29,13 +29,13 @@
     <string name="unknown_album">Unbekanntes Album</string>
     <string name="unknown_genre">Unbekanntes Genre</string>
     <string name="songs">Songs</string>
-    <plurals name="songs">
+    <plurals name="songs_quantity">
         <item quantity="one">1 Song</item>
         <item quantity="other">%d Songs</item>
     </plurals>
     <string name="artists">Künstler</string>
     <string name="albums">Alben</string>
-    <plurals name="albums">
+    <plurals name="albums_quantity">
         <item quantity="one">1 Album</item>
         <item quantity="other">%d Alben</item>
     </plurals>
@@ -79,7 +79,7 @@
     <string name="track_unknown">Unbekannter Titel</string>
     <string name="track_codec_info">Codec: %1$s\n</string>
     <string name="track_language_info">Sprache: %1$s\n</string>
-    <plurals name="track_channels_info">
+    <plurals name="track_channels_info_quantity">
         <item quantity="one">%1$d Kanal\n</item>
         <item quantity="other">%1$d Kanäle\n</item>
     </plurals>

vlc-android/res/values-eu/strings.xml

@@ -30,17 +30,17 @@
   <string name="unknown_album">Album ezezaguna</string>
   <string name="unknown_genre">Genero ezezaguna</string>
   <string name="songs">Kantak</string>
-  <plurals name="songs">
+  <plurals name="songs_quantity">
     <item quantity="one">Kanta</item>
     <item quantity="other">Kantak</item>
   </plurals>
   <string name="artists">Artistak</string>
   <string name="albums">Albumak</string>
-  <plurals name="albums">
+  <plurals name="albums_quantity">
     <item quantity="one">Album</item>
     <item quantity="other">Albumak</item>
   </plurals>
-  <plurals name="subfolders">
+  <plurals name="subfolders_quantity">
     <item quantity="one">Azpikarpeta bat</item>
     <item quantity="other">%d azpikarpeta</item>
   </plurals>
@@ -75,7 +75,7 @@
   <string name="track_unknown">Pista ezezaguna</string>
   <string name="track_codec_info">Kodeka: %1$s\n</string>
   <string name="track_language_info">Hizkuntza: %1$s\n</string>
-  <plurals name="track_channels_info">
+  <plurals name="track_channels_info_quantity">
     <item quantity="one">Kanal %1$d\n</item>
     <item quantity="other">%1$d kanal\n</item>
   </plurals>

vlc-android/res/values-fr/strings.xml

@@ -32,13 +32,13 @@
     <string name="unknown_album">Album inconnu</string>
     <string name="unknown_genre">Genre inconnu</string>
     <string name="songs">Chansons</string>
-    <plurals name="songs">
+    <plurals name="songs_quantity">
         <item quantity="one">1 chanson</item>
         <item quantity="other">%d chansons</item>
     </plurals>
     <string name="artists">Artistes</string>
     <string name="albums">Albums</string>
-    <plurals name="albums">
+    <plurals name="albums_quantity">
         <item quantity="one">1 album</item>
         <item quantity="other">%d albums</item>
     </plurals>
@@ -72,7 +72,7 @@
     <string name="track_unknown">Piste inconnue</string>
     <string name="track_codec_info">Codec: %1$s\n</string>
     <string name="track_language_info">Langue: %1$s\n</string>
-    <plurals name="track_channels_info">
+    <plurals name="track_channels_info_quantity">
         <item quantity="one">%1$d canal\n</item>
         <item quantity="other">%1$d canaux\n</item>
     </plurals>

vlc-android/res/values-gd/strings.xml

@@ -30,7 +30,7 @@
     <string name="unknown_album">Albam neo-aithnichte</string>
     <string name="unknown_genre">Gnè neo-aithnichte</string>
     <string name="songs">Òrain</string>
-    <plurals name="songs">
+    <plurals name="songs_quantity">
         <item quantity="zero">%d òran</item>
         <item quantity="one">%d òran</item>
 		<item quantity="two">%d òran</item>
@@ -38,13 +38,13 @@
     </plurals>
     <string name="artists">Luchd-ealain</string>
     <string name="albums">Albaman</string>
-    <plurals name="albums">
+    <plurals name="albums_quantity">
         <item quantity="zero">%d albam</item>
         <item quantity="one">%d albam</item>
         <item quantity="two">%d albam</item>
         <item quantity="few">%d albaim</item>
     </plurals>
-    <plurals name="subfolders">
+    <plurals name="subfolders_quantity">
 	    <item quantity="zero">%d fo-phasgan</item>
         <item quantity="one">%d fho-phasgan</item>
 		<item quantity="two">%d fho-phasgan</item>
@@ -81,7 +81,7 @@
     <string name="track_unknown">Traca neo-aithnichte</string>
     <string name="track_codec_info">Codec: %1$s\n</string>
     <string name="track_language_info">Cànan: %1$s\n</string>
-    <plurals name="track_channels_info">
+    <plurals name="track_channels_info_quantity">
         <item quantity="zero">0 seanail\n</item>
         <item quantity="one">1 seanail\n</item>
 		<item quantity="two">2 sheanail\n</item>

vlc-android/res/values-gl/strings.xml

@@ -30,17 +30,17 @@
     <string name="unknown_album">Álbum descoñecido</string>
     <string name="unknown_genre">Xénero descoñecido</string>
     <string name="songs">Cancións</string>
-    <plurals name="songs">
+    <plurals name="songs_quantity">
         <item quantity="one">1 canción</item>
         <item quantity="other">%d cancións</item>
     </plurals>
     <string name="artists">Artistas</string>
     <string name="albums">Álbumes</string>
-    <plurals name="albums">
+    <plurals name="albums_quantity">
         <item quantity="one">1 álbum</item>
         <item quantity="other">%d álbumes</item>
     </plurals>
-    <plurals name="subfolders">
+    <plurals name="subfolders_quantity">
         <item quantity="one">1 subcartafol</item>
         <item quantity="other">%d subcartafoles</item>
     </plurals>
@@ -75,7 +75,7 @@
     <string name="track_unknown">Pista descoñecida</string>
     <string name="track_codec_info">Códec: %1$s\n</string>
     <string name="track_language_info">Idioma: %1$s\n</string>
-    <plurals name="track_channels_info">
+    <plurals name="track_channels_info_quantity">
         <item quantity="one">%1$d canle\n</item>
         <item quantity="other">%1$d canles\n</item>
     </plurals>

vlc-android/res/values-hi/strings.xml

@@ -31,17 +31,17 @@
   <string name="unknown_album">अज्ञात एल्बम</string>
   <string name="unknown_genre">अज्ञात शैली</string>
   <string name="songs">गाने</string>
-  <plurals name="songs">
+  <plurals name="songs_quantity">
     <item quantity="one">1 गाने</item>
     <item quantity="other">गाने</item>
   </plurals>
   <string name="artists">कलाकार</string>
   <string name="albums">एल्बम</string>
-  <plurals name="albums">
+  <plurals name="albums_quantity">
     <item quantity="one">1 एल्बम</item>
     <item quantity="other">एल्बम</item>
   </plurals>
-  <plurals name="subfolders">
+  <plurals name="subfolders_quantity">
     <item quantity="one">1 उप-फ़ोल्डर</item>
     <item quantity="other">%d उप-फ़ोल्डर</item>
   </plurals>
@@ -76,7 +76,7 @@
   <string name="track_unknown">अज्ञात रील</string>
   <string name="track_codec_info">कोडेक: %1$s\n</string>
   <string name="track_language_info">भाषा: %1$s\n</string>
-  <plurals name="track_channels_info">
+  <plurals name="track_channels_info_quantity">
     <item quantity="one">%1$d चैनल\n</item>
     <item quantity="other">%1$d चैनलों\n</item>
   </plurals>

vlc-android/res/values-hr/strings.xml

@@ -30,17 +30,17 @@
     <string name="unknown_album">Nepoznati album</string>
     <string name="unknown_genre">Nepoznati smjer</string>
     <string name="songs">Skladbe</string>
-    <plurals name="songs">
+    <plurals name="songs_quantity">
         <item quantity="one">1 skladba</item>
         <item quantity="other">%d skladbi</item>
     </plurals>
     <string name="artists">Izvođači</string>
     <string name="albums">Albumi</string>
-    <plurals name="albums">
+    <plurals name="albums_quantity">
         <item quantity="one">1 album</item>
         <item quantity="other">%d albuma</item>
     </plurals>
-    <plurals name="subfolders">
+    <plurals name="subfolders_quantity">
         <item quantity="one">1 podmapa</item>
         <item quantity="other">%d podmapa</item>
     </plurals>
@@ -75,7 +75,7 @@
     <string name="track_unknown">Nepoznati zapis</string>
     <string name="track_codec_info">Kodek: %1$s\n</string>
     <string name="track_language_info">Jezik: %1$s\n</string>
-    <plurals name="track_channels_info">
+    <plurals name="track_channels_info_quantity">
         <item quantity="one">%1$d kanal\n</item>
         <item quantity="other">%1$d kanala\n</item>
     </plurals>

vlc-android/res/values-it/strings.xml

@@ -30,17 +30,17 @@
     <string name="unknown_album">Album sconosciuto</string>
     <string name="unknown_genre">Genere sconosciuto</string>
     <string name="songs">Brani</string>
-    <plurals name="songs">
+    <plurals name="songs_quantity">
         <item quantity="one">1 brano</item>
         <item quantity="other">%d brani</item>
     </plurals>
     <string name="artists">Artisti</string>
     <string name="albums">Album</string>
-    <plurals name="albums">
+    <plurals name="albums_quantity">
         <item quantity="one">1 album</item>
         <item quantity="other">%d album</item>
     </plurals>
-    <plurals name="subfolders">
+    <plurals name="subfolders_quantity">
         <item quantity="one">1 sottocartella</item>
         <item quantity="other">%d sottocartelle</item>
     </plurals>
@@ -75,7 +75,7 @@
     <string name="track_unknown">Traccia sconosciuta</string>
     <string name="track_codec_info">Codificatore: %1$s\n</string>
     <string name="track_language_info">Lingua: %1$s\n</string>
-    <plurals name="track_channels_info">
+    <plurals name="track_channels_info_quantity">
         <item quantity="one">%1$d canale\n</item>
         <item quantity="other">%1$d canali\n</item>
     </plurals>

vlc-android/res/values-iw/strings.xml

@@ -30,17 +30,17 @@
     <string name="unknown_album">אלבום בלתי ידוע</string>
     <string name="unknown_genre">סגנון בלתי ידוע</string>
     <string name="songs">שירים</string>
-    <plurals name="songs">
+    <plurals name="songs_quantity">
         <item quantity="one">שיר אחד</item>
         <item quantity="other">%d שירים</item>
     </plurals>
     <string name="artists">אמנים</string>
     <string name="albums">אלבומים</string>
-    <plurals name="albums">
+    <plurals name="albums_quantity">
         <item quantity="one">אלבום אחד</item>
         <item quantity="other">%d אלבומים</item>
     </plurals>
-    <plurals name="subfolders">
+    <plurals name="subfolders_quantity">
         <item quantity="one">תיקיית משנה אחת</item>
         <item quantity="other">%d תיקיות משנה</item>
     </plurals>
@@ -75,7 +75,7 @@
     <string name="track_unknown">רצועה בלתי ידועה</string>
     <string name="track_codec_info">מקודד: %1$s\n</string>
     <string name="track_language_info">שפה: %1$s\n</string>
-    <plurals name="track_channels_info">
+    <plurals name="track_channels_info_quantity">
         <item quantity="one">ערוץ אחד\n</item>
         <item quantity="other">%1$d ערוצים\n</item>
     </plurals>

vlc-android/res/values-ja/strings.xml

@@ -30,15 +30,15 @@
   <string name="unknown_album">未知のアルバム</string>
   <string name="unknown_genre">未知のジャンル</string>
   <string name="songs">曲</string>
-  <plurals name="songs">
+  <plurals name="songs_quantity">
     <item quantity="other">%d 曲</item>
   </plurals>
   <string name="artists">アーティスト</string>
   <string name="albums">アルバム</string>
-  <plurals name="albums">
+  <plurals name="albums_quantity">
     <item quantity="other">%d アルバム</item>
   </plurals>
-  <plurals name="subfolders">
+  <plurals name="subfolders_quantity">
     <item quantity="other">%d サブフォルダ</item>
   </plurals>
   <string name="parent_folder">一階層上に</string>
@@ -72,7 +72,7 @@
   <string name="track_unknown">未知のトラック</string>
   <string name="track_codec_info">コーデック: %1$s\n</string>
   <string name="track_language_info">言語: %1$s\n</string>
-  <plurals name="track_channels_info">
+  <plurals name="track_channels_info_quantity">
     <item quantity="other">%1$d チャンネル</item>
   </plurals>
   <string name="track_samplerate_info">サンプリングレート: %1$d Hz\n</string>

vlc-android/res/values-nl/strings.xml

@@ -30,17 +30,17 @@
     <string name="unknown_album">Onbekend album</string>
     <string name="unknown_genre">Onbekend genre</string>
     <string name="songs">Nummers</string>
-    <plurals name="songs">
+    <plurals name="songs_quantity">
         <item quantity="one">1 nummer</item>
         <item quantity="other">%d nummers</item>
     </plurals>
     <string name="artists">Artiesten</string>
     <string name="albums">Albums</string>
-    <plurals name="albums">
+    <plurals name="albums_quantity">
         <item quantity="one">1 album</item>
         <item quantity="other">%d albums</item>
     </plurals>
-    <plurals name="subfolders">
+    <plurals name="subfolders_quantity">
         <item quantity="one">1 submap</item>
         <item quantity="other">%d submappen</item>
     </plurals>
@@ -75,7 +75,7 @@
     <string name="track_unknown">Onbekende track</string>
     <string name="track_codec_info">Codec: %1$s\n</string>
     <string name="track_language_info">Taal: %1$s\n</string>
-    <plurals name="track_channels_info">
+    <plurals name="track_channels_info_quantity">
         <item quantity="one">%1$d kanaal\n</item>
         <item quantity="other">%1$d kanalen\n</item>
     </plurals>

vlc-android/res/values-pl/strings.xml

@@ -30,17 +30,17 @@
     <string name="unknown_album">Nieznany album</string>
     <string name="unknown_genre">Nieznany gatunek</string>
     <string name="songs">Piosenki</string>
-    <plurals name="songs">
+    <plurals name="songs_quantity">
         <item quantity="one">1 piosenka</item>
         <item quantity="other">%d piosen(ki/ek)</item>
     </plurals>
     <string name="artists">Wykonawcy</string>
     <string name="albums">Albumy</string>
-    <plurals name="albums">
+    <plurals name="albums_quantity">
         <item quantity="one">1 album</item>
         <item quantity="other">%d album(y/ów)</item>
     </plurals>
-    <plurals name="subfolders">
+    <plurals name="subfolders_quantity">
         <item quantity="one">1 podfolder</item>
         <item quantity="other">%d podfolder(y/ów)</item>
     </plurals>
@@ -75,7 +75,7 @@
     <string name="track_unknown">Nieznana ścieżka</string>
     <string name="track_codec_info">Kodek: %1$s\n</string>
     <string name="track_language_info">Język: %1$s\n</string>
-    <plurals name="track_channels_info">
+    <plurals name="track_channels_info_quantity">
         <item quantity="one">%1$d kanał\n</item>
         <item quantity="other">%1$d kanał(y/ów)\n</item>
     </plurals>

vlc-android/res/values-te/strings.xml

@@ -30,17 +30,17 @@
   <string name="unknown_album">తెలియని ఆల్బమ్</string>
   <string name="unknown_genre">తెలియని సాహిత్యం</string>
   <string name="songs">పాటలు</string>
-  <plurals name="songs">
+  <plurals name="songs_quantity">
     <item quantity="one">1 పాట</item>
     <item quantity="other">%d పాటలు</item>
   </plurals>
   <string name="artists">కళాకారులు</string>
   <string name="albums">ఆల్బమ్లు</string>
-  <plurals name="albums">
+  <plurals name="albums_quantity">
     <item quantity="one">ఆల్బమ్</item>
     <item quantity="other">%d ఆల్బమ్లు</item>
   </plurals>
-  <plurals name="subfolders">
+  <plurals name="subfolders_quantity">
     <item quantity="one">ఉపసంచయం</item>
     <item quantity="other">%d ఉపసంచయాలు</item>
   </plurals>
@@ -75,7 +75,7 @@
   <string name="track_unknown">తెలియని ట్రాక్</string>
   <string name="track_codec_info">కొడెక్: %1$s\n</string>
   <string name="track_language_info">భాష: %1$s\n</string>
-  <plurals name="track_channels_info">
+  <plurals name="track_channels_info_quantity">
     <item quantity="one">1 వాహిక\n</item>
     <item quantity="other">%1$d వాహికలు\n</item>
   </plurals>

vlc-android/res/values-uk/strings.xml

@@ -30,19 +30,19 @@
     <string name="unknown_album">Невідомий альбом</string>
     <string name="unknown_genre">Невідомий жанр</string>
     <string name="songs">Пісні</string>
-    <plurals name="songs">
+    <plurals name="songs_quantity">
         <item quantity="one">1 пісня</item>
         <item quantity="few">%d пісні</item>
         <item quantity="other">%d пісень</item>
     </plurals>
     <string name="artists">Виконавці</string>
     <string name="albums">Альбоми</string>
-    <plurals name="albums">
+    <plurals name="albums_quantity">
         <item quantity="one">1 альбом</item>
         <item quantity="few">%d альбоми</item>
         <item quantity="other">%d альбомів</item>
     </plurals>
-    <plurals name="subfolders">
+    <plurals name="subfolders_quantity">
         <item quantity="one">1 підкаталог</item>
         <item quantity="few">%d підкаталога</item>
         <item quantity="other">%d підкаталогів</item>
@@ -78,7 +78,7 @@
     <string name="track_unknown">Невідома доріжка</string>
     <string name="track_codec_info">Кодек: %1$s\n</string>
     <string name="track_language_info">Мова: %1$s\n</string>
-    <plurals name="track_channels_info">
+    <plurals name="track_channels_info_quantity">
         <item quantity="one">%1$d канал\n</item>
         <item quantity="few">%1$d канали\n</item>
         <item quantity="other">%1$d каналів\n</item>

vlc-android/res/values-zh-rCN/strings.xml

@@ -30,17 +30,17 @@
   <string name="unknown_album">未知专辑</string>
   <string name="unknown_genre">未知流派</string>
   <string name="songs">歌曲</string>
-  <plurals name="songs">
+  <plurals name="songs_quantity">
   	<item quantity="one">一首歌曲</item>
     <item quantity="other">%d 首歌曲</item>
   </plurals>
   <string name="artists">艺术家</string>
   <string name="albums">专辑</string>
-  <plurals name="albums">
+  <plurals name="albums_quantity">
   	<item quantity="one">一张专辑</item>
     <item quantity="other">%d 张专辑</item>
   </plurals>
-  <plurals name="subfolders">
+  <plurals name="subfolders_quantity">
   	<item quantity="one">一个子文件夹</item>
     <item quantity="other">%d 个子文件夹</item>
   </plurals>
@@ -75,7 +75,7 @@
   <string name="track_unknown">未知轨</string>
   <string name="track_codec_info">编解码器: %1$s\n</string>
   <string name="track_language_info">预言: %1$s\n</string>
-  <plurals name="track_channels_info">
+  <plurals name="track_channels_info_quantity">
   	<item quantity="one">单声道\n</item>
     <item quantity="other">%1$d 声道\n</item>
   </plurals>

vlc-android/res/values/strings.xml

@@ -31,17 +31,17 @@
     <string name="unknown_album">Unknown Album</string>
     <string name="unknown_genre">Unknown Genre</string>
     <string name="songs">Songs</string>
-    <plurals name="songs">
+    <plurals name="songs_quantity">
         <item quantity="one">1 song</item>
         <item quantity="other">%d songs</item>
     </plurals>
     <string name="artists">Artists</string>
     <string name="albums">Albums</string>
-    <plurals name="albums">
+    <plurals name="albums_quantity">
         <item quantity="one">1 album</item>
         <item quantity="other">%d albums</item>
     </plurals>
-    <plurals name="subfolders">
+    <plurals name="subfolders_quantity">
         <item quantity="one">1 subfolder</item>
         <item quantity="other">%d subfolders</item>
     </plurals>
@@ -76,7 +76,7 @@
     <string name="track_unknown">Unknown track</string>
     <string name="track_codec_info">Codec: %1$s\n</string>
     <string name="track_language_info">Language: %1$s\n</string>
-    <plurals name="track_channels_info">
+    <plurals name="track_channels_info_quantity">
         <item quantity="one">1 channel\n</item>
         <item quantity="other">%1$d channels\n</item>
     </plurals>

vlc-android/src/org/videolan/vlc/gui/DirectoryAdapter.java

@@ -267,13 +267,13 @@ public class DirectoryAdapter extends BaseAdapter {
 
             if(folderCount > 0)
                 holderText += context.getResources().getQuantityString(
-                        R.plurals.subfolders, folderCount, folderCount
+                        R.plurals.subfolders_quantity, folderCount, folderCount
                 );
             if(folderCount > 0 && songCount > 0)
                 holderText += ", ";
             if(songCount > 0)
                 holderText += context.getResources().getQuantityString(
-                        R.plurals.songs, songCount, songCount
+                        R.plurals.songs_quantity, songCount, songCount
                 );
         }
         holder.text.setText(holderText);

vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.java

@@ -101,9 +101,9 @@ public class AudioBrowserFragment extends SherlockFragment implements ISortable
         mMediaLibrary = MediaLibrary.getInstance(getActivity());
 
         mSongsAdapter = new AudioListAdapter(getActivity());
-        mArtistsAdapter = new AudioPlaylistAdapter(getActivity(), R.plurals.albums, R.plurals.songs);
-        mAlbumsAdapter = new AudioPlaylistAdapter(getActivity(), R.plurals.songs, R.plurals.songs);
-        mGenresAdapter = new AudioPlaylistAdapter(getActivity(), R.plurals.albums, R.plurals.songs);
+        mArtistsAdapter = new AudioPlaylistAdapter(getActivity(), R.plurals.albums_quantity, R.plurals.songs_quantity);
+        mAlbumsAdapter = new AudioPlaylistAdapter(getActivity(), R.plurals.songs_quantity, R.plurals.songs_quantity);
+        mGenresAdapter = new AudioPlaylistAdapter(getActivity(), R.plurals.albums_quantity, R.plurals.songs_quantity);
     }
 
     @Override

vlc-android/src/org/videolan/vlc/gui/video/MediaInfoAdapter.java

@@ -88,7 +88,7 @@ public class MediaInfoAdapter extends ArrayAdapter<TrackInfo> {
     }
 
     private void appendAudio(StringBuilder textBuilder, Resources res, TrackInfo track) {
-        textBuilder.append(res.getQuantityString(R.plurals.track_channels_info, track.Channels, track.Channels));
+        textBuilder.append(res.getQuantityString(R.plurals.track_channels_info_quantity, track.Channels, track.Channels));
         textBuilder.append(res.getString(R.string.track_samplerate_info, track.Samplerate));
     }