Mercurial > pidgin.yaz
changeset 16262:9815ba2af570
merge of '02ca9d2b907e1c26510d22406d0e0128b5b911d1'
and '27bf7e73ce033cc2c3318e675044e75dced3df8a'
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Thu, 19 Apr 2007 15:07:09 +0000 |
| parents | f1c2ff731fd9 (diff) 4aedcb70cc07 (current diff) |
| children | 7891ff4c8e91 |
| files | TODO libpurple/protocols/gg/.todo libpurple/protocols/irc/.todo libpurple/protocols/msn/.todo libpurple/protocols/yahoo/.todo libpurple/protocols/zephyr/.todo |
| diffstat | 50 files changed, 621 insertions(+), 725 deletions(-) [+] |
line wrap: on
line diff
--- a/Doxyfile.in Thu Apr 19 15:06:54 2007 +0000 +++ b/Doxyfile.in Thu Apr 19 15:07:09 2007 +0000 @@ -615,13 +615,13 @@ # each generated HTML page. If it is left blank doxygen will generate a # standard header. -HTML_HEADER = doc/TracHeader.html +HTML_HEADER = @top_srcdir@/doc/TracHeader.html # The HTML_FOOTER tag can be used to specify a personal HTML footer for # each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = doc/TracFooter.html +HTML_FOOTER = @top_srcdir@/doc/TracFooter.html # The HTML_STYLESHEET tag can be used to specify a user-defined cascading # style sheet that is used by each HTML page. It can be used to
--- a/doc/Makefile.am Thu Apr 19 15:06:54 2007 +0000 +++ b/doc/Makefile.am Thu Apr 19 15:07:09 2007 +0000 @@ -4,6 +4,8 @@ C-HOWTO.dox \ PERL-HOWTO.dox \ TCL-HOWTO.dox \ + TracFooter.html \ + TracHeader.html \ account-signals.dox \ blist-signals.dox \ cipher-signals.dox \
--- a/finch/gntplugin.c Thu Apr 19 15:06:54 2007 +0000 +++ b/finch/gntplugin.c Thu Apr 19 15:07:09 2007 +0000 @@ -63,17 +63,22 @@ static void plugin_toggled_cb(GntWidget *tree, PurplePlugin *plugin, gpointer null) { + /* TODO: Mark these strings for translation after the freeze */ if (gnt_tree_get_choice(GNT_TREE(tree), plugin)) { - if(!purple_plugin_load(plugin)) + if (!purple_plugin_load(plugin)) { purple_notify_error(NULL, "ERROR", "loading plugin failed", NULL); + gnt_tree_set_choice(GNT_TREE(tree), plugin, FALSE); + } } else { GntWidget *win; - if (!purple_plugin_unload(plugin)) + if (!purple_plugin_unload(plugin)) { purple_notify_error(NULL, "ERROR", "unloading plugin failed", NULL); + gnt_tree_set_choice(GNT_TREE(tree), plugin, TRUE); + } if ((win = g_hash_table_lookup(confwins, plugin)) != NULL) {
--- a/finch/libgnt/gnttree.c Thu Apr 19 15:06:54 2007 +0000 +++ b/finch/libgnt/gnttree.c Thu Apr 19 15:07:09 2007 +0000 @@ -7,6 +7,7 @@ #include <ctype.h> #define SEARCH_TIMEOUT 4000 /* 4 secs */ +#define SEARCHING(tree) (tree->search && tree->search->len > 0) enum { @@ -503,6 +504,14 @@ mvwaddch(widget->window, widget->priv.height - pos - 1, scrcol, (row ? ACS_DARROW : ' ') | COLOR_PAIR(GNT_COLOR_HIGHLIGHT_D)); + /* If there's a search-text, show it in the bottom of the tree */ + if (tree->search && tree->search->len > 0) { + const char *str = gnt_util_onscreen_width_to_pointer(tree->search->str, scrcol - 1, NULL); + wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_HIGHLIGHT_D)); + mvwaddnstr(widget->window, widget->priv.height - pos - 1, pos, + tree->search->str, str - tree->search->str); + } + gnt_widget_queue_update(widget); } @@ -576,15 +585,17 @@ { GntTree *tree = GNT_TREE(bind); GntTreeRow *row = tree->current; - if (row->parent) { - int dist; - tree->current = row->parent; - if ((dist = get_distance(tree->current, tree->top)) > 0) - gnt_tree_scroll(tree, -dist); - else - redraw_tree(tree); - tree_selection_changed(tree, row, tree->current); - } + int dist; + + if (!row->parent || SEARCHING(tree)) + return FALSE; + + tree->current = row->parent; + if ((dist = get_distance(tree->current, tree->top)) > 0) + gnt_tree_scroll(tree, -dist); + else + redraw_tree(tree); + tree_selection_changed(tree, row, tree->current); return TRUE; } @@ -693,8 +704,15 @@ end_search(tree); gnt_widget_activate(widget); } else if (tree->search) { + gboolean changed = TRUE; if (isalnum(*text)) { tree->search = g_string_append_c(tree->search, *text); + } else if (g_utf8_collate(text, GNT_KEY_BACKSPACE) == 0) { + if (tree->search->len) + tree->search->str[--tree->search->len] = '\0'; + } else + changed = FALSE; + if (changed) { redraw_tree(tree); g_source_remove(tree->search_timeout); tree->search_timeout = g_timeout_add(SEARCH_TIMEOUT, search_timeout, tree);
--- a/libpurple/prefs.c Thu Apr 19 15:06:54 2007 +0000 +++ b/libpurple/prefs.c Thu Apr 19 15:07:09 2007 +0000 @@ -1090,39 +1090,45 @@ return ret; } -void -purple_prefs_rename(const char *oldname, const char *newname) +static void +purple_prefs_rename_node(struct purple_pref *oldpref, struct purple_pref *newpref) { - struct purple_pref *oldpref, *newpref; - - oldpref = find_pref(oldname); + struct purple_pref *child; + char *oldname, *newname; - /* it's already been renamed, call off the dogs */ - if(!oldpref) - return; - - if (oldpref->first_child != NULL) /* can't rename parents */ + /* if we're a parent, rename the kids first */ + for(child = oldpref->first_child; child != NULL; child = child->sibling) { - purple_debug_error("prefs", "Unable to rename %s to %s: can't rename parents\n", oldname, newname); - return; + struct purple_pref *newchild; + for(newchild = newpref->first_child; newchild != NULL; newchild = newchild->sibling) + { + if(!strcmp(child->name, newchild->name)) + { + purple_prefs_rename_node(child, newchild); + break; + } + } + if(newchild == NULL) { + /* no rename happened, we weren't able to find the new pref */ + char *tmpname = pref_full_name(child); + purple_debug_error("prefs", "Unable to find rename pref for %s", tmpname); + g_free(tmpname); + } } - - newpref = find_pref(newname); - - if (newpref == NULL) - { - purple_debug_error("prefs", "Unable to rename %s to %s: new pref not created\n", oldname, newname); - return; - } + oldname = pref_full_name(oldpref); + newname = pref_full_name(newpref); if (oldpref->type != newpref->type) { purple_debug_error("prefs", "Unable to rename %s to %s: differing types\n", oldname, newname); + g_free(oldname); + g_free(newname); return; } purple_debug_info("prefs", "Renaming %s to %s\n", oldname, newname); + g_free(oldname); switch(oldpref->type) { case PURPLE_PREF_NONE: @@ -1146,11 +1152,34 @@ purple_prefs_set_path_list(newname, oldpref->value.stringlist); break; } + g_free(newname); remove_pref(oldpref); } void +purple_prefs_rename(const char *oldname, const char *newname) +{ + struct purple_pref *oldpref, *newpref; + + oldpref = find_pref(oldname); + + /* it's already been renamed, call off the dogs */ + if(!oldpref) + return; + + newpref = find_pref(newname); + + if (newpref == NULL) + { + purple_debug_error("prefs", "Unable to rename %s to %s: new pref not created\n", oldname, newname); + return; + } + + purple_prefs_rename_node(oldpref, newpref); +} + +void purple_prefs_rename_boolean_toggle(const char *oldname, const char *newname) { struct purple_pref *oldpref, *newpref;
--- a/libpurple/protocols/jabber/Makefile.am Thu Apr 19 15:06:54 2007 +0000 +++ b/libpurple/protocols/jabber/Makefile.am Thu Apr 19 15:07:09 2007 +0000 @@ -38,26 +38,32 @@ AM_CFLAGS = $(st) -libjabber_la_LDFLAGS = -module -avoid-version +libxmpp_la_LDFLAGS = -module -avoid-version if STATIC_JABBER st = -DPURPLE_STATIC_PRPL -noinst_LIBRARIES = libjabber.a +noinst_LIBRARIES = libjabber.a libxmpp.a pkg_LTLIBRARIES = libjabber_a_SOURCES = $(JABBERSOURCES) libjabber_a_CFLAGS = $(AM_CFLAGS) +libxmpp_a_SOURCES = libxmpp.c +libxmpp_a_CFLAGS = $(AM_CFLAGS) + else st = -pkg_LTLIBRARIES = libjabber.la +pkg_LTLIBRARIES = libjabber.la libxmpp.la noinst_LIBRARIES = libjabber_la_SOURCES = $(JABBERSOURCES) libjabber_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS) +libxmpp_la_SOURCES = libxmpp.c +libxmpp_la_LIBADD = libjabber.la + endif AM_CPPFLAGS = \
--- a/libpurple/protocols/jabber/Makefile.mingw Thu Apr 19 15:06:54 2007 +0000 +++ b/libpurple/protocols/jabber/Makefile.mingw Thu Apr 19 15:07:09 2007 +0000 @@ -8,6 +8,7 @@ include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak TARGET = libjabber +XMPP_TARGET = libxmpp TYPE = PLUGIN # Static or Plugin... @@ -35,7 +36,8 @@ LIB_PATHS = -L$(GTK_TOP)/lib \ -L$(LIBXML2_TOP)/lib \ - -L$(PURPLE_TOP) + -L$(PURPLE_TOP) \ + -L. ## ## SOURCES, OBJECTS @@ -59,6 +61,9 @@ OBJECTS = $(C_SRC:%.c=%.o) +XMPP_C_SRC = libxmpp.c +XMPP_OBJECTS = $(XMPP_C_SRC:%.c=%.o) + ## ## LIBRARIES ## @@ -76,21 +81,25 @@ ## .PHONY: all install clean -all: $(TARGET).dll +all: $(TARGET).dll $(XMPP_TARGET).dll install: all $(DLL_INSTALL_DIR) - cp $(TARGET).dll $(DLL_INSTALL_DIR) + cp $(XMPP_TARGET).dll $(DLL_INSTALL_DIR) + cp $(TARGET).dll $(PURPLE_INSTALL_DIR) $(OBJECTS): $(PURPLE_CONFIG_H) $(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS) - $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll + $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll + +$(XMPP_TARGET).dll: $(TARGET).dll.a $(XMPP_OBJECTS) + $(CC) -shared $(XMPP_OBJECTS) $(LIB_PATHS) $(LIBS) -ljabber $(DLL_LD_FLAGS) -o $(XMPP_TARGET).dll ## ## CLEAN RULES ## clean: - rm -f $(OBJECTS) - rm -f $(TARGET).dll + rm -f $(OBJECTS) $(TARGET).dll $(TARGET).dll.a + rm -f $(XMPP_OBJECTS) $(XMPP_TARGET).dll include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/protocols/jabber/jabber.c Thu Apr 19 15:06:54 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.c Thu Apr 19 15:07:09 2007 +0000 @@ -339,7 +339,7 @@ return; } -static int jabber_prpl_send_raw(PurpleConnection *gc, const char *buf, int len) +int jabber_prpl_send_raw(PurpleConnection *gc, const char *buf, int len) { JabberStream *js = (JabberStream*)gc->proto_data; jabber_send_raw(js, buf, len); @@ -362,7 +362,7 @@ g_free(txt); } -static void jabber_keepalive(PurpleConnection *gc) +void jabber_keepalive(PurpleConnection *gc) { jabber_send_raw(gc->proto_data, "\t", -1); } @@ -535,9 +535,7 @@ } } - - -static void +void jabber_login(PurpleAccount *account) { PurpleConnection *gc = purple_account_get_connection(account); @@ -887,7 +885,7 @@ jabber_iq_send(iq); } -static void jabber_register_account(PurpleAccount *account) +void jabber_register_account(PurpleAccount *account) { PurpleConnection *gc = purple_account_get_connection(account); JabberStream *js; @@ -958,7 +956,7 @@ } } -static void jabber_close(PurpleConnection *gc) +void jabber_close(PurpleConnection *gc) { JabberStream *js = gc->proto_data; @@ -1073,19 +1071,19 @@ } -static void jabber_idle_set(PurpleConnection *gc, int idle) +void jabber_idle_set(PurpleConnection *gc, int idle) { JabberStream *js = gc->proto_data; js->idle = idle ? time(NULL) - idle : idle; } -static const char *jabber_list_icon(PurpleAccount *a, PurpleBuddy *b) +const char *jabber_list_icon(PurpleAccount *a, PurpleBuddy *b) { return "jabber"; } -static const char* jabber_list_emblem(PurpleBuddy *b) +const char* jabber_list_emblem(PurpleBuddy *b) { JabberStream *js; JabberBuddy *jb = NULL; @@ -1105,7 +1103,7 @@ return NULL; } -static char *jabber_status_text(PurpleBuddy *b) +char *jabber_status_text(PurpleBuddy *b) { JabberBuddy *jb = jabber_buddy_find(b->account->gc->proto_data, b->name, FALSE); @@ -1134,7 +1132,7 @@ return ret; } -static void jabber_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full) +void jabber_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full) { JabberBuddy *jb; @@ -1218,7 +1216,7 @@ } } -static GList *jabber_status_types(PurpleAccount *account) +GList *jabber_status_types(PurpleAccount *account) { PurpleStatusType *type; GList *types = NULL; @@ -1371,7 +1369,7 @@ _("Cancel"), NULL, js); } -static GList *jabber_actions(PurplePlugin *plugin, gpointer context) +GList *jabber_actions(PurplePlugin *plugin, gpointer context) { GList *m = NULL; PurplePluginAction *act; @@ -1393,7 +1391,7 @@ return m; } -static PurpleChat *jabber_find_blist_chat(PurpleAccount *account, const char *name) +PurpleChat *jabber_find_blist_chat(PurpleAccount *account, const char *name) { PurpleBlistNode *gnode, *cnode; JabberID *jid; @@ -1427,7 +1425,7 @@ return NULL; } -static void jabber_convo_closed(PurpleConnection *gc, const char *who) +void jabber_convo_closed(PurpleConnection *gc, const char *who) { JabberStream *js = gc->proto_data; JabberID *jid; @@ -1777,12 +1775,12 @@ return PURPLE_CMD_RET_OK; } -static gboolean jabber_offline_message(const PurpleBuddy *buddy) +gboolean jabber_offline_message(const PurpleBuddy *buddy) { return TRUE; } -static void jabber_register_commands(void) +void jabber_register_commands(void) { purple_cmd_register("config", "", PURPLE_CMD_P_PRPL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, @@ -1856,182 +1854,8 @@ NULL); } -static PurplePluginProtocolInfo prpl_info = -{ -#ifdef HAVE_CYRUS_SASL - OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME | - OPT_PROTO_MAIL_CHECK | OPT_PROTO_PASSWORD_OPTIONAL, -#else - OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME | OPT_PROTO_MAIL_CHECK, -#endif - NULL, /* user_splits */ - NULL, /* protocol_options */ - {"png,gif,jpeg", 32, 32, 96, 96, 8191, PURPLE_ICON_SCALE_SEND | PURPLE_ICON_SCALE_DISPLAY}, /* icon_spec */ - jabber_list_icon, /* list_icon */ - jabber_list_emblem, /* list_emblems */ - jabber_status_text, /* status_text */ - jabber_tooltip_text, /* tooltip_text */ - jabber_status_types, /* status_types */ - jabber_blist_node_menu, /* blist_node_menu */ - jabber_chat_info, /* chat_info */ - jabber_chat_info_defaults, /* chat_info_defaults */ - jabber_login, /* login */ - jabber_close, /* close */ - jabber_message_send_im, /* send_im */ - jabber_set_info, /* set_info */ - jabber_send_typing, /* send_typing */ - jabber_buddy_get_info, /* get_info */ - jabber_presence_send, /* set_away */ - jabber_idle_set, /* set_idle */ - NULL, /* change_passwd */ - jabber_roster_add_buddy, /* add_buddy */ - NULL, /* add_buddies */ - jabber_roster_remove_buddy, /* remove_buddy */ - NULL, /* remove_buddies */ - NULL, /* add_permit */ - jabber_google_roster_add_deny, /* add_deny */ - NULL, /* rem_permit */ - jabber_google_roster_rem_deny, /* rem_deny */ - NULL, /* set_permit_deny */ - jabber_chat_join, /* join_chat */ - NULL, /* reject_chat */ - jabber_get_chat_name, /* get_chat_name */ - jabber_chat_invite, /* chat_invite */ - jabber_chat_leave, /* chat_leave */ - NULL, /* chat_whisper */ - jabber_message_send_chat, /* chat_send */ - jabber_keepalive, /* keepalive */ - jabber_register_account, /* register_user */ - jabber_buddy_get_info_chat, /* get_cb_info */ - NULL, /* get_cb_away */ - jabber_roster_alias_change, /* alias_buddy */ - jabber_roster_group_change, /* group_buddy */ - jabber_roster_group_rename, /* rename_group */ - NULL, /* buddy_free */ - jabber_convo_closed, /* convo_closed */ - jabber_normalize, /* normalize */ - jabber_set_buddy_icon, /* set_buddy_icon */ - NULL, /* remove_group */ - jabber_chat_buddy_real_name, /* get_cb_real_name */ - jabber_chat_set_topic, /* set_chat_topic */ - jabber_find_blist_chat, /* find_blist_chat */ - jabber_roomlist_get_list, /* roomlist_get_list */ - jabber_roomlist_cancel, /* roomlist_cancel */ - NULL, /* roomlist_expand_category */ - NULL, /* can_receive_file */ - jabber_si_xfer_send, /* send_file */ - jabber_si_new_xfer, /* new_xfer */ - jabber_offline_message, /* offline_message */ - NULL, /* whiteboard_prpl_ops */ - jabber_prpl_send_raw, /* send_raw */ - jabber_roomlist_room_serialize, /* roomlist_room_serialize */ -}; - -static gboolean load_plugin(PurplePlugin *plugin) +void +jabber_init_plugin(PurplePlugin *plugin) { - purple_signal_register(plugin, "jabber-receiving-xmlnode", - purple_marshal_VOID__POINTER_POINTER, NULL, 2, - purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION), - purple_value_new_outgoing(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_XMLNODE)); - - purple_signal_register(plugin, "jabber-sending-xmlnode", - purple_marshal_VOID__POINTER_POINTER, NULL, 2, - purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION), - purple_value_new_outgoing(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_XMLNODE)); - - purple_signal_register(plugin, "jabber-sending-text", - purple_marshal_VOID__POINTER_POINTER, NULL, 2, - purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION), - purple_value_new_outgoing(PURPLE_TYPE_STRING)); - - - return TRUE; -} - -static gboolean unload_plugin(PurplePlugin *plugin) -{ - purple_signal_unregister(plugin, "jabber-receiving-xmlnode"); - - purple_signal_unregister(plugin, "jabber-sending-xmlnode"); - - purple_signal_unregister(plugin, "jabber-sending-text"); - - return TRUE; + my_protocol = plugin; } - -static PurplePluginInfo info = -{ - PURPLE_PLUGIN_MAGIC, - PURPLE_MAJOR_VERSION, - PURPLE_MINOR_VERSION, - PURPLE_PLUGIN_PROTOCOL, /**< type */ - NULL, /**< ui_requirement */ - 0, /**< flags */ - NULL, /**< dependencies */ - PURPLE_PRIORITY_DEFAULT, /**< priority */ - - "prpl-jabber", /**< id */ - "Jabber", /**< name */ - VERSION, /**< version */ - /** summary */ - N_("Jabber Protocol Plugin"), - /** description */ - N_("Jabber Protocol Plugin"), - NULL, /**< author */ - PURPLE_WEBSITE, /**< homepage */ - - load_plugin, /**< load */ - unload_plugin, /**< unload */ - NULL, /**< destroy */ - - NULL, /**< ui_info */ - &prpl_info, /**< extra_info */ - NULL, /**< prefs_info */ - jabber_actions -}; - -static void -init_plugin(PurplePlugin *plugin) -{ - PurpleAccountUserSplit *split; - PurpleAccountOption *option; - - split = purple_account_user_split_new(_("Server"), "jabber.org", '@'); - prpl_info.user_splits = g_list_append(prpl_info.user_splits, split); - - split = purple_account_user_split_new(_("Resource"), "Home", '/'); - prpl_info.user_splits = g_list_append(prpl_info.user_splits, split); - - option = purple_account_option_bool_new(_("Force old (port 5223) SSL"), "old_ssl", FALSE); - prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, - option); - - option = purple_account_option_bool_new( - _("Allow plaintext auth over unencrypted streams"), - "auth_plain_in_clear", FALSE); - prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, - option); - - option = purple_account_option_int_new(_("Connect port"), "port", 5222); - prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, - option); - - option = purple_account_option_string_new(_("Connect server"), - "connect_server", NULL); - prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, - option); - - my_protocol = plugin; - - purple_prefs_remove("/plugins/prpl/jabber"); - - /* XXX - If any other plugin wants SASL this won't be good ... */ -#ifdef HAVE_CYRUS_SASL - sasl_client_init(NULL); -#endif - jabber_register_commands(); - - jabber_iq_init(); -} - -PURPLE_INIT_PLUGIN(jabber, init_plugin, info);
--- a/libpurple/protocols/jabber/jabber.h Thu Apr 19 15:06:54 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.h Thu Apr 19 15:07:09 2007 +0000 @@ -163,4 +163,23 @@ char *jabber_parse_error(JabberStream *js, xmlnode *packet); +/** PRPL functions */ +const char *jabber_list_icon(PurpleAccount *a, PurpleBuddy *b); +const char* jabber_list_emblem(PurpleBuddy *b); +char *jabber_status_text(PurpleBuddy *b); +void jabber_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full); +GList *jabber_status_types(PurpleAccount *account); +void jabber_login(PurpleAccount *account); +void jabber_close(PurpleConnection *gc); +void jabber_idle_set(PurpleConnection *gc, int idle); +void jabber_keepalive(PurpleConnection *gc); +void jabber_register_account(PurpleAccount *account); +void jabber_convo_closed(PurpleConnection *gc, const char *who); +PurpleChat *jabber_find_blist_chat(PurpleAccount *account, const char *name); +gboolean jabber_offline_message(const PurpleBuddy *buddy); +int jabber_prpl_send_raw(PurpleConnection *gc, const char *buf, int len); +GList *jabber_actions(PurplePlugin *plugin, gpointer context); +void jabber_register_commands(void); +void jabber_init_plugin(PurplePlugin *plugin); + #endif /* _PURPLE_JABBER_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Thu Apr 19 15:07:09 2007 +0000 @@ -0,0 +1,222 @@ +/* purple + * + * Purple is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +/* libxmpp is the XMPP protocol plugin. It is linked against libjabbercommon, + * which may be used to support other protocols (Bonjour) which may need to + * share code. + */ + +#include "accountopt.h" +#include "internal.h" +#include "version.h" + +#include "iq.h" +#include "jabber.h" +#include "chat.h" +#include "message.h" +#include "roster.h" +#include "si.h" +#include "message.h" +#include "presence.h" +#include "google.h" + +static PurplePluginProtocolInfo prpl_info = +{ +#ifdef HAVE_CYRUS_SASL + OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME | + OPT_PROTO_MAIL_CHECK | OPT_PROTO_PASSWORD_OPTIONAL, +#else + OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME | OPT_PROTO_MAIL_CHECK, +#endif + NULL, /* user_splits */ + NULL, /* protocol_options */ + {"png,gif,jpeg", 32, 32, 96, 96, 8191, PURPLE_ICON_SCALE_SEND | PURPLE_ICON_SCALE_DISPLAY}, /* icon_spec */ + jabber_list_icon, /* list_icon */ + jabber_list_emblem, /* list_emblems */ + jabber_status_text, /* status_text */ + jabber_tooltip_text, /* tooltip_text */ + jabber_status_types, /* status_types */ + jabber_blist_node_menu, /* blist_node_menu */ + jabber_chat_info, /* chat_info */ + jabber_chat_info_defaults, /* chat_info_defaults */ + jabber_login, /* login */ + jabber_close, /* close */ + jabber_message_send_im, /* send_im */ + jabber_set_info, /* set_info */ + jabber_send_typing, /* send_typing */ + jabber_buddy_get_info, /* get_info */ + jabber_presence_send, /* set_away */ + jabber_idle_set, /* set_idle */ + NULL, /* change_passwd */ + jabber_roster_add_buddy, /* add_buddy */ + NULL, /* add_buddies */ + jabber_roster_remove_buddy, /* remove_buddy */ + NULL, /* remove_buddies */ + NULL, /* add_permit */ + jabber_google_roster_add_deny, /* add_deny */ + NULL, /* rem_permit */ + jabber_google_roster_rem_deny, /* rem_deny */ + NULL, /* set_permit_deny */ + jabber_chat_join, /* join_chat */ + NULL, /* reject_chat */ + jabber_get_chat_name, /* get_chat_name */ + jabber_chat_invite, /* chat_invite */ + jabber_chat_leave, /* chat_leave */ + NULL, /* chat_whisper */ + jabber_message_send_chat, /* chat_send */ + jabber_keepalive, /* keepalive */ + jabber_register_account, /* register_user */ + jabber_buddy_get_info_chat, /* get_cb_info */ + NULL, /* get_cb_away */ + jabber_roster_alias_change, /* alias_buddy */ + jabber_roster_group_change, /* group_buddy */ + jabber_roster_group_rename, /* rename_group */ + NULL, /* buddy_free */ + jabber_convo_closed, /* convo_closed */ + jabber_normalize, /* normalize */ + jabber_set_buddy_icon, /* set_buddy_icon */ + NULL, /* remove_group */ + jabber_chat_buddy_real_name, /* get_cb_real_name */ + jabber_chat_set_topic, /* set_chat_topic */ + jabber_find_blist_chat, /* find_blist_chat */ + jabber_roomlist_get_list, /* roomlist_get_list */ + jabber_roomlist_cancel, /* roomlist_cancel */ + NULL, /* roomlist_expand_category */ + NULL, /* can_receive_file */ + jabber_si_xfer_send, /* send_file */ + jabber_si_new_xfer, /* new_xfer */ + jabber_offline_message, /* offline_message */ + NULL, /* whiteboard_prpl_ops */ + jabber_prpl_send_raw, /* send_raw */ + jabber_roomlist_room_serialize, /* roomlist_room_serialize */ +}; + +static gboolean load_plugin(PurplePlugin *plugin) +{ + purple_signal_register(plugin, "jabber-receiving-xmlnode", + purple_marshal_VOID__POINTER_POINTER, NULL, 2, + purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION), + purple_value_new_outgoing(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_XMLNODE)); + + purple_signal_register(plugin, "jabber-sending-xmlnode", + purple_marshal_VOID__POINTER_POINTER, NULL, 2, + purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION), + purple_value_new_outgoing(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_XMLNODE)); + + purple_signal_register(plugin, "jabber-sending-text", + purple_marshal_VOID__POINTER_POINTER, NULL, 2, + purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION), + purple_value_new_outgoing(PURPLE_TYPE_STRING)); + + + return TRUE; +} + +static gboolean unload_plugin(PurplePlugin *plugin) +{ + purple_signal_unregister(plugin, "jabber-receiving-xmlnode"); + + purple_signal_unregister(plugin, "jabber-sending-xmlnode"); + + purple_signal_unregister(plugin, "jabber-sending-text"); + + return TRUE; +} + +static PurplePluginInfo info = +{ + PURPLE_PLUGIN_MAGIC, + PURPLE_MAJOR_VERSION, + PURPLE_MINOR_VERSION, + PURPLE_PLUGIN_PROTOCOL, /**< type */ + NULL, /**< ui_requirement */ + 0, /**< flags */ + NULL, /**< dependencies */ + PURPLE_PRIORITY_DEFAULT, /**< priority */ + + "prpl-jabber", /**< id */ + "XMPP", /**< name */ + VERSION, /**< version */ + /** summary */ + N_("Jabber Protocol Plugin"), + /** description */ + N_("Jabber Protocol Plugin"), + NULL, /**< author */ + PURPLE_WEBSITE, /**< homepage */ + + load_plugin, /**< load */ + unload_plugin, /**< unload */ + NULL, /**< destroy */ + + NULL, /**< ui_info */ + &prpl_info, /**< extra_info */ + NULL, /**< prefs_info */ + jabber_actions +}; + +static void +init_plugin(PurplePlugin *plugin) +{ + PurpleAccountUserSplit *split; + PurpleAccountOption *option; + + split = purple_account_user_split_new(_("Server"), "jabber.org", '@'); + prpl_info.user_splits = g_list_append(prpl_info.user_splits, split); + + split = purple_account_user_split_new(_("Resource"), "Home", '/'); + prpl_info.user_splits = g_list_append(prpl_info.user_splits, split); + + option = purple_account_option_bool_new(_("Force old (port 5223) SSL"), "old_ssl", FALSE); + prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, + option); + + option = purple_account_option_bool_new( + _("Allow plaintext auth over unencrypted streams"), + "auth_plain_in_clear", FALSE); + prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, + option); + + option = purple_account_option_int_new(_("Connect port"), "port", 5222); + prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, + option); + + option = purple_account_option_string_new(_("Connect server"), + "connect_server", NULL); + prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, + option); + + + jabber_init_plugin(plugin); + + purple_prefs_remove("/plugins/prpl/jabber"); + + /* XXX - If any other plugin wants SASL this won't be good ... */ +#ifdef HAVE_CYRUS_SASL + sasl_client_init(NULL); +#endif + jabber_register_commands(); + + jabber_iq_init(); +} + + +PURPLE_INIT_PLUGIN(jabber, init_plugin, info);
--- a/libpurple/savedstatuses.c Thu Apr 19 15:06:54 2007 +0000 +++ b/libpurple/savedstatuses.c Thu Apr 19 15:07:09 2007 +0000 @@ -403,6 +403,12 @@ g_free(data); } + if (ret->type == NULL) + { + g_free(ret); + return NULL; + } + /* Read the message */ node = xmlnode_get_child(substatus, "message"); if ((node != NULL) && ((data = xmlnode_get_data(node)) != NULL))
--- a/pidgin.spec.in Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin.spec.in Thu Apr 19 15:07:09 2007 +0000 @@ -318,7 +318,7 @@ %doc ChangeLog %doc NEWS %doc README -%doc README.SVN +%doc README.MTN %doc doc/the_penguin.txt %doc %{_mandir}/man1/pidgin.* %doc %{_mandir}/man3*/*
--- a/pidgin/gtkstatusbox.c Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/gtkstatusbox.c Thu Apr 19 15:07:09 2007 +0000 @@ -540,6 +540,32 @@ ); } +static GdkPixbuf * +pidgin_status_box_get_pixbuf(PidginStatusBox *status_box, PurpleStatusPrimitive prim) +{ + GdkPixbuf *pixbuf; + GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); + if (prim == PURPLE_STATUS_UNAVAILABLE) + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_BUSY, + icon_size, "PidginStatusBox"); + else if (prim == PURPLE_STATUS_AWAY) + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_AWAY, + icon_size, "PidginStatusBox"); + else if (prim == PURPLE_STATUS_EXTENDED_AWAY) + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_XA, + icon_size, "PidginStatusBox"); + else if (prim == PURPLE_STATUS_INVISIBLE) + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_INVISIBLE, + icon_size, "PidginStatusBox"); + else if (prim == PURPLE_STATUS_OFFLINE) + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_OFFLINE, + icon_size, "PidginStatusBox"); + else + pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_AVAILABLE, + icon_size, "PidginStatusBox"); + return pixbuf; +} + /** * This updates the text displayed on the status box so that it shows * the current status. This is the only function in this file that @@ -636,7 +662,6 @@ { PurpleStatusType *status_type; PurpleStatusPrimitive prim; - GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); if (account_status) { status_type = purple_status_get_type(purple_account_get_active_status(acct)); prim = purple_status_type_get_primitive(status_type); @@ -644,21 +669,7 @@ prim = purple_savedstatus_get_type(saved_status); } - if (prim == PURPLE_STATUS_UNAVAILABLE) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_BUSY, - icon_size, "PidginStatusBox"); - else if (prim == PURPLE_STATUS_AWAY) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_AWAY, - icon_size, "PidginStatusBox"); - else if (prim == PURPLE_STATUS_EXTENDED_AWAY) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_XA, - icon_size, "PidginStatusBox"); - else if (prim == PURPLE_STATUS_OFFLINE) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_OFFLINE, - icon_size, "PidginStatusBox"); - else - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_AVAILABLE, - icon_size, "PidginStatusBox"); + pixbuf = pidgin_status_box_get_pixbuf(status_box, prim); #if 0 if (account_status) pixbuf = pidgin_create_prpl_icon_with_status(acct, @@ -876,7 +887,6 @@ static void add_popular_statuses(PidginStatusBox *statusbox) { - GtkIconSize icon_size; GList *list, *cur; GdkPixbuf *pixbuf; @@ -885,8 +895,6 @@ /* Odd... oh well, nothing we can do about it. */ return; - icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); - pidgin_status_box_add_separator(statusbox); for (cur = list; cur != NULL; cur = cur->next) @@ -899,21 +907,8 @@ /* Get an appropriate status icon */ prim = purple_savedstatus_get_type(saved); - if (prim == PURPLE_STATUS_UNAVAILABLE) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), - PIDGIN_STOCK_STATUS_BUSY, icon_size, "PidginStatusBox"); - else if (prim == PURPLE_STATUS_AWAY) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), - PIDGIN_STOCK_STATUS_AWAY, icon_size, "PidginStatusBox"); - else if (prim == PURPLE_STATUS_EXTENDED_AWAY) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), - PIDGIN_STOCK_STATUS_XA, icon_size, "PidginStatusBox"); - else if (prim == PURPLE_STATUS_OFFLINE) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), - PIDGIN_STOCK_STATUS_OFFLINE, icon_size, "PidginStatusBox"); - else - pixbuf = gtk_widget_render_icon (GTK_WIDGET(statusbox), - PIDGIN_STOCK_STATUS_AVAILABLE, icon_size, "PidginStatusBox"); + + pixbuf = pidgin_status_box_get_pixbuf(statusbox, prim); if (purple_savedstatus_is_transient(saved)) { @@ -1019,28 +1014,13 @@ { PurpleStatusType *status_type = (PurpleStatusType *)l->data; PurpleStatusPrimitive prim; - GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL); if (!purple_status_type_is_user_settable(status_type)) continue; prim = purple_status_type_get_primitive(status_type); - if (prim == PURPLE_STATUS_UNAVAILABLE) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_BUSY, - icon_size, "PidginStatusBox"); - else if (prim == PURPLE_STATUS_AWAY) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_AWAY, - icon_size, "PidginStatusBox"); - else if (prim == PURPLE_STATUS_EXTENDED_AWAY) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_XA, - icon_size, "PidginStatusBox"); - else if (prim == PURPLE_STATUS_OFFLINE) - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_OFFLINE, - icon_size, "PidginStatusBox"); - else - pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), PIDGIN_STOCK_STATUS_AVAILABLE, - icon_size, "PidginStatusBox"); + pixbuf = pidgin_status_box_get_pixbuf(status_box, prim); pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_PRIMITIVE, pixbuf,
--- a/pidgin/gtkutils.c Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/gtkutils.c Thu Apr 19 15:07:09 2007 +0000 @@ -1569,6 +1569,9 @@ else if (prim == PURPLE_STATUS_EXTENDED_AWAY) pixbuf = gtk_widget_render_icon (w, PIDGIN_STOCK_STATUS_XA, icon_size, "GtkWidget"); + else if (prim == PURPLE_STATUS_INVISIBLE) + pixbuf = gtk_widget_render_icon (w, PIDGIN_STOCK_STATUS_INVISIBLE, + icon_size, "GtkWidget"); else if (prim == PURPLE_STATUS_OFFLINE) pixbuf = gtk_widget_render_icon (w, PIDGIN_STOCK_STATUS_OFFLINE, icon_size, "GtkWidget");
--- a/pidgin/win32/nsis/langmacros.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/langmacros.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -50,11 +50,6 @@ !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE ${CUR_LANG} !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SECTION_DESCRIPTION ${CUR_LANG} !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_SECTION_DESCRIPTION ${CUR_LANG} - !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_THEMES_SECTION_DESCRIPTION ${CUR_LANG} - !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_NO_THEME_DESC ${CUR_LANG} - !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_WIMP_THEME_DESC ${CUR_LANG} - !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_BLUECURVE_THEME_DESC ${CUR_LANG} - !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_LIGHTHOUSEBLUE_THEME_DESC ${CUR_LANG} !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SHORTCUTS_SECTION_DESCRIPTION ${CUR_LANG} !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_DESKTOP_SHORTCUT_DESC ${CUR_LANG} !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_STARTMENU_SHORTCUT_DESC ${CUR_LANG}
--- a/pidgin/win32/nsis/pidgin-installer.nsi Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Thu Apr 19 15:07:09 2007 +0000 @@ -9,7 +9,6 @@ ;Global Variables Var name Var GTK_FOLDER -Var GTK_THEME_SEL Var ISSILENT Var STARTUP_RUN_KEY Var SPELLCHECK_SEL @@ -49,9 +48,6 @@ !insertmacro VersionCompare !insertmacro WordFind -!include "TextFunc.nsh" -!insertmacro ConfigWriteS - ;-------------------------------- ;Defines @@ -78,7 +74,7 @@ !define GTK_RUNTIME_INSTALLER "..\..\..\..\gtk_installer\gtk-runtime*.exe" !define ASPELL_REG_KEY "SOFTWARE\Aspell" -!define DOWNLOADER_URL "http://www.pidgin.im/win32/download_redir.php" +!define DOWNLOADER_URL "http://pidgin.im/win32/download_redir.php" ;-------------------------------- ;Version resource @@ -121,7 +117,7 @@ !define MUI_FINISHPAGE_RUN "$INSTDIR\pidgin.exe" !define MUI_FINISHPAGE_RUN_NOTCHECKED !define MUI_FINISHPAGE_LINK $(PIDGIN_FINISH_VISIT_WEB_SITE) - !define MUI_FINISHPAGE_LINK_LOCATION "http://www.pidgin.im/win32" + !define MUI_FINISHPAGE_LINK_LOCATION "http://pidgin.im/win32" ;-------------------------------- ;Pages @@ -446,6 +442,11 @@ SetOutPath "$INSTDIR" ; Pidgin files SetOverwrite on + + ;Delete old liboscar and libjabber since they tend to be problematic + Delete "$INSTDIR\plugins\liboscar.dll" + Delete "$INSTDIR\plugins\libjabber.dll" + File /r ..\..\..\${PIDGIN_INSTALL_DIR}\*.* !ifdef DEBUG File "${PIDGIN_INSTALLER_DEPS}\exchndl.dll" @@ -521,31 +522,6 @@ SectionGroupEnd ;-------------------------------- -;GTK+ Themes - -SectionGroup /e $(GTK_THEMES_SECTION_TITLE) SecGtkThemes - Section /o $(GTK_NOTHEME_SECTION_TITLE) SecGtkNone - Push "Raleigh" - Call WriteGtkThemeConfig - SectionEnd - - Section $(GTK_WIMP_SECTION_TITLE) SecGtkWimp - Push "MS-Windows" - Call WriteGtkThemeConfig - SectionEnd - - Section /o $(GTK_BLUECURVE_SECTION_TITLE) SecGtkBluecurve - Push "Bluecurve" - Call WriteGtkThemeConfig - SectionEnd - - Section /o $(GTK_LIGHTHOUSEBLUE_SECTION_TITLE) SecGtkLighthouseblue - Push "Lighthouseblue" - Call WriteGtkThemeConfig - SectionEnd -SectionGroupEnd - -;-------------------------------- ;URI Handling SectionGroup /e $(URI_HANDLERS_SECTION_TITLE) SecURIHandlers Section /o "aim:" SecURI_AIM @@ -705,7 +681,6 @@ Delete "$INSTDIR\plugins\libgg.dll" Delete "$INSTDIR\plugins\libicq.dll" Delete "$INSTDIR\plugins\libirc.dll" - Delete "$INSTDIR\plugins\libjabber.dll" Delete "$INSTDIR\plugins\libmsn.dll" Delete "$INSTDIR\plugins\libnapster.dll" Delete "$INSTDIR\plugins\libnovell.dll" @@ -715,6 +690,7 @@ Delete "$INSTDIR\plugins\libsimple.dll" Delete "$INSTDIR\plugins\libtoc.dll" Delete "$INSTDIR\plugins\libyahoo.dll" + Delete "$INSTDIR\plugins\libxmpp.dll" Delete "$INSTDIR\plugins\log_reader.dll" Delete "$INSTDIR\plugins\markerline.dll" Delete "$INSTDIR\plugins\newline.dll" @@ -744,6 +720,7 @@ Delete "$INSTDIR\freebl3.dll" Delete "$INSTDIR\idletrack.dll" Delete "$INSTDIR\libgtkspell.dll" + Delete "$INSTDIR\libjabber.dll" Delete "$INSTDIR\liboscar.dll" Delete "$INSTDIR\libpurple.dll" Delete "$INSTDIR\libmeanwhile-1.dll" @@ -794,16 +771,6 @@ !insertmacro MUI_DESCRIPTION_TEXT ${SecGtk} \ $(GTK_SECTION_DESCRIPTION) !endif - !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkThemes} \ - $(GTK_THEMES_SECTION_DESCRIPTION) - !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkNone} \ - $(GTK_NO_THEME_DESC) - !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkWimp} \ - $(GTK_WIMP_THEME_DESC) - !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkBluecurve} \ - $(GTK_BLUECURVE_THEME_DESC) - !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkLighthouseblue} \ - $(GTK_LIGHTHOUSEBLUE_THEME_DESC) !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} \ $(PIDGIN_SHORTCUTS_SECTION_DESCRIPTION) @@ -863,42 +830,6 @@ ;-------------------------------- ;Functions -Function WriteGtkThemeConfig - Exch $0 - Push $1 - Push $2 - Push $3 - - Call CheckUserInstallRights - Pop $2 - StrCmp $2 "HKLM" 0 user_theme - - ; Global Theme - ClearErrors - ReadRegStr $2 HKLM ${GTK_REG_KEY} "Path" - IfErrors user_theme - StrCpy $3 "$2\etc\gtk-2.0\gtkrc" - Goto update_theme - user_theme: - StrCpy $3 "$PROFILE\.gtkrc-2.0" - - update_theme: - IfFileExists $3 0 new_file - ${ConfigWriteS} $3 "gtk-theme-name =" " $\"$0$\"" $1 - Goto done - - new_file: - FileOpen $1 $3 w - FileWrite $1 "gtk-theme-name = $\"$0$\"" - FileClose $1 - - done: - Pop $3 - Pop $2 - Pop $1 - Pop $0 -FunctionEnd - ; Default the URI handler checkboxes if Pidgin is the current handler or if there is no handler Function SelectURIHandlerSelections Push $R0 @@ -1195,7 +1126,6 @@ Abort Call RunCheck StrCpy $name "Pidgin ${PIDGIN_VERSION}" - StrCpy $GTK_THEME_SEL ${SecGtkWimp} StrCpy $SPELLCHECK_SEL "" ;Try to copy the old Gaim installer Lang Reg. key @@ -1207,12 +1137,6 @@ IfErrors +2 WriteRegStr HKCU "${PIDGIN_REG_KEY}" "Installer Language" "$R0" - !insertmacro SetSectionFlag ${SecGtkThemes} ${SF_RO} - !insertmacro UnselectSection ${SecGtkThemes} - !insertmacro SelectSection $GTK_THEME_SEL - !insertmacro SetSectionFlag ${SecSpellCheck} ${SF_RO} - !insertmacro UnselectSection ${SecSpellCheck} - ;Mark the dictionaries that are already installed as readonly Call SelectAndDisableInstalledDictionaries @@ -1318,13 +1242,6 @@ Push $1 Push $2 - !insertmacro StartRadioButtonsUnselectable $GTK_THEME_SEL - !insertmacro RadioButton ${SecGtkNone} - !insertmacro RadioButton ${SecGtkWimp} - !insertmacro RadioButton ${SecGtkBluecurve} - !insertmacro RadioButton ${SecGtkLighthouseblue} - !insertmacro EndRadioButtons - ; Check that at most one of the non-readonly spelling dictionaries are selected ; We can't use $R0 or $R1 in this block since they're used in the macros !insertmacro StartRadioButtonsUnselectable $SPELLCHECK_SEL
--- a/pidgin/win32/nsis/translations/albanian.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/albanian.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -25,11 +25,7 @@ !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "TemĂŤ Light House Blue" !define PIDGIN_SECTION_DESCRIPTION "Kartela dhe dll bazĂŤ tĂŤ Pidgin-it" !define GTK_SECTION_DESCRIPTION "NjĂŤ grup mjetesh shumĂŤplatformĂŤsh pĂŤr GUI, pĂŤrdorur nga Pidgin-i" -!define GTK_THEMES_SECTION_DESCRIPTION "Temat GTK+ mund tĂŤ ndryshojnĂŤ pamjen dhe sjelljen e zbatimeve GTK+." -!define GTK_NO_THEME_DESC "Mos instalo temĂŤ GTK+" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) ĂŤshtĂŤ njĂŤ temĂŤ GTK qĂŤ ndĂŤrthuret mirĂŤ mjedisin Windows." -!define GTK_BLUECURVE_THEME_DESC "Tema Bluecurve." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Tema Lighthouseblue." + ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "U gjet njĂŤ version i vjetĂŤr pĂŤr GTK+ runtime. Doni tĂŤ pĂŤrditĂŤsohet?$\rShĂŤnim: Pidgin-i mund tĂŤ mos punojĂŤ nĂŤse nuk e bĂŤni."
--- a/pidgin/win32/nsis/translations/bulgarian.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/bulgarian.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -21,11 +21,7 @@ !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Light House Blue Ňĺěŕ" !define PIDGIN_SECTION_DESCRIPTION "Ôŕéëîâĺ íŕ ˙äđîňî íŕ Pidgin č áčáëčîňĺęč" !define GTK_SECTION_DESCRIPTION "Ěóëňčďëŕňôîđĺí ęčň çŕ ăđŕôč÷ĺí čçăëĺä, čçďîëçâŕí îň Pidgin" -!define GTK_THEMES_SECTION_DESCRIPTION "GTK+ ňĺěčňĺ ěîăŕň äŕ ďđîěĺí˙ň Čçăëĺäŕ íŕ GTK+ ďđčëîćĺíč˙." -!define GTK_NO_THEME_DESC "Íĺ číńňŕëčđŕéňĺ GTK+ ňĺěŕ" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) ĺ GTK ňĺěŕ ęî˙ňî ńĺ ńěĺńâŕ äîáđĺ ńúń Windows." -!define GTK_BLUECURVE_THEME_DESC "Bluecurve ňĺěŕňŕ." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Lighthouseblue ňĺěŕňŕ." + ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "Ńňŕđŕ âĺđńč˙ GTK+ runtime ĺ îňęđčňŕ. Čńęŕňĺ ëč äŕ îáíîâčňĺ?$\rNote: Pidgin ěîćĺ äŕ íĺ ńđŕáîňč ŕęî íĺ ăî íŕďđŕâčňĺ."
--- a/pidgin/win32/nsis/translations/catalan.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/catalan.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -31,11 +31,8 @@ !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Menu Inici" !define PIDGIN_SECTION_DESCRIPTION "Fitxers i dlls del nucli de Pidgin" !define GTK_SECTION_DESCRIPTION "Una eina IGU multiplataforma, utilitzada per Pidgin" -!define GTK_THEMES_SECTION_DESCRIPTION "Els temes GTK+ poden modificar l'aspecte de les aplicacions GTK+." -!define GTK_NO_THEME_DESC "No instal.lis un tema GTK+" -!define GTK_WIMP_THEME_DESC "GTK-Imwi (imitador Windows) és un tema GTK que s'integra perfectament en un entorn d'escriptori Windows." -!define GTK_BLUECURVE_THEME_DESC "El tema Corba Blava." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "The Lighthouseblue theme." + + !define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Enllaços directes per iniciar el Pidgin" !define PIDGIN_DESKTOP_SHORTCUT_DESC "Afegir un enllaç directe al Pidgin a l'Escriptori" !define PIDGIN_STARTMENU_SHORTCUT_DESC "Crear una entrada Pidgin al Menu Inici"
--- a/pidgin/win32/nsis/translations/czech.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/czech.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -25,11 +25,7 @@ !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Light House Blue téma" !define PIDGIN_SECTION_DESCRIPTION "Základní soubory a DLL pro Pidgin" !define GTK_SECTION_DESCRIPTION "Multi-platform GUI toolkit pouívaný Pidginem" -!define GTK_THEMES_SECTION_DESCRIPTION "GTK+ témata umoňují měnit vzhled a způsob ovládání GTK+ aplikací." -!define GTK_NO_THEME_DESC "Neinstalovat GTK+ téma" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) je GTK téma které zapadne do Vaeho pracovního prostředí ve Windows." -!define GTK_BLUECURVE_THEME_DESC "Bluecurve téma." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Lighthouseblue téma." + ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "Byla nalezena starí verze GTK+ runtime. Chcete provést upgrade?$\rUpozornění: Bez upgradu $(^Name) nemusí pracovat správně."
--- a/pidgin/win32/nsis/translations/danish.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/danish.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -25,11 +25,7 @@ !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Light House Blue Tema" !define PIDGIN_SECTION_DESCRIPTION "Basale Pidgin filer og biblioteker" !define GTK_SECTION_DESCRIPTION "Et multi-platform grafisk interface udviklingsvćrktřj, bruges af Pidgin" -!define GTK_THEMES_SECTION_DESCRIPTION "GTK+ Temaer kan ćndre GTK+ programmers generelle udseende." -!define GTK_NO_THEME_DESC "Installér ikke noget GTK+ tema" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows efterligner) er et GTK tema som falder i med Windows skrivebordsmiljřet." -!define GTK_BLUECURVE_THEME_DESC "The Bluecurve tema." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "The Lighthouseblue tema." + ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "Der blev fundet en ćldre version af GTK+ runtime. Řnsker du at opgradere?$\rNB: $(^Name) virker muligvis ikke uden denne opgradering."
--- a/pidgin/win32/nsis/translations/dutch.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/dutch.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -28,11 +28,7 @@ !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Light House Blue thema" !define PIDGIN_SECTION_DESCRIPTION "Pidgin hoofdbestanden en dlls" !define GTK_SECTION_DESCRIPTION "Een multi-platform gebruikersinterface, gebruikt door Pidgin" -!define GTK_THEMES_SECTION_DESCRIPTION "GTK+ thema's veranderen het uiterlijk en gedrag van GTK+ programma's." -!define GTK_NO_THEME_DESC "Geen GTK+ thema installeren" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) is een GTK+ thema wat goed past in een windows omgeving." -!define GTK_BLUECURVE_THEME_DESC "Het Bluecurve thema (standaardthema voor RedHat Linux)." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Het Lighthouseblue thema." + ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "Er is een oude versie van GTK+ gevonden. Wilt u deze bijwerken?$\rLet op: $(^Name) werkt misschien niet als u dit niet doet."
--- a/pidgin/win32/nsis/translations/english.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/english.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -5,8 +5,8 @@ ;; Windows Code page: 1252 ;; ;; Version 3 -;; Note: If translating this file, replace "!insertmacro PIDGIN_MACRO_DEFAULT_STRING" -;; with "!define". +;; Note: If translating this file, replace '!insertmacro PIDGIN_MACRO_DEFAULT_STRING' +;; with '!define'. ; Make sure to update the PIDGIN_MACRO_LANGUAGEFILE_END macro in ; langmacros.nsh when updating this file @@ -33,11 +33,7 @@ !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Start Menu" !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SECTION_DESCRIPTION "Core Pidgin files and dlls" !insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_SECTION_DESCRIPTION "A multi-platform GUI toolkit, used by Pidgin" -!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_THEMES_SECTION_DESCRIPTION "GTK+ Themes can change the look and feel of GTK+ applications." -!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_NO_THEME_DESC "Don't install a GTK+ theme" -!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) is a GTK theme that blends well into the Windows desktop environment." -!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_BLUECURVE_THEME_DESC "The Bluecurve theme." -!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_LIGHTHOUSEBLUE_THEME_DESC "The Lighthouseblue theme." + !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Shortcuts for starting Pidgin" !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_DESKTOP_SHORTCUT_DESC "Create a shortcut to Pidgin on the Desktop" !insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_STARTMENU_SHORTCUT_DESC "Create a Start Menu entry for Pidgin"
--- a/pidgin/win32/nsis/translations/finnish.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/finnish.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -25,11 +25,6 @@ !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Light House Blue Teema" !define PIDGIN_SECTION_DESCRIPTION "Pidfinin ytimen tiedostot ja dll:t" !define GTK_SECTION_DESCRIPTION "Monipohjainen GUI (käyttäjäulkoasu) työkalupakki, Pidginin käyttämä" -!define GTK_THEMES_SECTION_DESCRIPTION "GTK+ teemat voivat muuttaa GTK+ ohjelmien ulkonäköä ja tuntua." -!define GTK_NO_THEME_DESC "Älä asenna GTK+ teemoja" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windowsiin mukautuminen) on GTK teema joka sulautuu hyvin Windowsin ympäristöön." -!define GTK_BLUECURVE_THEME_DESC "Bluecurve teema." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Lighthouseblue teema." ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "Vanha versio GTK+ runtimestä löytynyt. Tahdotko päivittää?$\rHuomio: $(^Name) ei välttämättä toimi mikäli jätät päivittämättä."
--- a/pidgin/win32/nsis/translations/french.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/french.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -34,11 +34,7 @@ !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Menu Démarrer" !define PIDGIN_SECTION_DESCRIPTION "Fichiers et DLLs de base de Pidgin" !define GTK_SECTION_DESCRIPTION "Un ensemble d'outils pour interfaces graphiques multi-plateforme, utilisé par Pidgin" -!define GTK_THEMES_SECTION_DESCRIPTION "Les thčmes GTK+ permettent de changer l'aspect des applications GTK+." -!define GTK_NO_THEME_DESC "Ne pas installer de thčme GTK+" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (imitateur de Windows) est un thčme de GTK+ qui se fond dans l'environnement graphique de Windows." -!define GTK_BLUECURVE_THEME_DESC "Thčme Bluecurve" -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Thčme Lighthouseblue" + !define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Raccourcis pour lancer Pidgin" !define PIDGIN_DESKTOP_SHORTCUT_DESC "Créer un raccourci pour Pidgin sur le bureau" !define PIDGIN_STARTMENU_SHORTCUT_DESC "Créer un raccourci pour Pidgin dans le menu Démarrer"
--- a/pidgin/win32/nsis/translations/galician.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/galician.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -25,11 +25,7 @@ !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Tema Light House Blue" !define PIDGIN_SECTION_DESCRIPTION "Ficheiros e dlls principais de Core" !define GTK_SECTION_DESCRIPTION "Unha suite de ferramentas GUI multiplataforma, utilizada por Pidgin" -!define GTK_THEMES_SECTION_DESCRIPTION "Os temas poden cambiar a apariencia de aplicacións GTK+." -!define GTK_NO_THEME_DESC "Non instalar un tema GTK+" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) é un tema GTK que se mestura moi bien co entorno de escritorio de Windows." -!define GTK_BLUECURVE_THEME_DESC "O tema Bluecurve." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "O tema Lighthouseblue." + ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "Atopouse unha versión antiga do executable de GTK+. żDesexa actualizala?$\rObservación: $(^Name) non funcionará a menos que o faga."
--- a/pidgin/win32/nsis/translations/german.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/german.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -1,90 +1,86 @@ -;; vim:syn=winbatch:encoding=cp1252: -;; -;; german.nsh -;; -;; German language strings for the Windows Pidgin NSIS installer. -;; Windows Code page: 1252 -;; -;; Author: Bjoern Voigt <bjoern@cs.tu-berlin.de>, 2007. -;; Version 4 -;; - -; Startup checks -!define INSTALLER_IS_RUNNING "Der Installer läuft schon." -!define PIDGIN_IS_RUNNING "Eine Instanz von Pidgin läuft momentan schon. Beenden Sie Pidgin und versuchen Sie es nochmal." -!define GTK_INSTALLER_NEEDED "Die GTK+ Runtime Umgebung fehlt entweder oder muss aktualisiert werden.$\rBitte installieren Sie v${GTK_MIN_VERSION} oder höher der GTK+ Runtime" - -; License Page -!define PIDGIN_LICENSE_BUTTON "Weiter >" -!define PIDGIN_LICENSE_BOTTOM_TEXT "$(^Name) wird unter der GNU General Public License (GPL) veröffentlicht. Die Lizenz dient hier nur der Information. $_CLICK" - -; Components Page -!define PIDGIN_SECTION_TITLE "Pidgin Instant Messaging Client (erforderlich)" -!define GTK_SECTION_TITLE "GTK+ Runtime Umgebung (erforderlich)" -!define GTK_THEMES_SECTION_TITLE "GTK+ Themen" -!define GTK_NOTHEME_SECTION_TITLE "Kein Thema" -!define GTK_WIMP_SECTION_TITLE "Wimp Thema" -!define GTK_BLUECURVE_SECTION_TITLE "Bluecurve Thema" -!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Light House Blue Thema" -!define PIDGIN_SHORTCUTS_SECTION_TITLE "Verknüpfungen" -!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Desktop" -!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Startmenü" -!define PIDGIN_SECTION_DESCRIPTION "Pidgin-Basisdateien und -DLLs" -!define GTK_SECTION_DESCRIPTION "Ein Multi-Plattform-GUI-Toolkit, verwendet von Pidgin" -!define GTK_THEMES_SECTION_DESCRIPTION "GTK+ Themen können Aussehen und Bedienung von GTK+ Anwendungen verändern." -!define GTK_NO_THEME_DESC "Installiere kein GTK+ Thema" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows Imitator) ist ein GTK Theme, das sich besonders gut in den Windows Desktop integriert." -!define GTK_BLUECURVE_THEME_DESC "Das Bluecurve Thema." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Das Lighthouseblue Thema." -!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Verknüpfungen zum Starten von Pidgin" -!define PIDGIN_DESKTOP_SHORTCUT_DESC "Erstellt eine Verknüpfung zu Pidgin auf dem Desktop" -!define PIDGIN_STARTMENU_SHORTCUT_DESC "Erstellt einen Eintrag für Pidgin im Startmenü" - -; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Eine alte Version der GTK+ Runtime wurde gefunden. Möchten Sie aktualisieren?$\rHinweis: $(^Name) funktioniert evtl. nicht, wenn Sie nicht aktualisieren." - -; Installer Finish Page -!define PIDGIN_FINISH_VISIT_WEB_SITE "Besuchen Sie die Windows Pidgin Webseite" - -; Pidgin Section Prompts and Texts -!define PIDGIN_UNINSTALL_DESC "$(^Name) (nur entfernen)" - -; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Fehler beim Installieren der GTK+ Runtime." -!define GTK_BAD_INSTALL_PATH "Der Pfad, den Sie eingegeben haben, existiert nicht und kann nicht erstellt werden." - -; GTK+ Themes section -!define GTK_NO_THEME_INSTALL_RIGHTS "Sie haben keine Berechtigung, ein GTK+ Thema zu installieren." - -; Uninstall Section Prompts -!define un.PIDGIN_UNINSTALL_ERROR_1 "Der Deinstaller konnte keine Registrierungsschlüssel für Pidgin finden.$\rEs ist wahrscheinlich, daß ein anderer Benutzer diese Anwendung installiert hat." -!define un.PIDGIN_UNINSTALL_ERROR_2 "Sie haben keine Berechtigung, diese Anwendung zu deinstallieren." - -; Spellcheck Section Prompts -!define PIDGIN_SPELLCHECK_SECTION_TITLE "Unterstützung für Rechtschreibkontrolle" -!define PIDGIN_SPELLCHECK_ERROR "Fehler bei der Installation der Rechtschreibkontrolle" -!define PIDGIN_SPELLCHECK_DICT_ERROR "Fehler bei der Installation des Wörterbuches für die Rechtschreibkontrolle" -!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION "Unterstützung für Rechtschreibkontrolle. (Für die Installation ist eine Internet-Verbindung nötig)" -!define ASPELL_INSTALL_FAILED "Installation gescheitert" -!define PIDGIN_SPELLCHECK_BRETON "Bretonisch" -!define PIDGIN_SPELLCHECK_CATALAN "Katalanisch" -!define PIDGIN_SPELLCHECK_CZECH "Tschechisch" -!define PIDGIN_SPELLCHECK_WELSH "Walisisch" -!define PIDGIN_SPELLCHECK_DANISH "Dänisch" -!define PIDGIN_SPELLCHECK_GERMAN "Deutsch" -!define PIDGIN_SPELLCHECK_GREEK "Griechisch" -!define PIDGIN_SPELLCHECK_ENGLISH "Englisch" -!define PIDGIN_SPELLCHECK_ESPERANTO "Esperanto" -!define PIDGIN_SPELLCHECK_SPANISH "Spanisch" -!define PIDGIN_SPELLCHECK_FAROESE "Faröersprache" -!define PIDGIN_SPELLCHECK_FRENCH "Französisch" -!define PIDGIN_SPELLCHECK_ITALIAN "Italienisch" -!define PIDGIN_SPELLCHECK_DUTCH "Holländisch" -!define PIDGIN_SPELLCHECK_NORWEGIAN "Norwegisch" -!define PIDGIN_SPELLCHECK_POLISH "Polnisch" -!define PIDGIN_SPELLCHECK_PORTUGUESE "Portugiesisch" -!define PIDGIN_SPELLCHECK_ROMANIAN "Rumänisch" -!define PIDGIN_SPELLCHECK_RUSSIAN "Russisch" -!define PIDGIN_SPELLCHECK_SLOVAK "Slowakisch" -!define PIDGIN_SPELLCHECK_SWEDISH "Schwedisch" -!define PIDGIN_SPELLCHECK_UKRAINIAN "Ukrainisch" +;; vim:syn=winbatch:encoding=cp1252: +;; +;; german.nsh +;; +;; German language strings for the Windows Pidgin NSIS installer. +;; Windows Code page: 1252 +;; +;; Author: Bjoern Voigt <bjoern@cs.tu-berlin.de>, 2007. +;; Version 4 +;; + +; Startup checks +!define INSTALLER_IS_RUNNING "Der Installer läuft schon." +!define PIDGIN_IS_RUNNING "Eine Instanz von Pidgin läuft momentan schon. Beenden Sie Pidgin und versuchen Sie es nochmal." +!define GTK_INSTALLER_NEEDED "Die GTK+ Runtime Umgebung fehlt entweder oder muss aktualisiert werden.$\rBitte installieren Sie v${GTK_MIN_VERSION} oder höher der GTK+ Runtime" + +; License Page +!define PIDGIN_LICENSE_BUTTON "Weiter >" +!define PIDGIN_LICENSE_BOTTOM_TEXT "$(^Name) wird unter der GNU General Public License (GPL) veröffentlicht. Die Lizenz dient hier nur der Information. $_CLICK" + +; Components Page +!define PIDGIN_SECTION_TITLE "Pidgin Instant Messaging Client (erforderlich)" +!define GTK_SECTION_TITLE "GTK+ Runtime Umgebung (erforderlich)" +!define GTK_THEMES_SECTION_TITLE "GTK+ Themen" +!define GTK_NOTHEME_SECTION_TITLE "Kein Thema" +!define GTK_WIMP_SECTION_TITLE "Wimp Thema" +!define GTK_BLUECURVE_SECTION_TITLE "Bluecurve Thema" +!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Light House Blue Thema" +!define PIDGIN_SHORTCUTS_SECTION_TITLE "Verknüpfungen" +!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Desktop" +!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Startmenü" +!define PIDGIN_SECTION_DESCRIPTION "Pidgin-Basisdateien und -DLLs" +!define GTK_SECTION_DESCRIPTION "Ein Multi-Plattform-GUI-Toolkit, verwendet von Pidgin" + +!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Verknüpfungen zum Starten von Pidgin" +!define PIDGIN_DESKTOP_SHORTCUT_DESC "Erstellt eine Verknüpfung zu Pidgin auf dem Desktop" +!define PIDGIN_STARTMENU_SHORTCUT_DESC "Erstellt einen Eintrag für Pidgin im Startmenü" + +; GTK+ Directory Page +!define GTK_UPGRADE_PROMPT "Eine alte Version der GTK+ Runtime wurde gefunden. Möchten Sie aktualisieren?$\rHinweis: $(^Name) funktioniert evtl. nicht, wenn Sie nicht aktualisieren." + +; Installer Finish Page +!define PIDGIN_FINISH_VISIT_WEB_SITE "Besuchen Sie die Windows Pidgin Webseite" + +; Pidgin Section Prompts and Texts +!define PIDGIN_UNINSTALL_DESC "$(^Name) (nur entfernen)" + +; GTK+ Section Prompts +!define GTK_INSTALL_ERROR "Fehler beim Installieren der GTK+ Runtime." +!define GTK_BAD_INSTALL_PATH "Der Pfad, den Sie eingegeben haben, existiert nicht und kann nicht erstellt werden." + +; GTK+ Themes section +!define GTK_NO_THEME_INSTALL_RIGHTS "Sie haben keine Berechtigung, ein GTK+ Thema zu installieren." + +; Uninstall Section Prompts +!define un.PIDGIN_UNINSTALL_ERROR_1 "Der Deinstaller konnte keine Registrierungsschlüssel für Pidgin finden.$\rEs ist wahrscheinlich, daß ein anderer Benutzer diese Anwendung installiert hat." +!define un.PIDGIN_UNINSTALL_ERROR_2 "Sie haben keine Berechtigung, diese Anwendung zu deinstallieren." + +; Spellcheck Section Prompts +!define PIDGIN_SPELLCHECK_SECTION_TITLE "Unterstützung für Rechtschreibkontrolle" +!define PIDGIN_SPELLCHECK_ERROR "Fehler bei der Installation der Rechtschreibkontrolle" +!define PIDGIN_SPELLCHECK_DICT_ERROR "Fehler bei der Installation des Wörterbuches für die Rechtschreibkontrolle" +!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION "Unterstützung für Rechtschreibkontrolle. (Für die Installation ist eine Internet-Verbindung nötig)" +!define ASPELL_INSTALL_FAILED "Installation gescheitert" +!define PIDGIN_SPELLCHECK_BRETON "Bretonisch" +!define PIDGIN_SPELLCHECK_CATALAN "Katalanisch" +!define PIDGIN_SPELLCHECK_CZECH "Tschechisch" +!define PIDGIN_SPELLCHECK_WELSH "Walisisch" +!define PIDGIN_SPELLCHECK_DANISH "Dänisch" +!define PIDGIN_SPELLCHECK_GERMAN "Deutsch" +!define PIDGIN_SPELLCHECK_GREEK "Griechisch" +!define PIDGIN_SPELLCHECK_ENGLISH "Englisch" +!define PIDGIN_SPELLCHECK_ESPERANTO "Esperanto" +!define PIDGIN_SPELLCHECK_SPANISH "Spanisch" +!define PIDGIN_SPELLCHECK_FAROESE "Faröersprache" +!define PIDGIN_SPELLCHECK_FRENCH "Französisch" +!define PIDGIN_SPELLCHECK_ITALIAN "Italienisch" +!define PIDGIN_SPELLCHECK_DUTCH "Holländisch" +!define PIDGIN_SPELLCHECK_NORWEGIAN "Norwegisch" +!define PIDGIN_SPELLCHECK_POLISH "Polnisch" +!define PIDGIN_SPELLCHECK_PORTUGUESE "Portugiesisch" +!define PIDGIN_SPELLCHECK_ROMANIAN "Rumänisch" +!define PIDGIN_SPELLCHECK_RUSSIAN "Russisch" +!define PIDGIN_SPELLCHECK_SLOVAK "Slowakisch" +!define PIDGIN_SPELLCHECK_SWEDISH "Schwedisch" +!define PIDGIN_SPELLCHECK_UKRAINIAN "Ukrainisch"
--- a/pidgin/win32/nsis/translations/hebrew.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/hebrew.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -25,11 +25,6 @@ !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Light House Blue îřŕä" !define PIDGIN_SECTION_DESCRIPTION ".áńéńńéí DLL-ĺ Pidgin ÷áöé" !define GTK_SECTION_DESCRIPTION ".îĺěčé-ôěčôĺřîééí GUI ëěé" -!define GTK_THEMES_SECTION_DESCRIPTION " .GTK+ éëĺěéí ěůđĺú ŕú äîřŕä ůě úĺëđĺú GTK+ îřŕĺú" -!define GTK_NO_THEME_DESC ".GTK+ ěŕ ěäú÷éď îřŕä ůě" -!define GTK_WIMP_THEME_DESC ".ćä îřŕä ůîůúěá ěîřŕä ůě çěĺđĺú GTK-Wimp (Windows impersonator)" -!define GTK_BLUECURVE_THEME_DESC ".Bluecurve äîřŕä ůě" -!define GTK_LIGHTHOUSEBLUE_THEME_DESC ".Lighthouseblueäîřŕä ůě" ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "A?đîöŕä. ěůăřâ GTK+ ńáéáä éůđä ůě$\rNote: .éëĺě ěŕ ěňáĺă ŕí ěŕ $(^Name)"
--- a/pidgin/win32/nsis/translations/hungarian.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/hungarian.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -1,93 +1,89 @@ -;; -;; hungarian.nsh -;; -;; Default language strings for the Windows Pidgin NSIS installer. -;; Windows Code page: 1250 -;; -;; Authors: Sutto Zoltan <suttozoltan@chello.hu>, 2003 -;; Gabor Kelemen <kelemeng@gnome.hu>, 2005 -;; - -; Startup Checks -!define GTK_INSTALLER_NEEDED "A GTK+ futtató környezet hiányzik vagy frissítése szükséges.$\rKérem telepítse a v${GTK_MIN_VERSION} vagy magasabb verziójú GTK+ futtató környezetet." -!define INSTALLER_IS_RUNNING "A telepítő már fut." -!define PIDGIN_IS_RUNNING "Jelenleg fut a Pidgin egy példánya. Lépjen ki a Pidginból és azután próbálja újra." - -; License Page -!define PIDGIN_LICENSE_BUTTON "Tovább >" -!define PIDGIN_LICENSE_BOTTOM_TEXT "A $(^Name) a GNU General Public License (GPL) alatt kerül terjesztésre. Az itt olvasható licenc csak tájékoztatási célt szolgál. $_CLICK" - -; Components Page -!define PIDGIN_SECTION_TITLE "Pidgin azonnali üzenő kliens (szükséges)" -!define GTK_SECTION_TITLE "GTK+ futtató környezet (szükséges)" -!define GTK_THEMES_SECTION_TITLE "GTK+ témák" -!define GTK_NOTHEME_SECTION_TITLE "Nincs téma" -!define GTK_WIMP_SECTION_TITLE "Wimp téma" -!define GTK_BLUECURVE_SECTION_TITLE "Bluecurve téma" -!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Light House Blue téma" -!define PIDGIN_SHORTCUTS_SECTION_TITLE "Parancsikonok" -!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Asztal" -!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Start Menü" -!define PIDGIN_SECTION_DESCRIPTION "Pidgin fájlok és dll-ek" -!define GTK_SECTION_DESCRIPTION "A Pidgin által használt többplatformos grafikus eszközkészlet" -!define GTK_THEMES_SECTION_DESCRIPTION "A GTK+ témák megváltoztatják a GTK+ alkalmazások kinézetét." -!define GTK_NO_THEME_DESC "Ne telepítsen GTK+ témát" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows utánzat), a Windows környezettel harmonizáló GTK téma." -!define GTK_BLUECURVE_THEME_DESC "A Bluecurve téma." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "A Lighthouseblue téma." -!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Parancsikonok a Pidgin indításához" -!define PIDGIN_DESKTOP_SHORTCUT_DESC "Parancsikon létrehozása a Pidginhoz az asztalon" -!define PIDGIN_STARTMENU_SHORTCUT_DESC "Start Menü bejegyzés létrehozása a Pidginhoz" - -; GTK+ Directory Page -!define GTK_UPGRADE_PROMPT "Egy régi verziójú GTK+ futtatókörnyezet van telepítve. Kívánja frissíteni?$\rMegjegyzés: a Pidgin nem fog működni, ha nem frissíti." -!define GTK_WINDOWS_INCOMPATIBLE "A Windows 95/98/Me nem kompatibillisek a GTK+ 2.8.0 vagy újabb változatokkal. A GTK+ ${GTK_INSTALL_VERSION} nem kerül telepítésre. $\rHa a GTK+ ${GTK_MIN_VERSION} vagy újabb még nincs telepítve, akkor a telepítés most megszakad." - -; Installer Finish Page -!define PIDGIN_FINISH_VISIT_WEB_SITE "A Windows Pidgin weboldalának felkeresése" - -; Pidgin Section Prompts and Texts -!define PIDGIN_UNINSTALL_DESC "Pidgin (csak eltávolítás)" -!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "A Pidgin jelenleg telepített változata nem távolítható el. Az új verzió a jelenleg telepített verzió eltávolítása nélkül kerül telepítésre. " - - -; GTK+ Section Prompts -!define GTK_INSTALL_ERROR "Hiba a GTK+ futtatókörnyezet telepítése közben." -!define GTK_BAD_INSTALL_PATH "A megadott elérési út nem érhető el, vagy nem hozható létre." - -; GTK+ Themes section -!define GTK_NO_THEME_INSTALL_RIGHTS "Nincs jogosultsága a GTK+ témák telepítéséhez." - -; Uninstall Section Prompts -!define un.PIDGIN_UNINSTALL_ERROR_1 "Az eltávolító nem találta a Pidgin registry bejegyzéseket.$\rValószínüleg egy másik felhasználó telepítette az alkalmazást." -!define un.PIDGIN_UNINSTALL_ERROR_2 "Nincs jogosultsága az alkalmazás eltávolításához." - -; Spellcheck Section Prompts -!define PIDGIN_SPELLCHECK_SECTION_TITLE "Helyesírás-ellenőrzés támogatása" -!define PIDGIN_SPELLCHECK_ERROR "Hiba a helyesírás-ellenőrzés telepítése közben" -!define PIDGIN_SPELLCHECK_DICT_ERROR "Hiba a helyesírás-ellenőrzési szótár telepítése közben" -!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION "Helyesírás-ellenőrzés támogatása. (Internetkapcsolat szükséges a telepítéshez)" -!define ASPELL_INSTALL_FAILED "A telepítés sikertelen" -!define PIDGIN_SPELLCHECK_BRETON "Breton" -!define PIDGIN_SPELLCHECK_CATALAN "Katalán" -!define PIDGIN_SPELLCHECK_CZECH "Cseh" -!define PIDGIN_SPELLCHECK_WELSH "Walesi" -!define PIDGIN_SPELLCHECK_DANISH "Dán" -!define PIDGIN_SPELLCHECK_GERMAN "Német" -!define PIDGIN_SPELLCHECK_GREEK "Görög" -!define PIDGIN_SPELLCHECK_ENGLISH "Angol" -!define PIDGIN_SPELLCHECK_ESPERANTO "Eszperantó" -!define PIDGIN_SPELLCHECK_SPANISH "Spanyol" -!define PIDGIN_SPELLCHECK_FAROESE "Faröai" -!define PIDGIN_SPELLCHECK_FRENCH "Francia" -!define PIDGIN_SPELLCHECK_ITALIAN "Olasz" -!define PIDGIN_SPELLCHECK_DUTCH "Holland" -!define PIDGIN_SPELLCHECK_NORWEGIAN "Norvég" -!define PIDGIN_SPELLCHECK_POLISH "Lengyel" -!define PIDGIN_SPELLCHECK_PORTUGUESE "Portugál" -!define PIDGIN_SPELLCHECK_ROMANIAN "Román" -!define PIDGIN_SPELLCHECK_RUSSIAN "Orosz" -!define PIDGIN_SPELLCHECK_SLOVAK "Szlovák" -!define PIDGIN_SPELLCHECK_SWEDISH "Svéd" -!define PIDGIN_SPELLCHECK_UKRAINIAN "Ukrán" - +;; +;; hungarian.nsh +;; +;; Default language strings for the Windows Pidgin NSIS installer. +;; Windows Code page: 1250 +;; +;; Authors: Sutto Zoltan <suttozoltan@chello.hu>, 2003 +;; Gabor Kelemen <kelemeng@gnome.hu>, 2005 +;; + +; Startup Checks +!define GTK_INSTALLER_NEEDED "A GTK+ futtató környezet hiányzik vagy frissítése szükséges.$\rKérem telepítse a v${GTK_MIN_VERSION} vagy magasabb verziójú GTK+ futtató környezetet." +!define INSTALLER_IS_RUNNING "A telepítő már fut." +!define PIDGIN_IS_RUNNING "Jelenleg fut a Pidgin egy példánya. Lépjen ki a Pidginból és azután próbálja újra." + +; License Page +!define PIDGIN_LICENSE_BUTTON "Tovább >" +!define PIDGIN_LICENSE_BOTTOM_TEXT "A $(^Name) a GNU General Public License (GPL) alatt kerül terjesztésre. Az itt olvasható licenc csak tájékoztatási célt szolgál. $_CLICK" + +; Components Page +!define PIDGIN_SECTION_TITLE "Pidgin azonnali üzenő kliens (szükséges)" +!define GTK_SECTION_TITLE "GTK+ futtató környezet (szükséges)" +!define GTK_THEMES_SECTION_TITLE "GTK+ témák" +!define GTK_NOTHEME_SECTION_TITLE "Nincs téma" +!define GTK_WIMP_SECTION_TITLE "Wimp téma" +!define GTK_BLUECURVE_SECTION_TITLE "Bluecurve téma" +!define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Light House Blue téma" +!define PIDGIN_SHORTCUTS_SECTION_TITLE "Parancsikonok" +!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Asztal" +!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Start Menü" +!define PIDGIN_SECTION_DESCRIPTION "Pidgin fájlok és dll-ek" +!define GTK_SECTION_DESCRIPTION "A Pidgin által használt többplatformos grafikus eszközkészlet" + +!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Parancsikonok a Pidgin indításához" +!define PIDGIN_DESKTOP_SHORTCUT_DESC "Parancsikon létrehozása a Pidginhoz az asztalon" +!define PIDGIN_STARTMENU_SHORTCUT_DESC "Start Menü bejegyzés létrehozása a Pidginhoz" + +; GTK+ Directory Page +!define GTK_UPGRADE_PROMPT "Egy régi verziójú GTK+ futtatókörnyezet van telepítve. Kívánja frissíteni?$\rMegjegyzés: a Pidgin nem fog működni, ha nem frissíti." +!define GTK_WINDOWS_INCOMPATIBLE "A Windows 95/98/Me nem kompatibillisek a GTK+ 2.8.0 vagy újabb változatokkal. A GTK+ ${GTK_INSTALL_VERSION} nem kerül telepítésre. $\rHa a GTK+ ${GTK_MIN_VERSION} vagy újabb még nincs telepítve, akkor a telepítés most megszakad." + +; Installer Finish Page +!define PIDGIN_FINISH_VISIT_WEB_SITE "A Windows Pidgin weboldalának felkeresése" + +; Pidgin Section Prompts and Texts +!define PIDGIN_UNINSTALL_DESC "Pidgin (csak eltávolítás)" +!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL "A Pidgin jelenleg telepített változata nem távolítható el. Az új verzió a jelenleg telepített verzió eltávolítása nélkül kerül telepítésre. " + + +; GTK+ Section Prompts +!define GTK_INSTALL_ERROR "Hiba a GTK+ futtatókörnyezet telepítése közben." +!define GTK_BAD_INSTALL_PATH "A megadott elérési út nem érhető el, vagy nem hozható létre." + +; GTK+ Themes section +!define GTK_NO_THEME_INSTALL_RIGHTS "Nincs jogosultsága a GTK+ témák telepítéséhez." + +; Uninstall Section Prompts +!define un.PIDGIN_UNINSTALL_ERROR_1 "Az eltávolító nem találta a Pidgin registry bejegyzéseket.$\rValószínüleg egy másik felhasználó telepítette az alkalmazást." +!define un.PIDGIN_UNINSTALL_ERROR_2 "Nincs jogosultsága az alkalmazás eltávolításához." + +; Spellcheck Section Prompts +!define PIDGIN_SPELLCHECK_SECTION_TITLE "Helyesírás-ellenőrzés támogatása" +!define PIDGIN_SPELLCHECK_ERROR "Hiba a helyesírás-ellenőrzés telepítése közben" +!define PIDGIN_SPELLCHECK_DICT_ERROR "Hiba a helyesírás-ellenőrzési szótár telepítése közben" +!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION "Helyesírás-ellenőrzés támogatása. (Internetkapcsolat szükséges a telepítéshez)" +!define ASPELL_INSTALL_FAILED "A telepítés sikertelen" +!define PIDGIN_SPELLCHECK_BRETON "Breton" +!define PIDGIN_SPELLCHECK_CATALAN "Katalán" +!define PIDGIN_SPELLCHECK_CZECH "Cseh" +!define PIDGIN_SPELLCHECK_WELSH "Walesi" +!define PIDGIN_SPELLCHECK_DANISH "Dán" +!define PIDGIN_SPELLCHECK_GERMAN "Német" +!define PIDGIN_SPELLCHECK_GREEK "Görög" +!define PIDGIN_SPELLCHECK_ENGLISH "Angol" +!define PIDGIN_SPELLCHECK_ESPERANTO "Eszperantó" +!define PIDGIN_SPELLCHECK_SPANISH "Spanyol" +!define PIDGIN_SPELLCHECK_FAROESE "Faröai" +!define PIDGIN_SPELLCHECK_FRENCH "Francia" +!define PIDGIN_SPELLCHECK_ITALIAN "Olasz" +!define PIDGIN_SPELLCHECK_DUTCH "Holland" +!define PIDGIN_SPELLCHECK_NORWEGIAN "Norvég" +!define PIDGIN_SPELLCHECK_POLISH "Lengyel" +!define PIDGIN_SPELLCHECK_PORTUGUESE "Portugál" +!define PIDGIN_SPELLCHECK_ROMANIAN "Román" +!define PIDGIN_SPELLCHECK_RUSSIAN "Orosz" +!define PIDGIN_SPELLCHECK_SLOVAK "Szlovák" +!define PIDGIN_SPELLCHECK_SWEDISH "Svéd" +!define PIDGIN_SPELLCHECK_UKRAINIAN "Ukrán" +
--- a/pidgin/win32/nsis/translations/italian.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/italian.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -25,11 +25,6 @@ !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Tema Light House Blue" !define PIDGIN_SECTION_DESCRIPTION "File principali di Pidgin e dll" !define GTK_SECTION_DESCRIPTION "Un toolkit multipiattaforma per interfacce grafiche, usato da Pidgin" -!define GTK_THEMES_SECTION_DESCRIPTION "I temi GTK+ modificano l'aspetto delle applicazioni GTK+." -!define GTK_NO_THEME_DESC "Non installare nessun tema GTK+" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) č un tema GTK che si adatta bene all'aspetto di Windows." -!define GTK_BLUECURVE_THEME_DESC "Il tema Bluecurve." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Il tema Lighthouseblue." ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "Č stata trovata una versione precedente di GTK+. Vuoi aggiornarla?$\rNota: $(^Name) potrebbe non funzionare senza l'aggiornamento."
--- a/pidgin/win32/nsis/translations/japanese.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/japanese.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -31,11 +31,8 @@ !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "X^[gAbv" !define PIDGIN_SECTION_DESCRIPTION "PidginĚjĆČét@CĆdll" !define GTK_SECTION_DESCRIPTION "PidginĚgÁĢé}`vbgtH[GUIc[Lbg" -!define GTK_THEMES_SECTION_DESCRIPTION "GTK+Ěe[}ÍAGTK+ĚAvP[VĚbNtB[đĎŚçęܡB" -!define GTK_NO_THEME_DESC "GTK+Ěe[}đCXg[ľČ˘" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator)ÍWindowsĚfXNgbvÂŤĆć˛aľ˝e[}šB" -!define GTK_BLUECURVE_THEME_DESC "Bluecurvee[}B" -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Lighthousebluee[}B" + + !define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Pidgin đŔsˇé˝ßĚV[gJbg" !define PIDGIN_DESKTOP_SHORTCUT_DESC "fXNgbvÉ Pidgin ĚV[gJbgđ쏡é" !define PIDGIN_STARTMENU_SHORTCUT_DESC "X^[gj [É Pidgin ĚÚđ쏡é"
--- a/pidgin/win32/nsis/translations/korean.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/korean.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -20,11 +20,6 @@ !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Light House Blue Ĺ׸ś" !define PIDGIN_SECTION_DESCRIPTION "°ĄŔÓŔÇ ÄÚžî ĆÄŔĎ°ú dll" !define GTK_SECTION_DESCRIPTION "°ĄŔÓŔĚ ťçżëÇĎ´Â ¸ÖĆź Çá§Ćű GUI ĹřĹś" -!define GTK_THEMES_SECTION_DESCRIPTION "GTK+ Ĺ׸ś´Â GTK+ ÇÁˇÎą×ˇĽŔÇ ˇčžŘÇĘŔť šŮ˛Ü źö ŔÖ˝Ŕ´Ď´Ů." -!define GTK_NO_THEME_DESC "GTK+ Ĺ׸ś¸Ś źłÄĄÇĎÁö žĘ˝Ŕ´Ď´Ů." -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator)´Â ŔŠľľżě ľĽ˝şĹŠĹž ČŻ°ćżĄ Ŕß ÁśČľÇ´Â GTK Ĺ׸śŔÔ´Ď´Ů." -!define GTK_BLUECURVE_THEME_DESC "şíˇçÄżşę Ĺ׸ś." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "The Lighthouseblue theme." ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "żžłŻ šöŔü GTK+ ˇąĹ¸ŔÓŔť ĂŁžŇ˝Ŕ´Ď´Ů. ž÷ą×ˇšŔĚľĺÇŇąîżä?$\rNote: ž÷ą×ˇšŔĚľĺÇĎÁö žĘŔ¸¸é °ĄŔÓŔĚ ľżŔŰÇĎÁö žĘŔť źöľľ ŔÖ˝Ŕ´Ď´Ů."
--- a/pidgin/win32/nsis/translations/kurdish.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/kurdish.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -31,11 +31,7 @@ !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Menuya destpękę" !define PIDGIN_SECTION_DESCRIPTION "Dosiyęn cevherî ya Pidgin ű dll" !define GTK_SECTION_DESCRIPTION "Paketa aműręn GUI ji bo gelek platforman, ji hęla Pidgin tę bikaranîn." -!define GTK_THEMES_SECTION_DESCRIPTION "Dirbęn GTK+ dikarin ruyę bernameyęn GTK biguherînin." -!define GTK_NO_THEME_DESC "Dirbeke GTK+ saz neke" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) dirbeyke GTK ya wekî derdora sermaseyę ya Windowsę." -!define GTK_BLUECURVE_THEME_DESC "Dirbę Bluecurve." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Dirbę Lighthouseblue." + !define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "ręya kin a ji bo destpękirina Pidgin" !define PIDGIN_DESKTOP_SHORTCUT_DESC "ręya kin a Pidgin di sermasęyę de çęke" !define PIDGIN_STARTMENU_SHORTCUT_DESC "Pidgin ę binivîse menuya destpęk"
--- a/pidgin/win32/nsis/translations/lithuanian.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/lithuanian.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -28,11 +28,7 @@ !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Pradiniame meniu" !define PIDGIN_SECTION_DESCRIPTION "Pagrindiniai Pidgin failai" !define GTK_SECTION_DESCRIPTION "Daugiaplatforminis vartotojo sŕsajos priemoniř komplektas, naudojamas Pidgin." -!define GTK_THEMES_SECTION_DESCRIPTION "GTK+ apipavidalinimai gali pakeisti GTK+ programř iđvaizdŕ." -!define GTK_NO_THEME_DESC "Neádiegti GTK+ apipavidalinimo." -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows imitatorius) yra gerai Windows aplinkoje derantis GTK apipavidalinimas." -!define GTK_BLUECURVE_THEME_DESC "Bluecurve apipavidalinimas." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Lighthouseblue apipavidalinimas." + !define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Pidgin paleidimo nuorodos" !define PIDGIN_DESKTOP_SHORTCUT_DESC "Sukurti nuorodŕ á Pidgin darbastalyje." !define PIDGIN_STARTMENU_SHORTCUT_DESC "Sukurti pradinio meniu árađŕ, skirtŕ Pidgin."
--- a/pidgin/win32/nsis/translations/norwegian.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/norwegian.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -30,11 +30,7 @@ !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Startmeny" !define PIDGIN_SECTION_DESCRIPTION "Pidgins kjernefiler og dll'er" !define GTK_SECTION_DESCRIPTION "Et GUI-verktřy for flere ulike plattformer, brukes av Pidgin." -!define GTK_THEMES_SECTION_DESCRIPTION "GTK+ Tema kan endre utseendet og fřlelsen av GTK+ applikasjoner." -!define GTK_NO_THEME_DESC "Ikke installér noe GTK+ tema." -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows-imitator) er et GTK-tema som passer godt inn i Windows-miljř." -!define GTK_BLUECURVE_THEME_DESC "Bluecurve-tema." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Lighthouseblue-tema." + !define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Snarveier for ĺ starte Pidgin" !define PIDGIN_DESKTOP_SHORTCUT_DESC "Lag en snarvei til Pidgin pĺ Skrivebordet" !define PIDGIN_STARTMENU_SHORTCUT_DESC "Legg til Pidgin i Startmenyen"
--- a/pidgin/win32/nsis/translations/polish.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/polish.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -25,11 +25,6 @@ !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Temat Light House Blue" !define PIDGIN_SECTION_DESCRIPTION "Zbiory Core Pidgin oraz dll" !define GTK_SECTION_DESCRIPTION "Wieloplatformowe narzędzie GUI, używane w Pidgin" -!define GTK_THEMES_SECTION_DESCRIPTION "Tematy GTK+ mogš zmienić wyglšd i działanie aplikacji GTK+ ." -!define GTK_NO_THEME_DESC "Nie instaluj tematów GTK+" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) to temat GTK który doskonale wkomponowuje się w rodowisko systemu Windows." -!define GTK_BLUECURVE_THEME_DESC "Temat The Bluecurve." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Temat Lighthouseblue." ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "Znaleziono starš wersję runtime-u GTK+. Czy chcesz upgrade-ować?$\rNote: $(^Name) może nie działać jeli nie wykonasz procedury."
--- a/pidgin/win32/nsis/translations/portuguese-br.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/portuguese-br.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -28,11 +28,7 @@ !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Menu Iniciar" !define PIDGIN_SECTION_DESCRIPTION "Arquivos e bibliotecas principais do Pidgin" !define GTK_SECTION_DESCRIPTION "Um conjunto de ferramentas multi-plataforma para interface do usuário, usado pelo Pidgin" -!define GTK_THEMES_SECTION_DESCRIPTION "Os temas do GTK+ podem mudar a aparęncia e o funcionamento dos aplicativos GTK+." -!define GTK_NO_THEME_DESC "Năo instalar um tema do GTK+" -!define GTK_WIMP_THEME_DESC "O tema 'GTK-Wimp' ('Windows impersonator', personificador do Windows) é um tema GTK que combina bem com o ambiente de área de trabalho do Windows." -!define GTK_BLUECURVE_THEME_DESC "O tema 'Bluecurve'." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "O tema 'Lighthouseblue'." + !define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Atalhos para iniciar o Pidgin" !define PIDGIN_DESKTOP_SHORTCUT_DESC "Crie um atalho para o Pidgin na Área de Trabalho" !define PIDGIN_STARTMENU_SHORTCUT_DESC "Crie uma entrada no Menu Iniciar para o Pidgin"
--- a/pidgin/win32/nsis/translations/portuguese.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/portuguese.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -30,11 +30,7 @@ !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Menu de Iniciar" !define PIDGIN_SECTION_DESCRIPTION "Ficheiros e bibliotecas principais do Pidgin" !define GTK_SECTION_DESCRIPTION "Um conjunto de ferramentas de interface gráfica multi-plataforma, usado pelo Pidgin" -!define GTK_THEMES_SECTION_DESCRIPTION "Os Temas do GTK+ podem mudar a aparęncia dos programas GTK+." -!define GTK_NO_THEME_DESC "Năo instalar um tema do GTK+" -!define GTK_WIMP_THEME_DESC "O tema GTK-Wimp (Windows impersonator, personificador do Windows) é um tema GTK+ que combina bem com o ambiente de trabalho do Windows." -!define GTK_BLUECURVE_THEME_DESC "O tema Bluecurve." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "O tema Lighthouseblue." + !define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Atalhos para iniciar o Pidgin" !define PIDGIN_DESKTOP_SHORTCUT_DESC "Criar um atalho para o Pidgin no Ambiente de Trabalho" !define PIDGIN_STARTMENU_SHORTCUT_DESC "Criar uma entrada para o Pidgin na Barra de Iniciar"
--- a/pidgin/win32/nsis/translations/romanian.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/romanian.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -29,11 +29,7 @@ !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Meniu Start" !define PIDGIN_SECTION_DESCRIPTION "Fişiere Pidgin şi dll-uri" !define GTK_SECTION_DESCRIPTION "Un mediu de dezvoltare multiplatformă utilizat de Pidgin" -!define GTK_THEMES_SECTION_DESCRIPTION "Temele GTK+ schimbă aparenţa aplicaţiilor GTK+." -!define GTK_NO_THEME_DESC "Fără teme GTK+" -!define GTK_WIMP_THEME_DESC "GTK-Wimp este o temă GTK+ ce imită mediul grafic Windows." -!define GTK_BLUECURVE_THEME_DESC "Tema Bluecurve." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Tema Lighthouseblue." + !define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Scurtături pentru pornirea Pidgin" !define PIDGIN_DESKTOP_SHORTCUT_DESC "Creează iconiţe Pidgin pe Desktop" !define PIDGIN_STARTMENU_SHORTCUT_DESC "Creează o intrare Pidgin în meniul Start"
--- a/pidgin/win32/nsis/translations/russian.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/russian.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -25,11 +25,6 @@ !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Ňĺěŕ 'Light House Blue'." !define PIDGIN_SECTION_DESCRIPTION "Îńíîâíŕ˙ ÷ŕńňü Pidgin č áčáëčîňĺęč." !define GTK_SECTION_DESCRIPTION "Ěóëüňčďëŕňôîđěĺííűé ăđŕôč÷ĺńęčé číńňđóěĺíňŕđčé, čńďîëüçóĺěűé Pidgin." -!define GTK_THEMES_SECTION_DESCRIPTION "Ňĺěű äë˙ GTK+ čçěĺí˙ţň ĺăî âíĺříčé âčä č âîńďđč˙ňčĺ ďîëüçîâŕňĺëĺě." -!define GTK_NO_THEME_DESC "Íĺ óńňŕíŕâëčâŕňü ňĺěű äë˙ GTK+." -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows-ďîäńňđîéęŕ) ýňî ňĺěŕ äë˙ GTK, ęîňîđŕ˙ î÷ĺíü ăŕđěîíč÷íî ďîäńňđîčňń˙ ďîä âčçóŕëüíîĺ îęđóćĺíčĺ čç ńđĺäű đŕáî÷ĺăî ńňîëŕ Windows." -!define GTK_BLUECURVE_THEME_DESC "Ňĺěŕ 'The Bluecurve'." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Ňĺěŕ 'The Lighthouseblue'." ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "Íŕéäĺíŕ ńňŕđŕ˙ âĺđńč˙ GTK+. Âű íĺ őîňĺëč áű îáíîâčňü ĺ¸ ?$\rĎđčěĺ÷ŕíčĺ: Pidgin ěîćĺň íĺ đŕáîňŕňü ĺńëč Âű íĺ ńäĺëŕĺňĺ ýňîăî."
--- a/pidgin/win32/nsis/translations/serbian-latin.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/serbian-latin.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -20,11 +20,6 @@ !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Light House Blue tema" !define PIDGIN_SECTION_DESCRIPTION "Osnovne Pidgin datoteke i dinamičke biblioteke" !define GTK_SECTION_DESCRIPTION "Skup oruđa za grafičko okruenje, za vie platformi, koristi ga Pidgin " -!define GTK_THEMES_SECTION_DESCRIPTION "GTK+ teme menjaju izgled i način rada GTK+ aplikacija." -!define GTK_NO_THEME_DESC "Ne instaliraj GTK+ temu" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows imitator) je GTK tema koja se dobro uklapa u Windows radno okruenje." -!define GTK_BLUECURVE_THEME_DESC "Bluecurve tema." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Lighthouseblue tema." ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "Nađena je stara verzija GTK+ izvrne okoline. Da li elite da je unapredite?$\rPrimedba: Ukoliko to ne uradite, $(^Name) moda neće raditi."
--- a/pidgin/win32/nsis/translations/simp-chinese.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/simp-chinese.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -30,11 +30,7 @@ !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "żŞĘź˛ËľĽ" !define PIDGIN_SECTION_DESCRIPTION "Pidgin şËĐÄÎÄźţşÍ DLLs" !define GTK_SECTION_DESCRIPTION "Pidgin ËůÓþĜŕƽ̨ GUI š¤žß°ü" -!define GTK_THEMES_SECTION_DESCRIPTION "GTK+ Ö÷ĚâżÉŇÔ¸ü¸Ä GTK+ łĚĐňľÄšŰ¸ĐĄŁ" -!define GTK_NO_THEME_DESC "˛ť°˛×° GTK+ Ö÷Ěâ" -!define GTK_WIMP_THEME_DESC "GTK-Wimp ĘÇĘĘşĎ Windows ×ŔĂ条žłľÄ GTK+ Ö÷Ě⥣" -!define GTK_BLUECURVE_THEME_DESC "Bluecurve Ö÷Ě⥣" -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Lighthouseblue Ö÷Ě⥣" + !define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "ĆôśŻ Pidgin ľÄżě˝Ýˇ˝Ę˝" !define PIDGIN_DESKTOP_SHORTCUT_DESC "ÔÚ×ŔĂćÉĎ´´˝¨ Pidgin ľÄżě˝Ýˇ˝Ę˝" !define PIDGIN_STARTMENU_SHORTCUT_DESC "ÔÚżŞĘź˛ËľĽÖĐ´´˝¨ Pidgin ľÄżě˝Ýˇ˝Ę˝"
--- a/pidgin/win32/nsis/translations/slovak.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/slovak.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -30,11 +30,7 @@ !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "tart Menu" !define PIDGIN_SECTION_DESCRIPTION "Jadro Pidgin-u a nevyhnutné DLL súbory" !define GTK_SECTION_DESCRIPTION "Multiplatformové GUI nástroje, pouívané Pidgin-om" -!define GTK_THEMES_SECTION_DESCRIPTION "Pomocou GTK+ grafických tém môete zmeni vzhžad GTK+ aplikácií." -!define GTK_NO_THEME_DESC "Neintalova GTK+ grafickú tému" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) je GTK grafická téma, ktorá pekne ladí s prostredím Windows." -!define GTK_BLUECURVE_THEME_DESC "Bluecurve grafická téma." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Lighthouseblue grafická téma" + !define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Zástupcovia pre Pidgin" !define PIDGIN_DESKTOP_SHORTCUT_DESC "Vytvori zástupcu pre Pidgin na pracovnej ploche" !define PIDGIN_STARTMENU_SHORTCUT_DESC "Vytvori odkaz na Pidgin v tart Menu"
--- a/pidgin/win32/nsis/translations/slovenian.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/slovenian.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -30,11 +30,7 @@ !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Začetni meni" !define PIDGIN_SECTION_DESCRIPTION "Temeljne datoteke Pidgin" !define GTK_SECTION_DESCRIPTION "Večplatformna orodjarna GUI, ki jo uporablja Pidgin" -!define GTK_THEMES_SECTION_DESCRIPTION "Teme GTK+ lahko spremenijo videz programov GTK+." -!define GTK_NO_THEME_DESC "Brez namestitve teme GTK+" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (oponaevalec Oken) je tema GTK, ki se lepo vklaplja v namizno okolje Windows." -!define GTK_BLUECURVE_THEME_DESC "Tema Bluecurve." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Tema Lighthouseblue." + !define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Blinjice za zagon Pidgina" !define PIDGIN_DESKTOP_SHORTCUT_DESC "Ustvari blinjico za Pidgin na namizju" !define PIDGIN_STARTMENU_SHORTCUT_DESC "Ustvari vnos Pidgin v meniju Start"
--- a/pidgin/win32/nsis/translations/spanish.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/spanish.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -25,11 +25,6 @@ !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Tema Light House Blue" !define PIDGIN_SECTION_DESCRIPTION "Ficheros y dlls principales de Core" !define GTK_SECTION_DESCRIPTION "Una suite de herramientas GUI multiplataforma, utilizada por Pidgin" -!define GTK_THEMES_SECTION_DESCRIPTION "Los temas pueden cambiar la apariencia de aplicaciones GTK+." -!define GTK_NO_THEME_DESC "No instalar un tema GTK+" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) es un tema GTK que se fusiona muy bien con el entorno de escritorio de Windows." -!define GTK_BLUECURVE_THEME_DESC "El tema Bluecurve." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "El tema Lighthouseblue." ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "Se ha encontrado una versión antigüa del ejecutable de GTK+. żDesea actualizarla?$\rObservación: $(^Name) no funcionará a menos que lo haga."
--- a/pidgin/win32/nsis/translations/swedish.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/swedish.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -33,11 +33,7 @@ !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Startmeny" !define PIDGIN_SECTION_DESCRIPTION "Pidgin kärnfiler och DLL:er" !define GTK_SECTION_DESCRIPTION "En GUI-verktygsuppsättning för flera olika plattformar som Pidgin använder." -!define GTK_THEMES_SECTION_DESCRIPTION "GTK+-teman kan ändra känslan av och utseendet pĺ GTK+-applikationer." -!define GTK_NO_THEME_DESC "Installera inte nĺgot GTK+-tema" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) ett GTK-tema som smälter bra in i Windows-miljön." -!define GTK_BLUECURVE_THEME_DESC "The Bluecurve-tema." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "The Lighthouseblue-tema." + !define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Genvägar för att starta Pidgin" !define PIDGIN_DESKTOP_SHORTCUT_DESC "Skapar en genväg till Pidgin pĺ skrivbordet" !define PIDGIN_STARTMENU_SHORTCUT_DESC "Skapar ett tillägg i startmenyn för Pidgin"
--- a/pidgin/win32/nsis/translations/trad-chinese.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/trad-chinese.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -32,11 +32,7 @@ !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "ś}ŠlĽ\ŻŕŞí" !define PIDGIN_SECTION_DESCRIPTION "Pidgin ŽÖ¤ßŔɎפΰʺA¨çŚĄŽw" !define GTK_SECTION_DESCRIPTION "Pidgin ŠŇ¨ĎĽÎŞş¸óĽĽxšĎ§Î¤śą¨çŚĄŽw" -!define GTK_THEMES_SECTION_DESCRIPTION "GTK+ §G´şĽDĂDĽiĽHĽÎ¨Ó§ďĹÜ GTK+ ŔłĽÎľ{ŚĄŞşĽ~Ć[ĄC" -!define GTK_NO_THEME_DESC "¤ŁŚw¸Ë GTK+ §G´şĽDĂD" -!define GTK_WIMP_THEME_DESC "ĄuGTK-WimpĄv(Windows impersonator) ĽDĂDĽiĹý GTK+ żÄ¤J Windows ¨ôąŔôŔô¤§¤¤ĄC" -!define GTK_BLUECURVE_THEME_DESC "ĄuBluecurveĄvĽDĂD" -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "ĄuLighthouseblueĄvĽDĂDĄC" + !define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "ŤŘĽß Pidgin ąśŽ|" !define PIDGIN_DESKTOP_SHORTCUT_DESC "ŚbŽŕąŤŘĽßąśŽ|" !define PIDGIN_STARTMENU_SHORTCUT_DESC "Śbś}ŠlĽ\ŻŕŞíŤŘĽßąśŽ|"
--- a/pidgin/win32/nsis/translations/valencian.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/valencian.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -33,11 +33,7 @@ !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Menu d'Inici" !define PIDGIN_SECTION_DESCRIPTION "Archius i dlls del nucleu de Pidgin" !define GTK_SECTION_DESCRIPTION "Una ferramenta multi-plataforma GUI, usada per Pidgin" -!define GTK_THEMES_SECTION_DESCRIPTION "Els Temes GTK+ poden canviar l'aspecte de les aplicacions GTK+." -!define GTK_NO_THEME_DESC "No instalar un tema GTK+" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (imitador Windows) es un tema GTK que s'integra perfectament en l'entorn d'escritori de Windows." -!define GTK_BLUECURVE_THEME_DESC "El tema Bluecurve." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "El tema Lighthouseblue." + !define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION "Enllaços directes per a iniciar Pidgin" !define PIDGIN_DESKTOP_SHORTCUT_DESC "Crear un enllaç directe a Pidgin en l'Escritori" !define PIDGIN_STARTMENU_SHORTCUT_DESC "Crear una entrada per a Pidgin en Menu Inici"
--- a/pidgin/win32/nsis/translations/vietnamese.nsh Thu Apr 19 15:06:54 2007 +0000 +++ b/pidgin/win32/nsis/translations/vietnamese.nsh Thu Apr 19 15:07:09 2007 +0000 @@ -26,11 +26,6 @@ !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE "Light House Blue Theme" !define PIDGIN_SECTION_DESCRIPTION "CĂĄc táşp tin Pidgin chĂnh vĂ dlls" !define GTK_SECTION_DESCRIPTION "Báť cĂ´ng c᝼ giao diáťn Äáť háťa Äa náťn Äáť dĂšng cho Pidgin" -!define GTK_THEMES_SECTION_DESCRIPTION "GTK+ Themes cĂł tháť thay Äáťi diáťm mấo vĂ sĂĄc thĂĄi cᝧa cĂĄc ᝊng d᝼ng GTK+." -!define GTK_NO_THEME_DESC "KhĂ´ng cĂ i Äạt GTK+ theme" -!define GTK_WIMP_THEME_DESC "GTK-Wimp (Windows impersonator) lĂ máťt GTK theme tĂch hᝣp táťt trong mĂ´i trĆ°áťng desktop cᝧa Windows." -!define GTK_BLUECURVE_THEME_DESC "Bluecurve theme." -!define GTK_LIGHTHOUSEBLUE_THEME_DESC "Lighthouseblue theme." ; GTK+ Directory Page !define GTK_UPGRADE_PROMPT "PhĂĄt hiáťn thẼy cĂł phiĂŞn bản cĹŠ cᝧa GTK+ runtime. Bấn muáťn nâng cẼp khĂ´ng?$\rNote: $(^Name) cĂł tháť khĂ´ng chấy náşżu khĂ´ng nâng cẼp."