diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
9 files changed, 29 insertions, 26 deletions
diff --git a/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml b/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml index c0021261e..88686bbbc 100644 --- a/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml +++ b/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal" > - <android.support.v4.widget.DrawerLayout + <android.support.v4.widget.FixedDrawerLayout android:id="@+id/drawer_layout" android:layout_width="match_parent" @@ -13,7 +13,7 @@ <include layout="@layout/drawer_list"/> - </android.support.v4.widget.DrawerLayout> + </android.support.v4.widget.FixedDrawerLayout> <include layout="@layout/api_apps_list_content"/> diff --git a/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml b/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml index 26aed0831..9e9f37391 100644 --- a/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml +++ b/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml @@ -4,7 +4,7 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="match_parent"> - <android.support.v4.widget.DrawerLayout + <android.support.v4.widget.FixedDrawerLayout xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:id="@+id/drawer_layout" android:layout_width="match_parent" @@ -12,7 +12,7 @@ <include layout="@layout/drawer_list"/> - </android.support.v4.widget.DrawerLayout> + </android.support.v4.widget.FixedDrawerLayout> <include layout="@layout/decrypt_content"/> diff --git a/OpenKeychain/src/main/res/layout-large/encrypt_activity.xml b/OpenKeychain/src/main/res/layout-large/encrypt_activity.xml index 7d0d44074..355580fad 100644 --- a/OpenKeychain/src/main/res/layout-large/encrypt_activity.xml +++ b/OpenKeychain/src/main/res/layout-large/encrypt_activity.xml @@ -4,7 +4,7 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="match_parent"> - <android.support.v4.widget.DrawerLayout + <android.support.v4.widget.FixedDrawerLayout xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" xmlns:fontawesometext="http://schemas.android.com/apk/res-auto" android:id="@+id/drawer_layout" @@ -13,7 +13,7 @@ <include layout="@layout/drawer_list"/> - </android.support.v4.widget.DrawerLayout> + </android.support.v4.widget.FixedDrawerLayout> <include layout="@layout/encrypt_content"/> </FrameLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout-large/key_list_activity.xml b/OpenKeychain/src/main/res/layout-large/key_list_activity.xml index 6636f12ff..6abbea13f 100644 --- a/OpenKeychain/src/main/res/layout-large/key_list_activity.xml +++ b/OpenKeychain/src/main/res/layout-large/key_list_activity.xml @@ -4,14 +4,14 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="match_parent"> - <android.support.v4.widget.DrawerLayout + <android.support.v4.widget.FixedDrawerLayout android:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent"> <include layout="@layout/drawer_list"/> - </android.support.v4.widget.DrawerLayout> + </android.support.v4.widget.FixedDrawerLayout> <include layout="@layout/key_list_content"/> diff --git a/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml b/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml index 9f95e9f3b..df187e0a5 100644 --- a/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml +++ b/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent" > @@ -8,4 +8,4 @@ <include layout="@layout/drawer_list" /> -</android.support.v4.widget.DrawerLayout>
\ No newline at end of file +</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/decrypt_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_activity.xml index c4709a67e..94d82fe1d 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_activity.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_activity.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:id="@+id/drawer_layout" android:layout_width="match_parent" @@ -9,4 +9,4 @@ <include layout="@layout/drawer_list" /> -</android.support.v4.widget.DrawerLayout>
\ No newline at end of file +</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/encrypt_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_activity.xml index 6484c9b7b..65c2ee8fd 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_activity.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_activity.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" xmlns:fontawesometext="http://schemas.android.com/apk/res-auto" android:id="@+id/drawer_layout" @@ -10,4 +10,4 @@ <include layout="@layout/drawer_list" /> -</android.support.v4.widget.DrawerLayout>
\ No newline at end of file +</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/key_list_activity.xml b/OpenKeychain/src/main/res/layout/key_list_activity.xml index fcb376fa8..c4c2c35cb 100644 --- a/OpenKeychain/src/main/res/layout/key_list_activity.xml +++ b/OpenKeychain/src/main/res/layout/key_list_activity.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent" > @@ -8,4 +8,4 @@ <include layout="@layout/drawer_list" /> -</android.support.v4.widget.DrawerLayout>
\ No newline at end of file +</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index aa96ac29b..330bc349d 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -140,6 +140,8 @@ <string name="no_key"><no key></string> <string name="can_encrypt">can encrypt</string> <string name="can_sign">can sign</string> + <string name="can_certify">can certify</string> + <string name="can_certify_not">cannot certify</string> <string name="expired">expired</string> <string name="revoked">revoked</string> @@ -368,6 +370,7 @@ <!-- Help --> <string name="help_tab_start">Start</string> <string name="help_tab_faq">FAQ</string> + <string name="help_tab_wot">Web of Trust</string> <string name="help_tab_nfc_beam">NFC Beam</string> <string name="help_tab_changelog">Changelog</string> <string name="help_tab_about">About</string> @@ -468,34 +471,34 @@ <string name="encrypt_content_edit_text_hint">Write message here to encrypt and/or sign…</string> <string name="decrypt_content_edit_text_hint">Enter ciphertext here to decrypt and/or verify…</string> - <!-- unsorted --> - <string name="section_signer_id">Signer</string> - <string name="section_cert">Certificate Details</string> - <string name="label_user_id">User ID</string> - <string name="unknown_uid"><unknown></string> - <string name="empty_certs">No certificates for this key</string> - <string name="section_uids_to_sign">User IDs to sign</string> + <!-- certifications --> <string name="cert_default">default</string> <string name="cert_none">none</string> <string name="cert_casual">casual</string> <string name="cert_positive">positive</string> <string name="cert_revoke">revoke</string> - <string name="help_tab_wot">Web of Trust</string> <string name="cert_verify_ok">ok</string> <string name="cert_verify_failed">failed!</string> <string name="cert_verify_error">error!</string> <string name="cert_verify_unavailable">key unavailable</string> + + <!-- unsorted --> + <string name="section_signer_id">Signer</string> + <string name="section_cert">Certificate Details</string> + <string name="label_user_id">User ID</string> + <string name="unknown_uid"><unknown></string> + <string name="empty_certs">No certificates for this key</string> + <string name="section_uids_to_sign">User IDs to sign</string> <string name="label_revocation">Revocation Reason</string> <string name="label_verify_status">Verification Status</string> <string name="label_cert_type">Type</string> - <string name="can_certify">can certify</string> - <string name="can_certify_not">cannot certify</string> <string name="error_key_not_found">Key not found!</string> <string name="error_key_processing">Error processing key!</string> <string name="no_subkey">subkey unavailable</string> <string name="key_stripped">stripped</string> <string name="secret_cannot_multiple">Secret keys can only be deleted individually!</string> <string name="title_view_cert">View Certificate Details</string> + <string name="unknown_algorithm">unknown</string> <string name="can_sign_not">cannot sign</string> </resources> |