From 38efe37b1ab7975dc6a606022d452b09cf528480 Mon Sep 17 00:00:00 2001
From: Aidan Follestad <drummer.aidan@gmail.com>
Date: Mon, 20 Apr 2015 09:12:08 -0500
Subject: [PATCH] String updates, removed unnecessary use of
 getResources().getString()

---
 .../ui/activities/tageditor/AbsTagEditorActivity.java       | 6 ++----
 .../java/com/kabouzeid/gramophone/util/NavigationUtil.java  | 2 +-
 app/src/main/res/values-cs/strings.xml                      | 2 +-
 app/src/main/res/values-de/strings.xml                      | 4 ++--
 app/src/main/res/values-es-r419/strings.xml                 | 2 +-
 app/src/main/res/values-es-rES/strings.xml                  | 4 ++--
 app/src/main/res/values-fr/strings.xml                      | 2 +-
 app/src/main/res/values-it/strings.xml                      | 2 +-
 app/src/main/res/values-nl/strings.xml                      | 4 ++--
 app/src/main/res/values-pl/strings.xml                      | 4 ++--
 app/src/main/res/values-pt-rBR/strings.xml                  | 2 +-
 app/src/main/res/values-pt-rPT/strings.xml                  | 2 +-
 app/src/main/res/values-ro/strings.xml                      | 2 +-
 app/src/main/res/values-ru/strings.xml                      | 4 ++--
 app/src/main/res/values-tr/strings.xml                      | 4 ++--
 app/src/main/res/values-zh-rCN/strings.xml                  | 2 +-
 app/src/main/res/values-zh-rTW/strings.xml                  | 2 +-
 app/src/main/res/values/strings.xml                         | 4 ++--
 18 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
index a33d834e..7eb48278 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
@@ -328,11 +328,9 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
     protected void writeValuesToFiles(final Map<FieldKey, String> fieldKeyValueMap, final Artwork artwork, final boolean deleteArtwork) {
         Util.hideSoftKeyboard(this);
         final String writingFileStr = getResources().getString(R.string.writing_file_number);
-        final String savingStr = getResources().getString(R.string.saving_changes);
-        final String rescanningStr = getResources().getString(R.string.rescanning_changed_files);
         //TODO dialog currently disappears on orientation change and using DialogFragment causes an exception for some reason
         final MaterialDialog progressDialog = new MaterialDialog.Builder(AbsTagEditorActivity.this)
-                .title(savingStr)
+                .title(R.string.saving_changes)
                 .cancelable(false)
                 .progress(true, 0)
                 .build();
@@ -385,7 +383,7 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
                 runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
-                        progressDialog.setContent(rescanningStr);
+                        progressDialog.setContent(getString(R.string.rescanning_media));
                     }
                 });
                 rescanMediaAndQuitOnFinish(new OnScannedAllListener() {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java
index 6772c68d..a92a4b81 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java
@@ -116,7 +116,7 @@ public class NavigationUtil {
     public static void openEqualizer(final Activity activity) {
         final int sessionId = MusicPlayerRemote.getAudioSessionId();
         if (sessionId == AudioEffect.ERROR_BAD_VALUE) {
-            Toast.makeText(activity, activity.getResources().getString(R.string.no_audio_id), Toast.LENGTH_LONG).show();
+            Toast.makeText(activity, activity.getResources().getString(R.string.no_audio_ID), Toast.LENGTH_LONG).show();
         } else {
             try {
                 final Intent effects = new Intent(AudioEffect.ACTION_DISPLAY_AUDIO_EFFECT_CONTROL_PANEL);
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 6c1a2900..b4255fb3 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -91,7 +91,7 @@
     <string name="pref_title_colored_navigation_bar_other_screens">Všude jinde</string>
     <string name="pref_title_colored_album_footers">Barevné zápatí alb</string>
     <string name="no_equalizer">Ekvalizér nenalezen</string>
-    <string name="no_audio_id">Neznámé ID hudby, přehrajte něco jiného a zkuste to znovu.</string>
+    <string name="no_audio_ID">Neznámé ID hudby, přehrajte něco jiného a zkuste to znovu.</string>
     <string name="navigation_drawer_open">Otevřít navigační záložku</string>
     <string name="navigation_drawer_close">Zavřít navigační záložku</string>
     <string name="delete_action">Smazat</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b077509f..85fd8fd1 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -92,7 +92,7 @@
     <string name="pref_title_colored_navigation_bar_other_screens">Überall sonst</string>
     <string name="pref_title_colored_album_footers">Farbige Balken unter den Alben</string>
     <string name="no_equalizer">Es wurde kein Equalizer gefunden</string>
-    <string name="no_audio_id">Keine Audio ID gefunden, gib ein anderes Lied wieder und versuch es nochmal.</string>
+    <string name="no_audio_ID">Keine Audio ID gefunden, gib ein anderes Lied wieder und versuch es nochmal.</string>
     <string name="navigation_drawer_open">Öffne Navigation Drawer</string>
     <string name="navigation_drawer_close">Schließe Navigation Drawer</string>
     <string name="delete_action">Löschen</string>
@@ -113,7 +113,7 @@
     <string name="pref_summary_colored_album_footers">Die Titel der Alben im Raster passend zu ihrer Cover Farbe färben.</string>
     <string name="failed_download_albumart">Das Cover für dieses Album konnte nicht heruntergeladen werden.</string>
     <string name="search_hint">Durchsuche deine Mediathek</string>
-    <string name="rescanning_changed_files">Geänderte Dateien werden erneut gescannt</string>
+    <string name="rescanning_media">Geänderte Dateien werden erneut gescannt</string>
     <string-array name="update_album_cover_options">
         <item>Von Last.fm herunterladen</item>
         <item>Aus lokalem Speicher wählen</item>
diff --git a/app/src/main/res/values-es-r419/strings.xml b/app/src/main/res/values-es-r419/strings.xml
index 51d6d2bb..5c2d215c 100644
--- a/app/src/main/res/values-es-r419/strings.xml
+++ b/app/src/main/res/values-es-r419/strings.xml
@@ -85,7 +85,7 @@
     <string name="pref_title_colored_navigation_bar_albums">Barra de navegación de Vista del Álbum coloreada</string>
     <string name="pref_title_colored_album_footers">Pie de álbum coloreado</string>
     <string name="no_equalizer">No se encontró ningún ecualizador</string>
-    <string name="no_audio_id">Sin id de audio, toca algo e intenta nuevamente</string>
+    <string name="no_audio_ID">Sin id de audio, toca algo e intenta nuevamente</string>
     <string name="navigation_drawer_open">Abrir cajón de navegación</string>
     <string name="navigation_drawer_close">"Cerrar la barra de navegación "</string>
     <string name="delete_action">Borrar</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 0fac3e1b..9434117f 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -95,7 +95,7 @@
     <string name="pref_title_colored_navigation_bar_other_screens">En el resto de sitios</string>
     <string name="pref_title_colored_album_footers">Pie de álbum coloreado</string>
     <string name="no_equalizer">No se encontró ecualizador</string>
-    <string name="no_audio_id">No se identificó audio, intenta reproducir nuevamente</string>
+    <string name="no_audio_ID">No se identificó audio, intenta reproducir nuevamente</string>
     <string name="navigation_drawer_open">Abrir cajón de navegación</string>
     <string name="navigation_drawer_close">Cerrar cajón de navegación</string>
     <string name="delete_action">Borrar</string>
@@ -116,7 +116,7 @@
     <string name="pref_summary_colored_album_footers">Los pies de álbum de la cuadrícula están coloreados con las paletas de colores de sus respectivas portadas.</string>
     <string name="failed_download_albumart">No se puede descargar la portada del álbum.</string>
     <string name="search_hint">Buscar en librería...</string>
-    <string name="rescanning_changed_files">Reescaneando archivos modificados</string>
+    <string name="rescanning_media">Reescaneando archivos modificados</string>
     <string-array name="update_album_cover_options">
         <item>Descargar de Last.fm</item>
         <item>Escoger de disco duro</item>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 14794c71..1e8cc9f6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -91,7 +91,7 @@
     <string name="pref_title_colored_navigation_bar_other_screens">Partout ailleurs</string>
     <string name="pref_title_colored_album_footers">Bas d\'album coloré</string>
     <string name="no_equalizer">Aucun égaliseur trouvé</string>
-    <string name="no_audio_id">Aucun audio, veuillez lire un titre puis réessayer</string>
+    <string name="no_audio_ID">Aucun audio, veuillez lire un titre puis réessayer</string>
     <string name="navigation_drawer_open">Ouvrir le volet de navigation</string>
     <string name="navigation_drawer_close">Fermer le volet de navigation</string>
     <string name="delete_action">Supprimer</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 01953313..385e796e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -69,7 +69,7 @@
     <string name="pref_title_colored_navigation_bar_albums">Barra navigazione album colorata</string>
     <string name="pref_title_colored_album_footers">Piè di pagina album colorati</string>
     <string name="no_equalizer">Nessun equalizzatore trovato</string>
-    <string name="no_audio_id">Nessun audio id, riproduci qualcosa e riprova</string>
+    <string name="no_audio_ID">Nessun audio id, riproduci qualcosa e riprova</string>
     <string name="navigation_drawer_open">Apri la barra di navigazione</string>
     <string name="navigation_drawer_close">Chiudi la barra di navigazione</string>
     <string name="song">Canzone</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index bbe2cecb..95316234 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -92,7 +92,7 @@
     <string name="pref_title_colored_navigation_bar_other_screens">Overal elders</string>
     <string name="pref_title_colored_album_footers">Gekleurde album footers</string>
     <string name="no_equalizer">Geen equalizer gevonden</string>
-    <string name="no_audio_id">Geen audio ID, speel iets af en probeer het nogmaals.</string>
+    <string name="no_audio_ID">Geen audio ID, speel iets af en probeer het nogmaals.</string>
     <string name="navigation_drawer_open">Open navigatiebalk</string>
     <string name="navigation_drawer_close">Sluit navigatiebalk</string>
     <string name="delete_action">Verwijderen</string>
@@ -113,7 +113,7 @@
     <string name="pref_summary_colored_album_footers">"Album footers in het raster worden gekleurd met het palet van de albumhoes. "</string>
     <string name="failed_download_albumart">"Het lukt niet om de albumhoes te downloaden. "</string>
     <string name="search_hint">Zoek in je bibliotheek...</string>
-    <string name="rescanning_changed_files">Opnieuw scannen van gewijzigde bestanden</string>
+    <string name="rescanning_media">Opnieuw scannen van gewijzigde bestanden</string>
     <string-array name="update_album_cover_options">
         <item>Downloaden van Last.fm</item>
         <item>Kies vanuit lokale opslag</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index f1c455c7..41ce9f17 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -94,7 +94,7 @@
     <string name="pref_title_colored_navigation_bar_other_screens">Wszędzie</string>
     <string name="pref_title_colored_album_footers">Kolorowe stopki albumu</string>
     <string name="no_equalizer">Nie znaleziono korektora</string>
-    <string name="no_audio_id">Brak ID dźwięku, puść coś i spróbuj ponownie</string>
+    <string name="no_audio_ID">Brak ID dźwięku, puść coś i spróbuj ponownie</string>
     <string name="navigation_drawer_open">Otwórz pasek nawigacji</string>
     <string name="navigation_drawer_close">Zamknij pasek nawigacji</string>
     <string name="delete_action">Usuń</string>
@@ -115,7 +115,7 @@
     <string name="pref_summary_colored_album_footers">Stopki albumu w siatce są w tonacji okładki albumu</string>
     <string name="failed_download_albumart">Nie można pobrać okładki dla tego albumu</string>
     <string name="search_hint">Przeszukuje bibliotekę...</string>
-    <string name="rescanning_changed_files">Ponowne skanowanie zmienionych plików</string>
+    <string name="rescanning_media">Ponowne skanowanie zmienionych plików</string>
     <string-array name="update_album_cover_options">
         <item>Pobierz z Last.fm</item>
         <item>Wybierz z pamięci lokalnej</item>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index adcff3d7..5361ebc0 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -91,7 +91,7 @@
     <string name="pref_title_colored_navigation_bar_other_screens">Todos os outros lugares</string>
     <string name="pref_title_colored_album_footers">Colorir rodapés de álbuns</string>
     <string name="no_equalizer">Nenhum equalizador encontrado</string>
-    <string name="no_audio_id">Sem id de áudio, reproduza alguma coisa e tente novamente.</string>
+    <string name="no_audio_ID">Sem id de áudio, reproduza alguma coisa e tente novamente.</string>
     <string name="navigation_drawer_open">Abrir gaveta de navegação</string>
     <string name="navigation_drawer_close">Fechar gaveta de navegação</string>
     <string name="delete_action">Excluir</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 09833df4..a47655b8 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -71,7 +71,7 @@
     <string name="pref_title_colored_navigation_bar_albums">Barra de navegação colorida na visualização do álbum</string>
     <string name="pref_title_colored_album_footers">Rodapés coloridos do álbum</string>
     <string name="no_equalizer">Nenhum equalizador encontrado</string>
-    <string name="no_audio_id">Nenhuma identificação de áudio, reproduza algo e tente novamente.</string>
+    <string name="no_audio_ID">Nenhuma identificação de áudio, reproduza algo e tente novamente.</string>
     <string name="navigation_drawer_open">Abrir área de navegação</string>
     <string name="navigation_drawer_close">Fechar área de navegação</string>
     <string name="song">Música</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 0acf3720..89820d44 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -90,7 +90,7 @@
     <string name="pref_title_colored_navigation_bar_other_screens">Oriunde altundeva</string>
     <string name="pref_title_colored_album_footers">Bară detalii album colorată</string>
     <string name="no_equalizer">Niciun egalizator găsit</string>
-    <string name="no_audio_id">Nicio identificare audio, redă ceva şi încearcă din nou.</string>
+    <string name="no_audio_ID">Nicio identificare audio, redă ceva şi încearcă din nou.</string>
     <string name="navigation_drawer_open">Deschide sertarul de navigație</string>
     <string name="navigation_drawer_close">Închide sertarul de navigație</string>
     <string name="delete_action">Șterge</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f500b47a..88fde263 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -92,7 +92,7 @@
     <string name="pref_title_colored_navigation_bar_other_screens">Во всех остальных</string>
     <string name="pref_title_colored_album_footers">Цветная панель названия альбома</string>
     <string name="no_equalizer">Эквалайзер не найден</string>
-    <string name="no_audio_id">Нет аудио, воспроизведите что-нибудь и попробуйте ещё раз.</string>
+    <string name="no_audio_ID">Нет аудио, воспроизведите что-нибудь и попробуйте ещё раз.</string>
     <string name="navigation_drawer_open">Открыть панель навигации</string>
     <string name="navigation_drawer_close">Закрыть панель навигации</string>
     <string name="delete_action">Удалить</string>
@@ -113,7 +113,7 @@
     <string name="pref_summary_colored_album_footers">Панели альбомов в сетке окрашены цветом из палитры обложки альбома.</string>
     <string name="failed_download_albumart">Невозможно загрузить обложку для этого альбома.</string>
     <string name="search_hint">Поиск библиотеки...</string>
-    <string name="rescanning_changed_files">Повторное сканирование изменённых файлов</string>
+    <string name="rescanning_media">Повторное сканирование изменённых файлов</string>
     <string-array name="update_album_cover_options">
         <item>Скачать с Last.fm</item>
         <item>Выбрать из локального хранилища</item>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index ac159e62..637f4645 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -92,7 +92,7 @@
     <string name="pref_title_colored_navigation_bar_other_screens">Başka her yer</string>
     <string name="pref_title_colored_album_footers">Renkli albüm alt bilgileri</string>
     <string name="no_equalizer">Hiçbir ekolayzer bulunamadı</string>
-    <string name="no_audio_id">Hiçbir ses kimliği bulunamadı, bir şarkı çalın ve tekrar deneyin.</string>
+    <string name="no_audio_ID">Hiçbir ses kimliği bulunamadı, bir şarkı çalın ve tekrar deneyin.</string>
     <string name="navigation_drawer_open">Gezinti çekmecesini aç</string>
     <string name="navigation_drawer_close">Gezinti çekmecesini kapat</string>
     <string name="delete_action">Sil</string>
@@ -112,7 +112,7 @@
     <string name="pref_summary_transparent_toolbar">Araç çubuğunun altına kaydırılan içerik görünüyor.</string>
     <string name="pref_summary_colored_album_footers">Izgara içindeki albüm alt bilgisi albüm arkaplanı paletiyle renklendirildi.</string>
     <string name="failed_download_albumart">Bu albüm için kapak indirilemiyor.</string>
-    <string name="rescanning_changed_files">Değiştirilen dosyalatı yeniden tara</string>
+    <string name="rescanning_media">Değiştirilen dosyalatı yeniden tara</string>
     <string-array name="update_album_cover_options">
         <item>Last.FM den indir</item>
         <item>Pick from Local Storage</item>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 32e190d3..dfa8b831 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -91,7 +91,7 @@
     <string name="pref_title_colored_navigation_bar_other_screens">其他任何地方</string>
     <string name="pref_title_colored_album_footers">使用变色的专辑标签</string>
     <string name="no_equalizer">没有找到均衡器</string>
-    <string name="no_audio_id">没有音频ID，请播放曲目并重试。</string>
+    <string name="no_audio_ID">没有音频ID，请播放曲目并重试。</string>
     <string name="navigation_drawer_open">弹出导航抽屉</string>
     <string name="navigation_drawer_close">关闭导航抽屉</string>
     <string name="delete_action">删除</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 88ca90fe..fc60282b 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -91,7 +91,7 @@
     <string name="pref_title_colored_navigation_bar_other_screens">其他任何地方</string>
     <string name="pref_title_colored_album_footers">使用變色的專輯標籤</string>
     <string name="no_equalizer">沒有找到均衡器</string>
-    <string name="no_audio_id">沒有音訊ID，請重新嘗試播放歌曲。</string>
+    <string name="no_audio_ID">沒有音訊ID，請重新嘗試播放歌曲。</string>
     <string name="navigation_drawer_open">打開側選單</string>
     <string name="navigation_drawer_close">關閉側選單</string>
     <string name="delete_action">刪除</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 20803cea..cffdf46d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -104,7 +104,7 @@
     <string name="pref_title_colored_navigation_bar_other_screens">Everywhere else</string>
     <string name="pref_title_colored_album_footers">Colored album footers</string>
     <string name="no_equalizer">No equalizer found</string>
-    <string name="no_audio_id">No audio id, play something and try again.</string>
+    <string name="no_audio_ID">No audio ID, play something and try again.</string>
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
     <string name="delete_action">Delete</string>
@@ -126,7 +126,7 @@
     <string name="pref_summary_colored_album_footers">Album footers in the grid are colored with the album cover\'s palette.</string>
     <string name="failed_download_albumart">Unable to download the art for this album.</string>
     <string name="search_hint">Search your library…</string>
-    <string name="rescanning_changed_files">Rescanning changed files</string>
+    <string name="rescanning_media">Rescanning media…</string>
 
     <string-array name="update_album_cover_options">
         <item>Download from Last.fm</item>