diff options
Diffstat (limited to 'OpenPGP-Keychain/res')
4 files changed, 27 insertions, 17 deletions
diff --git a/OpenPGP-Keychain/res/layout/api_app_register_activity.xml b/OpenPGP-Keychain/res/layout/api_app_register_activity.xml index b8b668681..c1b2a9c50 100644 --- a/OpenPGP-Keychain/res/layout/api_app_register_activity.xml +++ b/OpenPGP-Keychain/res/layout/api_app_register_activity.xml @@ -3,7 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="vertical" > + android:orientation="vertical" + android:padding="8dp" > <fragment android:id="@+id/api_app_settings_fragment" @@ -23,11 +24,10 @@ android:id="@+id/register_crypto_consumer_question" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Package TODO requests permanent access to OpenPGP Keychain\'s API. Allow permanent access?" + android:text="TODO: use string" android:textAppearance="?android:attr/textAppearanceMedium" /> <LinearLayout - android:id="@+id/register_crypto_consumer_register_layout" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" @@ -38,16 +38,15 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:text="Disallow access" /> + android:text="@string/api_register_disallow" /> <Button android:id="@+id/register_crypto_consumer_allow" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:text="Allow access" /> + android:text="@string/api_register_allow" /> </LinearLayout> </LinearLayout> - </LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml index e25a110cc..35caec434 100644 --- a/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml +++ b/OpenPGP-Keychain/res/layout/api_app_settings_activity.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + android:padding="8dp" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" > @@ -24,14 +25,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:text="Revoke access" /> + android:text="@string/api_settings_revoke" /> <Button android:id="@+id/register_crypto_consumer_allow" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:text="Save" /> + android:text="@string/api_settings_save" /> </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml index 3763d3198..6db366297 100644 --- a/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml +++ b/OpenPGP-Keychain/res/layout/api_app_settings_fragment.xml @@ -11,36 +11,37 @@ android:paddingBottom="3dip" > <TextView - android:id="@+id/register_crypto_consumer_select_key" + android:id="@+id/api_app_settings_selected_key" android:layout_width="0dip" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_weight="1" - android:text="Select key" + android:text="@string/api_settings_no_key" android:textAppearance="?android:attr/textAppearanceMedium" /> <Button - android:id="@+id/register_crypto_consumer_select_key_button" + android:id="@+id/api_app_settings_select_key_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:text="TD Select priv key" /> + android:text="@string/api_settings_select_key" /> </LinearLayout> <Button android:id="@+id/api_app_settings_advanced_button" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="show advanced settings" /> + android:text="@string/api_settings_show_advanced" /> <LinearLayout android:id="@+id/api_app_settings_advanced" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="horizontal" > + android:orientation="horizontal" + android:visibility="invisible" > <CheckBox - android:id="@+id/asciiArmour" + android:id="@+id/api_app_ascii_armor" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_vertical" diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml index 5dfd0d312..d6253ea57 100644 --- a/OpenPGP-Keychain/res/values/strings.xml +++ b/OpenPGP-Keychain/res/values/strings.xml @@ -359,9 +359,18 @@ <string name="intent_import_key">OpenPGP: Import Keyring</string> <string name="intent_send_encrypt">OpenPGP: Encrypt</string> <string name="intent_send_decrypt">OpenPGP: Decrypt</string> - + <!-- Remote API --> <string name="api_no_apps">No registered applications!</string> <string name="api_unknown_app">Unknown app</string> - + <string name="api_settings_show_advanced">Show advanced settingsā¦</string> + <string name="api_settings_hide_advanced">Hide advanced settingsā¦</string> + <string name="api_settings_no_key">No key selected</string> + <string name="api_settings_select_key">Select key</string> + <string name="api_settings_save">Save</string> + <string name="api_settings_revoke">Revoke access</string> + <string name="api_register_text">%1$s (%2$s) requests access to OpenPGP Keychain\'s API.\n\nAllow permanent access?</string> + <string name="api_register_allow">Allow access</string> + <string name="api_register_disallow">Disallow access</string> + </resources>
\ No newline at end of file |