Use plurals where necessary

12 files changed, 94 insertions, 32 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/DashClock.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/DashClock.java
index b3491972..e12b35d3 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DashClock.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/DashClock.java
@@ -56,7 +56,7 @@ public class DashClock extends DashClockExtension {
 											updatedData.icon(R.drawable.dashclock);
 											updatedData.status(String.valueOf(unread));
 						
-											updatedData.expandedTitle(getString(R.string.n_unread_articles, unread));
+											updatedData.expandedTitle(getResources().getQuantityString(R.plurals.n_unread_articles, unread, unread));
 											//updatedData.expandedBody(getString(R.string.app_name));
 						
 											updatedData.clickIntent(new Intent().setClassName("org.fox.ttrss",
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
index c1adef52..e5e35ebf 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
@@ -526,10 +526,10 @@ public class OnlineActivity extends CommonActivity {
 				dialog.show();
 				
 			} else {
-				long daysLeft = Math.round((firstStart + (TRIAL_DAYS * 24 * 60 * 60 * 1000) - System.currentTimeMillis()) / (24 * 60 * 60 * 1000));
+				int daysLeft = Math.round((firstStart + (TRIAL_DAYS * 24 * 60 * 60 * 1000) - System.currentTimeMillis()) / (24 * 60 * 60 * 1000));
 				
 				if (notify) {
-					toast(getString(R.string.trial_mode_prompt, Long.valueOf(daysLeft)));
+					toast(getResources().getQuantityString(R.plurals.trial_mode_prompt, daysLeft, daysLeft));
 				}
 			}
 		} else if (notify) {			
@@ -797,7 +797,7 @@ public class OnlineActivity extends CommonActivity {
 					if (confirm) {
 						AlertDialog.Builder builder = new AlertDialog.Builder(
 								OnlineActivity.this)
-								.setMessage(getString(R.string.mark_num_headlines_as_read, count))
+								.setMessage(getResources().getQuantityString(R.plurals.mark_num_headlines_as_read, count, count))
 								.setPositiveButton(R.string.catchup,
 										new Dialog.OnClickListener() {
 											public void onClick(DialogInterface dialog,
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
index fd05b596..ebf1bb07 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
@@ -422,7 +422,7 @@ public class OfflineActivity extends CommonActivity {
 					if (confirm) {
 						AlertDialog.Builder builder = new AlertDialog.Builder(
 								OfflineActivity.this)
-								.setMessage(getString(R.string.mark_num_headlines_as_read, count))
+								.setMessage(getResources().getQuantityString(R.plurals.mark_num_headlines_as_read, count, count))
 								.setPositiveButton(R.string.catchup,
 										new Dialog.OnClickListener() {
 											public void onClick(DialogInterface dialog,
diff --git a/org.fox.ttrss/src/main/res/values-cs/strings.xml b/org.fox.ttrss/src/main/res/values-cs/strings.xml
index fcaf790e..75869c33 100644
--- a/org.fox.ttrss/src/main/res/values-cs/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-cs/strings.xml
@@ -146,7 +146,9 @@
   <string name="prefs_dim_status_bar">Matný stavový proužek</string>
   <string name="prefs_dim_status_bar_long">Schová stavový proužek při čtení</string>
   <string name="article_comments">%1$d komentáře</string>
-  <string name="trial_mode_prompt">Trial verze, %1$d dní zbývá.</string>
+  <plurals name="trial_mode_prompt">
+      <item quantity="other">Trial verze, %1$d dní zbývá.</item>
+  </plurals>
   <string name="trial_purchase">Odemknout plnou verzi</string>
   <string name="trial_expired">Trial verze vypršela</string>
   <string name="trial_expired_message">Chcete-li pokračovat v používání aplikace Tiny Tiny RSS prosím odemkněte ji zakoupeným klíčem.</string>
@@ -188,14 +190,18 @@
   <string name="labels">Štítky</string>
   <string name="prefs_confirm_headlines_catchup">Potvrdit označení článků jako přečtených</string>
   <string name="article_img_open">Otevřít obrázek</string>
-  <string name="n_unread_articles">%1$d nepřečtených článků</string>
+    <plurals name="n_unread_articles">
+        <item quantity="other">%1$d nepřečtených článků</item>
+    </plurals>
   <string name="pref_headline_font_size">Velikost textu nadpisu</string>
   <string name="requires_api5">Vyžaduje verzi 1.7.6</string>
   <string name="pref_headlines_mark_read_scroll_long">Nadpisy budou při posunu označeny jako přečtené</string>
   <string name="no_caption_to_display">Bez popisky</string>
   <string name="article_img_view_caption">Zobrazit popisku</string>
   <string name="light_theme_is_not_supported_on_honeycomb">Světlé téma není na Honeycombu podporováno</string>
-  <string name="mark_num_headlines_as_read">Označit %1$d článků jako přečtené?</string>
+  <plurals name="mark_num_headlines_as_read">
+      <item quantity="other">Označit %1$d článků jako přečtené?</item>
+  </plurals>
   <string name="pref_headlines_mark_read_scroll">Při posunu označit jako přečtené</string>
   <string name="article_img_share">Sdílet obrázek</string>
 </resources>
diff --git a/org.fox.ttrss/src/main/res/values-de/strings.xml b/org.fox.ttrss/src/main/res/values-de/strings.xml
index 7e8c2992..cbc25cdc 100644
--- a/org.fox.ttrss/src/main/res/values-de/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-de/strings.xml
@@ -146,7 +146,9 @@
     <string name="prefs_dim_status_bar">Statusleiste abdunkeln</string>
     <string name="prefs_dim_status_bar_long">Statusleiste beim Lesen dunkler machen</string>
     <string name="article_comments">%1$d Kommentare</string>
-    <string name="trial_mode_prompt">Testversion, %1$d Tag(e) übrig.</string>
+    <plurals name="trial_mode_prompt">
+        <item quantity="other">Testversion, %1$d Tag(e) übrig.</item>
+    </plurals>
     <string name="trial_purchase">Vollversion freischalten</string>
     <string name="trial_expired">Testzeitraum abgelaufen</string>
     <string name="trial_expired_message">Um Tiny Tiny RSS weiterhin nutzen zu können kaufen Sie bitte den Schlüssel.</string>
@@ -193,10 +195,14 @@
     <string name="light_theme_is_not_supported_on_honeycomb">Helle Oberfläche wird auf Honeycomb nicht unterstützt</string>
     <string name="pref_headlines_mark_read_scroll">Beim scrollen als gelesen markieren</string>
     <string name="pref_headlines_mark_read_scroll_long">Überschriften werden beim Vorbeiscrollen als gelesen markiert</string>
-    <string name="mark_num_headlines_as_read">%1$d Artikel als gelesen markieren?</string>
+    <plurals name="mark_num_headlines_as_read">
+        <item quantity="other">%1$d Artikel als gelesen markieren?</item>
+    </plurals>
     <string name="prefs_confirm_headlines_catchup">Nachfragen, bevor Artikel als gelesen markiert werden</string>
     <string name="author_formatted">von %1$s</string>
-    <string name="n_unread_articles">%1$d ungelesene Artikel</string>
+    <plurals name="n_unread_articles">
+        <item quantity="other">%1$d ungelesene Artikel</item>
+    </plurals>
     <string name="pref_headline_font_size">Schriftgröße Überschriften</string>
     <string name="context_confirm_catchup">Alle Artikel in %1$s als gelesen markieren?</string>
     <string name="theme_system">Voreinstellung des Systems</string>
diff --git a/org.fox.ttrss/src/main/res/values-es/strings.xml b/org.fox.ttrss/src/main/res/values-es/strings.xml
index 6a111fea..3c3bc1da 100644
--- a/org.fox.ttrss/src/main/res/values-es/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-es/strings.xml
@@ -148,7 +148,9 @@
     <string name="prefs_dim_status_bar">Oscurecer barra de estado</string>
     <string name="prefs_dim_status_bar_long">Oscurecer barra de estado durante lectura</string>
     <string name="article_comments">%1$d comentarios</string>
-    <string name="trial_mode_prompt">Período de prueba, queda(n) %1$d día(s).</string>
+    <plurals name="trial_mode_prompt">
+        <item quantity="other">Período de prueba, queda(n) %1$d día(s).</item>
+    </plurals>
     <string name="trial_purchase">Desbloquear versión completa</string>
     <string name="trial_expired">Período de prueba expirado</string>
     <string name="trial_expired_message">Para continuar usando Tiny Tiny RSS, por favor desbloquee la versión completa adquiriendo una clave.</string>
@@ -195,10 +197,14 @@
     <string name="light_theme_is_not_supported_on_honeycomb">Tema claro no está soportado en Honeycomb</string>
     <string name="pref_headlines_mark_read_scroll">Marcar como leído al desplazarse por titulares</string>
     <string name="pref_headlines_mark_read_scroll_long">Los artículos se marcarán como leídos al desplazarse por la lista de titulares</string>
-    <string name="mark_num_headlines_as_read">Marcar %1$d artículo(s) como leído(s)?</string>
+    <plurals name="mark_num_headlines_as_read">
+        <item quantity="other">Marcar %1$d artículo(s) como leído(s)?</item>
+    </plurals>
     <string name="prefs_confirm_headlines_catchup">Confirme para marcar artículos como leídos</string>
     <string name="author_formatted">por %1$s</string>
-    <string name="n_unread_articles">%1$d artículos sin leer</string>
+    <plurals name="n_unread_articles">
+        <item quantity="other">%1$d artículos sin leer</item>
+    </plurals>
     <string name="pref_headline_font_size">Tamaño de texto para los titulares</string>
     <string name="context_confirm_catchup">¿Marcar todos los artículos en %1$s como leídos?</string>
 </resources>
diff --git a/org.fox.ttrss/src/main/res/values-fr/strings.xml b/org.fox.ttrss/src/main/res/values-fr/strings.xml
index afb98075..eae21dc3 100644
--- a/org.fox.ttrss/src/main/res/values-fr/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-fr/strings.xml
@@ -148,7 +148,10 @@
     <string name="prefs_dim_status_bar">Assombrir la barre de statut</string>
     <string name="prefs_dim_status_bar_long">Assombrir la barre de satut pendant la lecture</string>
     <string name="article_comments">%1$d commentaires</string>
-    <string name="trial_mode_prompt">Mode évaluation, %1$d jour(s) restant(s).</string>
+    <plurals name="trial_mode_prompt">
+        <item quantity="one">Mode évaluation, un seul jour restant.</item>
+        <item quantity="other">Mode évaluation, %1$d jours restants.</item>
+    </plurals>
     <string name="trial_purchase">Débloquer la version complète</string>
     <string name="trial_expired">La période d\'évaluation a expiré</string>
     <string name="trial_expired_message">Pour continuer à utiliser Tiny Tiny RSS merci de débloquer la version complète en achetant la clé.</string>
@@ -195,10 +198,17 @@
     <string name="light_theme_is_not_supported_on_honeycomb">Le thème clair n\'est pas supporté sur Honeycomb</string>
     <string name="pref_headlines_mark_read_scroll">Automatiquement marquer les articles comme lus</string>
     <string name="pref_headlines_mark_read_scroll_long">Cette option permet de marquer automatiquement les articles comme lus lorsque vous naviguez dans la liste d\'articles.</string>
-    <string name="mark_num_headlines_as_read">Marquer %1$d article(s) comme lu(s) ?</string>
+    <plurals name="mark_num_headlines_as_read">
+        <item quantity="one">Marquer %1$d article comme lu ?</item>
+        <item quantity="other">Marquer %1$d articles comme lus ?</item>
+    </plurals>
     <string name="prefs_confirm_headlines_catchup">Confirmer marquer comme lu</string>
     <string name="author_formatted">par %1$s</string>
-    <string name="n_unread_articles">%1$d articles non lus</string>
+    <plurals name="n_unread_articles">
+        <item quantity="zero">Aucun article non lu</item>
+        <item quantity="one">Un article non lu</item>
+        <item quantity="other">%1$d articles non lus</item>
+    </plurals>
     <string name="pref_headline_font_size">Taille du texte des titres</string>
 
     <string name="context_confirm_catchup">Marquer tous les articles de %1$s comme lus ?</string>
diff --git a/org.fox.ttrss/src/main/res/values-it/strings.xml b/org.fox.ttrss/src/main/res/values-it/strings.xml
index 4fa8945c..be7a3c6c 100644
--- a/org.fox.ttrss/src/main/res/values-it/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-it/strings.xml
@@ -147,7 +147,9 @@
     <string name="prefs_dim_status_bar">Oscura la barra di stato</string>
     <string name="prefs_dim_status_bar_long">Oscura la barra di stato durante la lettura</string>
     <string name="article_comments">%1$d commenti</string>
-    <string name="trial_mode_prompt">Modalità demo, %1$d giorno/i rimanenti.</string>
+    <plurals name="trial_mode_prompt">
+        <item quantity="other">Modalità demo, %1$d giorno/i rimanenti.</item>
+    </plurals>
     <string name="trial_purchase">Sblocca versione completa</string>
     <string name="trial_expired">Demo scaduta</string>
     <string name="trial_expired_message">Per continuare ad usare Tiny Tiny RSS si prega di sbloccare la versione Full acquistando l\'app chiave.</string>
@@ -194,8 +196,12 @@
     <string name="light_theme_is_not_supported_on_honeycomb">Il tema chiaro non è supportata su Honeycomb</string>
     <string name="pref_headlines_mark_read_scroll">Segna come letto quando si scorre</string>
     <string name="pref_headlines_mark_read_scroll_long">Gli articoli verranno segnati come letti quando si scorre oltre</string>
-    <string name="mark_num_headlines_as_read">Segni %1$d articolo/i come letti?</string>
+    <plurals name="mark_num_headlines_as_read">
+        <item quantity="other">Segni %1$d articolo/i come letti?</item>
+    </plurals>
     <string name="prefs_confirm_headlines_catchup">Confermi la marcatura degli articoli come letti</string>
     <string name="author_formatted">di %1$s</string>
-    <string name="n_unread_articles">%1$d articoli non letti</string>
+    <plurals name="n_unread_articles">
+        <item quantity="other">%1$d articoli non letti</item>
+    </plurals>
 </resources>
diff --git a/org.fox.ttrss/src/main/res/values-ja/strings.xml b/org.fox.ttrss/src/main/res/values-ja/strings.xml
index 956e0772..d9234993 100644
--- a/org.fox.ttrss/src/main/res/values-ja/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-ja/strings.xml
@@ -149,7 +149,9 @@
     <string name="prefs_dim_status_bar">下部ソフトキーをぼかす</string>
     <string name="prefs_dim_status_bar_long">記事表示中は下部ソフトキーをぼかす</string>
     <string name="article_comments">%1$d 件のコメント</string>
-    <string name="trial_mode_prompt">試用期間中。残り %1$d 日間。</string>
+    <plurals name="trial_mode_prompt">
+        <item quantity="other">試用期間中。残り %1$d 日間。</item>
+    </plurals>
     <string name="trial_purchase">フルバージョンを購入</string>
     <string name="trial_expired">試用期限終了</string>
     <string name="trial_expired_message">Tiny Tiny RSSを継続して使用する場合はTiny Tiny RSS Unlockerを購入してください。</string>
@@ -195,10 +197,14 @@
     <string name="light_theme_is_not_supported_on_honeycomb">ライトテーマはHoneycombではサポートされていません</string>
     <string name="pref_headlines_mark_read_scroll">スクロールしたら既読にする</string>
     <string name="pref_headlines_mark_read_scroll_long">ヘッドラインをスクロールしたら既読にする</string>
-    <string name="mark_num_headlines_as_read">%1$d 件の記事を既読にしますか？</string>
+    <plurals name="mark_num_headlines_as_read">
+        <item quantity="other">%1$d 件の記事を既読にしますか？</item>
+    </plurals>
     <string name="prefs_confirm_headlines_catchup">記事を既読にする際に確認する</string>
     <string name="author_formatted">by %1$s</string>
-    <string name="n_unread_articles">%1$d 件の未読記事</string>
+    <plurals name="n_unread_articles">
+        <item quantity="other">%1$d 件の未読記事</item>
+    </plurals>
     <string name="pref_headline_font_size">ヘッドラインの文字サイズ</string>
     <string name="context_confirm_catchup">%1$s の全ての記事を既読にしますか？</string>
     <string name="theme_system">端末のデフォルト</string>
diff --git a/org.fox.ttrss/src/main/res/values-pl/strings.xml b/org.fox.ttrss/src/main/res/values-pl/strings.xml
index 9e60b96f..304c747b 100644
--- a/org.fox.ttrss/src/main/res/values-pl/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-pl/strings.xml
@@ -164,7 +164,9 @@
     <string name="prefs_dim_status_bar">Przyciemnij pasek statusu</string>
     <string name="prefs_dim_status_bar_long">Przyciemnij pasek statusu podczas czytania</string>
     <string name="article_comments">%1$d komentarzy</string>
-    <string name="trial_mode_prompt">Tryb wersji testowej, pozostało dni: %1$d.</string>
+    <plurals name="trial_mode_prompt">
+        <item quantity="other">Tryb wersji testowej, pozostało dni: %1$d.</item>
+    </plurals>
     <string name="trial_purchase">Odblokuj pełną wersję</string>
     <string name="trial_expired">Wersja testowa wygasła</string>
     <string name="trial_expired_message">Aby nadal używać Tiny Tiny RSS odblokuj pełną wersję kupując klucz aktywacyjny.</string>
@@ -211,9 +213,13 @@
     <string name="light_theme_is_not_supported_on_honeycomb">Jasny styl nie jest wspierany na Androidzie Honeycomb</string>
     <string name="pref_headlines_mark_read_scroll">Oznaczaj jako przeczytane podczas przewijania</string>
     <string name="pref_headlines_mark_read_scroll_long">Nagłówki będą oznaczane jako przeczynane podczas przewijania ich listy</string>
-    <string name="mark_num_headlines_as_read">Oznaczyć %1$d artykuł(y) jako przeczytane?</string>
+    <plurals name="mark_num_headlines_as_read">
+        <item quantity="other">Oznaczyć %1$d artykuł(y) jako przeczytane?</item>
+    </plurals>
     <string name="prefs_confirm_headlines_catchup">Potwierdzaj oznaczanie artykułów jako przeczytane</string>
     <string name="author_formatted">przez %1$s</string>
-    <string name="n_unread_articles">%1$d nieprzeczytanych artykułów</string>
+    <plurals name="n_unread_articles">
+        <item quantity="other">%1$d nieprzeczytanych artykułów</item>
+    </plurals>
     <string name="pref_headline_font_size">Rozmiar czcionki nagłówka</string>
 </resources>
diff --git a/org.fox.ttrss/src/main/res/values-pt-rBR/strings.xml b/org.fox.ttrss/src/main/res/values-pt-rBR/strings.xml
index ee55cdda..ac5d44fa 100644
--- a/org.fox.ttrss/src/main/res/values-pt-rBR/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-pt-rBR/strings.xml
@@ -148,7 +148,9 @@
     <string name="prefs_dim_status_bar">Ocultar barra de status</string>
     <string name="prefs_dim_status_bar_long">Ocultar barra de status durante a leitura</string>
     <string name="article_comments">%1$d comentários</string>
-    <string name="trial_mode_prompt">Modo de teste, resta(m) %1$d dia(s).</string>
+    <plurals name="trial_mode_prompt">
+        <item quantity="other">Modo de teste, resta(m) %1$d dia(s).</item>
+    </plurals>
     <string name="trial_purchase">Desbloquear a versão completa</string>
     <string name="trial_expired">Período de teste encerrado</string>
     <string name="trial_expired_message">Para continuar usando o Tiny Tiny RSS por favor desbloqueie a versão completa comprando a chave.</string>
@@ -195,9 +197,13 @@
     <string name="light_theme_is_not_supported_on_honeycomb">Tema claro não é suportado no Honeycomb</string>
     <string name="pref_headlines_mark_read_scroll">Marcar como lida ao visualizar</string>
     <string name="pref_headlines_mark_read_scroll_long">Títulos serão marcados como lidos ao rodar depois deles</string>
-    <string name="mark_num_headlines_as_read">Marcar %1$d artigo(s) como lido(s)?</string>
+    <plurals name="mark_num_headlines_as_read">
+        <item quantity="other">Marcar %1$d artigo(s) como lido(s)?</item>
+    </plurals>
     <string name="prefs_confirm_headlines_catchup">Confirme marcação de artigos como lidos</string>
     <string name="author_formatted">por %1$s</string>
-    <string name="n_unread_articles">%1$d artigos não lidos</string>
+    <plurals name="n_unread_articles">
+        <item quantity="other">%1$d artigos não lidos</item>
+    </plurals>
     <string name="pref_headline_font_size">Tamanho do texto para os títulos</string>
 </resources>
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index d5653d49..784c8dc2 100644
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -149,7 +149,10 @@
     <string name="prefs_dim_status_bar">Dim status bar</string>
     <string name="prefs_dim_status_bar_long">Dim status bar when reading</string>
     <string name="article_comments">%1$d comments</string>
-    <string name="trial_mode_prompt">Trial mode, %1$d day(s) left.</string>
+    <plurals name="trial_mode_prompt">
+        <item quantity="one">Trial mode, only one day left.</item>
+        <item quantity="other">Trial mode, %1$d days left.</item>
+    </plurals>
     <string name="trial_purchase">Unlock full version</string>
     <string name="trial_expired">Trial expired</string>
     <string name="trial_expired_message">To continue using Tiny Tiny RSS please unlock the full version by purchasing the key.</string>
@@ -195,10 +198,17 @@
     <string name="light_theme_is_not_supported_on_honeycomb">Light theme is not supported on Honeycomb</string>
     <string name="pref_headlines_mark_read_scroll">Mark read on scroll</string>
     <string name="pref_headlines_mark_read_scroll_long">Headlines will be marked read when scrolling past them</string>
-    <string name="mark_num_headlines_as_read">Mark %1$d article(s) as read?</string>
+    <plurals name="mark_num_headlines_as_read">
+        <item quantity="one">Mark %1$d article as read?</item>
+        <item quantity="other">Mark %1$d articles as read?</item>
+    </plurals>
     <string name="prefs_confirm_headlines_catchup">Confirm marking articles as read</string>
     <string name="author_formatted">by %1$s</string>
-    <string name="n_unread_articles">%1$d unread articles</string>
+    <plurals name="n_unread_articles">
+        <item quantity="zero">No unread articles</item>
+        <item quantity="one">One unread article</item>
+        <item quantity="other">%1$d unread articles</item>
+    </plurals>
     <string name="pref_headline_font_size">Headline text size</string>
     <string name="context_confirm_catchup">Mark all articles in %1$s as read?</string>
     <string name="theme_system">Device Default</string>