diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
4 files changed, 57 insertions, 16 deletions
diff --git a/OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml b/OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml new file mode 100644 index 000000000..78e9247ea --- /dev/null +++ b/OpenKeychain/src/main/res/layout/add_keyserver_dialog.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:custom="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingBottom="16dp" + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:paddingTop="16dp"> + + <EditText + android:id="@+id/keyserver_url_edit_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginBottom="8dp" + android:ems="10" + android:hint="@string/label_enter_keyserver_url" + android:imeOptions="actionDone" /> + + <CheckBox + android:id="@+id/verify_keyserver_checkbox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/label_verify_keyserver" + android:checked="true"/> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml index b75ec5022..8fd2c79fc 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> @@ -12,4 +12,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> -</LinearLayout>
\ No newline at end of file +</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml index 3c21291cd..7645918f4 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml @@ -1,25 +1,24 @@ <?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent" - android:fillViewport="true"> + android:layout_height="match_parent"> - <LinearLayout + <ScrollView android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="4dp" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:orientation="vertical"> + android:layout_height="match_parent" + android:fillViewport="true"> <EditText android:id="@+id/encrypt_text_text" android:layout_width="match_parent" - android:layout_height="0dip" + android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" android:gravity="top" android:inputType="text|textCapSentences|textMultiLine|textLongMessage" - android:hint="@string/encrypt_content_edit_text_hint" - android:layout_weight="1" /> + android:hint="@string/encrypt_content_edit_text_hint" /> - </LinearLayout> -</ScrollView> + </ScrollView> + +</RelativeLayout> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index d4c67aa23..df88336a1 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -86,6 +86,7 @@ <string name="btn_encrypt_text">"Encrypt text"</string> <string name="btn_add_email">"Add additional email address"</string> <string name="btn_unlock">"Unlock"</string> + <string name="btn_add_keyserver">"Add"</string> <!-- menu --> <string name="menu_preferences">"Settings"</string> @@ -152,6 +153,8 @@ <string name="label_enable_compression">"Enable compression"</string> <string name="label_encrypt_filenames">"Encrypt filenames"</string> <string name="label_hidden_recipients">"Hide recipients"</string> + <string name="label_verify_keyserver">"Verify Keyserver"</string> + <string name="label_enter_keyserver_url">"Enter Keyserver URL"</string> <string name="pref_keyserver">"Search Keyserver"</string> <string name="pref_keyserver_summary">"Search HKP keyserver"</string> @@ -353,6 +356,8 @@ <string name="progress_con_saving">"consolidate: saving to cache…"</string> <string name="progress_con_reimport">"consolidate: reimporting…"</string> + <string name="progress_verifying_keyserver_url">"verifying keyserver…"</string> + <!-- action strings --> <string name="hint_cloud_search_hint">"Search via Name, Email…"</string> @@ -645,6 +650,13 @@ <string name="view_key_fragment_no_system_contact">"<none>"</string> + <!-- Add keyserver --> + <string name="add_keyserver_dialog_title">"Add Keyserver"</string> + <string name="add_keyserver_verified">"Keyserver verified!"</string> + <string name="add_keyserver_without_verification">"Keyserver added without verification."</string> + <string name="add_keyserver_invalid_url">"Invalid URL!"</string> + <string name="add_keyserver_connection_failed">"Failed to connect to keyserver. Please check the URL and your internet connection."</string> + <!-- Navigation Drawer --> <string name="nav_keys">"Keys"</string> <string name="nav_encrypt_decrypt">"Encrypt/Decrypt"</string> @@ -1226,6 +1238,7 @@ <string name="swipe_to_update">"Swipe down to update from keyserver"</string> <string name="error_no_file_selected">"Select at least one file to encrypt!"</string> <string name="error_multi_not_supported">"Saving of multiple files not supported. This is a limitation on current Android."</string> + <string name="error_empty_text">"Type some text to encrypt!"</string> <string name="key_colon">"Key:"</string> <string name="exchange_description">"To start a key exchange, choose the number of participants on the right side, then hit the “Start exchange” button.\n\nYou will be asked two more questions to make sure only the right participants are in the exchange and their fingerprints are correct."</string> <string name="btn_start_exchange">"Start exchange"</string> |