diff options
Diffstat (limited to 'src/main/res')
-rw-r--r-- | src/main/res/menu/editaccount.xml | 7 | ||||
-rw-r--r-- | src/main/res/menu/manageaccounts.xml | 6 | ||||
-rw-r--r-- | src/main/res/values/strings.xml | 8 |
3 files changed, 17 insertions, 4 deletions
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml index 2076805ef..62981a454 100644 --- a/src/main/res/menu/editaccount.xml +++ b/src/main/res/menu/editaccount.xml @@ -11,6 +11,13 @@ android:showAsAction="never" /> <item + android:id="@+id/action_renew_certificate" + android:title="@string/action_renew_certificate" + android:visible="false" + android:showAsAction="never" /> + /> + + <item android:id="@+id/action_server_info_show_more" android:title="@string/server_info_show_more" android:checkable="true" diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml index 6dd57ae54..ffa692a0b 100644 --- a/src/main/res/menu/manageaccounts.xml +++ b/src/main/res/menu/manageaccounts.xml @@ -7,11 +7,11 @@ android:showAsAction="always" android:title="@string/action_add_account"/> <item - android:id="@+id/action_add_account_from_key" + android:id="@+id/action_add_account_with_cert" android:showAsAction="never" android:icon="?attr/icon_add_person" - android:title="@string/action_add_account_from_key" - android:visible="false"/> + android:title="@string/action_add_account_with_certificate" + android:visible="true"/> <item android:id="@+id/action_enable_all" android:title="@string/enable_all_accounts"/> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 5be800883..162c277bd 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -524,7 +524,13 @@ <string name="pref_away_when_screen_off_summary">Marks your resource as away when the screen is turned off</string> <string name="pref_xa_on_silent_mode">Not available in silent mode</string> <string name="pref_xa_on_silent_mode_summary">Marks your resource as not available when phone is in silent mode</string> - <string name="action_add_account_from_key">Add account from key</string> + <string name="action_add_account_with_certificate">Add account with certificate</string> <string name="unable_to_parse_certificate">Unable to parse certificate</string> <string name="authenticate_with_certificate">Leave empty to authenticate w/ certificate</string> + <string name="captcha_ocr">Captcha text</string> + <string name="captcha_required">Captcha required</string> + <string name="captcha_hint">enter the text from the image</string> + <string name="certificate_chain_is_not_trusted">Certificate chain is not trusted</string> + <string name="jid_does_not_match_certificate">Jabber ID does not match certificate</string> + <string name="action_renew_certificate">Renew certificate</string> </resources> |