pidgin: 605e3104: Modernize the list of browsers a bit by ...

[rekkanoryo at pidgin.im]

----------------------------------------------------------------------
Revision: 605e3104d4da257c5bd0a523e362328583ea8b17
Parent:   1038d385901b2c20e17c07dfc4611110c31162d8
Author:   rekkanoryo at pidgin.im
Date:     09/17/10 21:38:41
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/605e3104d4da257c5bd0a523e362328583ea8b17

Changelog: 

Modernize the list of browsers a bit by adding Google Chrome and Chromium to
the list of possible browsers.  Refs #12505.

Changes against parent 1038d385901b2c20e17c07dfc4611110c31162d8

  patched  ChangeLog
  patched  pidgin/gtkprefs.c

-------------- next part --------------
============================================================
--- ChangeLog	19b7b0a9d0e9926075bf3026f0a28a2092e8cb51
+++ ChangeLog	b5ec7b1cc9340f79fa1cc63686d79428b9576b09
@@ -19,6 +19,9 @@ version 2.7.4 (MM/DD/YYYY):
 	  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
============================================================
--- pidgin/gtkprefs.c	4624c89f7953c55266e8d528c535d61108305e6d
+++ pidgin/gtkprefs.c	72cc171962e19b76bdb120156cce915b018557d1
@@ -1832,12 +1832,19 @@ get_available_browsers(void)
 		{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);