/soc/2013/ankitkv/gobjectification: fad1f20fb629: Merged default...

Fri Jun 6 06:32:00 EDT 2014

Changeset: fad1f20fb629418adaf5a293b47b41fe515be2ad
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-06-06 16:01 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/fad1f20fb629

Description:

Merged default branch

diffstat:

 libpurple/plugins/tcl/tcl_cmds.c |     1 +
 po/pl.po                         |  4905 +++++++++++++++++++------------------
 2 files changed, 2485 insertions(+), 2421 deletions(-)

diffs (truncated from 12217 to 300 lines):

diff --git a/libpurple/plugins/tcl/tcl_cmds.c b/libpurple/plugins/tcl/tcl_cmds.c
--- a/libpurple/plugins/tcl/tcl_cmds.c
+++ b/libpurple/plugins/tcl/tcl_cmds.c
@@ -872,6 +872,7 @@ int tcl_cmd_conversation(ClientData unus
 			pmsg = purple_message_new_incoming(from, what, 0, 0);
 			break;
 		case CMD_CONV_WRITE_SYSTEM:
+		default:
 			pmsg = purple_message_new_system(what, 0);
 			break;
 		}
diff --git a/po/pl.po b/po/pl.po
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,13 +12,13 @@
 # Copyright (C) Tomasz SaÅ‚aciÅ„ski <tsalacinski at gmail.com>, 2007
 # Piotr DrÄ
g <piotrdrag at gmail.com>, 2011-2014
 # Richard Laager <rlaager at wiktel.com>, 2011
-# tomkiewicz, 2013
+# tomkiewicz <twasilczyk at pidgin.im>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-24 09:57-0500\n"
-"PO-Revision-Date: 2014-04-13 08:43+0000\n"
+"POT-Creation-Date: 2014-05-25 09:57-0500\n"
+"PO-Revision-Date: 2014-05-24 15:02+0000\n"
 "Last-Translator: Piotr DrÄ
g <piotrdrag at gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/pidgin/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -29,24 +29,24 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:44 ../finch/libfinch.c:67 ../finch/libfinch.c:330
+#: ../finch/finch.c:44 ../finch/libfinch.c:67 ../finch/libfinch.c:329
 msgid "Finch"
 msgstr "Finch"
 
 #. the user did not fill in the captcha
 #: ../finch/gntaccount.c:123 ../finch/gntaccount.c:168
-#: ../finch/gntaccount.c:180 ../finch/gntaccount.c:566 ../finch/gntblist.c:638
+#: ../finch/gntaccount.c:180 ../finch/gntaccount.c:568 ../finch/gntblist.c:638
 #: ../finch/gntblist.c:800 ../finch/gntplugin.c:244 ../finch/gntplugin.c:305
 #: ../finch/gntrequest.c:388 ../finch/gntstatus.c:297 ../finch/gntstatus.c:306
 #: ../finch/plugins/gntclipboard.c:116 ../finch/plugins/gntclipboard.c:122
 #: ../finch/plugins/gntclipboard.c:129
 #: ../libpurple/protocols/jabber/chat.c:824
 #: ../libpurple/protocols/jabber/chat.c:836
-#: ../libpurple/protocols/jabber/jabber.c:2348
+#: ../libpurple/protocols/jabber/jabber.c:2343
 #: ../libpurple/protocols/jabber/jutil.c:716
-#: ../libpurple/protocols/mxit/login.c:535
+#: ../libpurple/protocols/mxit/login.c:532
 #: ../libpurple/protocols/mxit/protocol.c:2517
-#: ../libpurple/protocols/silc/ops.c:79 ../libpurple/protocols/silc/ops.c:1487
+#: ../libpurple/protocols/silc/ops.c:79 ../libpurple/protocols/silc/ops.c:1484
 #: ../pidgin/plugins/disco/xmppdisco.c:512
 #: ../pidgin/plugins/disco/xmppdisco.c:517
 msgid "Error"
@@ -77,137 +77,138 @@ msgid ""
 "server."
 msgstr "Nazwa uÅ¼ytkownika konta nie moÅ¼e byÄ‡ zmieniana, kiedy jest poÅ‚Ä
czone z serwerem."
 
-#: ../finch/gntaccount.c:517
+#: ../finch/gntaccount.c:519
 msgid "New mail notifications"
 msgstr "Powiadomienia o nowej poczcie"
 
-#: ../finch/gntaccount.c:527 ../libpurple/protocols/gg/account.c:234
+#: ../finch/gntaccount.c:529 ../libpurple/protocols/gg/account.c:234
 msgid "Remember password"
 msgstr "ZapamiÄ™tanie hasÅ‚a"
 
-#: ../finch/gntaccount.c:567
+#: ../finch/gntaccount.c:569
 msgid "There are no protocol plugins installed."
 msgstr "Nie zainstalowano Å¼adnych wtyczek protokoÅ‚Ã³w."
 
-#: ../finch/gntaccount.c:568
+#: ../finch/gntaccount.c:570
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Prawdopodobnie zapomniano o wykonaniu polecenia \"make install\")"
 
-#: ../finch/gntaccount.c:579 ../finch/gntconn.c:132
-#: ../pidgin/gtkaccount.c:1775 ../pidgin/gtkblist.c:5335
+#: ../finch/gntaccount.c:581 ../finch/gntconn.c:132
+#: ../pidgin/gtkaccount.c:1787 ../pidgin/gtkblist.c:5335
 msgid "Modify Account"
 msgstr "Modyfikacja konta"
 
-#: ../finch/gntaccount.c:579
+#: ../finch/gntaccount.c:581
 msgid "New Account"
 msgstr "Nowe Konto"
 
-#: ../finch/gntaccount.c:605 ../pidgin/gtkxfer.c:653
+#: ../finch/gntaccount.c:607 ../pidgin/gtkxfer.c:653
 msgid "Protocol:"
 msgstr "ProtokÃ³Å‚:"
 
-#: ../finch/gntaccount.c:613
+#: ../finch/gntaccount.c:615
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:290
 msgid "Username:"
 msgstr "Nazwa uÅ¼ytkownika:"
 
-#: ../finch/gntaccount.c:626
+#: ../finch/gntaccount.c:628
 msgid "Password:"
 msgstr "HasÅ‚o:"
 
-#: ../finch/gntaccount.c:636
+#: ../finch/gntaccount.c:638
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Register checkbox
-#: ../finch/gntaccount.c:647
+#: ../finch/gntaccount.c:649
 msgid "Create this account on the server"
 msgstr "Utworzenie tego konta na serwerze"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:663 ../finch/gntaccount.c:732
-#: ../finch/gntaccount.c:1029 ../finch/gntblist.c:692 ../finch/gntblist.c:790
+#: ../finch/gntaccount.c:665 ../finch/gntaccount.c:734
+#: ../finch/gntaccount.c:1031 ../finch/gntblist.c:692 ../finch/gntblist.c:790
 #: ../finch/gntblist.c:837 ../finch/gntblist.c:1149 ../finch/gntblist.c:1386
 #: ../finch/gntblist.c:1519 ../finch/gntblist.c:2693 ../finch/gntblist.c:2743
 #: ../finch/gntblist.c:2816 ../finch/gntblist.c:2877 ../finch/gntcertmgr.c:86
 #: ../finch/gntplugin.c:594 ../finch/gntpounce.c:468 ../finch/gntpounce.c:675
-#: ../finch/gntprefs.c:265 ../finch/gntprefs.c:303 ../finch/gntsound.c:1075
+#: ../finch/gntprefs.c:267 ../finch/gntprefs.c:305 ../finch/gntsound.c:1075
 #: ../finch/gntstatus.c:141 ../finch/gntstatus.c:481 ../finch/gntstatus.c:606
 #: ../finch/plugins/gnthistory.c:180 ../libpurple/account.c:302
 #: ../libpurple/account.c:687 ../libpurple/account.c:721
-#: ../libpurple/conversation.c:791 ../libpurple/conversationtypes.c:1279
+#: ../libpurple/conversation.c:804 ../libpurple/conversationtypes.c:1279
 #: ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/plugins/keyrings/internalkeyring.c:616
+#: ../libpurple/plugins/keyrings/internalkeyring.c:617
 #: ../libpurple/protocols/gg/account.c:259
 #: ../libpurple/protocols/gg/account.c:516
-#: ../libpurple/protocols/gg/pubdir-prpl.c:542
-#: ../libpurple/protocols/gg/pubdir-prpl.c:852
+#: ../libpurple/protocols/gg/pubdir-prpl.c:544
+#: ../libpurple/protocols/gg/pubdir-prpl.c:856
 #: ../libpurple/protocols/gg/purplew.c:71
 #: ../libpurple/protocols/gg/status.c:360
 #: ../libpurple/protocols/jabber/buddy.c:693
 #: ../libpurple/protocols/jabber/buddy.c:2243
 #: ../libpurple/protocols/jabber/buddy.c:2294
 #: ../libpurple/protocols/jabber/chat.c:938
-#: ../libpurple/protocols/jabber/jabber.c:1469
-#: ../libpurple/protocols/jabber/jabber.c:1480
-#: ../libpurple/protocols/jabber/jabber.c:2558
-#: ../libpurple/protocols/jabber/jabber.c:3422
-#: ../libpurple/protocols/jabber/si.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1464
+#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:2553
+#: ../libpurple/protocols/jabber/jabber.c:3417
+#: ../libpurple/protocols/jabber/si.c:1573
 #: ../libpurple/protocols/jabber/usernick.c:83
 #: ../libpurple/protocols/jabber/xdata.c:407
 #: ../libpurple/protocols/msn/msn.c:459 ../libpurple/protocols/msn/msn.c:582
 #: ../libpurple/protocols/msn/msn.c:644 ../libpurple/protocols/msn/msn.c:659
 #: ../libpurple/protocols/msn/msn.c:676 ../libpurple/protocols/msn/msn.c:693
 #: ../libpurple/protocols/msn/msn.c:714
-#: ../libpurple/protocols/mxit/actions.c:314
-#: ../libpurple/protocols/mxit/actions.c:411
-#: ../libpurple/protocols/mxit/login.c:375
-#: ../libpurple/protocols/mxit/login.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5032
-#: ../libpurple/protocols/oscar/peer.c:1103
-#: ../libpurple/protocols/sametime/sametime.c:3419
-#: ../libpurple/protocols/sametime/sametime.c:3505
-#: ../libpurple/protocols/sametime/sametime.c:5385
-#: ../libpurple/protocols/sametime/sametime.c:5476
-#: ../libpurple/protocols/sametime/sametime.c:5602
+#: ../libpurple/protocols/mxit/actions.c:311
+#: ../libpurple/protocols/mxit/actions.c:405
+#: ../libpurple/protocols/mxit/login.c:372
+#: ../libpurple/protocols/mxit/login.c:709
+#: ../libpurple/protocols/oscar/oscar.c:5041
+#: ../libpurple/protocols/oscar/peer.c:1098
+#: ../libpurple/protocols/sametime/sametime.c:3425
+#: ../libpurple/protocols/sametime/sametime.c:3511
+#: ../libpurple/protocols/sametime/sametime.c:5382
+#: ../libpurple/protocols/sametime/sametime.c:5473
+#: ../libpurple/protocols/sametime/sametime.c:5599
 #: ../libpurple/protocols/silc/buddy.c:469
-#: ../libpurple/protocols/silc/buddy.c:1098
-#: ../libpurple/protocols/silc/buddy.c:1213
+#: ../libpurple/protocols/silc/buddy.c:1092
+#: ../libpurple/protocols/silc/buddy.c:1207
 #: ../libpurple/protocols/silc/chat.c:625
 #: ../libpurple/protocols/silc/chat.c:759
-#: ../libpurple/protocols/silc/ops.c:1858
+#: ../libpurple/protocols/silc/ops.c:1855
 #: ../libpurple/protocols/silc/silc.c:1071
 #: ../libpurple/protocols/silc/silc.c:1282
-#: ../libpurple/protocols/yahoo/libymsg.c:4411
-#: ../libpurple/protocols/yahoo/libymsg.c:4421
+#: ../libpurple/protocols/yahoo/libymsg.c:4418
+#: ../libpurple/protocols/yahoo/libymsg.c:4428
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:564
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:577
-#: ../libpurple/request.c:2303 ../pidgin/gtkaccount.c:2157
-#: ../pidgin/gtkaccount.c:2696 ../pidgin/gtkaccount.c:2760
-#: ../pidgin/gtkaccount.c:2802 ../pidgin/gtkblist.c:701
-#: ../pidgin/gtkblist.c:3669 ../pidgin/gtkblist.c:7566
+#: ../libpurple/request.c:2305 ../pidgin/gtkaccount.c:2169
+#: ../pidgin/gtkaccount.c:2708 ../pidgin/gtkaccount.c:2772
+#: ../pidgin/gtkaccount.c:2814 ../pidgin/gtkblist.c:701
+#: ../pidgin/gtkblist.c:3669 ../pidgin/gtkblist.c:7570
 #: ../pidgin/gtkcertmgr.c:191 ../pidgin/gtkcertmgr.c:329
-#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkdialogs.c:1093
-#: ../pidgin/gtkdialogs.c:1184 ../pidgin/gtkdialogs.c:1207
-#: ../pidgin/gtkdialogs.c:1233 ../pidgin/gtkdialogs.c:1284
-#: ../pidgin/gtkdialogs.c:1325 ../pidgin/gtkdialogs.c:1381
-#: ../pidgin/gtkdialogs.c:1420 ../pidgin/gtkdialogs.c:1446
+#: ../pidgin/gtkdialogs.c:948 ../pidgin/gtkdialogs.c:1087
+#: ../pidgin/gtkdialogs.c:1178 ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1227 ../pidgin/gtkdialogs.c:1278
+#: ../pidgin/gtkdialogs.c:1319 ../pidgin/gtkdialogs.c:1375
+#: ../pidgin/gtkdialogs.c:1414 ../pidgin/gtkdialogs.c:1440
 #: ../pidgin/gtklog.c:321 ../pidgin/gtkplugin.c:441 ../pidgin/gtkpounce.c:1139
 #: ../pidgin/gtkprivacy.c:495 ../pidgin/gtkprivacy.c:510
 #: ../pidgin/gtkprivacy.c:535 ../pidgin/gtkprivacy.c:548
-#: ../pidgin/gtkrequest.c:340 ../pidgin/gtkrequest.c:967
+#: ../pidgin/gtkrequest.c:340 ../pidgin/gtkrequest.c:964
 #: ../pidgin/gtksavedstatuses.c:312 ../pidgin/gtkstatusbox.c:1604
-#: ../pidgin/gtkutils.c:1565 ../pidgin/gtkutils.c:1585
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
 #: ../pidgin/gtkwebviewtoolbar.c:590 ../pidgin/plugins/disco/gtkdisco.c:251
+#: ../pidgin/plugins/imgupload.c:425
 msgid "Cancel"
 msgstr "Anuluj"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:667 ../finch/gntcertmgr.c:304 ../finch/gntdebug.c:337
-#: ../finch/gntplugin.c:594 ../finch/gntpounce.c:474 ../finch/gntprefs.c:265
-#: ../finch/gntprefs.c:302 ../finch/gntsound.c:1072 ../finch/gntstatus.c:484
+#: ../finch/gntaccount.c:669 ../finch/gntcertmgr.c:304 ../finch/gntdebug.c:338
+#: ../finch/gntplugin.c:594 ../finch/gntpounce.c:474 ../finch/gntprefs.c:267
+#: ../finch/gntprefs.c:304 ../finch/gntsound.c:1072 ../finch/gntstatus.c:484
 #: ../finch/gntstatus.c:594 ../libpurple/account.c:720
 #: ../libpurple/plugins/buddynote.c:50
 #: ../libpurple/protocols/jabber/buddy.c:692 ../pidgin/gtkblist.c:701
@@ -215,78 +216,78 @@ msgstr "Anuluj"
 msgid "Save"
 msgstr "Zapisz"
 
-#: ../finch/gntaccount.c:726 ../pidgin/gtkaccount.c:2150
+#: ../finch/gntaccount.c:728 ../pidgin/gtkaccount.c:2162
 #: ../pidgin/gtksavedstatuses.c:300 ../pidgin/gtkstatusbox.c:1598
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Na pewno usunÄ
Ä‡ %s?"
 
-#: ../finch/gntaccount.c:729
+#: ../finch/gntaccount.c:731
 msgid "Delete Account"
 msgstr "UsuÅ„ konto"
 
 #. Delete button
-#: ../finch/gntaccount.c:732 ../finch/gntaccount.c:847
+#: ../finch/gntaccount.c:734 ../finch/gntaccount.c:849
 #: ../finch/gntcertmgr.c:312 ../finch/gntpounce.c:674 ../finch/gntpounce.c:737
 #: ../finch/gntstatus.c:140 ../finch/gntstatus.c:206
-#: ../pidgin/gtkaccount.c:2157 ../pidgin/gtklog.c:320
+#: ../pidgin/gtkaccount.c:2169 ../pidgin/gtklog.c:320
 #: ../pidgin/gtkpounce.c:1138 ../pidgin/gtkrequest.c:344
 #: ../pidgin/gtksavedstatuses.c:311 ../pidgin/gtkstatusbox.c:1603
 msgid "Delete"
 msgstr "UsuÅ„"
 
-#: ../finch/gntaccount.c:808 ../finch/gntblist.c:2559 ../finch/gntui.c:103
-#: ../pidgin/gtkaccount.c:2554 ../pidgin/gtkaccount.c:2556
+#: ../finch/gntaccount.c:810 ../finch/gntblist.c:2559 ../finch/gntui.c:103
+#: ../pidgin/gtkaccount.c:2566 ../pidgin/gtkaccount.c:2568
 msgid "Accounts"
 msgstr "Konta"
 
-#: ../finch/gntaccount.c:814
+#: ../finch/gntaccount.c:816
 msgid "You can enable/disable accounts from the following list."
 msgstr "MoÅ¼na wÅ‚Ä
czyÄ‡/wyÅ‚Ä
czyÄ‡ konta z poniÅ¼szej listy."
 
 #. Add button
-#: ../finch/gntaccount.c:838 ../finch/gntaccount.c:1028
+#: ../finch/gntaccount.c:840 ../finch/gntaccount.c:1030
 #: ../finch/gntblist.c:691 ../finch/gntblist.c:790 ../finch/gntblist.c:837
-#: ../finch/gntblist.c:2996 ../finch/gntcertmgr.c:299 ../finch/gntnotify.c:462
+#: ../finch/gntblist.c:2996 ../finch/gntcertmgr.c:299 ../finch/gntnotify.c:464

