Merge translation files from master branch.

1 files changed, 0 insertions, 9 deletions

diff --git a/tde-i18n-gl/messages/tdenetwork/kopete.po b/tde-i18n-gl/messages/tdenetwork/kopete.po
index 4c82aad9af2..ebc64485dc8 100644
--- a/tde-i18n-gl/messages/tdenetwork/kopete.po
+++ b/tde-i18n-gl/messages/tdenetwork/kopete.po
@@ -6724,9 +6724,6 @@ msgstr ""
 
 #: protocols/msn/msnnotifysocket.cpp:183
 #, fuzzy
-#| msgid ""
-#| "The user %1 is online but has blocked you:\n"
-#| "you can not talk to this user."
 msgid "The user '%1' seems to already be blocked or allowed on the server."
 msgstr ""
 "O usuario %1 está en liña pero bloqueoulle:\n"
@@ -7033,9 +7030,6 @@ msgstr ""
 
 #: protocols/msn/webcam.cpp:89
 #, fuzzy
-#| msgid ""
-#| "<qt>The contact %1 wants to see <b>your</b> webcam, do you want them to "
-#| "see it?</qt>"
 msgid "The contact %1 wants to show you his/her webcam, do you want to see it?"
 msgstr ""
 "<qt>O contacto %1 quere ver a <b>súa</b> webcam, quere deixar que a vexan?</"
@@ -15680,9 +15674,6 @@ msgstr "O enderezo IP ou máscara do servidor AIM ó que se queira conectar."
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:268
 #: protocols/oscar/aim/ui/aimeditaccountui.ui:285
 #, fuzzy, no-c-format
-#| msgid ""
-#| "The IP address or hostmask of the AIM server you wish to connect to.  "
-#| "Normally you will want the default (login.oscar.aol.com)."
 msgid ""
 "The IP address or hostmask of the AIM server you wish to connect to.  "
 "Normally you will want the default (iwarg.ddns.net)."