aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/create_key.xml4
-rw-r--r--res/layout/edit_key_key_item.xml10
-rw-r--r--res/layout/edit_key_user_id_item.xml8
-rw-r--r--res/layout/key_server_query_layout.xml5
-rw-r--r--res/values/strings.xml10
5 files changed, 26 insertions, 11 deletions
diff --git a/res/layout/create_key.xml b/res/layout/create_key.xml
index ab327ffeb..d8ccc73ec 100644
--- a/res/layout/create_key.xml
+++ b/res/layout/create_key.xml
@@ -29,7 +29,7 @@
<TableRow>
<TextView android:id="@+id/label_algorithm"
- android:text="Algorithm"
+ android:text="@string/label_algorithm"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
@@ -45,7 +45,7 @@
<TableRow>
<TextView android:id="@+id/label_size"
- android:text="Key Size"
+ android:text="@string/label_keySize"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
diff --git a/res/layout/edit_key_key_item.xml b/res/layout/edit_key_key_item.xml
index ba428938e..2db805d09 100644
--- a/res/layout/edit_key_key_item.xml
+++ b/res/layout/edit_key_key_item.xml
@@ -43,7 +43,7 @@
<TextView
android:id="@+id/label_keyId"
- android:text="Key ID"
+ android:text="@string/label_keyId"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
@@ -63,7 +63,7 @@
<TextView
android:id="@+id/label_algorithm"
- android:text="Algorithm"
+ android:text="@string/label_algorithm"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
@@ -82,7 +82,7 @@
<TextView
android:id="@+id/label_creation"
- android:text="Creation"
+ android:text="@string/label_creation"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
@@ -99,7 +99,7 @@
<TextView
android:id="@+id/label_expiry"
- android:text="Expiry"
+ android:text="@string/label_expiry"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
@@ -116,7 +116,7 @@
<TextView
android:id="@+id/label_usage"
- android:text="Usage"
+ android:text="@string/label_usage"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
diff --git a/res/layout/edit_key_user_id_item.xml b/res/layout/edit_key_user_id_item.xml
index 2dc383a01..d5c7c0fa5 100644
--- a/res/layout/edit_key_user_id_item.xml
+++ b/res/layout/edit_key_user_id_item.xml
@@ -29,7 +29,7 @@
<RadioButton
android:id="@+id/isMainUserId"
- android:text="Main User ID"
+ android:text="@string/label_mainUserId"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginLeft="20dip"/>
@@ -49,7 +49,7 @@
<TextView
android:id="@+id/label_name"
- android:text="Name"
+ android:text="@string/label_name"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -68,7 +68,7 @@
<TextView
android:id="@+id/label_email"
- android:text="Email"
+ android:text="@string/label_email"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -87,7 +87,7 @@
<TextView
android:id="@+id/label_comment"
- android:text="Comment"
+ android:text="@string/label_comment"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
diff --git a/res/layout/key_server_query_layout.xml b/res/layout/key_server_query_layout.xml
index 167d02fef..6af4f3644 100644
--- a/res/layout/key_server_query_layout.xml
+++ b/res/layout/key_server_query_layout.xml
@@ -20,6 +20,11 @@
android:layout_height="fill_parent"
android:orientation="vertical">
+ <Spinner
+ android:id="@+id/keyServer"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"/>
+
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dabade473..2ca8d949b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -113,6 +113,15 @@
<string name="label_language">Language</string>
<string name="label_forceV3Signature">Force V3 Signatures</string>
<string name="label_keyServers">Key Servers</string>
+ <string name="label_keyId">Key ID</string>
+ <string name="label_creation">Creation</string>
+ <string name="label_expiry">Expiry</string>
+ <string name="label_usage">Usage</string>
+ <string name="label_keySize">Key Size</string>
+ <string name="label_mainUserId">Main User ID</string>
+ <string name="label_name">Name</string>
+ <string name="label_comment">Comment</string>
+ <string name="label_email">Email</string>
<string name="noKeysSelected">Select</string>
<string name="oneKeySelected">1 Selected</string>
@@ -263,6 +272,7 @@
<string name="progress_verifyingIntegrity">verifying integrity...</string>
<string name="progress_deletingSecurely">deleting \'%s\' securely...</string>
<string name="progress_querying">querying...</string>
+ <string name="progress_queryingServer">querying %s...</string>
<!-- permission strings -->
<string name="permission_read_key_details_label">Read key details from APG.</string>