diff options
| author | grait <grandhiajit9@gmail.com> | 2014-03-09 14:44:20 +0530 |
|---|---|---|
| committer | grait <grandhiajit9@gmail.com> | 2014-03-09 14:44:20 +0530 |
| commit | 7b8668a7e30bc3eef4aaece87a13ff27fc924e79 (patch) | |
| tree | 61f9fb2d589746a3f7e3aa02922325812ccf0d20 /OpenPGP-Keychain/src/main/res | |
| parent | 3fbda4245cf34d2f8e150e6a26ad4048cdb6b204 (diff) | |
| parent | 50d9908bafd1b55640deb3a0b2cff4e06155cc5e (diff) | |
| download | open-keychain-7b8668a7e30bc3eef4aaece87a13ff27fc924e79.tar.gz open-keychain-7b8668a7e30bc3eef4aaece87a13ff27fc924e79.tar.bz2 open-keychain-7b8668a7e30bc3eef4aaece87a13ff27fc924e79.zip | |
Merge branch 'develop' into master2
Diffstat (limited to 'OpenPGP-Keychain/src/main/res')
3 files changed, 9 insertions, 3 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml index 055687183..b44ca82ec 100644 --- a/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml +++ b/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml @@ -92,7 +92,7 @@ android:layout_width="wrap_content" android:layout_height="0dp" android:layout_weight="1" - android:stretchColumns="1"> + android:shrinkColumns="1"> <TableRow> diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml index 35a8f3926..35f4fca92 100644 --- a/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml +++ b/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml @@ -4,7 +4,7 @@ <item android:id="@+id/menu_key_list_public_import" - app:showAsAction="always|withText" + app:showAsAction="ifRoom|withText" android:icon="@drawable/ic_action_add_person" android:title="@string/menu_import" /> <item @@ -16,5 +16,5 @@ android:title="@string/menu_search" android:icon="@drawable/ic_action_search" app:actionViewClass="android.support.v7.widget.SearchView" - app:showAsAction="ifRoom" /> + app:showAsAction="collapseActionView|ifRoom" /> </menu>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml index 99fc7c8a7..cd016c41e 100644 --- a/OpenPGP-Keychain/src/main/res/values/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values/strings.xml @@ -296,10 +296,16 @@ <string name="error_keyserver_insufficient_query">Insufficient server query</string> <string name="error_keyserver_query">Querying keyserver failed</string> <string name="error_keyserver_too_many_responses">Too many responses</string> + <string name="error_import_file_no_content">File has no content</string> + <string name="error_generic_report_bug">A generic error occurred, please create a new bug report for OpenKeychain.</string> <plurals name="error_can_not_delete_info"> <item quantity="one">Please delete it from the \'My Keys\' screen!</item> <item quantity="other">Please delete them from the \'My Keys\' screen!</item> </plurals> + <plurals name="error_import_non_pgp_part"> + <item quantity="one">part of the loaded file is a valid OpenPGP object but not a OpenPGP key</item> + <item quantity="other">parts of the loaded file are valid OpenPGP objects but not OpenPGP keys</item> + </plurals> <!-- progress dialogs, usually ending in '…' --> <string name="progress_done">done.</string> |