From 146b8ba14ed66a4e4450d08ee825cca35ea8e7d5 Mon Sep 17 00:00:00 2001
From: ceskobassman <ceskobassman@gmail.com>
Date: Tue, 27 Jan 2015 10:43:52 +0100
Subject: IT translation - Singular for plurals and other fixes

Italian translation updated.
---
 org.fox.ttrss/src/main/res/values-it/strings.xml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'org.fox.ttrss')

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 219d06f4..58a3d0c7 100644
--- a/org.fox.ttrss/src/main/res/values-it/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-it/strings.xml
@@ -47,8 +47,8 @@
     <string name="context_selection_toggle_marked">(Non)Speciale</string>
     <string name="context_selection_toggle_published">(De)Pubblica</string>
     <string name="context_selection_toggle_unread">(Non)Letto</string>
-    <string name="article_set_unread">Imposta come Non letto</string>
-    <string name="article_mark_read_above">Segna gli articoli sopra questo come letti</string>
+    <string name="article_set_unread">Imposta come non letto</string>
+    <string name="article_mark_read_above">Segna sopra come letti</string>
     <string name="http_login_summary">Opzionale. Compila questo solo se la tua installazione di tt-rss è protetta con autenticazione HTTP Basic</string>
     <string name="login_summary">Il tuo nome utente per tt-rss. Non è necessario per la modalità utente singolo.</string>
     <string name="ttrss_url_summary">URL della tua installazione di tt-rss, es. http://sito.it/tt-rss/</string>
@@ -61,7 +61,7 @@
     <string name="headlines_mark_as_read">Segna come letto</string>
     <string name="error_unknown">Errore: errore sconosciuto (Vedi log)</string>
     <string name="error_http_unauthorized">Errore: 401 non autorizzato</string>
-    <string name="error_http_forbidden">Errore: 403 proibit</string>
+    <string name="error_http_forbidden">Errore: 403 accesso negato</string>
     <string name="error_http_not_found">Errore: 404 non trovato</string>
     <string name="error_http_server_error">Errore: 500 errore del server</string>
     <string name="error_http_other_error">Errore: altro errore HTTP (Vedi log)</string>
@@ -122,7 +122,7 @@
     <string name="close_feed">Chiudi feed</string>
     <string name="close_article">Chiudi articolo</string>
     <string name="dialog_open_preferences">Impostazioni</string>
-    <string name="dialog_need_configure_prompt">Compila le informazioni per l\'accesso al server tt-rss:URL, login, e password.</string>
+    <string name="dialog_need_configure_prompt">Compila le informazioni per l\'accesso al server tt-rss: URL, login, e password.</string>
     <string name="notify_article_marked">Articolo reso speciale</string>
     <string name="notify_article_unmarked">Articolo reso non-speciale</string>
     <string name="notify_article_published">Articolo publicato</string>
@@ -134,7 +134,7 @@
     <string name="category_browse_headlines">Naviga titoli</string>
     <string name="pref_default_view_mode">Modalità visualizzazione default</string>
     <string name="pref_default_view_mode_long">Quale modalità di visualizzazione utilizzare come predefinita sugli smartphones</string>
-    <string name="donate_thanks">Donazione trovata, Grazie per il supporto!</string>
+    <string name="donate_thanks">Donazione trovata, grazie per il supporto!</string>
     <string name="use_volume_keys">Usa pulsanti volume</string>
     <string name="use_volume_keys_long">Sfoglia gli articoli usando i tasti volume</string>
     <string name="ssl_trust_any_host">Nessuna validazione sull\'hostname</string>
@@ -148,11 +148,13 @@
     <string name="prefs_dim_status_bar_long">Oscura la barra di stato durante la lettura</string>
 
     <plurals name="article_comments">
+        <item quantity="one">%1$d commento</item>
         <item quantity="other">%1$d commenti</item>
     </plurals>
 
     <plurals name="trial_mode_prompt">
-        <item quantity="other">Modalità demo, %1$d giorno/i rimanenti.</item>
+        <item quantity="one">Modalità demo, %1$d giorno rimanente.</item>
+        <item quantity="other">Modalità demo, %1$d giorni rimanenti.</item>
     </plurals>
     <string name="trial_purchase">Sblocca versione completa</string>
     <string name="trial_expired">Demo scaduta</string>
@@ -201,11 +203,13 @@
     <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>
     <plurals name="mark_num_headlines_as_read">
-        <item quantity="other">Segni %1$d articolo/i come letti?</item>
+        <item quantity="one">Vuoi segnare %1$d articolo come letto?</item>
+        <item quantity="other">Vuoi segnare %1$d articoli 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>
     <plurals name="n_unread_articles">
+        <item quantity="one">%1$d articolo non letto</item>
         <item quantity="other">%1$d articoli non letti</item>
     </plurals>
 </resources>
-- 
cgit v1.2.3


From df0c03abd8c30e70bcb5b79167f0919faefad0bf Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 7 Feb 2015 16:35:44 +0300
Subject: add fix for sidebar not showing/hiding properly on tablets because of
 activity not being recreated on orientation change (this is needed to restore
 webview/fsview state)

---
 .../main/java/org/fox/ttrss/HeadlinesActivity.java | 16 ++++++++-
 .../src/main/res/layout-sw600dp-port/headlines.xml | 36 -------------------
 .../res/layout-sw600dp-port/headlines_articles.xml | 41 ++++++++++++++++++++++
 .../res/layout-sw700dp-port/headlines_articles.xml | 36 -------------------
 4 files changed, 56 insertions(+), 73 deletions(-)
 delete mode 100644 org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml
 delete mode 100644 org.fox.ttrss/src/main/res/layout-sw700dp-port/headlines_articles.xml

(limited to 'org.fox.ttrss')

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java
index 4773535d..eef2fa08 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java
@@ -3,6 +3,7 @@ package org.fox.ttrss;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
@@ -39,6 +40,10 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL
 		
 		GlobalState.getInstance().load(savedInstanceState);
 
+        if (isPortrait() && !isSmallScreen()) {
+            findViewById(R.id.headlines_fragment).setVisibility(View.GONE);
+        }
+
 		if (savedInstanceState == null) {
 			Intent i = getIntent();
 			
@@ -99,6 +104,15 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL
 		}
 	}
 
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+
+        if (!isSmallScreen()) {
+            findViewById(R.id.headlines_fragment).setVisibility(isPortrait() ? View.GONE : View.VISIBLE);
+        }
+    }
+
 	@Override
 	protected void refresh() {
 		super.refresh();
@@ -223,7 +237,7 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL
 	}
 
     public void showSidebar(boolean show) {
-        if (!isSmallScreen()) {
+        if (!isSmallScreen() && !isPortrait()) {
             findViewById(R.id.headlines_fragment).setVisibility(show ? View.VISIBLE : View.GONE);
             invalidateOptionsMenu();
         }
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml
deleted file mode 100644
index 01737c68..00000000
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:fitsSystemWindows="true">
-
-    <FrameLayout
-        android:id="@+id/sw600dp_port_anchor"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone" >
-    </FrameLayout>
-
-    <android.support.v4.widget.DrawerLayout
-        android:id="@+id/headlines_drawer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <FrameLayout
-            android:id="@+id/headlines_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?headlinesBackground">
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/feeds_fragment"
-            android:layout_width="300dp"
-            android:layout_gravity="start"
-            android:background="?feedlistBackground"
-            android:layout_height="match_parent" >
-        </FrameLayout>
-
-    </android.support.v4.widget.DrawerLayout>
-
-
-</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml
new file mode 100644
index 00000000..f4ff2c59
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml
@@ -0,0 +1,41 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/headlines"
+    android:fitsSystemWindows="true"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <FrameLayout
+        android:id="@+id/sw600dp_anchor"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone" >
+    </FrameLayout>
+
+    <LinearLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:baselineAligned="false"
+        android:orientation="horizontal" >
+
+        <FrameLayout
+            android:paddingRight="4dp"
+            android:id="@+id/headlines_fragment"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.4"
+            android:background="?headlinesBackground" >
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/article_fragment"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.6"
+            android:elevation="4dp"
+            android:background="?articleBackground" >
+        </FrameLayout>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout-sw700dp-port/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw700dp-port/headlines_articles.xml
deleted file mode 100644
index 7ed80c18..00000000
--- a/org.fox.ttrss/src/main/res/layout-sw700dp-port/headlines_articles.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main"
-    android:fitsSystemWindows="true"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
-
-    <FrameLayout
-        android:id="@+id/sw600dp_anchor"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone" >
-    </FrameLayout>
-
-    <android.support.v4.widget.DrawerLayout
-        android:id="@+id/headlines_drawer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <FrameLayout
-            android:id="@+id/article_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?articleBackground">
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/headlines_fragment"
-            android:layout_height="match_parent"
-            android:layout_width="500dp"
-            android:layout_gravity="start"
-            android:background="?headlinesBackground">
-        </FrameLayout>
-    </android.support.v4.widget.DrawerLayout>
-
-</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 8a10f86305fa21d49ae74e3cb7650a69693e8480 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 7 Feb 2015 19:51:49 +0300
Subject: update library dependencies

---
 org.fox.ttrss/build.gradle      | 6 +++---
 org.fox.ttrss/org.fox.ttrss.iml | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'org.fox.ttrss')

diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle
index 7be86dd8..eae59b2a 100644
--- a/org.fox.ttrss/build.gradle
+++ b/org.fox.ttrss/build.gradle
@@ -29,8 +29,8 @@ dependencies {
     compile files('libs/universal-image-loader-1.9.3.jar')
     compile 'com.viewpagerindicator:library:2.4.1'
     compile 'com.android.support:cardview-v7:21.0.0'
-    compile 'com.android.support:support-v4:21.0.0'
-    compile 'com.google.code.gson:gson:2.2.4'
-    compile 'com.android.support:appcompat-v7:21.0.0'
+    compile 'com.android.support:support-v4:21.0.3'
+    compile 'com.google.code.gson:gson:2.3'
+    compile 'com.android.support:appcompat-v7:21.0.3'
     compile 'com.shamanland:fab:0.0.5'
 }
diff --git a/org.fox.ttrss/org.fox.ttrss.iml b/org.fox.ttrss/org.fox.ttrss.iml
index 14d85977..00b5d8ae 100644
--- a/org.fox.ttrss/org.fox.ttrss.iml
+++ b/org.fox.ttrss/org.fox.ttrss.iml
@@ -83,16 +83,16 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
     <orderEntry type="library" exported="" name="cardview-v7-21.0.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="jsoup-1.6.1" level="project" />
+    <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
     <orderEntry type="library" exported="" name="library-2.4.1" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="universal-image-loader-1.9.3" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-21.0.0" level="project" />
     <orderEntry type="library" exported="" name="dashclock-api-r1.1" level="project" />
     <orderEntry type="library" exported="" name="fab-0.0.5" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
     <orderEntry type="module" module-name="taskerlocaleapi" exported="" />
   </component>
 </module>
-- 
cgit v1.2.3