Fixed localization for metadata license selector.

diff --git a/ChangeLog b/ChangeLog
index fdf7429ba30bccc643ca37ca601ec313bf999848..1e07cedc968209b63ee5c13a970393ace078e919 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-17  Kees Cook  <kees@outflux.net>
+       * src/dialogs/rdf.cpp: corrected localization on array, added comments.
+       * src/ui/widget/licensor.cpp: Localized the license name.
+       * configure.ac: added comment about why sigc++ was upgraded
+
 2006-05-17  Jon A. Cruz  <jon@joncruz.org>
        * src/dialogs/layers-panel.cpp:
          Flipped top/bottom in layers UI to reflect visible stacking.

diff --git a/configure.ac b/configure.ac
index 5b7ad8ed403cb241c5593e57f630fafb710474ee..9d5049774f3ee8ce008b9f974424eacc0789eb96 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -494,6 +494,7 @@ dnl ******************************
 
 dnl *** NOTE: when we move to gtk 2.6 or later, we can remove the 
 dnl ********* the override for g_ascii_strtod below...
+dnl sigc++-2.0 >= 2.0.11: using "visit_each" not available in 2.0.10
 PKG_CHECK_MODULES(INKSCAPE, gdkmm-2.4  glibmm-2.4  gtkmm-2.4  gtk+-2.0 >= 2.4.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  sigc++-2.0 >= 2.0.11  $ink_spell_pkg  gthread-2.0 >= 2.0)
 
 dnl Shouldn't we test for libpng and libz?

diff --git a/src/dialogs/rdf.cpp b/src/dialogs/rdf.cpp
index df89ee6480a1c5841a7e7fff20c934241c066079..a0bb04ad17adfda1bd41ccada84292b852054947 100644 (file)
--- a/src/dialogs/rdf.cpp
+++ b/src/dialogs/rdf.cpp
@@ -175,52 +175,52 @@ struct rdf_double_t rdf_license_freeart [] = {
 };
 
 struct rdf_license_t rdf_licenses [] = {
-    { _("CC Attribution"), 
+    { N_("CC Attribution"), 
       "http://creativecommons.org/licenses/by/2.5/",
       rdf_license_cc_a,
     },
 
-    { _("CC Attribution-ShareAlike"), 
+    { N_("CC Attribution-ShareAlike"), 
       "http://creativecommons.org/licenses/by-sa/2.5/",
       rdf_license_cc_a_sa,
     },
 
-    { _("CC Attribution-NoDerivs"), 
+    { N_("CC Attribution-NoDerivs"), 
       "http://creativecommons.org/licenses/by-nd/2.5/",
       rdf_license_cc_a_nd,
     },
 
-    { _("CC Attribution-NonCommercial"), 
+    { N_("CC Attribution-NonCommercial"), 
       "http://creativecommons.org/licenses/by-nc/2.5/",
       rdf_license_cc_a_nc,
     },
 
-    { _("CC Attribution-NonCommercial-ShareAlike"), 
+    { N_("CC Attribution-NonCommercial-ShareAlike"), 
       "http://creativecommons.org/licenses/by-nc-sa/2.5/",
       rdf_license_cc_a_nc_sa,
     },
 
-    { _("CC Attribution-NonCommercial-NoDerivs"), 
+    { N_("CC Attribution-NonCommercial-NoDerivs"), 
       "http://creativecommons.org/licenses/by-nc-nd/2.5/",
       rdf_license_cc_a_nc_nd,
     },
 
-    { _("GNU General Public License"), 
+    { N_("GNU General Public License"), 
       "http://creativecommons.org/licenses/GPL/2.0/",
       rdf_license_gpl,
     },
 
-    { _("GNU Lesser General Public License"), 
+    { N_("GNU Lesser General Public License"), 
       "http://creativecommons.org/licenses/LGPL/2.1/",
       rdf_license_gpl,
     },
 
-    { _("Public Domain"),
+    { N_("Public Domain"),
       "http://web.resource.org/cc/PublicDomain",
       rdf_license_pd,
     },
 
-    { _("FreeArt"),
+    { N_("FreeArt"),
       "http://artlibre.org/licence.php/lalgb.html",
       rdf_license_freeart,
     },

diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp
index 9a571322096a72e0838fe13c4ee39e04a4ea50e7..df00e358a770225fa9f2f7a37034141a8ca231db 100644 (file)
--- a/src/ui/widget/licensor.cpp
+++ b/src/ui/widget/licensor.cpp
@@ -45,7 +45,7 @@ protected:
 };
 
 LicenseItem::LicenseItem (struct rdf_license_t const* license, EntityEntry* entity, Registry &wr)
-: Gtk::RadioButton(license->name), _lic(license), _eep(entity), _wr(wr)
+: Gtk::RadioButton(gettext(license->name)), _lic(license), _eep(entity), _wr(wr)
 {
     static Gtk::RadioButtonGroup group = get_group();
     static bool first = true;