# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1180741272 0
# Node ID f78b5aee202d921d9f9ad451a1a9757455b327f5
# Parent  f9335f068ae82f9afa768531a52fec7c054a5645# Parent  1b6db70bdab21cb7591ef40a84c3275c3732dc83
merge of '82644c8641c5089ed2cafd58983010f0144b7699'
     and 'afd06784e711190f110dfda57d2021357e08b391'

diff -r 1b6db70bdab2 -r f78b5aee202d pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Fri Jun 01 23:39:11 2007 +0000
+++ b/pidgin/gtkconv.c	Fri Jun 01 23:41:12 2007 +0000
@@ -6839,7 +6839,7 @@
 	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/scrollback_lines", 4000);
 
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/use_theme_font", TRUE);
-	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversations/custom_font", "Sans 28");
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversations/custom_font", "");
 
 	/* Conversations -> Chat */
 	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/conversations/chat");
diff -r 1b6db70bdab2 -r f78b5aee202d pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Fri Jun 01 23:39:11 2007 +0000
+++ b/pidgin/gtkprefs.c	Fri Jun 01 23:41:12 2007 +0000
@@ -906,6 +906,7 @@
 	GtkWidget *hbox;
 	GtkWidget *label;
 	GtkWidget *font_button;
+	const char *font_name;
 #endif
 
 	ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
@@ -947,7 +948,8 @@
 	hbox = gtk_hbox_new(FALSE, 3);
 	label = gtk_label_new_with_mnemonic(_("Conversation _font:"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	font_button = gtk_font_button_new_with_font(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/custom_font"));
+	font_name = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/custom_font");
+	font_button = gtk_font_button_new_with_font(purple_prefs_get_string(font_name ? font_name : NULL));
 	gtk_font_button_set_show_style(GTK_FONT_BUTTON(font_button), TRUE);
 	gtk_box_pack_start(GTK_BOX(hbox), font_button, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
diff -r 1b6db70bdab2 -r f78b5aee202d pidgin/win32/nsis/translations/slovenian.nsh
--- a/pidgin/win32/nsis/translations/slovenian.nsh	Fri Jun 01 23:39:11 2007 +0000
+++ b/pidgin/win32/nsis/translations/slovenian.nsh	Fri Jun 01 23:41:12 2007 +0000
@@ -19,30 +19,35 @@
 
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin - odjemalec za klepet (zahtevano)"
-!define GTK_SECTION_TITLE			"GTK+ izvajalno okolje (zahtevano)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Bližnjice"
+!define GTK_SECTION_TITLE			"Izvajalno okolje GTK+ (zahtevano)"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Tipke za bližnjice"
 !define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Namizje"
 !define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Začetni meni"
-!define PIDGIN_SECTION_DESCRIPTION		"Temeljne datoteke Pidgin"
+!define PIDGIN_SECTION_DESCRIPTION		"Temeljne datoteke in knjižnice za Pidgin"
 !define GTK_SECTION_DESCRIPTION			"Večplatformna orodjarna GUI, ki jo uporablja Pidgin"
 
 !define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Bližnjice za zagon Pidgina"
 !define PIDGIN_DESKTOP_SHORTCUT_DESC		"Ustvari bližnjico za Pidgin na namizju"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Ustvari vnos Pidgin v meniju Start"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Ustvari izbiro Pidgin v meniju Start"
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Nameščeno imate starejšo različico izvajalnega okolja GTK+. Jo želite nadgraditi?$\rOpomba: če je ne boste nadgradili, $(^Name) morda ne bo deloval."
+!define GTK_WINDOWS_INCOMPATIBLE		"Okolja Windows 95/98/Me z GTK+ 2.8.0 ali novejšimi niso združljiva.  GTK+ ${GTK_INSTALL_VERSION} will not be installed.$\rIf you don't have GTK+ ${GTK_MIN_VERSION} ali novejši je že nameščen, zato se bo namestitev zdaj prekinila."
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"Obiščite spletno stran Windows Pidgin"
 
 ; Pidgin Section Prompts and Texts
 !define PIDGIN_UNINSTALL_DESC			"$(^Name) (samo odstrani)"
+!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Trenutno nameščene različice Pidgina ni mogoče odstraniti. Nova različica bo nameščena brez odstranitve trenutno nameščene različice."
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Napaka pri namestitvi izvajalnega okolja GTK+."
 !define GTK_BAD_INSTALL_PATH			"Pot, ki ste jo vnesli, ni dosegljiva ali je ni mogoče ustvariti."
 
+; URL Handler section
+!define URI_HANDLERS_SECTION_TITLE		"URI Handlers"
+
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"Vnosov za Pidgin v registru ni mogoče najti.$\rNajverjetneje je ta program namestil drug uporabnik."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"Za odstranitev programa nimate ustreznih pravic."
diff -r 1b6db70bdab2 -r f78b5aee202d po/ChangeLog
--- a/po/ChangeLog	Fri Jun 01 23:39:11 2007 +0000
+++ b/po/ChangeLog	Fri Jun 01 23:41:12 2007 +0000
@@ -3,6 +3,7 @@
 version 2.0.2
 	* English (British) translation updated (Luke Ross)
 	* Slovenian translation updated (Martin Srebotnjak)
+	* Slovenian win32 installer updated (Martin Srebotnjak)
 
 version 2.0.1
 	* Chinese (Hong Kong) translation added (Ambrose C. Li, Abel Cheung)