From 7f08d95b277962e21317c39b5bb33ad256cc78c8 Mon Sep 17 00:00:00 2001
From: poitzorg <ailbone@gmail.com>
Date: Sat, 7 Jan 2012 01:43:07 +0100
Subject: [PATCH 1/4] Update src/org/fox/ttrss/MainActivity.java

---
 src/org/fox/ttrss/MainActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index 9e2d7d86..078a8b7b 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -1118,7 +1118,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
 			intent.putExtra(Intent.EXTRA_TEXT, article.link);
 
 			startActivity(Intent.createChooser(intent,
-					getString(R.id.share_article)));
+					getString(R.string.share_article)));
 		}
 	}
 

From c94449f1f3129dc392b383f06616290ec58a99c9 Mon Sep 17 00:00:00 2001
From: poitzorg <ailbone@gmail.com>
Date: Sat, 7 Jan 2012 02:33:39 +0100
Subject: [PATCH 2/4] Changed login and login_login Strings. login_login =
 "Username" login = "Log in"

---
 res/values-de/strings.xml | 4 ++--
 res/xml/preferences.xml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0b845516..f56e48fc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -7,9 +7,9 @@
     <string name="app_name">Tiny Tiny RSS</string>
     <string name="login_need_configure">Bitte erst Einstellungen überprüfen.</string>
     <string name="login_ready">Bereit zur Anmeldung</string>
-    <string name="login_login">Anmelden</string>
+    <string name="login_login">Benutzername</string>
     <string name="logout">Abmelden</string>
-    <string name="login">Benutzername</string>
+    <string name="login">Anmelden</string>
     <string name="debugging">Debugging</string>
     <string name="password">Passwort</string>
     <string name="default_url">http://example.domain/tt-rss/</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 1afeac97..85e11f88 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -7,7 +7,7 @@
             android:key="login"
             android:singleLine="true"
             android:summary="@string/login_summary"
-            android:title="@string/login" >
+            android:title="@string/login_login" >
         </EditTextPreference>
 
         <EditTextPreference
@@ -38,7 +38,7 @@
             android:key="http_login"
             android:singleLine="true"
             android:summary="@string/http_login_summary"
-            android:title="@string/login" >
+            android:title="@string/login_login" >
         </EditTextPreference>
 
         <EditTextPreference

From 8747a04a8b7478ade64e4bc7a61b2be72ca0d0b4 Mon Sep 17 00:00:00 2001
From: poitzorg <ailbone@gmail.com>
Date: Sat, 7 Jan 2012 02:59:37 +0100
Subject: [PATCH 3/4] Revert "Changed login and login_login Strings.
 login_login = "Username" login = "Log in""

This reverts commit c94449f1f3129dc392b383f06616290ec58a99c9
---
 res/values-de/strings.xml | 4 ++--
 res/xml/preferences.xml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f56e48fc..0b845516 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -7,9 +7,9 @@
     <string name="app_name">Tiny Tiny RSS</string>
     <string name="login_need_configure">Bitte erst Einstellungen überprüfen.</string>
     <string name="login_ready">Bereit zur Anmeldung</string>
-    <string name="login_login">Benutzername</string>
+    <string name="login_login">Anmelden</string>
     <string name="logout">Abmelden</string>
-    <string name="login">Anmelden</string>
+    <string name="login">Benutzername</string>
     <string name="debugging">Debugging</string>
     <string name="password">Passwort</string>
     <string name="default_url">http://example.domain/tt-rss/</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 85e11f88..1afeac97 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -7,7 +7,7 @@
             android:key="login"
             android:singleLine="true"
             android:summary="@string/login_summary"
-            android:title="@string/login_login" >
+            android:title="@string/login" >
         </EditTextPreference>
 
         <EditTextPreference
@@ -38,7 +38,7 @@
             android:key="http_login"
             android:singleLine="true"
             android:summary="@string/http_login_summary"
-            android:title="@string/login_login" >
+            android:title="@string/login" >
         </EditTextPreference>
 
         <EditTextPreference

From 232176c0e7b8d995de0ae0c905a8938cd0352f6d Mon Sep 17 00:00:00 2001
From: poitzorg <ailbone@gmail.com>
Date: Sat, 7 Jan 2012 03:08:49 +0100
Subject: [PATCH 4/4] Changed login Strings

---
 res/menu/main_menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index cc9f474e..85d9dac8 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -133,7 +133,7 @@
             android:id="@+id/login"
             android:icon="@android:drawable/ic_menu_rotate"
             android:showAsAction="ifRoom|withText"
-            android:title="@string/login"/>
+            android:title="@string/login_login"/>
     </group>
 
 </menu>
\ No newline at end of file