# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1178116065 0
# Node ID 2ff9195a35ce3b6a62bcd3900072b7445f7432f5
# Parent  e3f4f1fd8f3df375b392d36ecc3684bbd1b7d8ff# Parent  db38488fd2ff4091e2c8e2c08f6442c016388650
merge of '5f4a03fa07b74453c3b8312c388af42739fd16db'
     and '7ca58433ae1536292fa1729bd1b5f8b0ab0b4c01'

diff -r e3f4f1fd8f3d -r 2ff9195a35ce po/af.po
--- a/po/af.po	Wed May 02 11:55:04 2007 +0000
+++ b/po/af.po	Wed May 02 14:27:45 2007 +0000
@@ -12345,7 +12345,7 @@
 
 #: ../pidgin/gtkdialogs.c:374
 #, fuzzy
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim op irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
diff -r e3f4f1fd8f3d -r 2ff9195a35ce po/ca.po
--- a/po/ca.po	Wed May 02 11:55:04 2007 +0000
+++ b/po/ca.po	Wed May 02 14:27:45 2007 +0000
@@ -12686,8 +12686,8 @@
 msgstr "El %s és un client de missatgeria instantània modular, capaç d'utilitzar els protocols AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, i QQ, tots alhora. Utilitza la biblioteca de programació GTK+.<BR><BR>Podeu modificar i redistribuir el programa sota els termes de la GPL (versió 2 o posterior). Hi ha una còpia de la GPL dins del fitxer 'COPYING' que es distribueix amb el %s. Els drets d'autor del %s pertanyen als seus col·laboradors. El fitxer 'COPYRIGHT' conté una llista completa de tots els contribuïdors. No us proporcionem cap mena de garantia amb aquest programa.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin a irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 a irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff -r e3f4f1fd8f3d -r 2ff9195a35ce po/de.po
--- a/po/de.po	Wed May 02 11:55:04 2007 +0000
+++ b/po/de.po	Wed May 02 14:27:45 2007 +0000
@@ -12823,8 +12823,8 @@
 "Programm.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:375
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin auf irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 auf irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:378
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff -r e3f4f1fd8f3d -r 2ff9195a35ce po/en_GB.po
--- a/po/en_GB.po	Wed May 02 11:55:04 2007 +0000
+++ b/po/en_GB.po	Wed May 02 14:27:45 2007 +0000
@@ -12653,7 +12653,7 @@
 "warranty for this program.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:375
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidwgin on irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:378
diff -r e3f4f1fd8f3d -r 2ff9195a35ce po/eo.po
--- a/po/eo.po	Wed May 02 11:55:04 2007 +0000
+++ b/po/eo.po	Wed May 02 14:27:45 2007 +0000
@@ -12278,8 +12278,8 @@
 "garantion pri tiu programaro.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin ĉe irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 ĉe irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff -r e3f4f1fd8f3d -r 2ff9195a35ce po/es.po
--- a/po/es.po	Wed May 02 11:55:04 2007 +0000
+++ b/po/es.po	Wed May 02 14:27:45 2007 +0000
@@ -12820,9 +12820,9 @@
 "contribuido. Este programa se distribuye sin ninguna garantía.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> canal #pidgwin en irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">IRC:</FONT> canal #pidgin-win32 en irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff -r e3f4f1fd8f3d -r 2ff9195a35ce po/fa.po
--- a/po/fa.po	Wed May 02 11:55:04 2007 +0000
+++ b/po/fa.po	Wed May 02 14:27:45 2007 +0000
@@ -12566,8 +12566,8 @@
 "در قبال این برنامه ارائه نمی‌کنیم."
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin در irc.freenode.net<BR><BR"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 در irc.freenode.net<BR><BR"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff -r e3f4f1fd8f3d -r 2ff9195a35ce po/fi.po
--- a/po/fi.po	Wed May 02 11:55:04 2007 +0000
+++ b/po/fi.po	Wed May 02 14:27:45 2007 +0000
@@ -12697,9 +12697,9 @@
 "anna ohjelmalle minkäänlaista takuuta.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> #pidgwin palvelimella irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 palvelimella irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff -r e3f4f1fd8f3d -r 2ff9195a35ce po/fr.po
--- a/po/fr.po	Wed May 02 11:55:04 2007 +0000
+++ b/po/fr.po	Wed May 02 14:27:45 2007 +0000
@@ -12795,8 +12795,8 @@
 "<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC :</FONT> #pidgwin sur irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC :</FONT> #pidgin-win32 sur irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff -r e3f4f1fd8f3d -r 2ff9195a35ce po/he.po
--- a/po/he.po	Wed May 02 11:55:04 2007 +0000
+++ b/po/he.po	Wed May 02 14:27:45 2007 +0000
@@ -12514,8 +12514,8 @@
 "של התורמים. איננו מספקים שום אחריות לתוכנה זו.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin ב- irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 ב- irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff -r e3f4f1fd8f3d -r 2ff9195a35ce po/pt_BR.po
--- a/po/pt_BR.po	Wed May 02 11:55:04 2007 +0000
+++ b/po/pt_BR.po	Wed May 02 14:27:45 2007 +0000
@@ -12755,8 +12755,8 @@
 "contribuidores. Não oferecemos nenhuma garantia para este programa.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin no irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 no irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff -r e3f4f1fd8f3d -r 2ff9195a35ce po/sl.po
--- a/po/sl.po	Wed May 02 11:55:04 2007 +0000
+++ b/po/sl.po	Wed May 02 14:27:45 2007 +0000
@@ -12548,7 +12548,7 @@
 msgstr "%s je modularen odjemalec za neposredna sporočila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu in QQ. Napisan je s pomočjo Gtk+.<BR><BR>Program lahko spreminjate in razširjate pod pogoji licence GPL (različice 2 ali novejše).  Kopija licence GPL je v datoteki 'COPYING', ki je distribuirana s programom %s.  %s je zaščitena znamka svojih avtorjev.  Oglejte si datoteko 'COPYRIGHT' za popoln seznam sodelavcev.  Za program ni na voljo nikakršna garancija.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin na irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
diff -r e3f4f1fd8f3d -r 2ff9195a35ce po/zh_CN.po
--- a/po/zh_CN.po	Wed May 02 11:55:04 2007 +0000
+++ b/po/zh_CN.po	Wed May 02 14:27:45 2007 +0000
@@ -12395,7 +12395,7 @@
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidwin<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
diff -r e3f4f1fd8f3d -r 2ff9195a35ce po/zh_HK.po
--- a/po/zh_HK.po	Wed May 02 11:55:04 2007 +0000
+++ b/po/zh_HK.po	Wed May 02 14:27:45 2007 +0000
@@ -12976,9 +12976,9 @@
 "名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任何保用。<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgwin 頻道<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin-win32 頻道<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
diff -r e3f4f1fd8f3d -r 2ff9195a35ce po/zh_TW.po
--- a/po/zh_TW.po	Wed May 02 11:55:04 2007 +0000
+++ b/po/zh_TW.po	Wed May 02 14:27:45 2007 +0000
@@ -12976,9 +12976,9 @@
 "名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任何保用。<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgwin 頻道<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin-win32 頻道<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"