[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [konversation] /: Merge branch '1.5'
From:       Eike Hein <hein () kde ! org>
Date:       2013-12-17 4:15:53
Message-ID: E1Vsm4X-0003DD-91 () scm ! kde ! org
[Download RAW message or body]

Git commit c8061cbd19f207a0f147e6fb9bd4f47ba84259f3 by Eike Hein.
Committed on 17/12/2013 at 04:15.
Pushed by hein into branch 'master'.

Merge branch '1.5'

Conflicts:
	data/konversation.notifyrc

M  +3    -1    data/konversation.notifyrc
M  +2    -0    src/application.cpp
M  +1    -1    src/irc/server.cpp

http://commits.kde.org/konversation/c8061cbd19f207a0f147e6fb9bd4f47ba84259f3

diff --cc data/konversation.notifyrc
index 1867c43,a5ced50..c9f8218
--- a/data/konversation.notifyrc
+++ b/data/konversation.notifyrc
@@@ -1123,9 -1124,9 +1124,9 @@@ Name[de]=Spitzname ist onlin
  Name[es]=Apodo en conexión
  Name[fi]=Nimimerkki paikalla
  Name[fr]=Pseudo en Ligne
--Name[gl]=Alcume conectado
 +Name[it]=Nick collegato
  Name[nl]=Schermnaam online
+ Name[pa]=ਨਾਂ ਆਨਲਾਈਨ
  Name[pt]=Alcunha ligada
  Name[pt_BR]=Apelido conectado
  Name[sk]=Prezývka online
[prev in list] [next in list] [prev in thread] [next in thread]