aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/res/values/strings.xml
diff options
context:
space:
mode:
authorJohn Heroy <johnheroy@gmail.com>2015-10-22 10:29:02 -0700
committerJohn Heroy <johnheroy@gmail.com>2015-10-22 10:29:02 -0700
commit0ba492825d85f5d41acdd00fdbbcd6e8f1d8dfff (patch)
tree42acb30e08ab5d0419d5a1a7c64e27c0d4015a92 /app/src/main/res/values/strings.xml
parent9d4f9e73ed7053c5477def1c5e1496b71ffe8cee (diff)
parent50ea516a0730309d577977eb5664a9d9b5c3b947 (diff)
downloadconnectbot-0ba492825d85f5d41acdd00fdbbcd6e8f1d8dfff.tar.gz
connectbot-0ba492825d85f5d41acdd00fdbbcd6e8f1d8dfff.tar.bz2
connectbot-0ba492825d85f5d41acdd00fdbbcd6e8f1d8dfff.zip
Merge branch 'master' into fontsizeslider
Diffstat (limited to 'app/src/main/res/values/strings.xml')
-rw-r--r--app/src/main/res/values/strings.xml19
1 files changed, 0 insertions, 19 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d472353..824f664 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -45,17 +45,7 @@
<!-- Window title when generating a new pubkey. -->
<string name="title_pubkey_generate">Generate</string>
- <string name="resolve_connect">"Connect"</string>
- <!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->
- <string name="resolve_entropy">"Gather Entropy"</string>
-
- <string name="menu_insert">"Add Host"</string>
- <string name="menu_delete">"Delete Host"</string>
- <string name="menu_preferences">"Preferences"</string>
-
<string name="help_intro">"Please select a topic below for more information on a particular subject."</string>
- <string name="help_about">"About ConnectBot"</string>
- <string name="help_keyboard">"Keyboard"</string>
<!-- Title for the help page with the terms & conditions of the app. -->
<string name="terms_and_conditions">"Terms &amp; Conditions"</string>
@@ -200,8 +190,6 @@
<string name="button_cancel">Cancel</string>
<!-- Change an existing item's (e.g., host or pubkey) details. -->
<string name="button_change">"Change"</string>
- <!-- Button that begins the generation of a public key pair. -->
- <string name="button_generate">"Generate Key"</string>
<!-- Button that resizes the screen to the user-specified dimensions. -->
<string name="button_resize">"Resize"</string>
@@ -431,12 +419,8 @@
<!-- Button that commits the port forward to be made from the Port Forward Creation dialog. -->
<string name="portforward_pos">"Create port forward"</string>
- <string name="portforward_done">"Successfully created port forward"</string>
<string name="portforward_problem">"Problem creating port forward, maybe you're using ports under 1024 or port is already used?"</string>
- <!-- The string to present in the quick-connect box to hint the user to the format for connecting to hosts. -->
- <string name="hint_userhost">"user@hostname"</string>
-
<!-- Hint given to user when the format they're using is incorrect in the quick-connect box. -->
<string name="list_format_error">"Use the format \"%1$s\""</string>
@@ -544,9 +528,6 @@
<!-- Preference selection for SSH Authentication Agent to be able to use pubkeys -->
<string name="yes">"Yes"</string>
- <!-- String displayed to user when they're asked to submit exceptions to the ConnectBot developers -->
- <string name="exceptions_submit_message">"It appears ConnectBot had a problem last time it ran. Submit error report to ConnectBot developers?"</string>
-
<!-- Menu selection to reset colors to their defaults. -->
<string name="menu_colors_reset">"Reset"</string>