diff options
| author | Andrew Dolgov <[email protected]> | 2012-01-08 01:06:19 -0800 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-01-08 01:06:19 -0800 |
| commit | 27161555137065b114a97e8ce5c0b31e45e8c76b (patch) | |
| tree | a6a3931bb491b7b5ef141e5b42db99e6ab400ccd | |
| parent | c784d66394e8dfbc05f39b91e1cc8a1953cc9616 (diff) | |
| parent | 232176c0e7b8d995de0ae0c905a8938cd0352f6d (diff) | |
Merge pull request #1 from poitzorg/patch-1
Strings and share article fix
| -rw-r--r-- | res/menu/main_menu.xml | 2 | ||||
| -rw-r--r-- | src/org/fox/ttrss/MainActivity.java | 2 |
2 files changed, 2 insertions, 2 deletions
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 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))); } } |