summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-05-24 22:34:46 -0700
committerAndrew Dolgov <[email protected]>2013-05-24 22:34:46 -0700
commit17a9de1940051795235c816f26f8bd1b13b7014f (patch)
tree3564190132c07a5514b9cf8d936d19e1d2774fb7
parentdb6e446c676384870f444d545a18ab501776d828 (diff)
parent7d8a1c51de3c9ea08a5d0cb8a49af50fd9533ef6 (diff)
Merge pull request #40 from mcbyte-it/master
DashClock with multilanguage support + Updated Italian
-rw-r--r--res/drawable-hdpi/dashclock.pngbin2114 -> 3054 bytes
-rw-r--r--res/values-it/strings.xml8
-rw-r--r--res/values/strings.xml1
-rw-r--r--src/org/fox/ttrss/DashClock.java6
4 files changed, 11 insertions, 4 deletions
diff --git a/res/drawable-hdpi/dashclock.png b/res/drawable-hdpi/dashclock.png
index 394e58e9..99ffa932 100644
--- a/res/drawable-hdpi/dashclock.png
+++ b/res/drawable-hdpi/dashclock.png
Binary files differ
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 0b787ba8..5f3ab05d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -190,4 +190,12 @@
<string name="article_img_share">Condividi immagine</string>
<string name="requires_api5">Richiede versione 1.7.6</string>
<string name="labels">Etichette</string>
+ <string name="article_img_view_caption">Visualizza didascalia</string>
+ <string name="light_theme_is_not_supported_on_honeycomb">La tema Chiara 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>
+ <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>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a886c390..ec1331d3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -198,4 +198,5 @@
<string name="mark_num_headlines_as_read">Mark %1$d article(s) as read?</string>
<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>
</resources>
diff --git a/src/org/fox/ttrss/DashClock.java b/src/org/fox/ttrss/DashClock.java
index 26c1ecbb..0a9cbe05 100644
--- a/src/org/fox/ttrss/DashClock.java
+++ b/src/org/fox/ttrss/DashClock.java
@@ -6,7 +6,6 @@ import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
-import android.util.Log;
import com.google.android.apps.dashclock.api.DashClockExtension;
import com.google.android.apps.dashclock.api.ExtensionData;
@@ -53,7 +52,6 @@ public class DashClock extends DashClockExtension {
super(context);
}
- @SuppressWarnings("unchecked")
protected void onPostExecute(JsonElement result) {
if (result != null) {
try {
@@ -61,7 +59,7 @@ public class DashClock extends DashClockExtension {
if (content != null) {
m_sessionId = content.get("session_id").getAsString();
- Log.d(TAG, "Authenticated!");
+ // Log.d(TAG, "Authenticated!");
ApiRequest req = new ApiRequest(m_context) {
protected void onPostExecute(JsonElement result) {
@@ -85,7 +83,7 @@ public class DashClock extends DashClockExtension {
updatedData.icon(R.drawable.dashclock);
updatedData.status(String.valueOf(m_unreadCount));
- updatedData.expandedTitle(m_unreadCount + " unread articles");
+ updatedData.expandedTitle(getString(R.string.n_unread_articles, m_unreadCount));
//updatedData.expandedBody(getString(R.string.app_name));
updatedData.clickIntent(new Intent().setClassName("org.fox.ttrss",