From: Noxx Date: Wed, 10 Jul 2013 16:32:24 +0000 (+0200) Subject: Changed locale's identifier to one-word unique ones; Updated translations X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=247dd7ac1917369263b3e476e5aa3ee8974c84a8;p=KiwiIRC.git 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 efbf019..0c76dd3 100644 --- a/client/assets/src/applets/chanlist.js +++ b/client/assets/src/applets/chanlist.js @@ -8,9 +8,9 @@ initialize: function (options) { var text = { - channel_name: _kiwi.global.i18n.translate('Channel Name').fetch(), - users: _kiwi.global.i18n.translate('Users').fetch(), - topic: _kiwi.global.i18n.translate('Topic').fetch() + channel_name: _kiwi.global.i18n.translate('client_applets_chanlist_channelname').fetch(), + users: _kiwi.global.i18n.translate('client_applets_chanlist_users').fetch(), + topic: _kiwi.global.i18n.translate('client_applets_chanlist_topic').fetch() }; this.$el = $(_.template($('#tmpl_channel_list').html().trim(), text)); @@ -55,7 +55,7 @@ var Applet = Backbone.Model.extend({ initialize: function () { - this.set('title', _kiwi.global.i18n.translate('Channel List').fetch()); + this.set('title', _kiwi.global.i18n.translate('client_applets_chanlist_channellist').fetch()); this.view = new View(); this.network = _kiwi.global.components.Network(); diff --git a/client/assets/src/applets/scripteditor.js b/client/assets/src/applets/scripteditor.js index a196594..e75e075 100644 --- 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 3327be7..142d5d7 100644 --- a/client/assets/src/applets/settings.js +++ b/client/assets/src/applets/settings.js @@ -8,17 +8,17 @@ initialize: function (options) { var text = { - tabs: _kiwi.global.i18n.translate('Tabs').fetch(), - list: _kiwi.global.i18n.translate('List').fetch(), - large_amounts_of_chans: _kiwi.global.i18n.translate('for large amouts of channels').fetch(), - join_part: _kiwi.global.i18n.translate('Join/part channel notifications').fetch(), - timestamps: _kiwi.global.i18n.translate('Timestamps').fetch(), - mute: _kiwi.global.i18n.translate('Mute sound notifications').fetch(), - scroll_history: _kiwi.global.i18n.translate('messages in scroll history').fetch(), + tabs: _kiwi.global.i18n.translate('client_applets_settings_channelview_tabs').fetch(), + list: _kiwi.global.i18n.translate('client_applets_settings_channelview_list').fetch(), + large_amounts_of_chans: _kiwi.global.i18n.translate('client_applets_settings_channelview_list_notice').fetch(), + join_part: _kiwi.global.i18n.translate('client_applets_settings_notification_joinpart').fetch(), + timestamps: _kiwi.global.i18n.translate('client_applets_settings_timestamp').fetch(), + mute: _kiwi.global.i18n.translate('client_applets_settings_notification_sound').fetch(), + scroll_history: _kiwi.global.i18n.translate('client_applets_settings_history_length').fetch(), languages: _kiwi.app.translations, - default_client: _kiwi.global.i18n.translate('Default IRC client').fetch(), - make_default: _kiwi.global.i18n.translate('Make Kiwi my default IRC client').fetch(), - default_note: _kiwi.global.i18n.translate('Note: Chrome or Chromium browser users may need to check their settings via %s if nothing happens').fetch('chrome://settings/handlers') + default_client: _kiwi.global.i18n.translate('client_applets_settings_default_client').fetch(), + make_default: _kiwi.global.i18n.translate('client_applets_settings_default_client_enable').fetch(), + default_note: _kiwi.global.i18n.translate('client_applets_settings_default_client_notice').fetch('chrome://settings/handlers') }; this.$el = $(_.template($('#tmpl_applet_settings').html().trim(), text)); @@ -111,7 +111,7 @@ var Applet = Backbone.Model.extend({ initialize: function () { - this.set('title', _kiwi.global.i18n.translate('Settings').fetch()); + this.set('title', _kiwi.global.i18n.translate('client_applets_settings_title').fetch()); this.view = new View(); } }); diff --git a/client/assets/src/models/applet.js b/client/assets/src/models/applet.js index 495e7d3..b969282 100644 --- 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) { // Try find a title for the applet - this.set('title', applet_object.get('title') || _kiwi.global.i18n.translate('Unknown Applet').fetch()); + this.set('title', applet_object.get('title') || _kiwi.global.i18n.translate('client_models_applet_unknown').fetch()); // Update the tabs title if the applet changes it applet_object.bind('change:title', function (obj, new_value) { @@ -56,11 +56,11 @@ _kiwi.model.Applet = _kiwi.model.Panel.extend({ loadFromUrl: function(applet_url, applet_name) { var that = this; - this.view.$el.html(_kiwi.global.i18n.translate('Loading..').fetch()); + this.view.$el.html(_kiwi.global.i18n.translate('client_models_applet_loading').fetch()); $script(applet_url, function () { // Check if the applet loaded OK if (!_kiwi.applets[applet_name]) { - that.view.$el.html(_kiwi.global.i18n.translate('Not found').fetch()); + that.view.$el.html(_kiwi.global.i18n.translate('client_models_applet_notfound').fetch()); return; } diff --git a/client/assets/src/models/application.js b/client/assets/src/models/application.js index 3fd84f0..6ca06c2 100644 --- 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; gw.on('disconnect', function (event) { - var msg = _kiwi.global.i18n.translate('You have been disconnected. Attempting to reconnect for you').fetch() + '...'; + var msg = _kiwi.global.i18n.translate('client_models_application_reconnecting').fetch() + '...'; that.message.text(msg, {timeout: 10000}); that.view.$el.removeClass('connected'); @@ -364,7 +364,7 @@ _kiwi.model.Application = function () { gw.on('reconnecting', function (event) { - var msg = _kiwi.global.i18n.translate('You have been disconnected. Attempting to reconnect again in %d seconds').fetch(event.delay/1000) + '...'; + var msg = _kiwi.global.i18n.translate('client_models_application_reconnect_in_x_seconds').fetch(event.delay/1000) + '...'; // Only need to mention the repeating re-connection messages on server panels _kiwi.app.connections.forEach(function(connection) { @@ -377,7 +377,7 @@ _kiwi.model.Application = function () { that.view.$el.addClass('connected'); if (gw_stat !== 1) return; - var msg = _kiwi.global.i18n.translate('It\'s OK, you\'re connected again').fetch() + ':)'; + var msg = _kiwi.global.i18n.translate('client_models_application_reconnect_successfully').fetch() + ':)'; that.message.text(msg, {timeout: 5000}); // Mention the disconnection on every channel @@ -511,7 +511,7 @@ _kiwi.model.Application = function () { controlbox.on('command:save', function (ev) { _kiwi.global.settings.save(); - _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('Settings have been saved').fetch()); + _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_settings_saved').fetch()); }); @@ -553,12 +553,12 @@ _kiwi.model.Application = function () { // No parameters passed so list them if (!ev.params[0]) { if (list.length > 0) { - _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('Ignored nicks').fetch() + ':'); + _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('client_models_application_ignore_title').fetch() + ':'); $.each(list, function (idx, ignored_pattern) { _kiwi.app.panels().active.addMsg(' ', ignored_pattern); }); } else { - _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('Not ignoring anybody').fetch()); + _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('client_models_application_ignore_none').fetch()); } return; } @@ -566,7 +566,7 @@ _kiwi.model.Application = function () { // We have a parameter, so add it list.push(ev.params[0]); _kiwi.gateway.set('ignore_list', list); - _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('Ignoring %s').fetch(ev.params[0])); + _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('client_models_application_ignore_nick').fetch(ev.params[0])); }); @@ -574,7 +574,7 @@ _kiwi.model.Application = function () { var list = _kiwi.gateway.get('ignore_list'); if (!ev.params[0]) { - _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('Specifiy which nick you wish to stop ignoring').fetch()); + _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('client_models_application_ignore_stop_notice').fetch()); return; } @@ -584,7 +584,7 @@ _kiwi.model.Application = function () { _kiwi.gateway.set('ignore_list', list); - _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('Stopped ignoring %s').fetch(ev.params[0])); + _kiwi.app.panels().active.addMsg(' ', _kiwi.global.i18n.translate('client_models_application_ignore_stopped').fetch(ev.params[0])); }); @@ -754,7 +754,7 @@ _kiwi.model.Application = function () { if (_kiwi.applets[ev.params[0]]) { panel.load(new _kiwi.applets[ev.params[0]]()); } else { - _kiwi.app.panels().server.addMsg('', _kiwi.global.i18n.translate('Applet "%s" does not exist').fetch(ev.params[0])); + _kiwi.app.panels().server.addMsg('', _kiwi.global.i18n.translate('client_models_application_applet_notfound').fetch(ev.params[0])); return; } } @@ -795,14 +795,14 @@ _kiwi.model.Application = function () { if (ev.params[0]) { _kiwi.gateway.setEncoding(null, ev.params[0], function (success) { if (success) { - _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('Encoding modified to %s').fetch(ev.params[0])); + _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_encoding_changed').fetch(ev.params[0])); } else { - _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('%s is not a valid encoding').fetch(ev.params[0])); + _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_encoding_invalid').fetch(ev.params[0])); } }); } else { - _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('Encoding not specified').fetch()); - _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('Usage: /encoding [NEW-ENCODING]').fetch()); + _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_encoding_notspecified').fetch()); + _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_encoding_usage').fetch()); } } @@ -812,7 +812,7 @@ _kiwi.model.Application = function () { // If no server address given, show the new connection dialog if (!ev.params[0]) { - tmp = new _kiwi.view.MenuBox(_kiwi.global.i18n.translate('New Connection').fetch()); + tmp = new _kiwi.view.MenuBox(_kiwi.global.i18n.translate('client_models_application_connection_create').fetch()); tmp.addItem('new_connection', new _kiwi.model.NewConnection().view.$el); tmp.show(); @@ -855,7 +855,7 @@ _kiwi.model.Application = function () { // Use the same nick as we currently have nick = _kiwi.app.connections.active_connection.get('nick'); - _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('Connecting to %s:%s...').fetch(server, port.toString())); + _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_connection_connecting').fetch(server, port.toString())); _kiwi.gateway.newConnection({ nick: nick, @@ -865,7 +865,7 @@ _kiwi.model.Application = function () { password: password }, function(err, new_connection) { if (err) - _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('Error connecting to %s:%s (%s)').fetch(server, port.toString(), err.toString())); + _kiwi.app.panels().active.addMsg('', _kiwi.global.i18n.translate('client_models_application_connection_error').fetch(server, port.toString(), err.toString())); }); } diff --git a/client/assets/src/models/channel.js b/client/assets/src/models/channel.js index 369f389..9134ad7 100644 --- 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; } - this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('%s has joined').fetch(member.displayNick(true)), 'action join'); + this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('client_models_channel_join').fetch(member.displayNick(true)), 'action join'); }, this); members.bind("remove", function (member, members, options) { @@ -30,21 +30,21 @@ _kiwi.model.Channel = _kiwi.model.Panel.extend({ var msg = (options.message) ? '(' + options.message + ')' : ''; if (options.type === 'quit' && show_message) { - this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('%s has quit %s').fetch(member.displayNick(true), msg), 'action quit'); + this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('client_models_channel_quit').fetch(member.displayNick(true), msg), 'action quit'); } else if(options.type === 'kick') { if (!options.current_user_kicked) { //If user kicked someone, show the message regardless of settings. if (show_message || options.current_user_initiated) { - this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('%s was kicked by %s %s').fetch(member.displayNick(true), options.by, msg), 'action kick'); + this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('client_models_channel_kicked').fetch(member.displayNick(true), options.by, msg), 'action kick'); } } else { - this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('You have been kicked by %s %s').fetch(options.by, msg), 'action kick'); + this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('client_models_channel_selfkick').fetch(options.by, msg), 'action kick'); } } else if (show_message) { - this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('%s has left %s').fetch(member.displayNick(true), msg), 'action part'); + this.addMsg(' ', '== ' + _kiwi.global.i18n.translate('client_models_channel_part').fetch(member.displayNick(true), msg), 'action part'); } }, this); } diff --git a/client/assets/src/models/network.js b/client/assets/src/models/network.js index 84ab239..176a95a 100644 --- 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 205dd0a..6edb330 100755 --- a/client/assets/src/translations/de.po +++ b/client/assets/src/translations/de.po @@ -1,358 +1,358 @@ #: client/assets/src/applets/chanlist.js -msgid "Channel Name" +msgid "client_applets_chanlist_channelname" msgstr "Raumname" -msgid "Users" +msgid "client_applets_chanlist_users" msgstr "Nutzer" -msgid "Topic" +msgid "client_applets_chanlist_topic" msgstr "Thema" -msgid "Channel List" +msgid "client_applets_chanlist_channellist msgstr "Raumliste" #: client/assets/src/applets/scripteditor.js -msgid "Save" +msgid "client_applets_scripteditor_save" msgstr "Speichern" -msgid "Script error. %s" +msgid "client_applets_scripteditor_error" msgstr "Programm-Fehler. %s" -msgid "Your script has been saved and is now active" +msgid "client_applets_scripteditor_saved" msgstr "Dein Programm wurde gespeichert und ist nun aktiv." -msgid "Script Editor" +msgid "client_applets_scripteditor_title" msgstr "Programm-Editor" #: client/assets/src/applets/settings.js -msgid "Tabs" +msgid "client_applets_settings_channelview_tabs" msgstr "Tabs" -msgid "List" +msgid "client_applets_settings_channelview_list" msgstr "Liste" -msgid "for large amouts of channels" +msgid "client_applets_settings_channelview_list_notice" msgstr "für eine große Anzahl an Räumen" -msgid "Join/part channel notifications" +msgid "client_applets_settings_notification_joinpart" msgstr "Beitreten/Verlassen Benachrichtigungen" -msgid "Timestamps" +msgid "client_applets_settings_timestamp" msgstr "Zeitstempel" -msgid "Mute sound notifications" +msgid "client_applets_settings_notification_sound" msgstr "Audio-Benachrichtigungen stummschalten" -msgid "messages in scroll history" +msgid "client_applets_settings_history_length" msgstr "Nachrichten im Verlauf" -msgid "Default IRC client" +msgid "client_applets_settings_default_client" msgstr "Standard IRC Client" -msgid "Make Kiwi my default IRC client" +msgid "client_applets_settings_default_client_enable" msgstr "Setze Kiwi als meinen Standard-IRC Client" -msgid "Note: Chrome or Chromium browser users may need to check their settings via %s if nothing happens" +msgid "client_applets_settings_default_client_notice" msgstr "Notiz: Nutzer von Chrome oder Chromium müssen ihre Einstellungen durch %s testen, sofern nichts passiert" -msgid "Settings" +msgid "client_applets_settings_title" msgstr "Einstellungen" #: client/assets/src/models/applet.js -msgid "Unknown Applet" +msgid "client_models_applet_unknown" msgstr "Unbekannte Anwendung" -msgid "Loading.." +msgid "client_models_applet_loading" msgstr "Lade.." -msgid "Not found" +msgid "client_models_applet_notfound" msgstr "Nicht gefunden" #: client/assets/src/models/application.js -msgid "You have been disconnected. Attempting to reconnect for you" +msgid "client_models_application_reconnecting" msgstr "Deine Verbindung wurde getrennt. Ein erneuter Verbindungsaufbau wird versucht" -msgid "You have been disconnected. Attempting to reconnect again in %d seconds" +msgid "client_models_application_reconnect_in_x_seconds" msgstr "Deine Verbindung wurde getrennt. Ein erneuter Verbindungsaufbau wird in %d Sekunden versucht" -msgid "It's OK, you're connected again" +msgid "client_models_application_reconnect_successfully" msgstr "Alles OK, du bist wieder verbunden" -msgid "Settings have been saved" +msgid "client_models_application_settings_saved" msgstr "Einstellungen wurden gespeichert" -msgid "Ignored nicks" +msgid "client_models_application_ignore_title" msgstr "Ignorierte Nicknamen" -msgid "Not ignoring anybody" +msgid "client_models_application_ignore_none" msgstr "Niemand wird ignoriert" -msgid "Ignoring %s" +msgid "client_models_application_ignore_nick" msgstr "Ignoriere %s" -msgid "Specifiy which nick you wish to stop ignoring" +msgid "client_models_application_ignore_stop_notice" msgstr "Gib den Nicknamen ein, den du nicht mehr ignorieren möchtest" -msgid "Stopped ignoring %s" +msgid "client_models_application_ignore_stopped" msgstr "%s wird nicht mehr ignoriert" -msgid "Applet \"%s\" does not exist" +msgid "client_models_application_applet_notfound" msgstr "Anwendung \"%s\" existiert nicht" -msgid "Encoding modified to %s" +msgid "client_models_application_encoding_changed" msgstr "Kodierung wurde in %s geändert" -msgid "%s is not a valid encoding" +msgid "client_models_application_encoding_invalid" msgstr "%s ist keine gültige Kodierung" -msgid "Encoding not specified" +msgid "client_models_application_encoding_notspecified" msgstr "Kodierung nicht angegeben" -msgid "Usage: /encoding [NEW-ENCODING]" +msgid "client_models_application_encoding_usage" msgstr "Verwendung: /encoding [NEUE-KODIERUNG]" -msgid "New Connection" +msgid "client_models_application_connection_create" msgstr "Neue Verbindung" -msgid "Connecting to %s:%s..." +msgid "client_models_application_connection_connecting" msgstr "verbinde nach %s:%s..." -msgid "Error connecting to %s:%s (%s)" +msgid "client_models_application_connection_error" msgstr "Fehler beim Verbindungsaufbau nach %s:%s (%s)" #: client/assets/src/models/channel.js -msgid "%s has joined" +msgid "client_models_channel_join" msgstr "%s ist beigetreten" -msgid "%s has quit %s" +msgid "client_models_channel_quit" msgstr "%s ist gegangen %s" -msgid "%s was kicked by %s %s" +msgid "client_models_channel_kicked" msgstr "%s wurde von %s rausgeschmissen %s" -msgid "You have been kicked by %s %s" +msgid "client_models_channel_selfkick" msgstr "Du wurdest von %s rausgeschmissen %s" -msgid "%s has left %s" +msgid "client_models_channel_part" msgstr "%s verließ %s" #: client/assets/src/models/network.js -msgid "%s is not a valid channel name" +msgid "client_models_network_channel_invalid_name" msgstr "%s ist kein gültiger Raumname" -msgid "Disconnected from the IRC network" +msgid "client_models_network_disconnected" msgstr "Verbindung zum IRC-Netzwerk getrennt" -msgid "%s is now known as %s" +msgid "client_models_network_nickname_changed" msgstr "%s ist nun bekannt als %s" -msgid "Topic set by %s at %s" +msgid "client_models_network_topic" msgstr "Thema wurde von %s am %s gesetzt" -msgid "%s sets mode %s" +msgid "client_models_network_selfmode" msgstr "%s setzt den Modus %s" -msgid "%s set mode %s" +msgid "client_models_network_mode" msgstr "%s setzte den Modus %s" -msgid "Channels: %s" +msgid "client_models_network_channels" msgstr "Räume: %s" -msgid "Connected to server: %s %s" +msgid "client_models_network_server" msgstr "Zum Server %s %s verbunden" -msgid "Idle for %s, signed on %s" +msgid "client_models_network_idle_and_signon" msgstr "Untätig seit %s, verbunden am %s" -msgid "Away: %s" +msgid "client_models_network_away" msgstr "Abwesend: %s" -msgid "Idle for %s" +msgid "client_models_network_idle" msgstr "Untätig seit %s" -msgid "No such nick" +msgid "client_models_network_nickname_notfound" msgstr "Ungültiger Nickname" -msgid "You are banned from %s. %s" +msgid "client_models_network_banned" msgstr "Du wurdest aus %s verbannt. %s" -msgid "Bad channel key for %s" +msgid "client_models_network_channel_badkey" msgstr "Falsches Passwort für %s" msgid "%s is invite only." -msgstr "Du benötigst eine Einladung für %s." +msgstr "client_models_network_channel_inviteonly" -msgid "%s is full." +msgid "client_models_network_channel_limitreached" msgstr "%s ist voll." -msgid "The nickname \"%s\" is already in use. Please select a new nickname" +msgid "client_models_network_nickname_alreadyinuse" msgstr "Der Nickname \"%s\" wird bereits verwendet. Bitte wähle einen anderen Nicknamen." -msgid "Incorrect password given" +msgid "client_models_network_badpassword" msgstr "Falsches Passwort" #: client/assets/src/views/application.js -msgid "This will close all KiwiIRC conversations. Are you sure you want to close this window?" +msgid "client_views_application_close_notice" msgstr "Dies wird alle KiwiIRC Verbindungen beenden. Bist du sicher, dass du dieses Fenster schließen willst?" #: client/assets/src/views/channel.js -msgid "Joining channel.." +msgid "client_views_channel_joining" msgstr "Betrete Raum.." -msgid "Topic for %s is: %s" +msgid "client_views_channel_topic" msgstr "Thema für %s ist: %s" #: client/assets/src/views/mediamessage.js -msgid "Close media" +msgid "client_views_mediamessage_close" msgstr "Schließe Medium" -msgid "Not found" +msgid "client_views_mediamessage_notfound" msgstr "Nicht gefunden" -msgid "Loading tweet" +msgid "client_views_mediamessage_load_tweet" msgstr "Lade Tweet" -msgid "Loading image" +msgid "client_views_mediamessage_load_image" msgstr "Lade Bild" -msgid "Loading Reddit thread" +msgid "client_views_mediamessage_load_reddit" msgstr "Lade Reddit Thread" -msgid "Loading gist" +msgid "client_views_mediamessage_load_gist" msgstr "Lade Gist" #: client/assets/src/views/nickchangegbox.js -msgid "New nick" +msgid "client_views_nickchangebox_new" msgstr "Neuer Nickname" -msgid "Change" +msgid "client_views_nickchangebox_change" msgstr "Ändern" -msgid "Cancel" +msgid "client_views_nickchangebox_cancel" msgstr "Abbrechen" #: client/assets/src/views/panel.js -msgid "People are talking!" +msgid "client_views_panel_activity" msgstr "Es wird geredet!" #: client/assets/src/views/serverselect.js -msgid "Think of a nickname..." +msgid "client_views_serverselect_form_title" msgstr "Denk an einen Nicknamen..." -msgid "Nickname" +msgid "client_views_serverselect_nickname" msgstr "Nickname" -msgid "I have a password" +msgid "client_views_serverselect_enable_password" msgstr "Ich habe ein Passwort" -msgid "Password" +msgid "client_views_serverselect_password" msgstr "Passwort" -msgid "Channel" +msgid "client_views_serverselect_channel" msgstr "Raum" -msgid "Channel Key" +msgid "client_views_serverselect_channelkey" msgstr "Raum-Passwort" -msgid "Channel requires a key" +msgid "client_views_serverselect_channelkey_required" msgstr "Raum benötigt ein Passwort" -msgid "Key" +msgid "client_views_serverselect_key" msgstr "Passwort" -msgid "Start..." +msgid "client_views_serverselect_connection_start" msgstr "Start..." -msgid "Server and network" +msgid "client_views_serverselect_server_and_network" msgstr "Server und Netzwerk" -msgid "Server" +msgid "client_views_serverselect_server" msgstr "Server" -msgid "Port" +msgid "client_views_serverselect_port" msgstr "Port" -msgid "Powered by Kiwi IRC" +msgid "client_views_serverselect_poweredby" msgstr "Präsentiert von Kiwi IRC" -msgid "Select a nickname first!" +msgid "client_views_serverselect_nickname_error_empty" msgstr "Wähle zuerst einen Nicknamen!" -msgid "Connected" +msgid "client_views_serverselect_connection_successfully" msgstr "Verbunden" -msgid "Connecting.." +msgid "client_views_serverselect_connection_trying" msgstr "Verbinde.." -msgid "Nickname already taken" +msgid "client_views_serverselect_nickname_error_alreadyinuse" msgstr "Der Nickname wird bereits verwendet" -msgid "Erroneus nickname" +msgid "client_views_serverselect_nickname_invalid" msgstr "Fehlerhafter Nickname" -msgid "Incorrect Password" +msgid "client_views_serverselect_password_incorrect" msgstr "Falsches Passwort" -msgid "Error Connecting" +msgid "client_views_serverselect_connection_error" msgstr "Fehler beim Verbinden" -msgid "Server not found" +msgid "client_views_serverselect_server_notfound" msgstr "Server konnte nicht gefunden werden" -msgid "Connection refused" +msgid "client_views_serverselect_connection_refused" msgstr "Verbindung wurde abgelehnt" #: client/assets/src/views/userbox.js -msgid "Op" +msgid "client_views_userbox_op" msgstr "Op" -msgid "De-op" +msgid "client_views_userbox_deop" msgstr "De-Op" -msgid "Voice" +msgid "client_views_userbox_voice" msgstr "Voice" -msgid "De-voice" +msgid "client_views_userbox_devoice" msgstr "De-Voice" -msgid "Kick" +msgid "client_views_userbox_kick" msgstr "Rausschmeissen" -msgid "Ban" +msgid "client_views_userbox_ban" msgstr "Verbannen" -msgid "Message" +msgid "client_views_userbox_query" msgstr "Nachricht" -msgid "Info" +msgid "client_views_userbox_whois" msgstr "Info" -msgid "Slap!" +msgid "client_views_userbox_slap" msgstr "Schlagen!" diff --git a/client/assets/src/translations/template.po b/client/assets/src/translations/template.po index abea90c..23f3b17 100755 --- a/client/assets/src/translations/template.po +++ b/client/assets/src/translations/template.po @@ -1,358 +1,358 @@ #: client/assets/src/applets/chanlist.js -msgid "Channel Name" -#msgstr "" +msgid "client_applets_chanlist_channelname" +msgstr "Channel Name" -msgid "Users" -#msgstr "" +msgid "client_applets_chanlist_users" +msgstr "Users" -msgid "Topic" -#msgstr "" +msgid "client_applets_chanlist_topic" +msgstr "Topic" -msgid "Channel List" -#msgstr "" +msgid "client_applets_chanlist_channellist" +msgstr "Channel List" #: client/assets/src/applets/scripteditor.js -msgid "Save" -#msgstr "" +msgid "client_applets_scripteditor_save" +msgstr "Save" -msgid "Script error. %s" -#msgstr "" +msgid "client_applets_scripteditor_error" +msgstr "Script error. %s" -msgid "Your script has been saved and is now active" -#msgstr "" +msgid "client_applets_scripteditor_saved" +msgstr "Your script has been saved and is now active" -msgid "Script Editor" -#msgstr "" +msgid "client_applets_scripteditor_title" +msgstr "Script Editor" #: client/assets/src/applets/settings.js -msgid "Tabs" -#msgstr "" +msgid "client_applets_settings_channelview_tabs" +msgstr "Tabs" -msgid "List" -#msgstr "" +msgid "client_applets_settings_channelview_list" +msgstr "List" -msgid "for large amouts of channels" -#msgstr "" +msgid "client_applets_settings_channelview_list_notice" +msgstr "for large amouts of channels" -msgid "Join/part channel notifications" -#msgstr "" +msgid "client_applets_settings_notification_joinpart" +msgstr "Join/part channel notifications" -msgid "Timestamps" -#msgstr "" +msgid "client_applets_settings_timestamp" +msgstr "Timestamps" -msgid "Mute sound notifications" -#msgstr "" +msgid "client_applets_settings_notification_sound" +msgstr "Mute sound notifications" -msgid "messages in scroll history" -#msgstr "" +msgid "client_applets_settings_history_length" +msgstr "messages in scroll history" -msgid "Default IRC client" -#msgstr "" +msgid "client_applets_settings_default_client" +msgstr "Default IRC client" -msgid "Make Kiwi my default IRC client" -#msgstr "" +msgid "client_applets_settings_default_client_enable" +msgstr "Make Kiwi my default IRC client" -msgid "Note: Chrome or Chromium browser users may need to check their settings via %s if nothing happens" -#msgstr "" +msgid "client_applets_settings_default_client_notice" +msgstr "Note: Chrome or Chromium browser users may need to check their settings via %s if nothing happens" -msgid "Settings" -#msgstr "" +msgid "client_applets_settings_title" +msgstr "Settings" #: client/assets/src/models/applet.js -msgid "Unknown Applet" -#msgstr "" +msgid "client_models_applet_unknown" +msgstr "Unknown Applet" -msgid "Loading.." -#msgstr "" +msgid "client_models_applet_loading" +msgstr "Loading.." -msgid "Not found" -#msgstr "" +msgid "client_models_applet_notfound" +msgstr "Not found" #: client/assets/src/models/application.js -msgid "You have been disconnected. Attempting to reconnect for you" -#msgstr "" +msgid "client_models_application_reconnecting" +msgstr "You have been disconnected. Attempting to reconnect for you" -msgid "You have been disconnected. Attempting to reconnect again in %d seconds" -#msgstr "" +msgid "client_models_application_reconnect_in_x_seconds" +msgstr "You have been disconnected. Attempting to reconnect again in %d seconds" -msgid "It's OK, you're connected again" -#msgstr "" +msgid "client_models_application_reconnect_successfully" +msgstr "It's OK, you're connected again" -msgid "Settings have been saved" -#msgstr "" +msgid "client_models_application_settings_saved" +msgstr "Settings have been saved" -msgid "Ignored nicks" -#msgstr "" +msgid "client_models_application_ignore_title" +msgstr "Ignored nicks" -msgid "Not ignoring anybody" -#msgstr "" +msgid "client_models_application_ignore_none" +msgstr "Not ignoring anybody" -msgid "Ignoring %s" -#msgstr "" +msgid "client_models_application_ignore_nick" +msgstr "Ignoring %s" -msgid "Specifiy which nick you wish to stop ignoring" -#msgstr "" +msgid "client_models_application_ignore_stop_notice" +msgstr "Specifiy which nick you wish to stop ignoring" -msgid "Stopped ignoring %s" -#msgstr "" +msgid "client_models_application_ignore_stopped" +msgstr "Stopped ignoring %s" -msgid "Applet \"%s\" does not exist" -#msgstr "" +msgid "client_models_application_applet_notfound" +msgstr "Applet \"%s\" does not exist" -msgid "Encoding modified to %s" -#msgstr "" +msgid "client_models_application_encoding_changed" +msgstr "Encoding modified to %s" -msgid "%s is not a valid encoding" -#msgstr "" +msgid "client_models_application_encoding_invalid" +msgstr "%s is not a valid encoding" -msgid "Encoding not specified" -#msgstr "" +msgid "client_models_application_encoding_notspecified" +msgstr "Encoding not specified" -msgid "Usage: /encoding [NEW-ENCODING]" -#msgstr "" +msgid "client_models_application_encoding_usage" +msgstr "Usage: /encoding [NEW-ENCODING]" -msgid "New Connection" -#msgstr "" +msgid "client_models_application_connection_create" +msgstr "New Connection" -msgid "Connecting to %s:%s..." -#msgstr "" +msgid "client_models_application_connection_connecting" +msgstr "Connecting to %s:%s..." -msgid "Error connecting to %s:%s (%s)" -#msgstr "" +msgid "client_models_application_connection_error" +msgstr "Error connecting to %s:%s (%s)" #: client/assets/src/models/channel.js -msgid "%s has joined" -#msgstr "" +msgid "client_models_channel_join" +msgstr "%s has joined" -msgid "%s has quit %s" -#msgstr "" +msgid "client_models_channel_quit" +msgstr "%s has quit %s" -msgid "%s was kicked by %s %s" -#msgstr "" +msgid "client_models_channel_kicked" +msgstr "%s was kicked by %s %s" -msgid "You have been kicked by %s %s" -#msgstr "" +msgid "client_models_channel_selfkick" +msgstr "You have been kicked by %s %s" -msgid "%s has left %s" -#msgstr "" +msgid "client_models_channel_part" +msgstr "%s has left %s" #: client/assets/src/models/network.js -msgid "%s is not a valid channel name" -#msgstr "" +msgid "client_models_network_channel_invalid_name" +msgstr "%s is not a valid channel name" -msgid "Disconnected from the IRC network" -#msgstr "" +msgid "client_models_network_disconnected" +msgstr "Disconnected from the IRC network" -msgid "%s is now known as %s" -#msgstr "" +msgid "client_models_network_nickname_changed" +msgstr "%s is now known as %s" -msgid "Topic set by %s at %s" -#msgstr "" +msgid "client_models_network_topic" +msgstr "Topic set by %s at %s" -msgid "%s sets mode %s" -#msgstr "" +msgid "client_models_network_selfmode" +msgstr "%s sets mode %s" -msgid "%s set mode %s" -#msgstr "" +msgid "client_models_network_mode" +msgstr "%s set mode %s" -msgid "Channels: %s" -#msgstr "" +msgid "client_models_network_channels" +msgstr "Channels: %s" -msgid "Connected to server: %s %s" -#msgstr "" +msgid "client_models_network_server" +msgstr "Connected to server: %s %s" -msgid "Idle for %s, signed on %s" -#msgstr "" +msgid "client_models_network_idle_and_signon" +msgstr "Idle for %s, signed on %s" -msgid "Away: %s" -#msgstr "" +msgid "client_models_network_away" +msgstr "Away: %s" -msgid "Idle for %s" -#msgstr "" +msgid "client_models_network_idle" +msgstr "Idle for %s" -msgid "No such nick" -#msgstr "" +msgid "client_models_network_nickname_notfound" +msgstr "No such nick" -msgid "You are banned from %s. %s" -#msgstr "" +msgid "client_models_network_banned" +msgstr "You are banned from %s. %s" -msgid "Bad channel key for %s" -#msgstr "" +msgid "client_models_network_channel_badkey" +msgstr "Bad channel key for %s" -msgid "%s is invite only." -#msgstr "" +msgid "client_models_network_channel_inviteonly" +msgstr "%s is invite only." -msgid "%s is full." -#msgstr "" +msgid "client_models_network_channel_limitreached" +msgstr "%s is full." -msgid "The nickname \"%s\" is already in use. Please select a new nickname" -#msgstr "" +msgid "client_models_network_nickname_alreadyinuse" +msgstr "The nickname \"%s\" is already in use. Please select a new nickname" -msgid "Incorrect password given" -#msgstr "" +msgid "client_models_network_badpassword" +msgstr "Incorrect password given" #: client/assets/src/views/application.js -msgid "This will close all KiwiIRC conversations. Are you sure you want to close this window?" -#msgstr "" +msgid "client_views_application_close_notice" +msgstr "This will close all KiwiIRC conversations. Are you sure you want to close this window?" #: client/assets/src/views/channel.js -msgid "Joining channel.." -#msgstr "" +msgid "client_views_channel_joining" +msgstr "Joining channel.." -msgid "Topic for %s is: %s" -#msgstr "" +msgid "client_views_channel_topic" +msgstr "Topic for %s is: %s" #: client/assets/src/views/mediamessage.js -msgid "Close media" -#msgstr "" +msgid "client_views_mediamessage_close" +msgstr "Close media" -msgid "Not found" -#msgstr "" +msgid "client_views_mediamessage_notfound" +msgstr "Not found" -msgid "Loading tweet" -#msgstr "" +msgid "client_views_mediamessage_load_tweet" +msgstr "Loading tweet" -msgid "Loading image" -#msgstr "" +msgid "client_views_mediamessage_load_image" +msgstr "Loading image" -msgid "Loading Reddit thread" -#msgstr "" +msgid "client_views_mediamessage_load_reddit" +msgstr "Loading Reddit thread" -msgid "Loading gist" -#msgstr "" +msgid "client_views_mediamessage_load_gist" +msgstr "Loading gist" #: client/assets/src/views/nickchangegbox.js -msgid "New nick" -#msgstr "" +msgid "client_views_nickchangebox_new" +msgstr "New nick" -msgid "Change" -#msgstr "" +msgid "client_views_nickchangebox_change" +msgstr "Change" -msgid "Cancel" -#msgstr "" +msgid "client_views_nickchangebox_cancel" +msgstr "Cancel" #: client/assets/src/views/panel.js -msgid "People are talking!" -#msgstr "" +msgid "client_views_panel_activity" +msgstr "People are talking!" #: client/assets/src/views/serverselect.js -msgid "Think of a nickname..." -#msgstr "" +msgid "client_views_serverselect_form_title" +msgstr "Think of a nickname..." -msgid "Nickname" -#msgstr "" +msgid "client_views_serverselect_nickname" +msgstr "Nickname" -msgid "I have a password" -#msgstr "" +msgid "client_views_serverselect_enable_password" +msgstr "I have a password" -msgid "Password" -#msgstr "" +msgid "client_views_serverselect_password" +msgstr "Password" -msgid "Channel" -#msgstr "" +msgid "client_views_serverselect_channel" +msgstr "Channel" -msgid "Channel Key" -#msgstr "" +msgid "client_views_serverselect_channelkey" +msgstr "Channel Key" -msgid "Channel requires a key" -#msgstr "" +msgid "client_views_serverselect_channelkey_required" +msgstr "Channel requires a key" -msgid "Key" -#msgstr "" +msgid "client_views_serverselect_key" +msgstr "Key" -msgid "Start..." -#msgstr "" +msgid "client_views_serverselect_connection_start" +msgstr "Start..." -msgid "Server and network" -#msgstr "" +msgid "client_views_serverselect_server_and_network" +msgstr "Server and network" -msgid "Server" -#msgstr "" +msgid "client_views_serverselect_server" +msgstr "Server" -msgid "Port" -#msgstr "" +msgid "client_views_serverselect_port" +msgstr "Port" -msgid "Powered by Kiwi IRC" -#msgstr "" +msgid "client_views_serverselect_poweredby" +msgstr "Powered by Kiwi IRC" -msgid "Select a nickname first!" -#msgstr "" +msgid "client_views_serverselect_nickname_error_empty" +msgstr "Select a nickname first!" -msgid "Connected" -#msgstr "" +msgid "client_views_serverselect_connection_successfully" +msgstr "Connected" -msgid "Connecting.." -#msgstr "" +msgid "client_views_serverselect_connection_trying" +msgstr "Connecting.." -msgid "Nickname already taken" -#msgstr "" +msgid "client_views_serverselect_nickname_error_alreadyinuse" +msgstr "Nickname already taken" -msgid "Erroneus nickname" -#msgstr "" +msgid "client_views_serverselect_nickname_invalid" +msgstr "Erroneus nickname" -msgid "Incorrect Password" -#msgstr "" +msgid "client_views_serverselect_password_incorrect" +msgstr "Incorrect Password" -msgid "Error Connecting" -#msgstr "" +msgid "client_views_serverselect_connection_error" +msgstr "Error Connecting" -msgid "Server not found" -#msgstr "" +msgid "client_views_serverselect_server_notfound" +msgstr "Server not found" -msgid "Connection refused" -#msgstr "" +msgid "client_views_serverselect_connection_refused" +msgstr "Connection refused" #: client/assets/src/views/userbox.js -msgid "Op" -#msgstr "" +msgid "client_views_userbox_op" +msgstr "Op" -msgid "De-op" -#msgstr "" +msgid "client_views_userbox_deop" +msgstr "De-op" -msgid "Voice" -#msgstr "" +msgid "client_views_userbox_voice" +msgstr "Voice" -msgid "De-voice" -#msgstr "" +msgid "client_views_userbox_devoice" +msgstr "De-voice" -msgid "Kick" -#msgstr "" +msgid "client_views_userbox_kick" +msgstr "Kick" -msgid "Ban" -#msgstr "" +msgid "client_views_userbox_ban" +msgstr "Ban" -msgid "Message" -#msgstr "" +msgid "client_views_userbox_query" +msgstr "Message" -msgid "Info" -#msgstr "" +msgid "client_views_userbox_whois" +msgstr "Info" -msgid "Slap!" -#msgstr "" +msgid "client_views_userbox_slap" +msgstr "Slap!" diff --git a/client/assets/src/views/application.js b/client/assets/src/views/application.js index b252a37..dcf9cfe 100644 --- 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 0eb2cb3..106ede3 100644 --- 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('
' + _kiwi.global.i18n.translate('Joining channel..').fetch() + '
'); + this.$el.append('
' + _kiwi.global.i18n.translate('client_views_channel_joining').fetch() + '
'); } }, @@ -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 587b74d..de24eb4 100644 --- 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 = $('
' + _kiwi.global.i18n.translate('Close media').fetch() + '
'); - this.$content.find('.content').append(this.mediaTypes[this.$el.data('type')].apply(this, []) || _kiwi.global.i18n.translate('Not found').fetch() + ' :('); + this.$content = $('
' + _kiwi.global.i18n.translate('client_views_mediamessage_close').fetch() + '
'); + 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 $('
' + _kiwi.global.i18n.translate('Loading tweet').fetch() + '...
'); + return $('
' + _kiwi.global.i18n.translate('client_views_mediamessage_load_tweet').fetch() + '...
'); }, @@ -64,7 +64,7 @@ _kiwi.view.MediaMessage = Backbone.View.extend({ that.$content.find('.content').html(img_html); }); - return $('
' + _kiwi.global.i18n.translate('Loading image').fetch() + '...
'); + return $('
' + _kiwi.global.i18n.translate('client_views_mediamessage_load_image').fetch() + '...
'); }, @@ -100,7 +100,7 @@ _kiwi.view.MediaMessage = Backbone.View.extend({ that.$content.find('.content').html(_.template(tmpl, post)); }); - return $('
' + _kiwi.global.i18n.translate('Loading Reddit thread').fetch() + '...
'); + return $('
' + _kiwi.global.i18n.translate('client_views_mediamessage_load_reddit').fetch() + '...
'); }, @@ -123,7 +123,7 @@ _kiwi.view.MediaMessage = Backbone.View.extend({ that.$content.find('.content').html(data.div); }); - return $('
' + _kiwi.global.i18n.translate('Loading gist').fetch() + '...
'); + return $('
' + _kiwi.global.i18n.translate('client_views_mediamessage_load_gist').fetch() + '...
'); } } }, { diff --git a/client/assets/src/views/nickchangebox.js b/client/assets/src/views/nickchangebox.js index b75fc99..94e74ac 100644 --- 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 9546f1f..9d2fd33 100644 --- 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 a6dda5b..249fed9 100644 --- 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 de9d0c3..a3da2f0 100644 --- 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)); },