[GATE-36] Fixed via "hack"

Added lots of new translatable strings.
Added german translation from dna.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk/src/plugins/gateway@5426 b35dd754-fafc-0310-a699-88a17e54d16e

src/i18n/gateway_i18n.properties

@@ -27,7 +27,7 @@
 ##
 ## REVISION HISTORY (by IM Gateway version):
 ##
-## 0.1
+## 1.0 Beta 1
 ##      Added key: 'gateway.aim.name'
 ##      Added key: 'gateway.aim.username'
 ##      Added key: 'gateway.aim.password'
@@ -49,34 +49,117 @@
 ##      Added key: 'gateway.irc.password'
 ##      Added key: 'gateway.irc.nickname'
 ##      Added key: 'gateway.irc.registration'
+##
+## 1.0 Beta 2
+##      Added key: 'login.title'
+##      Added key: 'global.add'
+##      Added key: 'global.edit'
+##      Added key: 'global.cancel'
+##      Added key: 'global.save_changes'
+##      Added key: 'gateway.aim.shortservice'
+##      Added key: 'gateway'aim.service'
+##      Added key: 'gateway.icq.shortservice'
+##      Added key: 'gateway'icq.service'
+##      Added key: 'gateway.irc.shortservice'
+##      Added key: 'gateway'irc.service'
+##      Added key: 'gateway.msn.shortservice'
+##      Added key: 'gateway'msn.service'
+##      Added key: 'gateway.yahoo.shortservice'
+##      Added key: 'gateway'yahoo.service'
+##      Added key: 'gateway.web.settings.instructions'
+##      Added key: 'gateway.web.registrations.instructions'
+##      Added key: 'gateway.web.registrations.addnewreg'
+##      Added key: 'gateway.web.registrations.cancelnewreg'
+##      Added key: 'gateway.web.registrations.username'
+##      Added key: 'gateway.web.registrations.password'
+##      Added key: 'gateway.web.registrations.nickname'
+##      Added key: 'gateway.web.registrations.jid'
+##      Added key: 'gateway.web.registrations.gateway'
+##      Added key: 'gateway.web.registrations.signedon'
+##      Added key: 'gateway.web.registrations.update'
+##      Added key: 'gateway.web.registrations.regsuccess'
+##      Added key: 'gateway.web.registrations.regfailure'
+##      Added key: 'gateway.web.registrations.next'
+##      Added key: 'gateway.web.registrations.prev'
+##      Added key: 'gateway.web.registrations.remove'
+##      Added key: 'gateway.web.registrations.edit'
+##      Added key: 'gateway.web.registrations.lastlogin'
+##      Added key: 'gateway.web.registrations.serviceusername'
+##      Added key: 'gateway.web.registrations.user'
+##      Added key: 'gateway.web.registrations.confirmdelete'
+##      Added key: 'gateway.web.registrations.registrations'
+
+
+# Temporary Tags Until Fixed Properly
+login.title=Admin Console
+global.add=Add
+global.edit=Edit
+global.cancel=Cancel
+global.save_changes=Save Changes
 
 # AIM Transport
+gateway.aim.shortservice=AIM
+gateway.aim.service=AOL Instant Messenger
 gateway.aim.name=AIM Transport
 gateway.aim.username=ScreenName
 gateway.aim.password=Password
 gateway.aim.registration=Please enter your AIM ScreenName and password.
 
 # ICQ Transport
+gateway.icq.shortservice=ICQ
+gateway.icq.service=ICQ
 gateway.icq.name=ICQ Transport
 gateway.icq.username=UIN/ICQ#
 gateway.icq.password=Password
 gateway.icq.registration=Please enter your ICQ# (UIN) and password.
 
 # MSN Transport
+gateway.msn.shortservice=MSN
+gateway.msn.service=MSN Messenger
 gateway.msn.name=MSN Transport
 gateway.msn.username=E-Mail Address
 gateway.msn.password=Password
 gateway.msn.registration=Please enter your MSN Passport e-mail address and password.
 
 # Yahoo Transport
+gateway.yahoo.shortservice=Yahoo
+gateway.yahoo.service=Yahoo! Messenger
 gateway.yahoo.name=Yahoo! Transport
 gateway.yahoo.username=Yahoo! ID
 gateway.yahoo.password=Password
 gateway.yahoo.registration=Please enter your Yahoo! ID and password.
 
 # IRC Transport
+gateway.irc.shortservice=IRC
+gateway.irc.service=IRC
 gateway.irc.name=IRC Transport
 gateway.irc.username=Username
 gateway.irc.password=Password
 gateway.irc.nickname=Nickname
 gateway.irc.registration=Please enter your IRC username, password, and nickname.  Nickname is the primary username used while username and password are used for authentication.  If no password is required, leave it blank.
+
+# Web Interface (Settings)
+gateway.web.settings.instructions=Select which gateways will be allowed, what features are available, and who can connect to each gateway service. Checking a gateway enables the service.
+
+# Web Interface (Registrations)
+gateway.web.registrations.instructions=Below is a list of all gateway service registrations. To filter by active sessions and/or specific gateways select the options below and update the view.
+gateway.web.registrations.addnewreg=Add a new registration
+gateway.web.registrations.cancelnewreg=Cancel adding new registration
+gateway.web.registrations.username=username
+gateway.web.registrations.password=password
+gateway.web.registrations.nickname=nickname
+gateway.web.registrations.jid=user (JID)
+gateway.web.registrations.gateway=gateway
+gateway.web.registrations.signedon=Signed on only
+gateway.web.registrations.update=Update
+gateway.web.registrations.regsuccess=Registration successfully updated.
+gateway.web.registrations.regfailure=Registration update failed.
+gateway.web.registrations.next=Next
+gateway.web.registrations.prev=Prev
+gateway.web.registrations.remove=Remove
+gateway.web.registrations.edit=Edit
+gateway.web.registrations.lastlogin=Last Login
+gateway.web.registrations.serviceusername=Service/Username
+gateway.web.registrations.user=User
+gateway.web.registrations.confirmdelete=Are you sure you want to delete this registration?
+gateway.web.registrations.registrations=Registrations
\ No newline at end of file

src/i18n/gateway_i18n_de.properties

+##
+## IM Gateway Resource Bundle - German locale (de)
+##
+## For a full changelog, refer to the English bundle, gateway_i18n.properties.
+
+# AIM Transport
+gateway.aim.name=AIM Transport
+gateway.aim.username=ScreenName
+gateway.aim.password=Passwort
+gateway.aim.registration=Bitte geben Sie ihr AIM ScreenName und das Passwort ein.
+
+# ICQ Transport
+gateway.icq.name=ICQ Transport
+gateway.icq.username=UIN/ICQ#
+gateway.icq.password=Passwort
+gateway.icq.registration=Bitte geben Sie Ihre ICQ Nummer (UIN) und das Passwort ein.
+
+# MSN Transport
+gateway.msn.name=MSN Transport
+gateway.msn.username=E-Mail Address
+gateway.msn.password=Password
+gateway.msn.registration=Bitte geben Sie Ihre E-Mailadresse und Passwort f\u00fcr das MSN Passport ein.
+
+# Yahoo Transport
+gateway.yahoo.name=Yahoo! Transport
+gateway.yahoo.username=Yahoo! ID
+gateway.yahoo.password=Passwort
+gateway.yahoo.registration=Bitte geben Sie Ihre Yahoo! ID und das Passwort ein.
+
+# IRC Transport
+gateway.irc.name=IRC Transport
+gateway.irc.username=Benutzername
+gateway.irc.password=Passwort
+gateway.irc.nickname=Nickname
+gateway.irc.registration=Bitte geben Sie Ihren IRC Benutzername, das Passwort und den Nickname ein. Der Benutzername und das Passwort werden f\u00fcr die Authentifizierung benutzt. Wird kein Passwort ben\u00f6tigt, lassen Sie das Feld frei.
\ No newline at end of file

src/web/gateway-settings.jsp

@@ -4,6 +4,7 @@
                  org.jivesoftware.wildfire.gateway.TransportType"
     errorPage="error.jsp"
 %>
+<%@ page import="org.jivesoftware.util.LocaleUtils"%>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
@@ -71,11 +72,11 @@
         }
     }
 
-    GatewaySettings aimSettings = new GatewaySettings(out, plugin, TransportType.aim, "AOL Instant Messenger");
-    GatewaySettings icqSettings = new GatewaySettings(out, plugin, TransportType.icq, "ICQ");
-    GatewaySettings ircSettings = new GatewaySettings(out, plugin, TransportType.irc, "IRC");
-    GatewaySettings msnSettings = new GatewaySettings(out, plugin, TransportType.msn, "MSN Messenger");
-    GatewaySettings yahooSettings = new GatewaySettings(out, plugin, TransportType.yahoo, "Yahoo! Messenger");
+    GatewaySettings aimSettings = new GatewaySettings(out, plugin, TransportType.aim, LocaleUtils.getLocalizedString("gateway.aim.service", "gateway"));
+    GatewaySettings icqSettings = new GatewaySettings(out, plugin, TransportType.icq, LocaleUtils.getLocalizedString("gateway.icq.service", "gateway"));
+    GatewaySettings ircSettings = new GatewaySettings(out, plugin, TransportType.irc, LocaleUtils.getLocalizedString("gateway.irc.service", "gateway"));
+    GatewaySettings msnSettings = new GatewaySettings(out, plugin, TransportType.msn, LocaleUtils.getLocalizedString("gateway.msn.service", "gateway"));
+    GatewaySettings yahooSettings = new GatewaySettings(out, plugin, TransportType.yahoo, LocaleUtils.getLocalizedString("gateway.yahoo.service", "gateway"));
 %>
 
 
@@ -95,7 +96,7 @@
 <body>
 
 
-<p>Select which gateways will be allowed, what features are available, and who can connect to each gateway service. Checking a gateway enables the service.</p>
+<p><fmt:message key="gateway.web.settings.instructions" /></p>
 
 
 <form action="" name="gatewayForm">