changeset 16932:b668951121d8

Change the PIDGIN_NAME stuff to allow translators to transliterate the name. The only advantage of PIDGIN_NAME is that it reduces the number of strings in the .po file where they'd need to transliterate Pidgin. I'm not sure if that's useful or not.
author Richard Laager <rlaager@wiktel.com>
date Sun, 06 May 2007 00:44:41 +0000
parents 09f0bb67a87f
children a4d9505bd307 ed303260e05a
files configure.ac finch/finch.c pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkdocklet.c pidgin/gtkmain.c pidgin/gtkutils.c pidgin/pidgin.h po/POTFILES.in
diffstat 9 files changed, 19 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Sun May 06 00:43:29 2007 +0000
+++ b/configure.ac	Sun May 06 00:44:41 2007 +0000
@@ -93,8 +93,6 @@
 GNT_LT_VERSION_INFO="gnt_lt_current:gnt_micro_version:gnt_minor_version"
 AC_SUBST(GNT_LT_VERSION_INFO)
 
-AC_DEFINE(PIDGIN_NAME, "Pidgin", [The user-visible application name])
-
 AC_PATH_PROG(sedpath, sed)
 
 dnl Storing configure arguments
--- a/finch/finch.c	Sun May 06 00:43:29 2007 +0000
+++ b/finch/finch.c	Sun May 06 00:44:41 2007 +0000
@@ -274,7 +274,7 @@
 	}
 	/* show version message */
 	if (opt_version) {
-		printf("Finch %s\n", VERSION);
+		printf("%s %s\n", _("Finch"), VERSION);
 		return 0;
 	}
 
@@ -303,7 +303,7 @@
 			char *text = g_strdup_printf(_(
 				"%s encountered errors migrating your settings "
 				"from %s to %s. Please investigate and complete the "
-				"migration by hand. Please report this error at http://developer.pidgin.im"), "Finch",
+				"migration by hand. Please report this error at http://developer.pidgin.im"), _("Finch"),
 				old, purple_user_dir());
 
 			g_free(old);
--- a/pidgin/gtkconv.c	Sun May 06 00:43:29 2007 +0000
+++ b/pidgin/gtkconv.c	Sun May 06 00:44:41 2007 +0000
@@ -376,7 +376,7 @@
 	PurpleCmdStatus status;
 
 	if (!g_ascii_strcasecmp(args[0], "version")) {
-		tmp = g_strdup_printf("me is using " PIDGIN_NAME " v%s.", VERSION);
+		tmp = g_strdup_printf("me is using %s v%s.", PIDGIN_NAME, VERSION);
 		markup = g_markup_escape_text(tmp, -1);
 
 		status = purple_cmd_do_command(conv, tmp, markup, error);
--- a/pidgin/gtkdialogs.c	Sun May 06 00:43:29 2007 +0000
+++ b/pidgin/gtkdialogs.c	Sun May 06 00:44:41 2007 +0000
@@ -350,7 +350,9 @@
 	gdk_pixbuf_unref(pixbuf);
 	/* Insert the logo */
 	obj = gtk_widget_get_accessible(logo);
-	atk_object_set_description(obj, PIDGIN_NAME " " VERSION);
+	tmp = g_strconcat(PIDGIN_NAME, " " VERSION, NULL);
+	atk_object_set_description(obj, tmp);
+	g_free(tmp);
 	gtk_box_pack_start(GTK_BOX(vbox), logo, FALSE, FALSE, 0);
 
 	frame = pidgin_create_imhtml(FALSE, &text, NULL, NULL);
@@ -506,9 +508,9 @@
 #endif
 
 #ifdef HAVE_SSL
-	g_string_append(str, "  <b>SSL:</b> " PIDGIN_NAME " was compiled with SSL support.<br/>");
+	g_string_append(str, "  <b>SSL:</b> SSL support is present.<br/>");
 #else
-	g_string_append(str, "  <b>SSL:</b> " PIDGIN_NAME " was <b><i>NOT</i></b> compiled with any SSL support!<br/>");
+	g_string_append(str, "  <b>SSL:</b> SSL support was <b><i>NOT</i></b> compiled!<br/>");
 #endif
 
 /* This might be useful elsewhere too, but it is particularly useful for
--- a/pidgin/gtkdocklet.c	Sun May 06 00:43:29 2007 +0000
+++ b/pidgin/gtkdocklet.c	Sun May 06 00:44:41 2007 +0000
@@ -171,7 +171,7 @@
 		g_list_free(convs);
 
 	} else if (ui_ops->set_tooltip) {
-		char *tooltip_text = g_strconcat(PIDGIN_NAME " - ",
+		char *tooltip_text = g_strconcat(PIDGIN_NAME, " - ",
 			purple_savedstatus_get_title(saved_status), NULL);
 		ui_ops->set_tooltip(tooltip_text);
 		g_free(tooltip_text);
--- a/pidgin/gtkmain.c	Sun May 06 00:43:29 2007 +0000
+++ b/pidgin/gtkmain.c	Sun May 06 00:44:41 2007 +0000
@@ -498,8 +498,8 @@
 			"%s has segfaulted and attempted to dump a core file.\n"
 			"This is a bug in the software and has happened through\n"
 			"no fault of your own.\n\n"
-			"If you can reproduce the crash, please notify the Pidgin\n"
-			"developers by reporting a bug at\n"
+			"If you can reproduce the crash, please notify the developers\n"
+			"by reporting a bug at:\n"
 			"%snewticket/\n\n"
 			"Please make sure to specify what you were doing at the time\n"
 			"and post the backtrace from the core file.  If you do not know\n"
@@ -630,7 +630,7 @@
 	}
 	/* show version message */
 	if (opt_version) {
-		printf(PIDGIN_NAME " %s\n", VERSION);
+		printf("%s %s\n", PIDGIN_NAME, VERSION);
 #ifdef HAVE_SIGNAL_H
 		g_free(segfault_message);
 #endif
@@ -667,7 +667,7 @@
 	if (!gui_check) {
 		char *display = gdk_get_display();
 
-		printf(PIDGIN_NAME " %s\n", VERSION);
+		printf("%s %s\n", PIDGIN_NAME, VERSION);
 
 		g_warning("cannot open display: %s", display ? display : "unset");
 		g_free(display);
@@ -727,7 +727,7 @@
 
 	if (!purple_core_init(PIDGIN_UI)) {
 		fprintf(stderr,
-				"Initialization of the " PIDGIN_NAME " core failed. Dumping core.\n"
+				"Initialization of the libpurple core failed. Dumping core.\n"
 				"Please report this!\n");
 #ifdef HAVE_SIGNAL_H
 		g_free(segfault_message);
--- a/pidgin/gtkutils.c	Sun May 06 00:43:29 2007 +0000
+++ b/pidgin/gtkutils.c	Sun May 06 00:44:41 2007 +0000
@@ -1417,7 +1417,7 @@
 			char *str, *str2;
 
 			str = g_strdup_printf(_("Cannot send folder %s."), basename);
-			str2 = g_strdup_printf(_("%s cannot transfer a folder. You will need to send the files within individually"), PIDGIN_NAME);
+			str2 = g_strdup_printf(_("%s cannot transfer a folder. You will need to send the files within individually."), PIDGIN_NAME);
 
 			purple_notify_error(NULL, NULL,
 					  str, str2);
--- a/pidgin/pidgin.h	Sun May 06 00:43:29 2007 +0000
+++ b/pidgin/pidgin.h	Sun May 06 00:44:41 2007 +0000
@@ -45,6 +45,9 @@
 /* change this only when we have a sane upgrade path for old prefs */
 #define PIDGIN_PREFS_ROOT "/pidgin"
 
+/* Translators may want to transliterate the name. */
+#define PIDGIN_NAME _("Pidgin")
+
 #ifndef _WIN32
 # define PIDGIN_ALERT_TITLE ""
 #else
--- a/po/POTFILES.in	Sun May 06 00:43:29 2007 +0000
+++ b/po/POTFILES.in	Sun May 06 00:44:41 2007 +0000
@@ -177,6 +177,7 @@
 pidgin/gtkutils.c
 pidgin/gtkwhiteboard.c
 pidgin/pidgincombobox.c
+pidgin/pidgin.h
 pidgin/pidginstock.c
 pidgin/plugins/cap/cap.c
 pidgin/plugins/contact_priority.c