From f8a5fde6fbe145a8840fb1dc3f7060d910261108 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@googlemail.com>
Date: Fri, 29 Oct 2010 19:03:17 +0200
Subject: [PATCH] Replaced server_add with server_save ("Add server" -> "Save")

---
 res/layout/serveradd.xml                      | 2 +-
 res/values-de/strings.xml                     | 1 -
 res/values-es/strings.xml                     | 1 -
 res/values-fr/strings.xml                     | 3 +--
 res/values-ja/strings.xml                     | 1 -
 res/values-zh/strings.xml                     | 1 -
 res/values/strings.xml                        | 1 -
 src/org/yaaic/activity/AddServerActivity.java | 2 --
 8 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/res/layout/serveradd.xml b/res/layout/serveradd.xml
index e2ad489..f3542a0 100644
--- a/res/layout/serveradd.xml
+++ b/res/layout/serveradd.xml
@@ -180,7 +180,7 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
             android:paddingTop="10px">
 			<Button
 				android:id="@+id/add"
-				android:text="@string/add_server"
+				android:text="@string/server_save"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_weight="1" />
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 34b2298..b16b2ae 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -20,7 +20,6 @@
     <string name="server_useSSL">SSL benutzen</string>
     <string name="server_autoconnect">Automatisch verbinden nach dem Start</string>
     <string name="server_channels">Kanäle</string>
-    <string name="add_server">Server hinzufügen</string>
     <string name="select_charset">Zeichensatz auswählen</string>
     <string name="nickname">Nickname</string>
     <string name="aliases">Aliases</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1f6977d..f7d0a5a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -21,7 +21,6 @@
     <string name="server_useSSL">Usar SSL</string>
     <string name="server_autoconnect">Conectar automaticamente al iniciar</string>
     <string name="server_channels">Canales</string>
-    <string name="add_server">Añadir servidor</string>
     <string name="server_save">Guardar</string>
     <string name="select_charset">Seleccionar juego de caracteres</string>
     <string name="nickname">Apodo</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 972802b..e14f4ca 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -21,7 +21,6 @@
     <string name="server_useSSL">Utiliser SSL</string>
     <string name="server_autoconnect">Se connecter au démarrage</string>
     <string name="server_channels">Canaux</string>
-    <string name="add_server">Ajouter un serveur</string>
     <string name="server_save">Enregistrer</string>
     <string name="select_charset">Choisir un encodage</string>
     <string name="nickname">Pseudo</string>
@@ -183,4 +182,4 @@
     <string name="settings_fontsize_dialog_title">Taille de police</string>
     <string name="settings_voice_recognition_title">Reconnaissance vocale</string>
     <string name="settings_voice_recognition_desc">Affiche le bouton pour la reconnaissance vocale</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index dc1e7aa..224adfa 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -21,7 +21,6 @@
     <string name="server_useSSL">SSL使用</string>
     <string name="server_autoconnect">起動時に接続する</string>
     <string name="server_channels">チャンネル</string>
-    <string name="add_server">サーバーを追加</string>
     <string name="select_charset">文字コード</string>
     <string name="nickname">Nickname</string>
     <string name="aliases">Aliases</string>
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
index 825e6e2..40bc334 100644
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@@ -21,7 +21,6 @@
     <string name="server_autoconnect">启动时自动连接</string>
 
     <string name="server_channels">频道</string>
-    <string name="add_server">添加服务器</string>
     <string name="select_charset">选择字符编码</string>
     <string name="nickname">昵称</string>
     <string name="aliases">别名</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bb97756..68ee7d9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -21,7 +21,6 @@
     <string name="server_useSSL">Use SSL</string>
     <string name="server_autoconnect">Auto connect on startup</string>
     <string name="server_channels">Channels</string>
-    <string name="add_server">Add server</string>
     <string name="server_save">Save</string>
     <string name="select_charset">Select a charset</string>
     <string name="nickname">Nickname</string>
diff --git a/src/org/yaaic/activity/AddServerActivity.java b/src/org/yaaic/activity/AddServerActivity.java
index 00997fb..cc4ec61 100644
--- a/src/org/yaaic/activity/AddServerActivity.java
+++ b/src/org/yaaic/activity/AddServerActivity.java
@@ -108,8 +108,6 @@ public class AddServerActivity extends Activity implements OnClickListener
         	((EditText) findViewById(R.id.realname)).setText(server.getIdentity().getRealName());
         	((CheckBox) findViewById(R.id.useSSL)).setChecked(server.useSSL());
         	
-        	((Button) findViewById(R.id.add)).setText(R.string.server_save);
-        	
         	// Select charset
         	if (server.getCharset() != null) {
         		for (int i = 0; i < charsets.length; i++) {