aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2011-07-01 02:05:30 -0700
committerKenny Root <kenny@the-b.org>2011-07-01 02:05:30 -0700
commit5c5353ec3129f6420def060d5a9f745e59f6a5da (patch)
tree7c64cb9b3f1f39f03b1d64d54990541261424871
parentecf8b0378c1b484e383bc6c4b7d6b727b64c8b1c (diff)
parent8bdb4f2f8a2f1753e78753e7db9dfde41ac20230 (diff)
downloadconnectbot-5c5353ec3129f6420def060d5a9f745e59f6a5da.tar.gz
connectbot-5c5353ec3129f6420def060d5a9f745e59f6a5da.tar.bz2
connectbot-5c5353ec3129f6420def060d5a9f745e59f6a5da.zip
Merge pull request #14 from dsalt/master
A little .gitignore stuff, and en_GB
-rw-r--r--.gitignore2
-rw-r--r--res/values-en-rGB/strings.xml29
2 files changed, 31 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index c1f0eb8..61075a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
bin
gen
launchpad-*.tar.gz
+local.properties
+*~
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..6bc6957
--- /dev/null
+++ b/res/values-en-rGB/strings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * ConnectBot: simple, powerful, open-source SSH client for Android
+ * Copyright 2007 Kenny Root, Jeffrey Sharkey
+ * Copyright 2011 Darren Salt
+ *
+ * This file is derived from res/values/strings.xml
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="title_colors">"Colours"</string>
+ <string name="hostpref_color_title">"Colour category"</string>
+ <string name="list_menu_sortcolor">"Sort by colour"</string>
+ <string name="color_gray">"grey"</string>
+</resources>