aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-01-09 23:51:23 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-01-09 23:51:23 +0100
commit3abad09cb0f755a53b47a239c4738b4d1718abfd (patch)
tree155a50e5ff6f0a4d861f3d2904d118e661cb9454 /OpenPGP-Keychain/res
parent37fd7dbbc70d6fc033db4101eaf89bad627fe499 (diff)
downloadopen-keychain-3abad09cb0f755a53b47a239c4738b4d1718abfd.tar.gz
open-keychain-3abad09cb0f755a53b47a239c4738b4d1718abfd.tar.bz2
open-keychain-3abad09cb0f755a53b47a239c4738b4d1718abfd.zip
preferences and help into menu not drawer according to guidelines and google apps
Diffstat (limited to 'OpenPGP-Keychain/res')
-rw-r--r--OpenPGP-Keychain/res/layout/encrypt.xml2
-rw-r--r--OpenPGP-Keychain/res/values/strings.xml3
2 files changed, 2 insertions, 3 deletions
diff --git a/OpenPGP-Keychain/res/layout/encrypt.xml b/OpenPGP-Keychain/res/layout/encrypt.xml
index 41b01c7c3..eea484df2 100644
--- a/OpenPGP-Keychain/res/layout/encrypt.xml
+++ b/OpenPGP-Keychain/res/layout/encrypt.xml
@@ -119,7 +119,7 @@
android:layout_gravity="center_vertical"
android:layout_margin="4dp"
android:text="@string/btn_select_encrypt_keys"
- bootstrapbutton:bb_icon_left="fa-users"
+ bootstrapbutton:bb_icon_left="fa-user"
bootstrapbutton:bb_size="default"
bootstrapbutton:bb_type="default" />
</LinearLayout>
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index e84a3e2f2..a84cd52a1 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -81,6 +81,7 @@
<!-- menu -->
<string name="menu_preferences">Settings</string>
+ <string name="menu_help">Help</string>
<string name="menu_api_app_settings">Registered Apps</string>
<string name="menu_import_from_file">Import from file</string>
<string name="menu_import_from_qr_code">Import from QR Code</string>
@@ -375,9 +376,7 @@
<string name="nav_decrypt">Decrypt</string>
<string name="nav_import">Import Keys</string>
<string name="nav_secret_keys">My Keys</string>
- <string name="nav_settings">Settings</string>
<string name="nav_apps">Registered Apps</string>
- <string name="nav_help">Help</string>
<string name="drawer_open">Open navigation drawer</string>
<string name="drawer_close">Close navigation drawer</string>