Merge remote branch 'origin/development' into text_themes

Conflicts:
	client/build.js
	client/src/models/network.js
	client/src/translations/es.po
	server/settingsgenerator.js

diff --cc client/build.js
index 008a44f9809cef65ef689f25a0ebee08e95d7a7b,4b9df3b3369e36c21cb71016688695627d880b43..0956e0754b05c2b678aed5faaac4bbede564254f
--- 1/client/build.js
--- 2/client/build.js
+++ b/client/build.js
@@@ -84,7 -81,11 +81,11 @@@ var source_files = 
      __dirname + '/src/views/userbox.js',\r
      __dirname + '/src/views/channeltools.js',\r
      __dirname + '/src/views/channelinfo.js',\r
-     __dirname + '/src/views/texttheme.js'\r
 -\r
++    __dirname + '/src/views/texttheme.js',\r
+     __dirname + '/src/applets/settings.js',\r
+     __dirname + '/src/applets/chanlist.js',\r
+     __dirname + '/src/applets/scripteditor.js',\r
+     __dirname + '/src/applets/startup.js'\r
  ];\r
  \r
  \r

diff --cc client/src/app.js
Simple merge

diff --cc client/src/index.html.tmpl
Simple merge

diff --cc client/src/models/application.js
Simple merge

diff --cc client/src/models/network.js
index 974bbf93facbf6b8b78c2d2c30f675d047a94772,0374d068d20aa490fc86b636868769622ba4770b..23987bfe83e48cfbd1f45f067a48f0609b94da6d
--- 1/client/src/models/network.js
--- 2/client/src/models/network.js
+++ b/client/src/models/network.js
@@@ -168,11 -168,10 +168,15 @@@
                  // Trim any whitespace off the name
                  channel_name = channel_name.trim();
  
 +                // If not a valid channel name, display a warning
 +                if (!that.isChannelName(channel_name)) {
 +                    that.panels.server.addMsg('', styleText('client_models_network_channel_invalid_name', {'%T': translateText('client_models_network_channel_invalid_name'), '%C': channel_name}));
 +                    _kiwi.app.message.text(channel_name + ' ' + _kiwi.global.i18n.translate('client_models_network_channel_invalid_name').fetch(), {timeout: 5000});
 +                    return;
+                 // Add channel_prefix in front of the first channel if missing
+                 if (that.get('channel_prefix').indexOf(channel_name[0]) === -1) {
+                     // Could be many prefixes but '#' is highly likely the required one
+                     channel_name = '#' + channel_name;
                  }
  
                  // Check if we have the panel already. If not, create it
@@@ -491,11 -490,15 +495,15 @@@
              panel = this.panels.server;
          }
  
 -        panel.addMsg('[' + (event.nick||'') + ']', event.msg, 'notice', {time: event.time});
 +        panel.addMsg('[' + (event.nick||'') + ']', styleText('notice', {'%T': event.msg}), 'notice', {time: event.time});
  
-         // Show this notice to the active panel if it didn't have a set target
-         if (!event.from_server && panel === this.panels.server && _kiwi.app.panels().active !== this.panels.server)
+         // Show this notice to the active panel if it didn't have a set target, but only in an active channel or query window
+         active_panel = _kiwi.app.panels().active;
+ 
+         if (!event.from_server && panel === this.panels.server && active_panel !== this.panels.server) {
+             if (active_panel.isChannel() || active_panel.isQuery())
 -                active_panel.addMsg('[' + (event.nick||'') + ']', event.msg, 'notice', {time: event.time});
 +            _kiwi.app.panels().active.addMsg('[' + (event.nick||'') + ']', styleText('notice', {'%T': event.msg}), 'notice', {time: event.time});
+         }
      }
  
  
@@@ -844,10 -846,7 +852,7 @@@
              display_params.shift();
          }
  
-         if (event.trailing)
-             display_params.push(event.trailing);
- 
 -        this.panels.server.addMsg('', '[' + event.command + '] ' + display_params.join(', ', ''));
 +        this.panels.server.addMsg('', styleText('unknown_command', {'%T': '[' + event.command + '] ' + display_params.join(', ', '')}));
      }
  }
  

diff --cc client/src/translations/cs.po
Simple merge

diff --cc client/src/translations/de-de.po
Simple merge

diff --cc client/src/translations/en-gb.po
Simple merge

diff --cc client/src/translations/es-419.po
Simple merge

diff --cc client/src/translations/es.po
index d238f83eab76d7ebcd323ab0c010fe33ef878e3e,990c3a8d04b90d952c4e0fa85359885eed9095fe..a19b369877d224b162e599bbdb8368b9116374d7
--- 1/client/src/translations/es.po
--- 2/client/src/translations/es.po
+++ b/client/src/translations/es.po
@@@ -179,7 -179,7 +179,7 @@@ msgstr "Error al conectarse a %s:%s (%s
  
  #: client/assets/src/models/channel.js
  msgid "client_models_channel_join"
- msgstr "se ha unido"
 -msgstr "%s se ha ingresado"
++msgstr "se ha ingresado"
  
  #: 
  msgid "client_models_channel_quit"

diff --cc client/src/translations/fr.po
Simple merge

diff --cc client/src/translations/he.po
Simple merge

diff --cc client/src/translations/it.po
Simple merge

diff --cc client/src/translations/nl.po
Simple merge

diff --cc client/src/translations/no.po
Simple merge

diff --cc client/src/translations/pl.po
Simple merge

diff --cc client/src/translations/pt-br.po
Simple merge

diff --cc client/src/translations/ro.po
Simple merge

diff --cc client/src/translations/ru.po
Simple merge

diff --cc client/src/translations/tr.po
Simple merge

diff --cc client/src/translations/uk.po
Simple merge

diff --cc client/src/translations/vi.po
Simple merge

diff --cc client/src/translations/zh-tw.po
Simple merge

diff --cc client/src/views/channel.js
Simple merge

diff --cc server/settingsgenerator.js
index bf767fba811e658e5ea729590f16221712f4f8b3,89d1d25d54fe4dcda4b840eb92722636d9bdaf5e..0f8b878f7abb417d048ebc614436b4f81e41dcad
--- 1/server/settingsgenerator.js
--- 2/server/settingsgenerator.js
+++ b/server/settingsgenerator.js
@@@ -249,8 -243,13 +243,12 @@@ function addScripts(vars, debug) 
              'src/views/topicbar.js',
              'src/views/userbox.js',
              'src/views/channeltools.js',
 -            'src/views/channelinfo.js'
 -        ],
 -        [
 +            'src/views/channelinfo.js',
-             'src/views/texttheme.js'
++            'src/views/texttheme.js',
+             'src/applets/settings.js',
+             'src/applets/chanlist.js',
+             'src/applets/scripteditor.js',
+             'src/applets/startup.js'
          ]
      ]);
  }