branch

3 files changed, 65 insertions, 48 deletions

diff --git a/ChangeLog b/ChangeLog
index c60df1b4..1002c16b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2007-10-03 15:45  Thierry Vignaud <tvignaud at mandriva.com>
+
+	* po/es.po: update (Fabián Mandelbaum)
+
+2007-10-01 17:44  Thierry Vignaud <tvignaud at mandriva.com>
+
+	* ChangeLog: update
+
+2007-10-01 17:43  Thierry Vignaud <tvignaud at mandriva.com>
+
+	* TODO: kill done items
+
+2007-10-01 13:53  Thierry Vignaud <tvignaud at mandriva.com>
+
+	* Makefile: 10.9
+
 2007-10-01 13:53  Thierry Vignaud <tvignaud at mandriva.com>
 
 	* Makefile: 10.9
diff --git a/control-center b/control-center
index fc5a0727..1abca77a 100755
--- a/control-center
+++ b/control-center
@@ -1261,20 +1261,21 @@ my @menu_items = (
                      ),
                   [ N("/_Help"), undef, undef, undef, '<Branch>' ],
                   [ N("/_Help") . N("/_Help"), undef,  sub { fork_("drakhelp --id $help_on_context", []) }, undef, '<Item>', N("Help") ],
-                  [ N("/_Help") . N("/_Release notes"), undef,  sub {
-                        run_program::raw({ detach => 1 }, '/usr/bin/www-browser',
-                                         "http://wiki.mandriva.com/en/Releases/Mandriva/$release->{version}/Notes");
-                    }, undef, '<Item>', N("Help") ],
-                  [ N("/_Help") . N("/_Errata"), undef,  sub {
-                        run_program::raw({ detach => 1 }, '/usr/bin/www-browser',
-                                         "http://wiki.mandriva.com/en/Releases/Mandriva/$release->{version}/Errata");
-                    }, undef, '<Item>', N("Help") ],
+                  [ N("/_Help") . N("/_Release notes"), undef,  sub { run_browser('Notes') }, undef, '<Item>', N("Help") ],
+                  [ N("/_Help") . N("/What's _New?"), undef,  sub { run_browser("What's New?") }, undef, '<Item>', N("Help") ],
+                  [ N("/_Help") . N("/_Errata"), undef,  sub { run_browser('Errata') }, undef, '<Item>', N("Help") ],
                   [ N("/_Help") . N("/_Report Bug"), undef, sub {
                         run_program::raw({ detach => 1 }, 'drakbug', '--report', (split(/\s/, $pending_app))[0] || 'drakconf');
                       }, undef, '<Item>' ],
                   [ N("/_Help") . N("/_About..."), undef, \&about_mdk_cc, undef, '<Item>' ]
                  );
 
+sub run_browser {
+    my ($url) = @_;
+    $url = "http://wiki.mandriva.com/en/Releases/Mandriva/$release->{version}/$url" if $url !~ m!^http://!;
+    run_program::raw({ detach => 1 }, '/usr/bin/www-browser', $url);
+}
+
 my ($menu, $factory) = create_factory_menu($window_global, @menu_items);
 
 # to retrieve a path, one must prevent "accelerators completion":
diff --git a/po/drakconf.pot b/po/drakconf.pot
index 4a0d6932..4c97be55 100644
--- a/po/drakconf.pot
+++ b/po/drakconf.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-09-17 13:43+0200\n"
+"POT-Creation-Date: 2007-10-03 18:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -520,7 +520,7 @@ msgstr ""
 msgid "Mandriva Linux Control Center"
 msgstr ""
 
-#: ../control-center:103 ../control-center:1545
+#: ../control-center:103 ../control-center:1547
 #, c-format
 msgid "Loading... Please wait"
 msgstr ""
@@ -1288,7 +1288,7 @@ msgstr ""
 msgid "Localization"
 msgstr ""
 
-#: ../control-center:1021
+#: ../control-center:1020
 #, c-format
 msgid "Administration tools"
 msgstr ""
@@ -1462,7 +1462,7 @@ msgid "/_More themes"
 msgstr ""
 
 #: ../control-center:1262 ../control-center:1263 ../control-center:1264
-#: ../control-center:1268 ../control-center:1272 ../control-center:1273
+#: ../control-center:1268 ../control-center:1272 ../control-center:1275
 #, c-format
 msgid "/_Help"
 msgstr ""
@@ -1487,32 +1487,32 @@ msgstr ""
 msgid "/_Report Bug"
 msgstr ""
 
-#: ../control-center:1273
+#: ../control-center:1275
 #, c-format
 msgid "/_About..."
 msgstr ""
 
-#: ../control-center:1301
+#: ../control-center:1303
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#: ../control-center:1335
+#: ../control-center:1337
 #, c-format
 msgid "Mandriva Linux Control Center %s [on %s]"
 msgstr ""
 
-#: ../control-center:1349
+#: ../control-center:1351
 #, c-format
 msgid "Welcome to the Mandriva Linux Control Center"
 msgstr ""
 
-#: ../control-center:1524 ../control-center:1597
+#: ../control-center:1526 ../control-center:1599
 #, c-format
 msgid "Error"
 msgstr ""
 
-#: ../control-center:1524
+#: ../control-center:1526
 #, c-format
 msgid ""
 "There's a bug in translations of your language (%s)\n"
@@ -1520,158 +1520,158 @@ msgid ""
 "Please report that bug."
 msgstr ""
 
-#: ../control-center:1597
+#: ../control-center:1599
 #, c-format
 msgid "Impossible to run unknown '%s' program"
 msgstr ""
 
-#: ../control-center:1616
+#: ../control-center:1618
 #, c-format
 msgid "The modifications done in the current module won't be saved."
 msgstr ""
 
-#: ../control-center:1623 ../control-center:1626
+#: ../control-center:1625 ../control-center:1628
 #, c-format
 msgid "Upload the hardware list"
 msgstr ""
 
-#: ../control-center:1628
+#: ../control-center:1630
 #, c-format
 msgid "Account:"
 msgstr ""
 
-#: ../control-center:1629
+#: ../control-center:1631
 #, c-format
 msgid "Password:"
 msgstr ""
 
-#: ../control-center:1630
+#: ../control-center:1632
 #, c-format
 msgid "Hostname:"
 msgstr ""
 
-#: ../control-center:1657
+#: ../control-center:1659
 #, c-format
 msgid "Please wait"
 msgstr ""
 
-#: ../control-center:1657
+#: ../control-center:1659
 #, c-format
 msgid "Uploading in progress"
 msgstr ""
 
-#: ../control-center:1749
+#: ../control-center:1751
 #, c-format
 msgid "cannot fork: %s"
 msgstr ""
 
-#: ../control-center:1760
+#: ../control-center:1762
 #, c-format
 msgid "cannot fork and exec \"%s\" since it is not executable"
 msgstr ""
 
-#: ../control-center:1883
+#: ../control-center:1885
 #, c-format
 msgid "This program has exited abnormally"
 msgstr ""
 
-#: ../control-center:1892
+#: ../control-center:1894
 #, c-format
 msgid "Warning"
 msgstr ""
 
-#: ../control-center:1902 ../drakconsole:31
+#: ../control-center:1904 ../drakconsole:31
 #, c-format
 msgid "Close"
 msgstr ""
 
-#: ../control-center:1909
+#: ../control-center:1911
 #, c-format
 msgid "More themes"
 msgstr ""
 
-#: ../control-center:1911
+#: ../control-center:1913
 #, c-format
 msgid "Getting new themes"
 msgstr ""
 
-#: ../control-center:1912
+#: ../control-center:1914
 #, c-format
 msgid "Additional themes"
 msgstr ""
 
-#: ../control-center:1914
+#: ../control-center:1916
 #, c-format
 msgid "Get additional themes on www.damz.net"
 msgstr ""
 
-#: ../control-center:1922
+#: ../control-center:1924
 #, c-format
 msgid "About - Mandriva Linux Control Center"
 msgstr ""
 
-#: ../control-center:1931
+#: ../control-center:1933
 #, c-format
 msgid "Authors: "
 msgstr ""
 
-#: ../control-center:1935
+#: ../control-center:1937
 #, c-format
 msgid "(perl version)"
 msgstr ""
 
-#: ../control-center:1940
+#: ../control-center:1942
 #, c-format
 msgid "Artwork: "
 msgstr ""
 
-#: ../control-center:1945
+#: ../control-center:1947
 #, c-format
 msgid "Helene Durosini"
 msgstr ""
 
 #. -PO: this is used as "language: translator" in credits part of the about dialog:
-#: ../control-center:1967
+#: ../control-center:1969
 #, c-format
 msgid "- %s: %s\n"
 msgstr ""
 
-#: ../control-center:1982
+#: ../control-center:1984
 #, c-format
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr ""
 
-#: ../control-center:1984
+#: ../control-center:1986
 #, c-format
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr ""
 
-#: ../control-center:1986
+#: ../control-center:1988
 #, c-format
 msgid "Translator: "
 msgstr ""
 
 #. -PO: here, %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
-#: ../control-center:1994
+#: ../control-center:1996
 #, c-format
 msgid "Mandriva Linux %s (%s) Control Center"
 msgstr ""
 
-#: ../control-center:1998
+#: ../control-center:2000
 #, c-format
 msgid "Copyright (C) 1999-2007 Mandriva SA"
 msgstr ""
 
-#: ../control-center:2004
+#: ../control-center:2006
 #, c-format
 msgid "Authors"
 msgstr ""
 
-#: ../control-center:2005
+#: ../control-center:2007
 #, c-format
 msgid "Mandriva Linux Contributors"
 msgstr ""