# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1284773921 0
# Node ID 0dc6c4be763d37813caff726b19e292755e86fde
# Parent  839f3d63acabe529031f24b22a4e15aa0bb47f33
Modernize the list of browsers a bit by adding Google Chrome and Chromium to
the list of possible browsers.  Refs #12505.

diff -r 839f3d63acab -r 0dc6c4be763d ChangeLog
--- a/ChangeLog	Sat Sep 18 01:33:34 2010 +0000
+++ b/ChangeLog	Sat Sep 18 01:38:41 2010 +0000
@@ -19,6 +19,9 @@
 	  Settings plugin.
 	* Use GRegex for the debug window where available. This brings regex
 	  filtering to the debug window on Windows. (Eion Robb) (#12601)
+	* Add Google Chrome to the list of possible browsers on non-Windows
+	  systems.
+	* Add Chromium to the list of possible browsers on non-Windows systems.
 
 	Finch:
 	* Add support for drop-down account options (like the SILC cipher
diff -r 839f3d63acab -r 0dc6c4be763d pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Sat Sep 18 01:33:34 2010 +0000
+++ b/pidgin/gtkprefs.c	Sat Sep 18 01:38:41 2010 +0000
@@ -1832,12 +1832,19 @@
 		{N_("Netscape"), "netscape"},
 		{N_("Mozilla"), "mozilla"},
 		{N_("Konqueror"), "kfmclient"},
+		{N_("Google Chrome"), "google-chrome"},
+		/* Do not move the line below.  Code below expects gnome-open to be in
+		 * this list immediately after xdg-open! */
 		{N_("Desktop Default"), "xdg-open"},
 		{N_("GNOME Default"), "gnome-open"},
 		{N_("Galeon"), "galeon"},
 		{N_("Firefox"), "firefox"},
 		{N_("Firebird"), "mozilla-firebird"},
-		{N_("Epiphany"), "epiphany"}
+		{N_("Epiphany"), "epiphany"},
+		/* Translators: please do not translate "chromium-browser" here! */
+		{N_("Chromium (chromium-browser)"), "chromium-browser"},
+		/* Translators: please do not translate "chrome" here! */
+		{N_("Chromium (chrome)"), "chrome"}
 	};
 	static const int num_possible_browsers = G_N_ELEMENTS(possible_browsers);