Changed locale's identifier to one-word unique ones; Updated translations

diff --git a/client/assets/src/applets/chanlist.js b/client/assets/src/applets/chanlist.js
index efbf0199969cab4f5e00e81bbec48e52c1e7fc11..0c76dd3650d2da02e215c3b649e3852c640dbe98 100644 (file)
--- a/client/assets/src/applets/chanlist.js
+++ b/client/assets/src/applets/chanlist.js
@@ -8,9 +8,9 @@
 \r
         initialize: function (options) {\r
             var text = {\r
-                channel_name: _kiwi.global.i18n.translate('Channel Name').fetch(),\r
-                users: _kiwi.global.i18n.translate('Users').fetch(),\r
-                topic: _kiwi.global.i18n.translate('Topic').fetch()\r
+                channel_name: _kiwi.global.i18n.translate('client_applets_chanlist_channelname').fetch(),\r
+                users: _kiwi.global.i18n.translate('client_applets_chanlist_users').fetch(),\r
+                topic: _kiwi.global.i18n.translate('client_applets_chanlist_topic').fetch()\r
             };\r
             this.$el = $(_.template($('#tmpl_channel_list').html().trim(), text));\r
 \r
@@ -55,7 +55,7 @@
 \r
     var Applet = Backbone.Model.extend({\r
         initialize: function () {\r
-            this.set('title', _kiwi.global.i18n.translate('Channel List').fetch());\r
+            this.set('title', _kiwi.global.i18n.translate('client_applets_chanlist_channellist').fetch());\r
             this.view = new View();\r
 \r
             this.network = _kiwi.global.components.Network();\r

diff --git a/client/assets/src/applets/scripteditor.js b/client/assets/src/applets/scripteditor.js
index a1965941987111b324a3b30083959b3fafecd38e..e75e07520a4f8121e3aa3745ad770d2e5733cc21 100644 (file)
--- a/client/assets/src/applets/scripteditor.js
+++ b/client/assets/src/applets/scripteditor.js
@@ -7,7 +7,7 @@
             initialize: function (options) {
                 var that = this,
                     text = {
-                        save: _kiwi.global.i18n.translate('Save').fetch()
+                        save: _kiwi.global.i18n.translate('client_applets_scripteditor_save').fetch()
                     };
                 this.$el = $(_.template($('#tmpl_script_editor').html().trim(), text));
 
@@ -56,7 +56,7 @@
                     _kiwi.user_script = new user_fn();
 
                 } catch (err) {
-                    this.setStatus(_kiwi.global.i18n.translate('Script error. %s').fetch(err.toString()));
+                    this.setStatus(_kiwi.global.i18n.translate('client_applets_scripteditor_error').fetch(err.toString()));
                     return;
                 }
 
@@ -64,7 +64,7 @@
                 _kiwi.global.settings.set('user_script', this.editor.getValue());
                 _kiwi.global.settings.save();
 
-                this.setStatus(_kiwi.global.i18n.translate('Your script has been saved and is now active').fetch() + ' :)');
+                this.setStatus(_kiwi.global.i18n.translate('client_applets_scripteditor_saved').fetch() + ' :)');
             },
 
 
@@ -85,7 +85,7 @@
             initialize: function () {
                 var that = this;
 
-                this.set('title', _kiwi.global.i18n.translate('Script Editor').fetch());
+                this.set('title', _kiwi.global.i18n.translate('client_applets_scripteditor_title').fetch());
                 this.view = new view({model: this});
 
             }

diff --git a/client/assets/src/applets/settings.js b/client/assets/src/applets/settings.js
index 3327be73d5a0480e57aab3df8926f623b354888e..142d5d7007c6a496a853cfe2b81d8ace4c40ddb9 100644 (file)
--- a/client/assets/src/applets/settings.js
+++ b/client/assets/src/applets/settings.js
@@ -8,17 +8,17 @@
 \r
         initialize: function (options) {\r
             var text = {\r
-                tabs: _kiwi.global.i18n.translate('Tabs').fetch(),\r
-                list: _kiwi.global.i18n.translate('List').fetch(),\r
-                large_amounts_of_chans: _kiwi.global.i18n.translate('for large amouts of channels').fetch(),\r
-                join_part: _kiwi.global.i18n.translate('Join/part channel notifications').fetch(),\r
-                timestamps: _kiwi.global.i18n.translate('Timestamps').fetch(),\r
-                mute: _kiwi.global.i18n.translate('Mute sound notifications').fetch(),\r
-                scroll_history: _kiwi.global.i18n.translate('messages in scroll history').fetch(),\r
+                tabs: _kiwi.global.i18n.translate('client_applets_settings_channelview_tabs').fetch(),\r
+                list: _kiwi.global.i18n.translate('client_applets_settings_channelview_list').fetch(),\r
+                large_amounts_of_chans: _kiwi.global.i18n.translate('client_applets_settings_channelview_list_notice').fetch(),\r
+                join_part: _kiwi.global.i18n.translate('client_applets_settings_notification_joinpart').fetch(),\r
+                timestamps: _kiwi.global.i18n.translate('client_applets_settings_timestamp').fetch(),\r
+                mute: _kiwi.global.i18n.translate('client_applets_settings_notification_sound').fetch(),\r
+                scroll_history: _kiwi.global.i18n.translate('client_applets_settings_history_length').fetch(),\r
                 languages: _kiwi.app.translations,\r
-                default_client: _kiwi.global.i18n.translate('Default IRC client').fetch(),\r
-                make_default: _kiwi.global.i18n.translate('Make Kiwi my default IRC client').fetch(),\r
-                default_note: _kiwi.global.i18n.translate('Note: Chrome or Chromium browser users may need to check their settings via %s if nothing happens').fetch('<a href="chrome://settings/handlers">chrome://settings/handlers</a>')\r
+                default_client: _kiwi.global.i18n.translate('client_applets_settings_default_client').fetch(),\r
+                make_default: _kiwi.global.i18n.translate('client_applets_settings_default_client_enable').fetch(),\r
+                default_note: _kiwi.global.i18n.translate('client_applets_settings_default_client_notice').fetch('<a href="chrome://settings/handlers">chrome://settings/handlers</a>')\r
             };\r
             this.$el = $(_.template($('#tmpl_applet_settings').html().trim(), text));\r
 \r
@@ -111,7 +111,7 @@
 \r
     var Applet = Backbone.Model.extend({\r
         initialize: function () {\r
-            this.set('title', _kiwi.global.i18n.translate('Settings').fetch());\r
+            this.set('title', _kiwi.global.i18n.translate('client_applets_settings_title').fetch());\r
             this.view = new View();\r
         }\r
     });\r

diff --git a/client/assets/src/models/applet.js b/client/assets/src/models/applet.js
index 495e7d33c5b681ecdf5439008f10f29cd1e4569b..b9692822ff6e016addcfca7ce3b0a88417414512 100644 (file)
--- a/client/assets/src/models/applet.js
+++ b/client/assets/src/models/applet.js
@@ -25,7 +25,7 @@ _kiwi.model.Applet = _kiwi.model.Panel.extend({
             if (applet_object.get || applet_object.extend) {\r
 \r
                 // Try find a title for the applet\r
-                this.set('title', applet_object.get('title') || _kiwi.global.i18n.translate('Unknown Applet').fetch());\r
+                this.set('title', applet_object.get('title') || _kiwi.global.i18n.translate('client_models_applet_unknown').fetch());\r
 \r
                 // Update the tabs title if the applet changes it\r
                 applet_object.bind('change:title', function (obj, new_value) {\r
@@ -56,11 +56,11 @@ _kiwi.model.Applet = _kiwi.model.Panel.extend({
     loadFromUrl: function(applet_url, applet_name) {\r
         var that = this;\r
 \r
-        this.view.$el.html(_kiwi.global.i18n.translate('Loading..').fetch());\r
+        this.view.$el.html(_kiwi.global.i18n.translate('client_models_applet_loading').fetch());\r
         $script(applet_url, function () {\r
             // Check if the applet loaded OK\r
             if (!_kiwi.applets[applet_name]) {\r
-                that.view.$el.html(_kiwi.global.i18n.translate('Not found').fetch());\r
+                that.view.$el.html(_kiwi.global.i18n.translate('client_models_applet_notfound').fetch());\r
                 return;\r
             }\r
 \r

diff --git a/client/assets/src/models/application.js b/client/assets/src/models/application.js
index 3fd84f0aaf0b168bd01901ab7778731ed117814b..6ca06c2686e8da4c4f96a4e4e297f101ff589ff0 100644 (file)
--- a/client/assets/src/models/application.js
+++ b/client/assets/src/models/application.js
@@ -342,7 +342,7 @@ _kiwi.model.Application = function () {
                 var gw_stat = 0;\r
 \r
                 gw.on('disconnect', function (event) {\r
-                    var msg = _kiwi.global.i18n.translate('You have been disconnected. Attempting to reconnect for you').fetch() + '...';\r
+                    var msg = _kiwi.global.i18n.translate('client_models_application_reconnecting').fetch() + '...';\r
                     that.message.text(msg, {timeout: 10000});\r
 \r
                     that.view.$el.removeClass('connected');\r
@@ -364,7 +364,7 @@ _kiwi.model.Application = function () {
 \r
 \r
                 gw.on('reconnecting', function (event) {\r
-                    var msg = _kiwi.global.i18n.translate('You have been disconnected. Attempting to reconnect again in %d seconds').fetch(event.delay/1000) + '...';\r
+                    var msg = _kiwi.global.i18n.translate('client_models_application_reconnect_in_x_seconds').fetch(event.delay/1000) + '...';\r
 \r
                     // Only need to mention the repeating re-connection messages on server panels\r
                     _kiwi.app.connections.forEach(function(connection) {\r
@@ -377,7 +377,7 @@ _kiwi.model.Application = function () {
                     that.view.$el.addClass('connected');\r
                     if (gw_stat !== 1) return;\r
 \r
-                    var msg = _kiwi.global.i18n.translate('It\'s OK, you\'re connected again').fetch() + ':)';\r
+                    var msg = _kiwi.global.i18n.translate('client_models_application_reconnect_successfully').fetch() + ':)';\r
                     that.message.text(msg, {timeout: 5000});\r
 \r
                     // Mention the disconnection on every channel\r
@@ -511,7 +511,7 @@ _kiwi.model.Application = function () {
 \r
             controlbox.on('command:save', function (ev) {\r
                 _kiwi.global.settings.save();\r
-                _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('Settings have been saved').fetch());\r
+                _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_settings_saved').fetch());\r
             });\r
 \r
 \r
@@ -553,12 +553,12 @@ _kiwi.model.Application = function () {
                 // No parameters passed so list them\r
                 if (!ev.params[0]) {\r
                     if (list.length > 0) {\r
-                        _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('Ignored nicks').fetch() + ':');\r
+                        _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('client_models_application_ignore_title').fetch() + ':');\r
                         $.each(list, function (idx, ignored_pattern) {\r
                             _kiwi.app.panels().active.addMsg(' ', ignored_pattern);\r
                         });\r
                     } else {\r
-                        _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('Not ignoring anybody').fetch());\r
+                        _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('client_models_application_ignore_none').fetch());\r
                     }\r
                     return;\r
                 }\r
@@ -566,7 +566,7 @@ _kiwi.model.Application = function () {
                 // We have a parameter, so add it\r
                 list.push(ev.params[0]);\r
                 _kiwi.gateway.set('ignore_list', list);\r
-                _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('Ignoring %s').fetch(ev.params[0]));\r
+                _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('client_models_application_ignore_nick').fetch(ev.params[0]));\r
             });\r
 \r
 \r
@@ -574,7 +574,7 @@ _kiwi.model.Application = function () {
                 var list = _kiwi.gateway.get('ignore_list');\r
 \r
                 if (!ev.params[0]) {\r
-                    _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('Specifiy which nick you wish to stop ignoring').fetch());\r
+                    _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('client_models_application_ignore_stop_notice').fetch());\r
                     return;\r
                 }\r
 \r
@@ -584,7 +584,7 @@ _kiwi.model.Application = function () {
 \r
                 _kiwi.gateway.set('ignore_list', list);\r
 \r
-                _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('Stopped ignoring %s').fetch(ev.params[0]));\r
+                _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('client_models_application_ignore_stopped').fetch(ev.params[0]));\r
             });\r
 \r
 \r
@@ -754,7 +754,7 @@ _kiwi.model.Application = function () {
                 if (_kiwi.applets[ev.params[0]]) {\r
                     panel.load(new _kiwi.applets[ev.params[0]]());\r
                 } else {\r
-                    _kiwi.app.panels().server.addMsg('', _kiwi.global.i18n.translate('Applet "%s" does not exist').fetch(ev.params[0]));\r
+                    _kiwi.app.panels().server.addMsg('', _kiwi.global.i18n.translate('client_models_application_applet_notfound').fetch(ev.params[0]));\r
                     return;\r
                 }\r
             }\r
@@ -795,14 +795,14 @@ _kiwi.model.Application = function () {
             if (ev.params[0]) {\r
                 _kiwi.gateway.setEncoding(null, ev.params[0], function (success) {\r
                     if (success) {\r
-                        _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('Encoding modified to %s').fetch(ev.params[0]));\r
+                        _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_encoding_changed').fetch(ev.params[0]));\r
                     } else {\r
-                        _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('%s is not a valid encoding').fetch(ev.params[0]));\r
+                        _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_encoding_invalid').fetch(ev.params[0]));\r
                     }\r
                 });\r
             } else {\r
-                _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('Encoding not specified').fetch());\r
-                _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('Usage: /encoding [NEW-ENCODING]').fetch());\r
+                _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_encoding_notspecified').fetch());\r
+                _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_encoding_usage').fetch());\r
             }\r
         }\r
 \r
@@ -812,7 +812,7 @@ _kiwi.model.Application = function () {
 \r
             // If no server address given, show the new connection dialog\r
             if (!ev.params[0]) {\r
-                tmp = new _kiwi.view.MenuBox(_kiwi.global.i18n.translate('New Connection').fetch());\r
+                tmp = new _kiwi.view.MenuBox(_kiwi.global.i18n.translate('client_models_application_connection_create').fetch());\r
                 tmp.addItem('new_connection', new _kiwi.model.NewConnection().view.$el);\r
                 tmp.show();\r
 \r
@@ -855,7 +855,7 @@ _kiwi.model.Application = function () {
             // Use the same nick as we currently have\r
             nick = _kiwi.app.connections.active_connection.get('nick');\r
 \r
-            _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('Connecting to %s:%s...').fetch(server, port.toString()));\r
+            _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_connection_connecting').fetch(server, port.toString()));\r
 \r
             _kiwi.gateway.newConnection({\r
                 nick: nick,\r
@@ -865,7 +865,7 @@ _kiwi.model.Application = function () {
                 password: password\r
             }, function(err, new_connection) {\r
                 if (err)\r
-                    _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('Error connecting to %s:%s (%s)').fetch(server, port.toString(), err.toString()));\r
+                    _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_connection_error').fetch(server, port.toString(), err.toString()));\r
             });\r
         }\r
 \r

diff --git a/client/assets/src/models/channel.js b/client/assets/src/models/channel.js
index 369f38931906ad37b58df5de796b2f6c3617615a..9134ad7067ef637bd5f4afbd1e4c1ee93cec26ec 100644 (file)
--- a/client/assets/src/models/channel.js
+++ b/client/assets/src/models/channel.js
@@ -22,7 +22,7 @@ _kiwi.model.Channel = _kiwi.model.Panel.extend({
                 return;\r
             }\r
 \r
-            this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('%s has joined').fetch(member.displayNick(true)), 'action join');\r
+            this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('client_models_channel_join').fetch(member.displayNick(true)), 'action join');\r
         }, this);\r
 \r
         members.bind("remove", function (member, members, options) {\r
@@ -30,21 +30,21 @@ _kiwi.model.Channel = _kiwi.model.Panel.extend({
             var msg = (options.message) ? '(' + options.message + ')' : '';\r
 \r
             if (options.type === 'quit' && show_message) {\r
-                this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('%s has quit %s').fetch(member.displayNick(true), msg), 'action quit');\r
+                this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('client_models_channel_quit').fetch(member.displayNick(true), msg), 'action quit');\r
 \r
             } else if(options.type === 'kick') {\r
 \r
                 if (!options.current_user_kicked) {\r
                     //If user kicked someone, show the message regardless of settings.\r
                     if (show_message || options.current_user_initiated) {\r
-                        this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('%s was kicked by %s %s').fetch(member.displayNick(true), options.by, msg), 'action kick');\r
+                        this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('client_models_channel_kicked').fetch(member.displayNick(true), options.by, msg), 'action kick');\r
                     }\r
                 } else {\r
-                    this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('You have been kicked by %s %s').fetch(options.by, msg), 'action kick');\r
+                    this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('client_models_channel_selfkick').fetch(options.by, msg), 'action kick');\r
                 }\r
             } else if (show_message) {\r
 \r
-                this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('%s has left %s').fetch(member.displayNick(true), msg), 'action part');\r
+                this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('client_models_channel_part').fetch(member.displayNick(true), msg), 'action part');\r
             }\r
         }, this);\r
     }\r

diff --git a/client/assets/src/models/network.js b/client/assets/src/models/network.js
index 84ab23912c4cdf99c801c67f8b24b4df15293eaf..176a95a1af4b00aba495eb174674761bc77f73b7 100644 (file)
--- a/client/assets/src/models/network.js
+++ b/client/assets/src/models/network.js
@@ -112,8 +112,8 @@
 
                 // If not a valid channel name, display a warning
                 if (!_kiwi.app.isChannelName(channel_name)) {
-                    that.panels.server.addMsg('', _kiwi.global.i18n.translate('%s is not a valid channel name').fetch(channel_name));
-                    _kiwi.app.message.text(_kiwi.global.i18n.translate('%s is not a valid channel name').fetch(channel_name), {timeout: 5000});
+                    that.panels.server.addMsg('', _kiwi.global.i18n.translate('client_models_network_channel_invalid_name').fetch(channel_name));
+                    _kiwi.app.message.text(_kiwi.global.i18n.translate('client_models_network_channel_invalid_name').fetch(channel_name), {timeout: 5000});
                     return;
                 }
 
@@ -153,7 +153,7 @@
     
     function onDisconnect(event) {
         $.each(this.panels.models, function (index, panel) {
-            panel.addMsg('', _kiwi.global.i18n.translate('Disconnected from the IRC network').fetch(), 'action quit');
+            panel.addMsg('', _kiwi.global.i18n.translate('client_models_network_disconnected').fetch(), 'action quit');
         });
     }
 
@@ -345,7 +345,7 @@
             member = panel.get('members').getByNick(event.nick);
             if (member) {
                 member.set('nick', event.newnick);
-                panel.addMsg('', '== ' + _kiwi.global.i18n.translate('%s is now known as %s').fetch(event.nick, event.newnick) , 'action nick');
+                panel.addMsg('', '== ' + _kiwi.global.i18n.translate('client_models_network_nickname_changed').fetch(event.nick, event.newnick) , 'action nick');
             }
         });
     }
@@ -468,7 +468,7 @@
         if (!c) return;
 
         when = formatDate(new Date(event.when * 1000));
-        c.addMsg('', _kiwi.global.i18n.translate('Topic set by %s at %s').fetch(event.nick, when), 'topic');
+        c.addMsg('', _kiwi.global.i18n.translate('client_models_network_topic').fetch(event.nick, when), 'topic');
     }
 
 
@@ -575,11 +575,11 @@
                 }
             }
 
-            channel.addMsg('', '== ' + _kiwi.global.i18n.translate('%s sets mode %s').fetch(event.nick, friendlyModeString()), 'action mode');
+            channel.addMsg('', '== ' + _kiwi.global.i18n.translate('client_models_network_mode').fetch(event.nick, friendlyModeString()), 'action mode');
         } else {
             // This is probably a mode being set on us.
             if (event.target.toLowerCase() === this.get("nick").toLowerCase()) {
-                this.panels.server.addMsg('', '== ' + _kiwi.global.i18n.translate('%s set mode %s').fetch(event.nick, friendlyModeString()), 'action mode');
+                this.panels.server.addMsg('', '== ' + _kiwi.global.i18n.translate('client_models_network_selfmode').fetch(event.nick, friendlyModeString()), 'action mode');
             } else {
                console.log('MODE command recieved for unknown target %s: ', event.target, event);
             }
@@ -603,9 +603,9 @@
         if (event.ident) {
             panel.addMsg(event.nick, event.nick + ' [' + event.nick + '!' + event.ident + '@' + event.host + '] * ' + event.msg, 'whois');
         } else if (event.chans) {
-            panel.addMsg(event.nick, _kiwi.global.i18n.translate('Channels: %s').fetch(event.chans), 'whois');
+            panel.addMsg(event.nick, _kiwi.global.i18n.translate('client_models_network_channels').fetch(event.chans), 'whois');
         } else if (event.irc_server) {
-            panel.addMsg(event.nick, _kiwi.global.i18n.translate('Connected to server: %s %s').fetch(event.irc_server, event.server_info), 'whois');
+            panel.addMsg(event.nick, _kiwi.global.i18n.translate('client_models_network_server').fetch(event.irc_server, event.server_info), 'whois');
         } else if (event.msg) {
             panel.addMsg(event.nick, event.msg, 'whois');
         } else if (event.logon) {
@@ -613,11 +613,11 @@
             logon_date.setTime(event.logon * 1000);
             logon_date = formatDate(logon_date);
 
-            panel.addMsg(event.nick, _kiwi.global.i18n.translate('Idle for %s, signed on %s').fetch(idle_time, logon_date), 'whois');
+            panel.addMsg(event.nick, _kiwi.global.i18n.translate('client_models_network_idle_and_signon').fetch(idle_time, logon_date), 'whois');
         } else if (event.away_reason) {
-            panel.addMsg(event.nick, _kiwi.global.i18n.translate('Away: %s').fetch(event.away_reason), 'whois');
+            panel.addMsg(event.nick, _kiwi.global.i18n.translate('client_models_network_away').fetch(event.away_reason), 'whois');
         } else {
-            panel.addMsg(event.nick, _kiwi.global.i18n.translate('Idle for %s').fetch(idle_time), 'whois');
+            panel.addMsg(event.nick, _kiwi.global.i18n.translate('client_models_network_idle').fetch(idle_time), 'whois');
         }
     }
 
@@ -631,7 +631,7 @@
         if (event.host) {
             panel.addMsg(event.nick, event.nick + ' [' + event.nick + ((event.ident)? '!' + event.ident : '') + '@' + event.host + '] * ' + event.real_name, 'whois');
         } else {
-            panel.addMsg(event.nick, _kiwi.global.i18n.translate('No such nick').fetch(), 'whois');
+            panel.addMsg(event.nick, _kiwi.global.i18n.translate('client_models_network_nickname_notfound').fetch(), 'whois');
         }
     }
 
@@ -665,20 +665,20 @@
 
         switch (event.error) {
         case 'banned_from_channel':
-            panel.addMsg(' ', '== ' + _kiwi.global.i18n.translate('You are banned from %s. %s').fetch(event.channel, event.reason), 'status');
-            _kiwi.app.message.text(_kiwi.global.i18n.translate('You are banned from %s. %s').fetch(event.channel, event.reason));
+            panel.addMsg(' ', '== ' + _kiwi.global.i18n.translate('client_models_network_banned').fetch(event.channel, event.reason), 'status');
+            _kiwi.app.message.text(_kiwi.global.i18n.translate('client_models_network_banned').fetch(event.channel, event.reason));
             break;
         case 'bad_channel_key':
-            panel.addMsg(' ', '== ' + _kiwi.global.i18n.translate('Bad channel key for %s').fetch(event.channel), 'status');
-            _kiwi.app.message.text(_kiwi.global.i18n.translate('Bad channel key for %s').fetch(event.channel));
+            panel.addMsg(' ', '== ' + _kiwi.global.i18n.translate('client_models_network_channel_badkey').fetch(event.channel), 'status');
+            _kiwi.app.message.text(_kiwi.global.i18n.translate('client_models_network_channel_badkey').fetch(event.channel));
             break;
         case 'invite_only_channel':
-            panel.addMsg(' ', '== ' + _kiwi.global.i18n.translate('%s is invite only.').fetch(event.channel), 'status');
-            _kiwi.app.message.text(_kiwi.global.i18n.translate('%s is invite only').fetch(event.channel));
+            panel.addMsg(' ', '== ' + _kiwi.global.i18n.translate('client_models_network_channel_inviteonly').fetch(event.channel), 'status');
+            _kiwi.app.message.text(_kiwi.global.i18n.translate('client_models_network_channel_inviteonly').fetch(event.channel));
             break;
         case 'channel_is_full':
-            panel.addMsg(' ', '== ' + _kiwi.global.i18n.translate('%s is full.').fetch(event.channel), 'status');
-            _kiwi.app.message.text(_kiwi.global.i18n.translate('%s is full').fetch(event.channel));
+            panel.addMsg(' ', '== ' + _kiwi.global.i18n.translate('client_models_network_channel_limitreached').fetch(event.channel), 'status');
+            _kiwi.app.message.text(_kiwi.global.i18n.translate('client_models_network_channel_limitreached').fetch(event.channel));
             break;
         case 'chanop_privs_needed':
             panel.addMsg(' ', '== ' + event.reason, 'status');
@@ -693,9 +693,9 @@
             }
             break;
         case 'nickname_in_use':
-            this.panels.server.addMsg(' ', '== ' + _kiwi.global.i18n.translate('The nickname "%s" is already in use. Please select a new nickname').fetch( event.nick), 'status');
+            this.panels.server.addMsg(' ', '== ' + _kiwi.global.i18n.translate('client_models_network_nickname_alreadyinuse').fetch( event.nick), 'status');
             if (this.panels.server !== this.panels.active) {
-                _kiwi.app.message.text(_kiwi.global.i18n.translate('The nickname "%s" is already in use. Please select a new nickname').fetch(event.nick));
+                _kiwi.app.message.text(_kiwi.global.i18n.translate('client_models_network_nickname_alreadyinuse').fetch(event.nick));
             }
 
             // Only show the nickchange component if the controlbox is open
@@ -706,7 +706,7 @@
             break;
 
         case 'password_mismatch':
-            this.panels.server.addMsg(' ', '== ' + _kiwi.global.i18n.translate('Incorrect password given').fetch(), 'status');
+            this.panels.server.addMsg(' ', '== ' + _kiwi.global.i18n.translate('client_models_network_badpassword').fetch(), 'status');
             break;
         default:
             // We don't know what data contains, so don't do anything with it.

diff --git a/client/assets/src/translations/de.po b/client/assets/src/translations/de.po
index 205dd0a3e3cfcb793384cef8f9b0612212835572..6edb330bb1784da71bdb8734c621aee3da41396f 100755 (executable)
--- a/client/assets/src/translations/de.po
+++ b/client/assets/src/translations/de.po
@@ -1,358 +1,358 @@
 \r
 #: client/assets/src/applets/chanlist.js\r
-msgid "Channel Name"\r
+msgid "client_applets_chanlist_channelname"\r
 msgstr "Raumname"\r
 \r
-msgid "Users"\r
+msgid "client_applets_chanlist_users"\r
 msgstr "Nutzer"\r
 \r
-msgid "Topic"\r
+msgid "client_applets_chanlist_topic"\r
 msgstr "Thema"\r
 \r
-msgid "Channel List"\r
+msgid "client_applets_chanlist_channellist\r
 msgstr "Raumliste"\r
 \r
 \r
 \r
 #: client/assets/src/applets/scripteditor.js\r
-msgid "Save"\r
+msgid "client_applets_scripteditor_save"\r
 msgstr "Speichern"\r
 \r
-msgid "Script error. %s"\r
+msgid "client_applets_scripteditor_error"\r
 msgstr "Programm-Fehler. %s"\r
 \r
-msgid "Your script has been saved and is now active"\r
+msgid "client_applets_scripteditor_saved"\r
 msgstr "Dein Programm wurde gespeichert und ist nun aktiv."\r
 \r
-msgid "Script Editor"\r
+msgid "client_applets_scripteditor_title"\r
 msgstr "Programm-Editor"\r
 \r
 \r
 \r
 #: client/assets/src/applets/settings.js\r
-msgid "Tabs"\r
+msgid "client_applets_settings_channelview_tabs"\r
 msgstr "Tabs"\r
 \r
-msgid "List"\r
+msgid "client_applets_settings_channelview_list"\r
 msgstr "Liste"\r
 \r
-msgid "for large amouts of channels"\r
+msgid "client_applets_settings_channelview_list_notice"\r
 msgstr "für eine große Anzahl an Räumen"\r
 \r
-msgid "Join/part channel notifications"\r
+msgid "client_applets_settings_notification_joinpart"\r
 msgstr "Beitreten/Verlassen Benachrichtigungen"\r
 \r
-msgid "Timestamps"\r
+msgid "client_applets_settings_timestamp"\r
 msgstr "Zeitstempel"\r
 \r
-msgid "Mute sound notifications"\r
+msgid "client_applets_settings_notification_sound"\r
 msgstr "Audio-Benachrichtigungen stummschalten"\r
 \r
-msgid "messages in scroll history"\r
+msgid "client_applets_settings_history_length"\r
 msgstr "Nachrichten im Verlauf"\r
 \r
-msgid "Default IRC client"\r
+msgid "client_applets_settings_default_client"\r
 msgstr "Standard IRC Client"\r
 \r
-msgid "Make Kiwi my default IRC client"\r
+msgid "client_applets_settings_default_client_enable"\r
 msgstr "Setze Kiwi als meinen Standard-IRC Client"\r
 \r
-msgid "Note: Chrome or Chromium browser users may need to check their settings via %s if nothing happens"\r
+msgid "client_applets_settings_default_client_notice"\r
 msgstr "Notiz: Nutzer von Chrome oder Chromium müssen ihre Einstellungen durch %s testen, sofern nichts passiert"\r
 \r
-msgid "Settings"\r
+msgid "client_applets_settings_title"\r
 msgstr "Einstellungen"\r
 \r
 \r
 \r
 #: client/assets/src/models/applet.js\r
-msgid "Unknown Applet"\r
+msgid "client_models_applet_unknown"\r
 msgstr "Unbekannte Anwendung"\r
 \r
-msgid "Loading.."\r
+msgid "client_models_applet_loading"\r
 msgstr "Lade.."\r
 \r
-msgid "Not found"\r
+msgid "client_models_applet_notfound"\r
 msgstr "Nicht gefunden"\r
 \r
 \r
 \r
 #: client/assets/src/models/application.js\r
-msgid "You have been disconnected. Attempting to reconnect for you"\r
+msgid "client_models_application_reconnecting"\r
 msgstr "Deine Verbindung wurde getrennt. Ein erneuter Verbindungsaufbau wird versucht"\r
 \r
-msgid "You have been disconnected. Attempting to reconnect again in %d seconds"\r
+msgid "client_models_application_reconnect_in_x_seconds"\r
 msgstr "Deine Verbindung wurde getrennt. Ein erneuter Verbindungsaufbau wird in %d Sekunden versucht"\r
 \r
-msgid "It's OK, you're connected again"\r
+msgid "client_models_application_reconnect_successfully"\r
 msgstr "Alles OK, du bist wieder verbunden"\r
 \r
-msgid "Settings have been saved"\r
+msgid "client_models_application_settings_saved"\r
 msgstr "Einstellungen wurden gespeichert"\r
 \r
-msgid "Ignored nicks"\r
+msgid "client_models_application_ignore_title"\r
 msgstr "Ignorierte Nicknamen"\r
 \r
-msgid "Not ignoring anybody"\r
+msgid "client_models_application_ignore_none"\r
 msgstr "Niemand wird ignoriert"\r
 \r
-msgid "Ignoring %s"\r
+msgid "client_models_application_ignore_nick"\r
 msgstr "Ignoriere %s"\r
 \r
-msgid "Specifiy which nick you wish to stop ignoring"\r
+msgid "client_models_application_ignore_stop_notice"\r
 msgstr "Gib den Nicknamen ein, den du nicht mehr ignorieren möchtest"\r
 \r
-msgid "Stopped ignoring %s"\r
+msgid "client_models_application_ignore_stopped"\r
 msgstr "%s wird nicht mehr ignoriert"\r
 \r
-msgid "Applet \"%s\" does not exist"\r
+msgid "client_models_application_applet_notfound"\r
 msgstr "Anwendung \"%s\" existiert nicht"\r
 \r
-msgid "Encoding modified to %s"\r
+msgid "client_models_application_encoding_changed"\r
 msgstr "Kodierung wurde in %s geändert"\r
 \r
-msgid "%s is not a valid encoding"\r
+msgid "client_models_application_encoding_invalid"\r
 msgstr "%s ist keine gültige Kodierung"\r
 \r
-msgid "Encoding not specified"\r
+msgid "client_models_application_encoding_notspecified"\r
 msgstr "Kodierung nicht angegeben"\r
 \r
-msgid "Usage: /encoding [NEW-ENCODING]"\r
+msgid "client_models_application_encoding_usage"\r
 msgstr "Verwendung: /encoding [NEUE-KODIERUNG]"\r
 \r
-msgid "New Connection"\r
+msgid "client_models_application_connection_create"\r
 msgstr "Neue Verbindung"\r
 \r
-msgid "Connecting to %s:%s..."\r
+msgid "client_models_application_connection_connecting"\r
 msgstr "verbinde nach %s:%s..."\r
 \r
-msgid "Error connecting to %s:%s (%s)"\r
+msgid "client_models_application_connection_error"\r
 msgstr "Fehler beim Verbindungsaufbau nach %s:%s (%s)"\r
 \r
 \r
 \r
 #: client/assets/src/models/channel.js\r
-msgid "%s has joined"\r
+msgid "client_models_channel_join"\r
 msgstr "%s ist beigetreten"\r
 \r
-msgid "%s has quit %s"\r
+msgid "client_models_channel_quit"\r
 msgstr "%s ist gegangen %s"\r
 \r
-msgid "%s was kicked by %s %s"\r
+msgid "client_models_channel_kicked"\r
 msgstr "%s wurde von %s rausgeschmissen %s"\r
 \r
-msgid "You have been kicked by %s %s"\r
+msgid "client_models_channel_selfkick"\r
 msgstr "Du wurdest von %s rausgeschmissen %s"\r
 \r
-msgid "%s has left %s"\r
+msgid "client_models_channel_part"\r
 msgstr "%s verließ %s"\r
 \r
 \r
 \r
 #: client/assets/src/models/network.js\r
-msgid "%s is not a valid channel name"\r
+msgid "client_models_network_channel_invalid_name"\r
 msgstr "%s ist kein gültiger Raumname"\r
 \r
-msgid "Disconnected from the IRC network"\r
+msgid "client_models_network_disconnected"\r
 msgstr "Verbindung zum IRC-Netzwerk getrennt"\r
 \r
-msgid "%s is now known as %s"\r
+msgid "client_models_network_nickname_changed"\r
 msgstr "%s ist nun bekannt als %s"\r
 \r
-msgid "Topic set by %s at %s"\r
+msgid "client_models_network_topic"\r
 msgstr "Thema wurde von %s am %s gesetzt"\r
 \r
-msgid "%s sets mode %s"\r
+msgid "client_models_network_selfmode"\r
 msgstr "%s setzt den Modus %s"\r
 \r
-msgid "%s set mode %s"\r
+msgid "client_models_network_mode"\r
 msgstr "%s setzte den Modus %s"\r
 \r
-msgid "Channels: %s"\r
+msgid "client_models_network_channels"\r
 msgstr "Räume: %s"\r
 \r
-msgid "Connected to server: %s %s"\r
+msgid "client_models_network_server"\r
 msgstr "Zum Server %s %s verbunden"\r
 \r
-msgid "Idle for %s, signed on %s"\r
+msgid "client_models_network_idle_and_signon"\r
 msgstr "Untätig seit %s, verbunden am %s"\r
 \r
-msgid "Away: %s"\r
+msgid "client_models_network_away"\r
 msgstr "Abwesend: %s"\r
 \r
-msgid "Idle for %s"\r
+msgid "client_models_network_idle"\r
 msgstr "Untätig seit %s"\r
 \r
-msgid "No such nick"\r
+msgid "client_models_network_nickname_notfound"\r
 msgstr "Ungültiger Nickname"\r
 \r
-msgid "You are banned from %s. %s"\r
+msgid "client_models_network_banned"\r
 msgstr "Du wurdest aus %s verbannt. %s"\r
 \r
-msgid "Bad channel key for %s"\r
+msgid "client_models_network_channel_badkey"\r
 msgstr "Falsches Passwort für %s"\r
 \r
 msgid "%s is invite only."\r
-msgstr "Du benötigst eine Einladung für %s."\r
+msgstr "client_models_network_channel_inviteonly"\r
 \r
-msgid "%s is full."\r
+msgid "client_models_network_channel_limitreached"\r
 msgstr "%s ist voll."\r
 \r
-msgid "The nickname \"%s\" is already in use. Please select a new nickname"\r
+msgid "client_models_network_nickname_alreadyinuse"\r
 msgstr "Der Nickname \"%s\" wird bereits verwendet. Bitte wähle einen anderen Nicknamen."\r
 \r
-msgid "Incorrect password given"\r
+msgid "client_models_network_badpassword"\r
 msgstr "Falsches Passwort"\r
 \r
 \r
 \r
 #: client/assets/src/views/application.js\r
-msgid "This will close all KiwiIRC conversations. Are you sure you want to close this window?"\r
+msgid "client_views_application_close_notice"\r
 msgstr "Dies wird alle KiwiIRC Verbindungen beenden. Bist du sicher, dass du dieses Fenster schließen willst?"\r
 \r
 \r
 \r
 #: client/assets/src/views/channel.js\r
-msgid "Joining channel.."\r
+msgid "client_views_channel_joining"\r
 msgstr "Betrete Raum.."\r
 \r
-msgid "Topic for %s is: %s"\r
+msgid "client_views_channel_topic"\r
 msgstr "Thema für %s ist: %s"\r
 \r
 \r
 \r
 #: client/assets/src/views/mediamessage.js\r
-msgid "Close media"\r
+msgid "client_views_mediamessage_close"\r
 msgstr "Schließe Medium"\r
 \r
-msgid "Not found"\r
+msgid "client_views_mediamessage_notfound"\r
 msgstr "Nicht gefunden"\r
 \r
-msgid "Loading tweet"\r
+msgid "client_views_mediamessage_load_tweet"\r
 msgstr "Lade Tweet"\r
 \r
-msgid "Loading image"\r
+msgid "client_views_mediamessage_load_image"\r
 msgstr "Lade Bild"\r
 \r
-msgid "Loading Reddit thread"\r
+msgid "client_views_mediamessage_load_reddit"\r
 msgstr "Lade Reddit Thread"\r
 \r
-msgid "Loading gist"\r
+msgid "client_views_mediamessage_load_gist"\r
 msgstr "Lade Gist"\r
 \r
 \r
 \r
 #: client/assets/src/views/nickchangegbox.js\r
-msgid "New nick"\r
+msgid "client_views_nickchangebox_new"\r
 msgstr "Neuer Nickname"\r
 \r
-msgid "Change"\r
+msgid "client_views_nickchangebox_change"\r
 msgstr "Ändern"\r
 \r
-msgid "Cancel"\r
+msgid "client_views_nickchangebox_cancel"\r
 msgstr "Abbrechen"\r
 \r
 \r
 \r
 #: client/assets/src/views/panel.js\r
-msgid "People are talking!"\r
+msgid "client_views_panel_activity"\r
 msgstr "Es wird geredet!"\r
 \r
 \r
 \r
 #: client/assets/src/views/serverselect.js\r
-msgid "Think of a nickname..."\r
+msgid "client_views_serverselect_form_title"\r
 msgstr "Denk an einen Nicknamen..."\r
 \r
-msgid "Nickname"\r
+msgid "client_views_serverselect_nickname"\r
 msgstr "Nickname"\r
 \r
-msgid "I have a password"\r
+msgid "client_views_serverselect_enable_password"\r
 msgstr "Ich habe ein Passwort"\r
 \r
-msgid "Password"\r
+msgid "client_views_serverselect_password"\r
 msgstr "Passwort"\r
 \r
-msgid "Channel"\r
+msgid "client_views_serverselect_channel"\r
 msgstr "Raum"\r
 \r
-msgid "Channel Key"\r
+msgid "client_views_serverselect_channelkey"\r
 msgstr "Raum-Passwort"\r
 \r
-msgid "Channel requires a key"\r
+msgid "client_views_serverselect_channelkey_required"\r
 msgstr "Raum benötigt ein Passwort"\r
 \r
-msgid "Key"\r
+msgid "client_views_serverselect_key"\r
 msgstr "Passwort"\r
 \r
-msgid "Start..."\r
+msgid "client_views_serverselect_connection_start"\r
 msgstr "Start..."\r
 \r
-msgid "Server and network"\r
+msgid "client_views_serverselect_server_and_network"\r
 msgstr "Server und Netzwerk"\r
 \r
-msgid "Server"\r
+msgid "client_views_serverselect_server"\r
 msgstr "Server"\r
 \r
-msgid "Port"\r
+msgid "client_views_serverselect_port"\r
 msgstr "Port"\r
 \r
-msgid "Powered by Kiwi IRC"\r
+msgid "client_views_serverselect_poweredby"\r
 msgstr "Präsentiert von Kiwi IRC"\r
 \r
-msgid "Select a nickname first!"\r
+msgid "client_views_serverselect_nickname_error_empty"\r
 msgstr "Wähle zuerst einen Nicknamen!"\r
 \r
-msgid "Connected"\r
+msgid "client_views_serverselect_connection_successfully"\r
 msgstr "Verbunden"\r
 \r
-msgid "Connecting.."\r
+msgid "client_views_serverselect_connection_trying"\r
 msgstr "Verbinde.."\r
 \r
-msgid "Nickname already taken"\r
+msgid "client_views_serverselect_nickname_error_alreadyinuse"\r
 msgstr "Der Nickname wird bereits verwendet"\r
 \r
-msgid "Erroneus nickname"\r
+msgid "client_views_serverselect_nickname_invalid"\r
 msgstr "Fehlerhafter Nickname"\r
 \r
-msgid "Incorrect Password"\r
+msgid "client_views_serverselect_password_incorrect"\r
 msgstr "Falsches Passwort"\r
 \r
-msgid "Error Connecting"\r
+msgid "client_views_serverselect_connection_error"\r
 msgstr "Fehler beim Verbinden"\r
 \r
-msgid "Server not found"\r
+msgid "client_views_serverselect_server_notfound"\r
 msgstr "Server konnte nicht gefunden werden"\r
 \r
-msgid "Connection refused"\r
+msgid "client_views_serverselect_connection_refused"\r
 msgstr "Verbindung wurde abgelehnt"\r
 \r
 \r
 \r
 #: client/assets/src/views/userbox.js\r
-msgid "Op"\r
+msgid "client_views_userbox_op"\r
 msgstr "Op"\r
 \r
-msgid "De-op"\r
+msgid "client_views_userbox_deop"\r
 msgstr "De-Op"\r
 \r
-msgid "Voice"\r
+msgid "client_views_userbox_voice"\r
 msgstr "Voice"\r
 \r
-msgid "De-voice"\r
+msgid "client_views_userbox_devoice"\r
 msgstr "De-Voice"\r
 \r
-msgid "Kick"\r
+msgid "client_views_userbox_kick"\r
 msgstr "Rausschmeissen"\r
 \r
-msgid "Ban"\r
+msgid "client_views_userbox_ban"\r
 msgstr "Verbannen"\r
 \r
-msgid "Message"\r
+msgid "client_views_userbox_query"\r
 msgstr "Nachricht"\r
 \r
-msgid "Info"\r
+msgid "client_views_userbox_whois"\r
 msgstr "Info"\r
 \r
-msgid "Slap!"\r
+msgid "client_views_userbox_slap"\r
 msgstr "Schlagen!"\r

diff --git a/client/assets/src/translations/template.po b/client/assets/src/translations/template.po
index abea90c8d270551ecc4b36bdd4fd3dcc93fbb114..23f3b17bc27f6cc69f166e3c022b817160f223cd 100755 (executable)
--- a/client/assets/src/translations/template.po
+++ b/client/assets/src/translations/template.po
@@ -1,358 +1,358 @@
 \r
 #: client/assets/src/applets/chanlist.js\r
-msgid "Channel Name"\r
-#msgstr ""\r
+msgid "client_applets_chanlist_channelname"\r
+msgstr "Channel Name"\r
 \r
-msgid "Users"\r
-#msgstr ""\r
+msgid "client_applets_chanlist_users"\r
+msgstr "Users"\r
 \r
-msgid "Topic"\r
-#msgstr ""\r
+msgid "client_applets_chanlist_topic"\r
+msgstr "Topic"\r
 \r
-msgid "Channel List"\r
-#msgstr ""\r
+msgid "client_applets_chanlist_channellist"\r
+msgstr "Channel List"\r
 \r
 \r
 \r
 #: client/assets/src/applets/scripteditor.js\r
-msgid "Save"\r
-#msgstr ""\r
+msgid "client_applets_scripteditor_save"\r
+msgstr "Save"\r
 \r
-msgid "Script error. %s"\r
-#msgstr ""\r
+msgid "client_applets_scripteditor_error"\r
+msgstr "Script error. %s"\r
 \r
-msgid "Your script has been saved and is now active"\r
-#msgstr ""\r
+msgid "client_applets_scripteditor_saved"\r
+msgstr "Your script has been saved and is now active"\r
 \r
-msgid "Script Editor"\r
-#msgstr ""\r
+msgid "client_applets_scripteditor_title"\r
+msgstr "Script Editor"\r
 \r
 \r
 \r
 #: client/assets/src/applets/settings.js\r
-msgid "Tabs"\r
-#msgstr ""\r
+msgid "client_applets_settings_channelview_tabs"\r
+msgstr "Tabs"\r
 \r
-msgid "List"\r
-#msgstr ""\r
+msgid "client_applets_settings_channelview_list"\r
+msgstr "List"\r
 \r
-msgid "for large amouts of channels"\r
-#msgstr ""\r
+msgid "client_applets_settings_channelview_list_notice"\r
+msgstr "for large amouts of channels"\r
 \r
-msgid "Join/part channel notifications"\r
-#msgstr ""\r
+msgid "client_applets_settings_notification_joinpart"\r
+msgstr "Join/part channel notifications"\r
 \r
-msgid "Timestamps"\r
-#msgstr ""\r
+msgid "client_applets_settings_timestamp"\r
+msgstr "Timestamps"\r
 \r
-msgid "Mute sound notifications"\r
-#msgstr ""\r
+msgid "client_applets_settings_notification_sound"\r
+msgstr "Mute sound notifications"\r
 \r
-msgid "messages in scroll history"\r
-#msgstr ""\r
+msgid "client_applets_settings_history_length"\r
+msgstr "messages in scroll history"\r
 \r
-msgid "Default IRC client"\r
-#msgstr ""\r
+msgid "client_applets_settings_default_client"\r
+msgstr "Default IRC client"\r
 \r
-msgid "Make Kiwi my default IRC client"\r
-#msgstr ""\r
+msgid "client_applets_settings_default_client_enable"\r
+msgstr "Make Kiwi my default IRC client"\r
 \r
-msgid "Note: Chrome or Chromium browser users may need to check their settings via %s if nothing happens"\r
-#msgstr ""\r
+msgid "client_applets_settings_default_client_notice"\r
+msgstr "Note: Chrome or Chromium browser users may need to check their settings via %s if nothing happens"\r
 \r
-msgid "Settings"\r
-#msgstr ""\r
+msgid "client_applets_settings_title"\r
+msgstr "Settings"\r
 \r
 \r
 \r
 #: client/assets/src/models/applet.js\r
-msgid "Unknown Applet"\r
-#msgstr ""\r
+msgid "client_models_applet_unknown"\r
+msgstr "Unknown Applet"\r
 \r
-msgid "Loading.."\r
-#msgstr ""\r
+msgid "client_models_applet_loading"\r
+msgstr "Loading.."\r
 \r
-msgid "Not found"\r
-#msgstr ""\r
+msgid "client_models_applet_notfound"\r
+msgstr "Not found"\r
 \r
 \r
 \r
 #: client/assets/src/models/application.js\r
-msgid "You have been disconnected. Attempting to reconnect for you"\r
-#msgstr ""\r
+msgid "client_models_application_reconnecting"\r
+msgstr "You have been disconnected. Attempting to reconnect for you"\r
 \r
-msgid "You have been disconnected. Attempting to reconnect again in %d seconds"\r
-#msgstr ""\r
+msgid "client_models_application_reconnect_in_x_seconds"\r
+msgstr "You have been disconnected. Attempting to reconnect again in %d seconds"\r
 \r
-msgid "It's OK, you're connected again"\r
-#msgstr ""\r
+msgid "client_models_application_reconnect_successfully"\r
+msgstr "It's OK, you're connected again"\r
 \r
-msgid "Settings have been saved"\r
-#msgstr ""\r
+msgid "client_models_application_settings_saved"\r
+msgstr "Settings have been saved"\r
 \r
-msgid "Ignored nicks"\r
-#msgstr ""\r
+msgid "client_models_application_ignore_title"\r
+msgstr "Ignored nicks"\r
 \r
-msgid "Not ignoring anybody"\r
-#msgstr ""\r
+msgid "client_models_application_ignore_none"\r
+msgstr "Not ignoring anybody"\r
 \r
-msgid "Ignoring %s"\r
-#msgstr ""\r
+msgid "client_models_application_ignore_nick"\r
+msgstr "Ignoring %s"\r
 \r
-msgid "Specifiy which nick you wish to stop ignoring"\r
-#msgstr ""\r
+msgid "client_models_application_ignore_stop_notice"\r
+msgstr "Specifiy which nick you wish to stop ignoring"\r
 \r
-msgid "Stopped ignoring %s"\r
-#msgstr ""\r
+msgid "client_models_application_ignore_stopped"\r
+msgstr "Stopped ignoring %s"\r
 \r
-msgid "Applet \"%s\" does not exist"\r
-#msgstr ""\r
+msgid "client_models_application_applet_notfound"\r
+msgstr "Applet \"%s\" does not exist"\r
 \r
-msgid "Encoding modified to %s"\r
-#msgstr ""\r
+msgid "client_models_application_encoding_changed"\r
+msgstr "Encoding modified to %s"\r
 \r
-msgid "%s is not a valid encoding"\r
-#msgstr ""\r
+msgid "client_models_application_encoding_invalid"\r
+msgstr "%s is not a valid encoding"\r
 \r
-msgid "Encoding not specified"\r
-#msgstr ""\r
+msgid "client_models_application_encoding_notspecified"\r
+msgstr "Encoding not specified"\r
 \r
-msgid "Usage: /encoding [NEW-ENCODING]"\r
-#msgstr ""\r
+msgid "client_models_application_encoding_usage"\r
+msgstr "Usage: /encoding [NEW-ENCODING]"\r
 \r
-msgid "New Connection"\r
-#msgstr ""\r
+msgid "client_models_application_connection_create"\r
+msgstr "New Connection"\r
 \r
-msgid "Connecting to %s:%s..."\r
-#msgstr ""\r
+msgid "client_models_application_connection_connecting"\r
+msgstr "Connecting to %s:%s..."\r
 \r
-msgid "Error connecting to %s:%s (%s)"\r
-#msgstr ""\r
+msgid "client_models_application_connection_error"\r
+msgstr "Error connecting to %s:%s (%s)"\r
 \r
 \r
 \r
 #: client/assets/src/models/channel.js\r
-msgid "%s has joined"\r
-#msgstr ""\r
+msgid "client_models_channel_join"\r
+msgstr "%s has joined"\r
 \r
-msgid "%s has quit %s"\r
-#msgstr ""\r
+msgid "client_models_channel_quit"\r
+msgstr "%s has quit %s"\r
 \r
-msgid "%s was kicked by %s %s"\r
-#msgstr ""\r
+msgid "client_models_channel_kicked"\r
+msgstr "%s was kicked by %s %s"\r
 \r
-msgid "You have been kicked by %s %s"\r
-#msgstr ""\r
+msgid "client_models_channel_selfkick"\r
+msgstr "You have been kicked by %s %s"\r
 \r
-msgid "%s has left %s"\r
-#msgstr ""\r
+msgid "client_models_channel_part"\r
+msgstr "%s has left %s"\r
 \r
 \r
 \r
 #: client/assets/src/models/network.js\r
-msgid "%s is not a valid channel name"\r
-#msgstr ""\r
+msgid "client_models_network_channel_invalid_name"\r
+msgstr "%s is not a valid channel name"\r
 \r
-msgid "Disconnected from the IRC network"\r
-#msgstr ""\r
+msgid "client_models_network_disconnected"\r
+msgstr "Disconnected from the IRC network"\r
 \r
-msgid "%s is now known as %s"\r
-#msgstr ""\r
+msgid "client_models_network_nickname_changed"\r
+msgstr "%s is now known as %s"\r
 \r
-msgid "Topic set by %s at %s"\r
-#msgstr ""\r
+msgid "client_models_network_topic"\r
+msgstr "Topic set by %s at %s"\r
 \r
-msgid "%s sets mode %s"\r
-#msgstr ""\r
+msgid "client_models_network_selfmode"\r
+msgstr "%s sets mode %s"\r
 \r
-msgid "%s set mode %s"\r
-#msgstr ""\r
+msgid "client_models_network_mode"\r
+msgstr "%s set mode %s"\r
 \r
-msgid "Channels: %s"\r
-#msgstr ""\r
+msgid "client_models_network_channels"\r
+msgstr "Channels: %s"\r
 \r
-msgid "Connected to server: %s %s"\r
-#msgstr ""\r
+msgid "client_models_network_server"\r
+msgstr "Connected to server: %s %s"\r
 \r
-msgid "Idle for %s, signed on %s"\r
-#msgstr ""\r
+msgid "client_models_network_idle_and_signon"\r
+msgstr "Idle for %s, signed on %s"\r
 \r
-msgid "Away: %s"\r
-#msgstr ""\r
+msgid "client_models_network_away"\r
+msgstr "Away: %s"\r
 \r
-msgid "Idle for %s"\r
-#msgstr ""\r
+msgid "client_models_network_idle"\r
+msgstr "Idle for %s"\r
 \r
-msgid "No such nick"\r
-#msgstr ""\r
+msgid "client_models_network_nickname_notfound"\r
+msgstr "No such nick"\r
 \r
-msgid "You are banned from %s. %s"\r
-#msgstr ""\r
+msgid "client_models_network_banned"\r
+msgstr "You are banned from %s. %s"\r
 \r
-msgid "Bad channel key for %s"\r
-#msgstr ""\r
+msgid "client_models_network_channel_badkey"\r
+msgstr "Bad channel key for %s"\r
 \r
-msgid "%s is invite only."\r
-#msgstr ""\r
+msgid "client_models_network_channel_inviteonly"\r
+msgstr "%s is invite only."\r
 \r
-msgid "%s is full."\r
-#msgstr ""\r
+msgid "client_models_network_channel_limitreached"\r
+msgstr "%s is full."\r
 \r
-msgid "The nickname \"%s\" is already in use. Please select a new nickname"\r
-#msgstr ""\r
+msgid "client_models_network_nickname_alreadyinuse"\r
+msgstr "The nickname \"%s\" is already in use. Please select a new nickname"\r
 \r
-msgid "Incorrect password given"\r
-#msgstr ""\r
+msgid "client_models_network_badpassword"\r
+msgstr "Incorrect password given"\r
 \r
 \r
 \r
 #: client/assets/src/views/application.js\r
-msgid "This will close all KiwiIRC conversations. Are you sure you want to close this window?"\r
-#msgstr ""\r
+msgid "client_views_application_close_notice"\r
+msgstr "This will close all KiwiIRC conversations. Are you sure you want to close this window?"\r
 \r
 \r
 \r
 #: client/assets/src/views/channel.js\r
-msgid "Joining channel.."\r
-#msgstr ""\r
+msgid "client_views_channel_joining"\r
+msgstr "Joining channel.."\r
 \r
-msgid "Topic for %s is: %s"\r
-#msgstr ""\r
+msgid "client_views_channel_topic"\r
+msgstr "Topic for %s is: %s"\r
 \r
 \r
 \r
 #: client/assets/src/views/mediamessage.js\r
-msgid "Close media"\r
-#msgstr ""\r
+msgid "client_views_mediamessage_close"\r
+msgstr "Close media"\r
 \r
-msgid "Not found"\r
-#msgstr ""\r
+msgid "client_views_mediamessage_notfound"\r
+msgstr "Not found"\r
 \r
-msgid "Loading tweet"\r
-#msgstr ""\r
+msgid "client_views_mediamessage_load_tweet"\r
+msgstr "Loading tweet"\r
 \r
-msgid "Loading image"\r
-#msgstr ""\r
+msgid "client_views_mediamessage_load_image"\r
+msgstr "Loading image"\r
 \r
-msgid "Loading Reddit thread"\r
-#msgstr ""\r
+msgid "client_views_mediamessage_load_reddit"\r
+msgstr "Loading Reddit thread"\r
 \r
-msgid "Loading gist"\r
-#msgstr ""\r
+msgid "client_views_mediamessage_load_gist"\r
+msgstr "Loading gist"\r
 \r
 \r
 \r
 #: client/assets/src/views/nickchangegbox.js\r
-msgid "New nick"\r
-#msgstr ""\r
+msgid "client_views_nickchangebox_new"\r
+msgstr "New nick"\r
 \r
-msgid "Change"\r
-#msgstr ""\r
+msgid "client_views_nickchangebox_change"\r
+msgstr "Change"\r
 \r
-msgid "Cancel"\r
-#msgstr ""\r
+msgid "client_views_nickchangebox_cancel"\r
+msgstr "Cancel"\r
 \r
 \r
 \r
 #: client/assets/src/views/panel.js\r
-msgid "People are talking!"\r
-#msgstr ""\r
+msgid "client_views_panel_activity"\r
+msgstr "People are talking!"\r
 \r
 \r
 \r
 #: client/assets/src/views/serverselect.js\r
-msgid "Think of a nickname..."\r
-#msgstr ""\r
+msgid "client_views_serverselect_form_title"\r
+msgstr "Think of a nickname..."\r
 \r
-msgid "Nickname"\r
-#msgstr ""\r
+msgid "client_views_serverselect_nickname"\r
+msgstr "Nickname"\r
 \r
-msgid "I have a password"\r
-#msgstr ""\r
+msgid "client_views_serverselect_enable_password"\r
+msgstr "I have a password"\r
 \r
-msgid "Password"\r
-#msgstr ""\r
+msgid "client_views_serverselect_password"\r
+msgstr "Password"\r
 \r
-msgid "Channel"\r
-#msgstr ""\r
+msgid "client_views_serverselect_channel"\r
+msgstr "Channel"\r
 \r
-msgid "Channel Key"\r
-#msgstr ""\r
+msgid "client_views_serverselect_channelkey"\r
+msgstr "Channel Key"\r
 \r
-msgid "Channel requires a key"\r
-#msgstr ""\r
+msgid "client_views_serverselect_channelkey_required"\r
+msgstr "Channel requires a key"\r
 \r
-msgid "Key"\r
-#msgstr ""\r
+msgid "client_views_serverselect_key"\r
+msgstr "Key"\r
 \r
-msgid "Start..."\r
-#msgstr ""\r
+msgid "client_views_serverselect_connection_start"\r
+msgstr "Start..."\r
 \r
-msgid "Server and network"\r
-#msgstr ""\r
+msgid "client_views_serverselect_server_and_network"\r
+msgstr "Server and network"\r
 \r
-msgid "Server"\r
-#msgstr ""\r
+msgid "client_views_serverselect_server"\r
+msgstr "Server"\r
 \r
-msgid "Port"\r
-#msgstr ""\r
+msgid "client_views_serverselect_port"\r
+msgstr "Port"\r
 \r
-msgid "Powered by Kiwi IRC"\r
-#msgstr ""\r
+msgid "client_views_serverselect_poweredby"\r
+msgstr "Powered by Kiwi IRC"\r
 \r
-msgid "Select a nickname first!"\r
-#msgstr ""\r
+msgid "client_views_serverselect_nickname_error_empty"\r
+msgstr "Select a nickname first!"\r
 \r
-msgid "Connected"\r
-#msgstr ""\r
+msgid "client_views_serverselect_connection_successfully"\r
+msgstr "Connected"\r
 \r
-msgid "Connecting.."\r
-#msgstr ""\r
+msgid "client_views_serverselect_connection_trying"\r
+msgstr "Connecting.."\r
 \r
-msgid "Nickname already taken"\r
-#msgstr ""\r
+msgid "client_views_serverselect_nickname_error_alreadyinuse"\r
+msgstr "Nickname already taken"\r
 \r
-msgid "Erroneus nickname"\r
-#msgstr ""\r
+msgid "client_views_serverselect_nickname_invalid"\r
+msgstr "Erroneus nickname"\r
 \r
-msgid "Incorrect Password"\r
-#msgstr ""\r
+msgid "client_views_serverselect_password_incorrect"\r
+msgstr "Incorrect Password"\r
 \r
-msgid "Error Connecting"\r
-#msgstr ""\r
+msgid "client_views_serverselect_connection_error"\r
+msgstr "Error Connecting"\r
 \r
-msgid "Server not found"\r
-#msgstr ""\r
+msgid "client_views_serverselect_server_notfound"\r
+msgstr "Server not found"\r
 \r
-msgid "Connection refused"\r
-#msgstr ""\r
+msgid "client_views_serverselect_connection_refused"\r
+msgstr "Connection refused"\r
 \r
 \r
 \r
 #: client/assets/src/views/userbox.js\r
-msgid "Op"\r
-#msgstr ""\r
+msgid "client_views_userbox_op"\r
+msgstr "Op"\r
 \r
-msgid "De-op"\r
-#msgstr ""\r
+msgid "client_views_userbox_deop"\r
+msgstr "De-op"\r
 \r
-msgid "Voice"\r
-#msgstr ""\r
+msgid "client_views_userbox_voice"\r
+msgstr "Voice"\r
 \r
-msgid "De-voice"\r
-#msgstr ""\r
+msgid "client_views_userbox_devoice"\r
+msgstr "De-voice"\r
 \r
-msgid "Kick"\r
-#msgstr ""\r
+msgid "client_views_userbox_kick"\r
+msgstr "Kick"\r
 \r
-msgid "Ban"\r
-#msgstr ""\r
+msgid "client_views_userbox_ban"\r
+msgstr "Ban"\r
 \r
-msgid "Message"\r
-#msgstr ""\r
+msgid "client_views_userbox_query"\r
+msgstr "Message"\r
 \r
-msgid "Info"\r
-#msgstr ""\r
+msgid "client_views_userbox_whois"\r
+msgstr "Info"\r
 \r
-msgid "Slap!"\r
-#msgstr ""\r
+msgid "client_views_userbox_slap"\r
+msgstr "Slap!"\r

diff --git a/client/assets/src/views/application.js b/client/assets/src/views/application.js
index b252a37e09f4200e4254ce616979daf20efbd21d..dcf9cfe02f71e6e59f5e2b250d896be385cb494a 100644 (file)
--- a/client/assets/src/views/application.js
+++ b/client/assets/src/views/application.js
@@ -23,7 +23,7 @@ _kiwi.view.Application = Backbone.View.extend({
         // Confirmation require to leave the page
         window.onbeforeunload = function () {
             if (_kiwi.gateway.isConnected()) {
-                return _kiwi.global.i18n.translate('This will close all KiwiIRC conversations. Are you sure you want to close this window?').fetch();
+                return _kiwi.global.i18n.translate('client_views_application_close_notice').fetch();
             }
         };
 

diff --git a/client/assets/src/views/channel.js b/client/assets/src/views/channel.js
index 0eb2cb3acc9f6b950e1c68f526b099e011e71ce1..106ede3d86705b5bf0527caa56bfa5e7ec4281f7 100644 (file)
--- a/client/assets/src/views/channel.js
+++ b/client/assets/src/views/channel.js
@@ -26,7 +26,7 @@ _kiwi.view.Channel = _kiwi.view.Panel.extend({
 
         // Only show the loader if this is a channel (ie. not a query)
         if (this.model.isChannel()) {
-            this.$el.append('<div class="initial_loader" style="margin:1em;text-align:center;"> ' + _kiwi.global.i18n.translate('Joining channel..').fetch() + ' <span class="loader"></span></div>');
+            this.$el.append('<div class="initial_loader" style="margin:1em;text-align:center;"> ' + _kiwi.global.i18n.translate('client_views_channel_joining').fetch() + ' <span class="loader"></span></div>');
         }
     },
 
@@ -40,7 +40,7 @@ _kiwi.view.Channel = _kiwi.view.Panel.extend({
             topic = this.model.get("topic");
         }
 
-        this.model.addMsg('', '== ' + _kiwi.global.i18n.translate('Topic for %s is: %s').fetch(this.model.get('name'), topic), 'topic');
+        this.model.addMsg('', '== ' + _kiwi.global.i18n.translate('client_views_channel_topic').fetch(this.model.get('name'), topic), 'topic');
 
         // If this is the active channel then update the topic bar
         if (_kiwi.app.panels().active === this) {

diff --git a/client/assets/src/views/mediamessage.js b/client/assets/src/views/mediamessage.js
index 587b74d4046bed797223a6c748e94e62c0ca56ad..de24eb4da612b451547bcea967a644b01fd7afb7 100644 (file)
--- a/client/assets/src/views/mediamessage.js
+++ b/client/assets/src/views/mediamessage.js
@@ -20,8 +20,8 @@ _kiwi.view.MediaMessage = Backbone.View.extend({
     open: function () {
         // Create the content div if we haven't already
         if (!this.$content) {
-            this.$content = $('<div class="media_content"><a class="media_close"><i class="icon-chevron-up"></i> ' + _kiwi.global.i18n.translate('Close media').fetch() + '</a><br /><div class="content"></div></div>');
-            this.$content.find('.content').append(this.mediaTypes[this.$el.data('type')].apply(this, []) || _kiwi.global.i18n.translate('Not found').fetch() + ' :(');
+            this.$content = $('<div class="media_content"><a class="media_close"><i class="icon-chevron-up"></i> ' + _kiwi.global.i18n.translate('client_views_mediamessage_close').fetch() + '</a><br /><div class="content"></div></div>');
+            this.$content.find('.content').append(this.mediaTypes[this.$el.data('type')].apply(this, []) || _kiwi.global.i18n.translate('client_views_mediamessage_notfound').fetch() + ' :(');
         }
 
         // Now show the content if not already
@@ -47,7 +47,7 @@ _kiwi.view.MediaMessage = Backbone.View.extend({
                 that.$content.find('.content').html(data.html);
             });
 
-            return $('<div>' + _kiwi.global.i18n.translate('Loading tweet').fetch() + '...</div>');
+            return $('<div>' + _kiwi.global.i18n.translate('client_views_mediamessage_load_tweet').fetch() + '...</div>');
         },
 
 
@@ -64,7 +64,7 @@ _kiwi.view.MediaMessage = Backbone.View.extend({
                 that.$content.find('.content').html(img_html);
             });
 
-            return $('<div>' + _kiwi.global.i18n.translate('Loading image').fetch() + '...</div>');
+            return $('<div>' + _kiwi.global.i18n.translate('client_views_mediamessage_load_image').fetch() + '...</div>');
         },
 
 
@@ -100,7 +100,7 @@ _kiwi.view.MediaMessage = Backbone.View.extend({
                 that.$content.find('.content').html(_.template(tmpl, post));
             });
 
-            return $('<div>' + _kiwi.global.i18n.translate('Loading Reddit thread').fetch() + '...</div>');
+            return $('<div>' + _kiwi.global.i18n.translate('client_views_mediamessage_load_reddit').fetch() + '...</div>');
         },
 
 
@@ -123,7 +123,7 @@ _kiwi.view.MediaMessage = Backbone.View.extend({
                 that.$content.find('.content').html(data.div);
             });
 
-            return $('<div>' + _kiwi.global.i18n.translate('Loading gist').fetch() + '...</div>');
+            return $('<div>' + _kiwi.global.i18n.translate('client_views_mediamessage_load_gist').fetch() + '...</div>');
         }
     }
     }, {

diff --git a/client/assets/src/views/nickchangebox.js b/client/assets/src/views/nickchangebox.js
index b75fc99ef65c6ac5ad40858adfe5469ed8db87e8..94e74ac225d1298c2aecdd225cad63ae39cedf82 100644 (file)
--- a/client/assets/src/views/nickchangebox.js
+++ b/client/assets/src/views/nickchangebox.js
@@ -6,9 +6,9 @@ _kiwi.view.NickChangeBox = Backbone.View.extend({
 
     initialize: function () {
         var text = {
-            new_nick: _kiwi.global.i18n.translate('New nick').fetch(),
-            change: _kiwi.global.i18n.translate('Change').fetch(),
-            cancel: _kiwi.global.i18n.translate('Cancel').fetch()
+            new_nick: _kiwi.global.i18n.translate('client_views_nickchangebox_new').fetch(),
+            change: _kiwi.global.i18n.translate('client_views_nickchangebox_change').fetch(),
+            cancel: _kiwi.global.i18n.translate('client_views_nickchangebox_cancel').fetch()
         };
         this.$el = $(_.template($('#tmpl_nickchange').html().trim(), text));
     },

diff --git a/client/assets/src/views/panel.js b/client/assets/src/views/panel.js
index 9546f1fa676a5b5ab194f306e31c2f093594b178..9d2fd338eca68017415f4f1d64ea9e6c579fe246 100644 (file)
--- a/client/assets/src/views/panel.js
+++ b/client/assets/src/views/panel.js
@@ -133,7 +133,7 @@ _kiwi.view.Panel = Backbone.View.extend({
             this.alert('action');
 
         } else if (is_highlight) {
-            _kiwi.app.view.alertWindow('* ' + _kiwi.global.i18n.translate('People are talking!').fetch());
+            _kiwi.app.view.alertWindow('* ' + _kiwi.global.i18n.translate('client_views_panel_activity').fetch());
             _kiwi.app.view.favicon.newHighlight();
             _kiwi.app.view.playSound('highlight');
             this.alert('highlight');
@@ -141,13 +141,13 @@ _kiwi.view.Panel = Backbone.View.extend({
         } else {
             // If this is the active panel, send an alert out
             if (this.model.isActive()) {
-                _kiwi.app.view.alertWindow('* ' + _kiwi.global.i18n.translate('People are talking!').fetch());
+                _kiwi.app.view.alertWindow('* ' + _kiwi.global.i18n.translate('client_views_panel_activity').fetch());
             }
             this.alert('activity');
         }
 
         if (this.model.isQuery() && !this.model.isActive()) {
-            _kiwi.app.view.alertWindow('* ' + _kiwi.global.i18n.translate('People are talking!').fetch());
+            _kiwi.app.view.alertWindow('* ' + _kiwi.global.i18n.translate('client_views_panel_activity').fetch());
             if (!is_highlight) {
                 _kiwi.app.view.favicon.newHighlight();
             }

diff --git a/client/assets/src/views/serverselect.js b/client/assets/src/views/serverselect.js
index a6dda5be8cfa5191e165f15f175494d72a66ce53..249fed91f09bca9a5479068f65f9f6f216c6829a 100644 (file)
--- a/client/assets/src/views/serverselect.js
+++ b/client/assets/src/views/serverselect.js
@@ -14,19 +14,19 @@ _kiwi.view.ServerSelect = function () {
         initialize: function () {
             var that = this,
                 text = {
-                    think_nick: _kiwi.global.i18n.translate('Think of a nickname...').fetch(),
-                    nickname: _kiwi.global.i18n.translate('Nickname').fetch(),
-                    have_password: _kiwi.global.i18n.translate('I have a password').fetch(),
-                    password: _kiwi.global.i18n.translate('Password').fetch(),
-                    channel: _kiwi.global.i18n.translate('Channel').fetch(),
-                    channel_key: _kiwi.global.i18n.translate('Channel Key').fetch(),
-                    require_key: _kiwi.global.i18n.translate('Channel requires a key').fetch(),
-                    key: _kiwi.global.i18n.translate('Key').fetch(),
-                    start: _kiwi.global.i18n.translate('Start...').fetch(),
-                    server_network: _kiwi.global.i18n.translate('Server and network').fetch(),
-                    server: _kiwi.global.i18n.translate('Server').fetch(),
-                    port: _kiwi.global.i18n.translate('Port').fetch(),
-                    powered_by: _kiwi.global.i18n.translate('Powered by Kiwi IRC').fetch()
+                    think_nick: _kiwi.global.i18n.translate('client_views_serverselect_form_title').fetch(),
+                    nickname: _kiwi.global.i18n.translate('client_views_serverselect_nickname').fetch(),
+                    have_password: _kiwi.global.i18n.translate('client_views_serverselect_enable_password').fetch(),
+                    password: _kiwi.global.i18n.translate('client_views_serverselect_password').fetch(),
+                    channel: _kiwi.global.i18n.translate('client_views_serverselect_channel').fetch(),
+                    channel_key: _kiwi.global.i18n.translate('client_views_serverselect_channelkey').fetch(),
+                    require_key: _kiwi.global.i18n.translate('client_views_serverselect_channelkey_required').fetch(),
+                    key: _kiwi.global.i18n.translate('client_views_serverselect_key').fetch(),
+                    start: _kiwi.global.i18n.translate('client_views_serverselect_connection_start').fetch(),
+                    server_network: _kiwi.global.i18n.translate('client_views_serverselect_server_and_network').fetch(),
+                    server: _kiwi.global.i18n.translate('client_views_serverselect_server').fetch(),
+                    port: _kiwi.global.i18n.translate('client_views_serverselect_port').fetch(),
+                    powered_by: _kiwi.global.i18n.translate('client_views_serverselect_poweredby').fetch()
                 };
 
             this.$el = $(_.template($('#tmpl_server_select').html().trim(), text));
@@ -57,7 +57,7 @@ _kiwi.view.ServerSelect = function () {
 
             // Make sure a nick is chosen
             if (!$('input.nick', this.$el).val().trim()) {
-                this.setStatus(_kiwi.global.i18n.translate('Select a nickname first!').fetch());
+                this.setStatus(_kiwi.global.i18n.translate('client_views_serverselect_nickname_error_empty').fetch());
                 $('input.nick', this.$el).select();
                 return;
             }
@@ -211,12 +211,12 @@ _kiwi.view.ServerSelect = function () {
         },
 
         networkConnected: function (event) {
-            this.setStatus(_kiwi.global.i18n.translate('Connected').fetch() + ' :)', 'ok');
+            this.setStatus(_kiwi.global.i18n.translate('client_views_serverselect_connection_successfully').fetch() + ' :)', 'ok');
             $('form', this.$el).hide();
         },
 
         networkConnecting: function (event) {
-            this.setStatus(_kiwi.global.i18n.translate('Connecting..').fetch(), 'ok');
+            this.setStatus(_kiwi.global.i18n.translate('client_views_serverselect_connection_trying').fetch(), 'ok');
         },
 
         onIrcError: function (data) {
@@ -224,17 +224,17 @@ _kiwi.view.ServerSelect = function () {
 
             switch(data.error) {
             case 'nickname_in_use':
-                this.setStatus(_kiwi.global.i18n.translate('Nickname already taken').fetch());
+                this.setStatus(_kiwi.global.i18n.translate('client_views_serverselect_nickname_error_alreadyinuse').fetch());
                 this.show('nick_change');
                 this.$el.find('.nick').select();
                 break;
             case 'erroneus_nickname':
-                this.setStatus(_kiwi.global.i18n.translate('Erroneus nickname').fetch());
+                this.setStatus(_kiwi.global.i18n.translate('client_views_serverselect_nickname_invalid').fetch());
                 this.show('nick_change');
                 this.$el.find('.nick').select();
                 break;
             case 'password_mismatch':
-                this.setStatus(_kiwi.global.i18n.translate('Incorrect Password').fetch());
+                this.setStatus(_kiwi.global.i18n.translate('client_views_serverselect_password_incorrect').fetch());
                 this.show('nick_change');
                 this.$el.find('.password').select();
                 break;
@@ -242,16 +242,16 @@ _kiwi.view.ServerSelect = function () {
         },
 
         showError: function (error_reason) {
-            var err_text = _kiwi.global.i18n.translate('Error Connecting').fetch();
+            var err_text = _kiwi.global.i18n.translate('client_views_serverselect_connection_error').fetch();
 
             if (error_reason) {
                 switch (error_reason) {
                 case 'ENOTFOUND':
-                    err_text = _kiwi.global.i18n.translate('Server not found').fetch();
+                    err_text = _kiwi.global.i18n.translate('client_views_serverselect_server_notfound').fetch();
                     break;
 
                 case 'ECONNREFUSED':
-                    err_text += ' (' + _kiwi.global.i18n.translate('Connection refused').fetch() + ')';
+                    err_text += ' (' + _kiwi.global.i18n.translate('client_views_serverselect_connection_refused').fetch() + ')';
                     break;
 
                 default:

diff --git a/client/assets/src/views/userbox.js b/client/assets/src/views/userbox.js
index de9d0c33cbf7d53c3d0f3d0a6c8ad6be80531a68..a3da2f0064fa929df896a47e82f75d9ef6fcd024 100644 (file)
--- a/client/assets/src/views/userbox.js
+++ b/client/assets/src/views/userbox.js
@@ -13,15 +13,15 @@ _kiwi.view.UserBox = Backbone.View.extend({
 
     initialize: function () {
         var text = {
-            op: _kiwi.global.i18n.translate('Op').fetch(),
-            de_op: _kiwi.global.i18n.translate('De-op').fetch(),
-            voice: _kiwi.global.i18n.translate('Voice').fetch(),
-            de_voice: _kiwi.global.i18n.translate('De-voice').fetch(),
-            kick: _kiwi.global.i18n.translate('Kick').fetch(),
-            ban: _kiwi.global.i18n.translate('Ban').fetch(),
-            message: _kiwi.global.i18n.translate('Message').fetch(),
-            info: _kiwi.global.i18n.translate('Info').fetch(),
-            slap: _kiwi.global.i18n.translate('Slap!').fetch()
+            op: _kiwi.global.i18n.translate('client_views_userbox_op').fetch(),
+            de_op: _kiwi.global.i18n.translate('client_views_userbox_deop').fetch(),
+            voice: _kiwi.global.i18n.translate('client_views_userbox_voice').fetch(),
+            de_voice: _kiwi.global.i18n.translate('client_views_userbox_devoice').fetch(),
+            kick: _kiwi.global.i18n.translate('client_views_userbox_kick').fetch(),
+            ban: _kiwi.global.i18n.translate('client_views_userbox_ban').fetch(),
+            message: _kiwi.global.i18n.translate('client_views_userbox_query').fetch(),
+            info: _kiwi.global.i18n.translate('client_views_userbox_whois').fetch(),
+            slap: _kiwi.global.i18n.translate('client_views_userbox_slap').fetch()
         };
         this.$el = $(_.template($('#tmpl_userbox').html().trim(), text));
     },