Mercurial > pidgin
changeset 16077:ce85859d2f41
merge of '2b84a8b2d83491cd54feb1e1d9ee5ce1a4c153af'
and 'e05642d9d762c1c9dfd2d19ae5c0e6b5a61ad3f1'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 12 Apr 2007 05:26:43 +0000 |
| parents | e36cd821c879 (diff) 0db4eca4a3e0 (current diff) |
| children | 783b05e528b0 |
| files | |
| diffstat | 8 files changed, 147 insertions(+), 158 deletions(-) [+] |
line wrap: on
line diff
--- a/README.SVN Wed Apr 11 15:45:48 2007 +0000 +++ b/README.SVN Thu Apr 12 05:26:43 2007 +0000 @@ -1,41 +1,39 @@ -If you plan to use gaim SVN, PLEASE read this message in its entirety! +If you plan to use Pidgin, Finch & libpurple mtn, PLEASE read this message in its entirety! -Gaim is a fast-moving project with a somewhat regular release schedule. -Due to the rate of gaim development, SVN undergoes frequent bursts of -massive changes, often leaving behind brokenness and partial -functionality while the responsible developers rewrite some portion of -code or seek to add new features. +Pidgin, Finch & libpurple is a fast-moving project with a somewhat regular +release schedule. Due to the rate of Pidgin, Finch & libpurple development, +mtn undergoes frequent bursts of massive changes, often leaving behind +brokenness and partial functionality while the responsible developers rewrite +some portion of code or seek to add new features. -What this all boils down to is that SVN _WILL_ sometimes be broken. +What this all boils down to is that mtn _WILL_ sometimes be broken. Because of this, we ask that users who are not interested in personally tracking down bugs and fixing them (without a lot of -assistance from the developers!) avoid SVN and use releases. Since +assistance from the developers!) avoid mtn and use releases. Since releases will be made often, this should not prevent anyone from using the newest, shiniest features -- but it will prevent users from having to deal with ugly development bugs that we already know about but haven't gotten around to fixing. -If you are interested in hacking on gaim, please read README and -HACKING, and take note of the issues in PROGRAMMING_NOTES. (Note that -they may be somewhat out of date at times.) Win32 developers, please +If you are interested in hacking on Pidgin, Finch & libpurple, please read +README and HACKING, and take note of the issues in PROGRAMMING_NOTES. (Note +that they may be somewhat out of date at times.) Win32 developers, please read README.mingw. By far the best documentation, however, is the documented code. Not -all parts of gaim have yet been documented, but the major subsystems -are falling fast. If you have doxygen, you can use the Doxyfile in +all parts of Pidgin, Finch & libpurple have yet been documented, but the major +subsystems are falling fast. If you have doxygen, you can use the Doxyfile in the toplevel directory to generate pretty documentation. Otherwise (or even if you do!), the header files for each subsystem contain documentation for the functions they contain. For instance, -conversation.h contains documentation for the entire -gaim_conversation_* API, and account.h contains documentation for the -gaim_account_* API. +conversation.h contains documentation for the entire purple_conversation_* +API, and account.h contains documentation for the purple_account_* API. -If you have questions, please feel free to contact the gaim developers -by email at gaim-devel@lists.sourceforge.net, on IRC at -irc.freenode.net in #gaim, or via the sourceforge forums at -http://www.sourceforge.net/projects/gaim. Please do as much homework -as you can before contacting us; the more you know about your -question, the faster and more effectively we can help you! +If you have questions, please feel free to contact the Pidgin, Finch & +libpurple developers by email at devel@pidgin.im or on IRC at irc.freenode.net +in #pidgin. Please do as much homework as you can before contacting us; the +more you know about your question, the faster and more effectively we can help +you! -Send patches to gaim-devel@lists.sourceforge.net or post them in the -Sourceforge forums at http://www.sourceforge.net/projects/gaim. +Send patches to Pidgin, Finch & libpurple mailing list, devel@pidgin.im, or +post them in the tracker at http://developer.pidgin.im.
--- a/TODO Wed Apr 11 15:45:48 2007 +0000 +++ b/TODO Thu Apr 12 05:26:43 2007 +0000 @@ -26,7 +26,7 @@ }}} * buddy list {{{ * we have not committed any gobjectification, so this is not a blocker for 2.0.0 until we do. - * if we do, it is only a blocker to the extent that gaim needs to run. That is, we do not + * if we do, it is only a blocker to the extent that pidgin & finch need to run. That is, we do not *necessarily* have to gobjectifiy everything as long as we preserve functionality. * That being said, my understanding of the signals mess says that it is probly more work to try to do this in stages than to start it or not start it. @@ -40,12 +40,6 @@ * bugs * wrong buddy given priority }}} -* build targets {{{ - * this is not a blocker - * we need build targets for libgaim, we need to test them, and make sure they work. - * we ought to use our own build targets to build the executable itself. - * due to the limitations of cvs, this cannot accompany moving files to other directories at this time. -}}} * status {{{ * Error messages aren't particularly usable currently. we need to be able to see the full text of the error, and what account is in that error condition. @@ -74,9 +68,9 @@ * on upgrade from 1.x, the timestamp preference often gets lost. }}} * system log {{{ - * The system log minimally should tell me what _I_ do in gaim. It should (minimally) tell me about + * The system log minimally should tell me what _I_ do in Pidgin. It should (minimally) tell me about my accounts and actions. It should thus list - * gaim start and quit + * Pidgin start and quit * Account connection * account disconnection, and reason if caused by error. * account state changes, IFF we are logging that for buddies.
--- a/libpurple/plugins/buddynote.c Wed Apr 11 15:45:48 2007 +0000 +++ b/libpurple/plugins/buddynote.c Thu Apr 12 05:26:43 2007 +0000 @@ -75,27 +75,24 @@ static PurplePluginInfo info = { PURPLE_PLUGIN_MAGIC, - PURPLE_MAJOR_VERSION, /**< major version */ - PURPLE_MINOR_VERSION, + PURPLE_MAJOR_VERSION, /**< major version */ + PURPLE_MINOR_VERSION, /**< minor version */ PURPLE_PLUGIN_STANDARD, /**< type */ NULL, /**< ui_requirement */ 0, /**< flags */ NULL, /**< dependencies */ - PURPLE_PRIORITY_DEFAULT, /**< priority */ - + PURPLE_PRIORITY_DEFAULT, /**< priority */ "core-plugin_pack-buddynote", /**< id */ N_("Buddy Notes"), /**< name */ VERSION, /**< version */ - N_("Store notes on particular buddies."), /** summary */ + N_("Store notes on particular buddies."), /**< summary */ N_("Adds the option to store notes for buddies " - "on your buddy list."), /** description */ + "on your buddy list."), /**< description */ "Stu Tomlinson <stu@nosnilmot.com>", /**< author */ PURPLE_WEBSITE, /**< homepage */ - plugin_load, /**< load */ NULL, /**< unload */ NULL, /**< destroy */ - NULL, /**< ui_info */ NULL, /**< extra_info */ NULL, /**< prefs_info */
--- a/libpurple/plugins/newline.c Wed Apr 11 15:45:48 2007 +0000 +++ b/libpurple/plugins/newline.c Thu Apr 12 05:26:43 2007 +0000 @@ -55,22 +55,22 @@ static PurplePluginInfo info = { - PURPLE_PLUGIN_MAGIC, /**< magic */ - PURPLE_MAJOR_VERSION, /**< major version */ - PURPLE_MINOR_VERSION, /**< minor version */ + PURPLE_PLUGIN_MAGIC, /**< magic */ + PURPLE_MAJOR_VERSION, /**< major version */ + PURPLE_MINOR_VERSION, /**< minor version */ PURPLE_PLUGIN_STANDARD, /**< type */ NULL, /**< ui_requirement */ 0, /**< flags */ NULL, /**< dependencies */ - PURPLE_PRIORITY_DEFAULT, /**< priority */ + PURPLE_PRIORITY_DEFAULT, /**< priority */ "core-plugin_pack-newline", /**< id */ N_("New Line"), /**< name */ VERSION, /**< version */ - N_("Prepends a newline to displayed message."), /** summary */ + N_("Prepends a newline to displayed message."), /**< summary */ N_("Prepends a newline to messages so that the " "rest of the message appears below the " - "screen name in the conversation window."), /** description */ + "screen name in the conversation window."), /**< description */ "Stu Tomlinson <stu@nosnilmot.com>", /**< author */ PURPLE_WEBSITE, /**< homepage */
--- a/pidgin.spec.in Wed Apr 11 15:45:48 2007 +0000 +++ b/pidgin.spec.in Thu Apr 12 05:26:43 2007 +0000 @@ -348,7 +348,7 @@ %{_bindir}/pidgin %{_datadir}/pixmaps/pidgin -%{_datadir}/pixmaps/pidgin.png +%{_datadir}/pixmaps/pidgin.svg %dir %{_datadir}/sounds/pidgin %{_datadir}/sounds/pidgin/* %{_datadir}/applications/*
--- a/pidgin/gtkdocklet.c Wed Apr 11 15:45:48 2007 +0000 +++ b/pidgin/gtkdocklet.c Thu Apr 12 05:26:43 2007 +0000 @@ -168,7 +168,7 @@ g_list_free(convs); } else if (ui_ops->set_tooltip) { - ui_ops->set_tooltip(NULL); + ui_ops->set_tooltip(PIDGIN_NAME); } for(l = purple_accounts_get_all(); l != NULL; l = l->next) {
--- a/pidgin/plugins/extplacement.c Wed Apr 11 15:45:48 2007 +0000 +++ b/pidgin/plugins/extplacement.c Thu Apr 12 05:26:43 2007 +0000 @@ -127,10 +127,10 @@ PURPLE_MAJOR_VERSION, PURPLE_MINOR_VERSION, PURPLE_PLUGIN_STANDARD, /**< type */ - PIDGIN_PLUGIN_TYPE, /**< ui_requirement */ + PIDGIN_PLUGIN_TYPE, /**< ui_requirement */ 0, /**< flags */ NULL, /**< dependencies */ - PURPLE_PRIORITY_DEFAULT, /**< priority */ + PURPLE_PRIORITY_DEFAULT, /**< priority */ "gtk-extplacement", /**< id */ N_("ExtPlacement"), /**< name */ VERSION, /**< version */
--- a/po/sl.po Wed Apr 11 15:45:48 2007 +0000 +++ b/po/sl.po Thu Apr 12 05:26:43 2007 +0000 @@ -1,5 +1,5 @@ # Copyright (C) 2004. -# This file is distributed under the same license as the Pidgin package. +# This file is distributed under the same license as the Gaim package. # Jure Čuhalev <gandalf@owca.info>, 2003. # Matjaž Horvat <matjaz@owca.info>, 2004. # Martin Srebotnjak <miles@filmsi.net>, 2006. @@ -9,7 +9,7 @@ "Project-Id-Version: Pidgin 2.0.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-09-08 00:02-0400\n" -"PO-Revision-Date: 2007-04-09 10:53+0100\n" +"PO-Revision-Date: 2007-04-11 19:07+0100\n" "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n" "Language-Team: Martin Srebotnjak, LUGOS <users@sl.openoffice.org>\n" "MIME-Version: 1.0\n" @@ -154,7 +154,7 @@ #: ../libpurple/protocols/msn/msn.c:280 #: ../libpurple/protocols/msn/msn.c:295 #: ../libpurple/protocols/msn/msn.c:312 -#: ../libpurple/protocols/oscar/oscar.c:6037 +#: ../libpurple/protocols/oscar/oscar.c:6039 #: ../libpurple/protocols/oscar/peer.c:1021 #: ../libpurple/protocols/qq/buddy_info.c:484 #: ../libpurple/protocols/qq/buddy_opt.c:212 @@ -250,7 +250,7 @@ #: ../pidgin/gtkrequest.c:273 #: ../pidgin/gtksavedstatuses.c:335 msgid "Delete" -msgstr "Zbriši" +msgstr "Izbriši" #: ../finch/gntaccount.c:644 #: ../finch/gntblist.c:1955 @@ -679,7 +679,7 @@ #: ../libpurple/protocols/msn/msn.c:264 #: ../libpurple/protocols/msn/msn.c:279 #: ../libpurple/protocols/msn/msn.c:294 -#: ../libpurple/protocols/oscar/oscar.c:6036 +#: ../libpurple/protocols/oscar/oscar.c:6038 #: ../libpurple/protocols/silc/buddy.c:466 #: ../libpurple/protocols/silc/buddy.c:1182 #: ../libpurple/protocols/silc/chat.c:424 @@ -1483,12 +1483,12 @@ #: ../libpurple/protocols/novell/novell.c:2942 #: ../libpurple/protocols/novell/novell.c:2948 #: ../libpurple/protocols/novell/novell.c:2954 -#: ../libpurple/protocols/oscar/oscar.c:5490 -#: ../libpurple/protocols/oscar/oscar.c:5718 -#: ../libpurple/protocols/oscar/oscar.c:5732 -#: ../libpurple/protocols/oscar/oscar.c:5748 -#: ../libpurple/protocols/oscar/oscar.c:5755 -#: ../libpurple/protocols/oscar/oscar.c:5762 +#: ../libpurple/protocols/oscar/oscar.c:5492 +#: ../libpurple/protocols/oscar/oscar.c:5720 +#: ../libpurple/protocols/oscar/oscar.c:5734 +#: ../libpurple/protocols/oscar/oscar.c:5750 +#: ../libpurple/protocols/oscar/oscar.c:5757 +#: ../libpurple/protocols/oscar/oscar.c:5764 #: ../libpurple/protocols/sametime/sametime.c:3287 #: ../libpurple/protocols/sametime/sametime.c:3293 #: ../libpurple/protocols/sametime/sametime.c:3299 @@ -2325,10 +2325,10 @@ #: ../libpurple/protocols/oscar/oscar.c:1434 #: ../libpurple/protocols/oscar/oscar.c:2243 #: ../libpurple/protocols/oscar/oscar.c:2289 -#: ../libpurple/protocols/oscar/oscar.c:5832 -#: ../libpurple/protocols/oscar/oscar.c:5884 -#: ../libpurple/protocols/oscar/oscar.c:6108 -#: ../libpurple/protocols/oscar/oscar.c:6177 +#: ../libpurple/protocols/oscar/oscar.c:5834 +#: ../libpurple/protocols/oscar/oscar.c:5886 +#: ../libpurple/protocols/oscar/oscar.c:6110 +#: ../libpurple/protocols/oscar/oscar.c:6179 #: ../libpurple/request.h:1350 #: ../libpurple/request.h:1360 msgid "_Cancel" @@ -3156,7 +3156,7 @@ #: ../libpurple/protocols/novell/novell.c:2820 #: ../libpurple/protocols/oscar/oscar.c:714 #: ../libpurple/protocols/oscar/oscar.c:4520 -#: ../libpurple/protocols/oscar/oscar.c:5568 +#: ../libpurple/protocols/oscar/oscar.c:5570 #: ../libpurple/protocols/qq/qq.c:180 #: ../libpurple/protocols/silc/buddy.c:1469 #: ../libpurple/protocols/yahoo/yahoo.c:3373 @@ -3465,7 +3465,7 @@ #: ../libpurple/protocols/jabber/buddy.c:1408 #: ../libpurple/protocols/novell/novell.c:2829 #: ../libpurple/protocols/oscar/oscar.c:809 -#: ../libpurple/protocols/oscar/oscar.c:5540 +#: ../libpurple/protocols/oscar/oscar.c:5542 #: ../libpurple/protocols/qq/qq.c:170 #: ../libpurple/protocols/qq/qq.c:177 #: ../libpurple/protocols/yahoo/yahoo.c:2898 @@ -3803,7 +3803,7 @@ #: ../libpurple/protocols/irc/msgs.c:312 #: ../libpurple/protocols/jabber/jabber.c:1994 #: ../libpurple/protocols/msn/msn.c:2099 -#: ../libpurple/protocols/oscar/oscar.c:6619 +#: ../libpurple/protocols/oscar/oscar.c:6621 #: ../libpurple/protocols/qq/qq.c:746 #: ../libpurple/protocols/sametime/sametime.c:5706 #: ../libpurple/protocols/silc/ops.c:1244 @@ -3816,7 +3816,7 @@ #. port to connect to #: ../libpurple/protocols/irc/irc.c:916 #: ../libpurple/protocols/msn/msn.c:2104 -#: ../libpurple/protocols/oscar/oscar.c:6622 +#: ../libpurple/protocols/oscar/oscar.c:6624 #: ../libpurple/protocols/qq/qq.c:749 #: ../libpurple/protocols/sametime/sametime.c:5711 #: ../libpurple/protocols/silc/silc.c:1850 @@ -4452,7 +4452,7 @@ #: ../libpurple/protocols/jabber/buddy.c:1418 #: ../libpurple/protocols/jabber/jabber.c:1271 #: ../libpurple/protocols/oscar/oscar.c:708 -#: ../libpurple/protocols/oscar/oscar.c:5754 +#: ../libpurple/protocols/oscar/oscar.c:5756 #: ../libpurple/protocols/sametime/sametime.c:3298 msgid "Do Not Disturb" msgstr "Ne moti" @@ -4537,7 +4537,7 @@ msgstr "Imenik iskanja" #: ../libpurple/protocols/jabber/chat.c:41 -#: ../libpurple/protocols/oscar/oscar.c:5250 +#: ../libpurple/protocols/oscar/oscar.c:5252 #: ../libpurple/protocols/yahoo/yahoochat.c:999 msgid "_Room:" msgstr "_Soba:" @@ -4730,7 +4730,7 @@ #: ../libpurple/protocols/jabber/jabber.c:1528 #: ../libpurple/protocols/jabber/jabber.c:1564 #: ../libpurple/protocols/oscar/oscar.c:807 -#: ../libpurple/protocols/oscar/oscar.c:5538 +#: ../libpurple/protocols/oscar/oscar.c:5540 msgid "Not Authorized" msgstr "Nepooblaščeno" @@ -4787,14 +4787,14 @@ msgstr "Vnesite svoje novo geslo" #: ../libpurple/protocols/jabber/jabber.c:1379 -#: ../libpurple/protocols/oscar/oscar.c:6339 +#: ../libpurple/protocols/oscar/oscar.c:6341 #: ../libpurple/protocols/silc/silc.c:1013 msgid "Set User Info..." msgstr "Nastavi informacije o uporabniku ..." #. if (js->protocol_options & CHANGE_PASSWORD) { #: ../libpurple/protocols/jabber/jabber.c:1384 -#: ../libpurple/protocols/oscar/oscar.c:6350 +#: ../libpurple/protocols/oscar/oscar.c:6352 #: ../libpurple/protocols/silc/silc.c:1009 msgid "Change Password..." msgstr "Spremeni geslo ..." @@ -6635,7 +6635,7 @@ msgstr "Pomenek" #: ../libpurple/protocols/oscar/oscar.c:632 -#: ../libpurple/protocols/oscar/oscar.c:5953 +#: ../libpurple/protocols/oscar/oscar.c:5955 msgid "Get File" msgstr "Sprejmi datoteko" @@ -6708,17 +6708,17 @@ msgstr "Kamera" #: ../libpurple/protocols/oscar/oscar.c:706 -#: ../libpurple/protocols/oscar/oscar.c:5726 +#: ../libpurple/protocols/oscar/oscar.c:5728 msgid "Free For Chat" msgstr "Na voljo za pogovor" #: ../libpurple/protocols/oscar/oscar.c:710 -#: ../libpurple/protocols/oscar/oscar.c:5761 +#: ../libpurple/protocols/oscar/oscar.c:5763 msgid "Not Available" msgstr "Ni na voljo" #: ../libpurple/protocols/oscar/oscar.c:712 -#: ../libpurple/protocols/oscar/oscar.c:5747 +#: ../libpurple/protocols/oscar/oscar.c:5749 msgid "Occupied" msgstr "Zaseden" @@ -6847,8 +6847,8 @@ #: ../libpurple/protocols/oscar/oscar.c:1433 #: ../libpurple/protocols/oscar/oscar.c:2242 #: ../libpurple/protocols/oscar/oscar.c:2288 -#: ../libpurple/protocols/oscar/oscar.c:5831 -#: ../libpurple/protocols/oscar/oscar.c:6107 +#: ../libpurple/protocols/oscar/oscar.c:5833 +#: ../libpurple/protocols/oscar/oscar.c:6109 #: ../libpurple/request.h:1350 msgid "_OK" msgstr "V _redu" @@ -6896,7 +6896,7 @@ #: ../libpurple/protocols/oscar/oscar.c:2280 #: ../libpurple/protocols/oscar/oscar.c:2287 #: ../libpurple/protocols/oscar/oscar.c:2413 -#: ../libpurple/protocols/oscar/oscar.c:5219 +#: ../libpurple/protocols/oscar/oscar.c:5221 #: ../libpurple/protocols/yahoo/yahoo.c:986 msgid "No reason given." msgstr "Ni podanega razloga." @@ -7271,8 +7271,8 @@ msgstr "Ni mogoče dodati prijatelja %s, ker ime ni veljavno. Imena se morajo začeti s črko, vsebujejo lahko le črke, številke in presledke, lahko pa so tudi sestavljena iz samih števil." #: ../libpurple/protocols/oscar/oscar.c:4603 -#: ../libpurple/protocols/oscar/oscar.c:5026 -#: ../libpurple/protocols/oscar/oscar.c:5040 +#: ../libpurple/protocols/oscar/oscar.c:5028 +#: ../libpurple/protocols/oscar/oscar.c:5042 msgid "Unable To Add" msgstr "Nemogoče dodati" @@ -7284,51 +7284,51 @@ msgid "The AIM servers were temporarily unable to send your buddy list. Your buddy list is not lost, and will probably become available in a few hours." msgstr "Vašega seznama prijateljev z AIM strežnikov trenutno ni mogoče pridobiti. Vaš seznam prijateljev ni izgubljen, verjetno pa bo postal dosegljiv v nekaj urah." -#: ../libpurple/protocols/oscar/oscar.c:4912 #: ../libpurple/protocols/oscar/oscar.c:4913 -#: ../libpurple/protocols/oscar/oscar.c:4918 -#: ../libpurple/protocols/oscar/oscar.c:5094 -#: ../libpurple/protocols/oscar/oscar.c:5095 -#: ../libpurple/protocols/oscar/oscar.c:5100 +#: ../libpurple/protocols/oscar/oscar.c:4914 +#: ../libpurple/protocols/oscar/oscar.c:4919 +#: ../libpurple/protocols/oscar/oscar.c:5096 +#: ../libpurple/protocols/oscar/oscar.c:5097 +#: ../libpurple/protocols/oscar/oscar.c:5102 msgid "Orphans" msgstr "Sirote" -#: ../libpurple/protocols/oscar/oscar.c:5024 +#: ../libpurple/protocols/oscar/oscar.c:5026 #, c-format msgid "Could not add the buddy %s because you have too many buddies in your buddy list. Please remove one and try again." msgstr "Prijatelja %s ni bilo mogoče dodati, ker imate na seznamu preveč prijateljev. Prosim odstranite enega in poskusite ponovno." -#: ../libpurple/protocols/oscar/oscar.c:5024 -#: ../libpurple/protocols/oscar/oscar.c:5038 +#: ../libpurple/protocols/oscar/oscar.c:5026 +#: ../libpurple/protocols/oscar/oscar.c:5040 msgid "(no name)" msgstr "(brez imena)" -#: ../libpurple/protocols/oscar/oscar.c:5038 +#: ../libpurple/protocols/oscar/oscar.c:5040 #, c-format msgid "Could not add the buddy %s for an unknown reason. The most common reason for this is that you have the maximum number of allowed buddies in your buddy list." msgstr "Prijatelja %s iz neznanega razloga ni bilo mogoče dodati na seznam. Najpogostejši razlog za to je preveliko število prijateljev na vašem seznamu." -#: ../libpurple/protocols/oscar/oscar.c:5131 +#: ../libpurple/protocols/oscar/oscar.c:5133 #, c-format msgid "The user %s has given you permission to add you to their buddy list. Do you want to add them?" msgstr "Uporabnik %s vam je dovolil, da ga dodate na svoj seznam prijateljev. Ali ga želite dodati?" -#: ../libpurple/protocols/oscar/oscar.c:5137 +#: ../libpurple/protocols/oscar/oscar.c:5139 msgid "Authorization Given" msgstr "Pooblastilo odobreno" #. Granted -#: ../libpurple/protocols/oscar/oscar.c:5215 +#: ../libpurple/protocols/oscar/oscar.c:5217 #, c-format msgid "The user %s has granted your request to add them to your buddy list." msgstr "Uporabnik %s je odobril zahtevo, da ga dodate na svoj seznam prijateljev." -#: ../libpurple/protocols/oscar/oscar.c:5216 +#: ../libpurple/protocols/oscar/oscar.c:5218 msgid "Authorization Granted" msgstr "Pooblastilo odobreno" #. Denied -#: ../libpurple/protocols/oscar/oscar.c:5219 +#: ../libpurple/protocols/oscar/oscar.c:5221 #, c-format msgid "" "The user %s has denied your request to add them to your buddy list for the following reason:\n" @@ -7337,181 +7337,181 @@ "Uporabnik %s je zavrnil vašo zahtevo, da ga dodate na svoj seznam prijateljev, ker:\n" "%s" -#: ../libpurple/protocols/oscar/oscar.c:5220 +#: ../libpurple/protocols/oscar/oscar.c:5222 msgid "Authorization Denied" msgstr "Pooblastilo zavrnjeno" -#: ../libpurple/protocols/oscar/oscar.c:5256 +#: ../libpurple/protocols/oscar/oscar.c:5258 #: ../libpurple/protocols/toc/toc.c:1371 msgid "_Exchange:" msgstr "_Izmenjaj:" -#: ../libpurple/protocols/oscar/oscar.c:5296 +#: ../libpurple/protocols/oscar/oscar.c:5298 msgid "Invalid chat name specified." msgstr "Navedeno je neveljavno ime pomenka." -#: ../libpurple/protocols/oscar/oscar.c:5366 +#: ../libpurple/protocols/oscar/oscar.c:5368 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats." msgstr "Vaša slika IM ni bila poslana. Slik IM ne morete pošiljati v klepetih AIM." -#: ../libpurple/protocols/oscar/oscar.c:5505 -#: ../libpurple/protocols/oscar/oscar.c:5510 +#: ../libpurple/protocols/oscar/oscar.c:5507 +#: ../libpurple/protocols/oscar/oscar.c:5512 msgid "Away Message" msgstr "Sporočilo o odsotnosti" -#: ../libpurple/protocols/oscar/oscar.c:5510 +#: ../libpurple/protocols/oscar/oscar.c:5512 msgid "<i>(retrieving)</i>" msgstr "<i>(pridobivanje ...)</i>" -#: ../libpurple/protocols/oscar/oscar.c:5720 +#: ../libpurple/protocols/oscar/oscar.c:5722 msgid "iTunes Music Store Link" msgstr "Povezava na glasbeno trgovino iTunes" -#: ../libpurple/protocols/oscar/oscar.c:5828 +#: ../libpurple/protocols/oscar/oscar.c:5830 #, c-format msgid "Buddy Comment for %s" msgstr "Komentar o prijatelju %s" -#: ../libpurple/protocols/oscar/oscar.c:5829 +#: ../libpurple/protocols/oscar/oscar.c:5831 msgid "Buddy Comment:" msgstr "Komentar prijatelja:" -#: ../libpurple/protocols/oscar/oscar.c:5875 +#: ../libpurple/protocols/oscar/oscar.c:5877 #, c-format msgid "You have selected to open a Direct IM connection with %s." msgstr "Izbrali ste neposredno povezovanje z %s." -#: ../libpurple/protocols/oscar/oscar.c:5879 +#: ../libpurple/protocols/oscar/oscar.c:5881 msgid "Because this reveals your IP address, it may be considered a security risk. Do you wish to continue?" msgstr "Ker razkrije vaš naslov IP, lahko velja za kršitev zasebnosti. Želite nadaljevati?" -#: ../libpurple/protocols/oscar/oscar.c:5883 +#: ../libpurple/protocols/oscar/oscar.c:5885 msgid "C_onnect" msgstr "Po_veži se" -#: ../libpurple/protocols/oscar/oscar.c:5918 +#: ../libpurple/protocols/oscar/oscar.c:5920 msgid "Get AIM Info" msgstr "Dobi podatke AIM" -#: ../libpurple/protocols/oscar/oscar.c:5924 +#: ../libpurple/protocols/oscar/oscar.c:5926 msgid "Edit Buddy Comment" msgstr "Uredi komentar prijatelja" -#: ../libpurple/protocols/oscar/oscar.c:5932 +#: ../libpurple/protocols/oscar/oscar.c:5934 msgid "Get Status Msg" msgstr "Poizvedi o stanju" -#: ../libpurple/protocols/oscar/oscar.c:5945 +#: ../libpurple/protocols/oscar/oscar.c:5947 msgid "Direct IM" msgstr "Neposredni pogovor" -#: ../libpurple/protocols/oscar/oscar.c:5967 +#: ../libpurple/protocols/oscar/oscar.c:5969 msgid "Re-request Authorization" msgstr "Ponovno zahtevaj pooblastilo" -#: ../libpurple/protocols/oscar/oscar.c:6026 +#: ../libpurple/protocols/oscar/oscar.c:6028 msgid "Require authorization" msgstr "Zahtevaj pooblastilo" -#: ../libpurple/protocols/oscar/oscar.c:6029 +#: ../libpurple/protocols/oscar/oscar.c:6031 msgid "Web aware (enabling this will cause you to receive SPAM!)" msgstr "Spletno zaveden (s to funkcijo boste prejemali tudi SPAM!)" -#: ../libpurple/protocols/oscar/oscar.c:6034 +#: ../libpurple/protocols/oscar/oscar.c:6036 msgid "ICQ Privacy Options" msgstr "Možnosti zasebnosti ICQ" -#: ../libpurple/protocols/oscar/oscar.c:6051 +#: ../libpurple/protocols/oscar/oscar.c:6053 msgid "The new formatting is invalid." msgstr "Oblika novega zapisa je neveljavna." -#: ../libpurple/protocols/oscar/oscar.c:6052 +#: ../libpurple/protocols/oscar/oscar.c:6054 msgid "Screen name formatting can change only capitalization and whitespace." msgstr "Z oblikovanjem imena lahko spreminjate samo velike črke in presledke." -#: ../libpurple/protocols/oscar/oscar.c:6105 +#: ../libpurple/protocols/oscar/oscar.c:6107 msgid "Change Address To:" msgstr "Spremeni naslov v:" -#: ../libpurple/protocols/oscar/oscar.c:6150 +#: ../libpurple/protocols/oscar/oscar.c:6152 msgid "<i>you are not waiting for authorization</i>" msgstr "<i>ne čakate na pooblastilo</i>" -#: ../libpurple/protocols/oscar/oscar.c:6153 +#: ../libpurple/protocols/oscar/oscar.c:6155 msgid "You are awaiting authorization from the following buddies" msgstr "Pričakujete pooblastila od naslednjih prijateljev" -#: ../libpurple/protocols/oscar/oscar.c:6154 +#: ../libpurple/protocols/oscar/oscar.c:6156 msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\"" msgstr "Če želite, lahko ponovno zahtevate pooblastilo od teh prijateljev, tako da desno kliknete na njih in izberete \"Ponovno zahtevaj pooblastilo.\"" -#: ../libpurple/protocols/oscar/oscar.c:6171 +#: ../libpurple/protocols/oscar/oscar.c:6173 msgid "Find Buddy by E-Mail" msgstr "Najdi prijatelja po e-pošti" -#: ../libpurple/protocols/oscar/oscar.c:6172 +#: ../libpurple/protocols/oscar/oscar.c:6174 msgid "Search for a buddy by e-mail address" msgstr "Išči prijatelje po naslovu e-pošte" -#: ../libpurple/protocols/oscar/oscar.c:6173 +#: ../libpurple/protocols/oscar/oscar.c:6175 msgid "Type the e-mail address of the buddy you are searching for." msgstr "Vnesite naslov e-pošte prijatelja, ki ga želite najti" -#: ../libpurple/protocols/oscar/oscar.c:6176 +#: ../libpurple/protocols/oscar/oscar.c:6178 msgid "_Search" msgstr "_Najdi" -#: ../libpurple/protocols/oscar/oscar.c:6345 +#: ../libpurple/protocols/oscar/oscar.c:6347 msgid "Set User Info (URL)..." msgstr "Nastavi informacije o uporabniku (URL) ..." -#: ../libpurple/protocols/oscar/oscar.c:6356 +#: ../libpurple/protocols/oscar/oscar.c:6358 msgid "Change Password (URL)" msgstr "Spremeni geslo (URL povezava)" -#: ../libpurple/protocols/oscar/oscar.c:6360 +#: ../libpurple/protocols/oscar/oscar.c:6362 msgid "Configure IM Forwarding (URL)" msgstr "Nastavi posredovanje sporočil (URL)" #. ICQ actions -#: ../libpurple/protocols/oscar/oscar.c:6370 +#: ../libpurple/protocols/oscar/oscar.c:6372 msgid "Set Privacy Options..." msgstr "Nastavi možnosti zasebnosti ..." #. AIM actions -#: ../libpurple/protocols/oscar/oscar.c:6377 +#: ../libpurple/protocols/oscar/oscar.c:6379 msgid "Confirm Account" msgstr "Potrdi račun" -#: ../libpurple/protocols/oscar/oscar.c:6381 +#: ../libpurple/protocols/oscar/oscar.c:6383 msgid "Display Currently Registered E-Mail Address" msgstr "Prikaži trenutno registriran e-naslov" -#: ../libpurple/protocols/oscar/oscar.c:6385 +#: ../libpurple/protocols/oscar/oscar.c:6387 msgid "Change Currently Registered E-Mail Address..." msgstr "Spremeni trenutno registriran e-naslov ..." -#: ../libpurple/protocols/oscar/oscar.c:6392 +#: ../libpurple/protocols/oscar/oscar.c:6394 msgid "Show Buddies Awaiting Authorization" msgstr "Pokaži prijatelje, ki čakajo na pooblastilo" -#: ../libpurple/protocols/oscar/oscar.c:6398 +#: ../libpurple/protocols/oscar/oscar.c:6400 msgid "Search for Buddy by E-Mail Address..." msgstr "Išči prijatelja po e-naslovu ..." -#: ../libpurple/protocols/oscar/oscar.c:6403 +#: ../libpurple/protocols/oscar/oscar.c:6405 msgid "Search for Buddy by Information" msgstr "Išči prijatelja po informaciji" -#: ../libpurple/protocols/oscar/oscar.c:6471 +#: ../libpurple/protocols/oscar/oscar.c:6473 msgid "Use recent buddies group" msgstr "Uporabi nedavno skupino prijateljev" -#: ../libpurple/protocols/oscar/oscar.c:6474 +#: ../libpurple/protocols/oscar/oscar.c:6476 msgid "Show how long you have been idle" msgstr "Prikaz časa vaše odsotnosti" -#: ../libpurple/protocols/oscar/oscar.c:6626 +#: ../libpurple/protocols/oscar/oscar.c:6628 msgid "" "Always use ICQ proxy server for file transfers\n" "(slower, but does not reveal your IP address)" @@ -11018,25 +11018,25 @@ msgid "%x %X" msgstr "%x %X" -#: ../libpurple/util.c:2435 +#: ../libpurple/util.c:2442 #, c-format msgid "Error Reading %s" msgstr "Napaka pri branju %s" -#: ../libpurple/util.c:2436 +#: ../libpurple/util.c:2443 #, c-format msgid "An error was encountered reading your %s. They have not been loaded, and the old file has been renamed to %s~." msgstr "Pri branju vašega %s je prišlo do napake, zato ni bil naložen. Stara datoteka se je preimenovala v %s~." -#: ../libpurple/util.c:2899 +#: ../libpurple/util.c:2906 msgid "Calculating..." msgstr "Preračunavanje ..." -#: ../libpurple/util.c:2902 +#: ../libpurple/util.c:2909 msgid "Unknown." msgstr "Neznano." -#: ../libpurple/util.c:2928 +#: ../libpurple/util.c:2935 #, c-format msgid "%d second" msgid_plural "%d seconds" @@ -11045,7 +11045,7 @@ msgstr[2] "%d sekundi" msgstr[3] "%d sekunde" -#: ../libpurple/util.c:2940 +#: ../libpurple/util.c:2947 #, c-format msgid "%d day" msgid_plural "%d days" @@ -11054,7 +11054,7 @@ msgstr[2] "%d dneva" msgstr[3] "%d dni" -#: ../libpurple/util.c:2948 +#: ../libpurple/util.c:2955 #, c-format msgid "%s, %d hour" msgid_plural "%s, %d hours" @@ -11063,7 +11063,7 @@ msgstr[2] "%s, %d uri" msgstr[3] "%s, %d ur" -#: ../libpurple/util.c:2954 +#: ../libpurple/util.c:2961 #, c-format msgid "%d hour" msgid_plural "%d hours" @@ -11072,7 +11072,7 @@ msgstr[2] "%d uri" msgstr[3] "%d ure" -#: ../libpurple/util.c:2962 +#: ../libpurple/util.c:2969 #, c-format msgid "%s, %d minute" msgid_plural "%s, %d minutes" @@ -11081,7 +11081,7 @@ msgstr[2] "%s, %d minuti" msgstr[3] "%s, %d minut" -#: ../libpurple/util.c:2968 +#: ../libpurple/util.c:2975 #, c-format msgid "%d minute" msgid_plural "%d minutes" @@ -11090,28 +11090,28 @@ msgstr[2] "%d minuti" msgstr[3] "%d minut" -#: ../libpurple/util.c:3235 -#: ../libpurple/util.c:3533 +#: ../libpurple/util.c:3242 +#: ../libpurple/util.c:3540 #, c-format msgid "Unable to connect to %s" msgstr "Ni se mogoče povezati z %s." -#: ../libpurple/util.c:3361 +#: ../libpurple/util.c:3368 #, c-format msgid "Unable to allocate enough memory to hold the contents from %s. The web server may be trying something malicious." msgstr "Za hrambo vsebine %s ni mogoče pridobiti zadostnega prostora. Spletni strežnik morda poskuša storiti nekaj sovražnega." -#: ../libpurple/util.c:3396 +#: ../libpurple/util.c:3403 #, c-format msgid "Error reading from %s: %s" msgstr "Napaka pri branju iz %s: %s" -#: ../libpurple/util.c:3427 +#: ../libpurple/util.c:3434 #, c-format msgid "Error writing to %s: %s" msgstr "Napaka pri pisanju v %s: %s" -#: ../libpurple/util.c:3452 +#: ../libpurple/util.c:3459 #, c-format msgid "Unable to connect to %s: %s" msgstr "Napaka pri povezovanju z %s: %s"