aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-09-10 11:46:31 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-09-10 11:46:31 +0200
commit178aea6b90fb085e05e9d50979af1782592a3a49 (patch)
treea9fe97f64fb0e6219f0b99c358b3e14ebf94f619 /OpenKeychain/src/main/res
parent9fd5e966f67be2ce8630df49b97d88a457b27d2d (diff)
downloadopen-keychain-178aea6b90fb085e05e9d50979af1782592a3a49.tar.gz
open-keychain-178aea6b90fb085e05e9d50979af1782592a3a49.tar.bz2
open-keychain-178aea6b90fb085e05e9d50979af1782592a3a49.zip
linked: localization for github creation
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml12
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml39
2 files changed, 31 insertions, 20 deletions
diff --git a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml
index 3b4f9e4ff..e1c8db383 100644
--- a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml
@@ -48,7 +48,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
- android:text="This operation links your key to your GitHub account."
+ android:text="@string/linked_github_text"
style="?android:textAppearanceSmall"/>
<LinearLayout
@@ -72,7 +72,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:text="Login at GitHub…"
+ android:text="@string/linked_progress_auth_github"
style="?android:textAppearanceMedium"
/>
@@ -92,7 +92,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:text="Post Gist…"
+ android:text="@string/linked_progress_post_gist"
style="?android:textAppearanceMedium"
/>
@@ -112,7 +112,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:text="Update Key…"
+ android:text="@string/linked_progress_update_key"
style="?android:textAppearanceMedium"
/>
</LinearLayout>
@@ -139,7 +139,7 @@
android:drawableLeft="@drawable/link_24dp"
android:drawableStart="@drawable/link_24dp"
android:drawablePadding="12dp"
- android:text="Link to Github Account"
+ android:text="@string/linked_button_start"
android:id="@+id/button_send"
/>
@@ -156,7 +156,7 @@
android:drawableLeft="@drawable/ic_repeat_black_24dp"
android:drawableStart="@drawable/ic_repeat_black_24dp"
android:drawablePadding="12dp"
- android:text="Retry Last Step"
+ android:text="@string/linked_button_retry"
android:id="@+id/button_retry"
/>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index bfa1395ac..034a78133 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1604,19 +1604,30 @@
<string name="menu_linked_add_identity">"Link to Account"</string>
<string name="section_linked_identities">"Linked Identities"</string>
<string name="btn_finish">"Finish"</string>
- <string name="linked_title_https">Website (HTTPS)</string>
- <string name="linked_title_dns">Domain Name (DNS)</string>
- <string name="linked_title_github">GitHub</string>
- <string name="linked_title_twitter">Twitter</string>
- <string name="card_linked_identity">Linked Identity</string>
- <string name="linked_button_verify">Verify</string>
- <string name="linked_button_retry">Retry</string>
- <string name="linked_button_confirm">Confirm</string>
- <string name="linked_button_view">View</string>
- <string name="linked_text_verifying">Verifying…</string>
- <string name="linked_text_error">Error</string>
- <string name="linked_text_confirming">Confirming…</string>
- <string name="linked_ids_more_unknown">%d more unknown identity types</string>
- <string name="title_linked_id_create">Create Linked Identity</string>
+ <string name="linked_title_https">"Website (HTTPS)"</string>
+ <string name="linked_title_dns">"Domain Name (DNS)"</string>
+ <string name="linked_title_github">"GitHub"</string>
+ <string name="linked_title_twitter">"Twitter"</string>
+ <string name="card_linked_identity">"Linked Identity"</string>
+ <string name="linked_button_verify">"Verify"</string>
+ <string name="linked_button_retry">"Retry last step"</string>
+ <string name="linked_button_confirm">"Confirm"</string>
+ <string name="linked_button_view">"View"</string>
+ <string name="linked_text_verifying">"Verifying…"</string>
+ <string name="linked_text_error">"Error"</string>
+ <string name="linked_text_confirming">"Confirming…"</string>
+ <string name="linked_ids_more_unknown">"%d more unknown identity types"</string>
+ <string name="title_linked_id_create">"Create Linked Identity"</string>
+ <string name="linked_github_text">"This operation links your key to your GitHub account.\nJust press the button to continue."</string>
+ <string name="linked_progress_auth_github">"Authorize with GitHub…"</string>
+ <string name="linked_progress_post_gist">"Post Gist…"</string>
+ <string name="linked_progress_update_key">"Update Key…"</string>
+ <string name="linked_button_start">"Link to Github Account"</string>
+ <string name="linked_error_auth_failed">"Authorization failed!"</string>
+ <string name="linked_error_timeout">"Connection timeout!"</string>
+ <string name="linked_error_network">"Network error!"</string>
+ <string name="linked_error_http">"Communication error: %s"</string>
+ <string name="linked_webview_title_github">"GitHub Authorization"</string>
+ <string name="linked_gist_description">"OpenKeychain API Tests"</string>
</resources>