From 04e61ded7e297f4ac0ce82fb30cb1d0ea5827a18 Mon Sep 17 00:00:00 2001
From: JazzyNico <nicoduf@yahoo.fr>
Date: Fri, 24 Sep 2010 18:11:21 +0200
Subject: [PATCH] i18n. Fix for bug #644967 (Translation of strings using NC_()
 macro are not applied properly).

---
 src/flood-context.cpp   |  8 ++++----
 src/ui/widget/panel.cpp | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/flood-context.cpp b/src/flood-context.cpp
index 612ae1cfc..12a8febe2 100644
--- a/src/flood-context.cpp
+++ b/src/flood-context.cpp
@@ -261,10 +261,10 @@ GList * flood_channels_dropdown_items_list() {
 GList * flood_autogap_dropdown_items_list() {
     GList *glist = NULL;
 
-    glist = g_list_append (glist, _("None"));
-    glist = g_list_append (glist, _("Small"));
-    glist = g_list_append (glist, _("Medium"));
-    glist = g_list_append (glist, _("Large"));
+    glist = g_list_append (glist, (void*) C_("Flood autogap", "None"));
+    glist = g_list_append (glist, (void*) C_("Flood autogap", "Small"));
+    glist = g_list_append (glist, (void*) C_("Flood autogap", "Medium"));
+    glist = g_list_append (glist, (void*) C_("Flood autogap", "Large"));
 
     return glist;
 }
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 66342ad1f..f3cb0967c 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -135,11 +135,11 @@ void Panel::_init()
 
         //TRANSLATORS: Indicates size of colour swatches
         const gchar *heightLabels[] = {
-            N_("Tiny"),
-            N_("Small"),
+            NC_("Swatches height", "Tiny"),
+            NC_("Swatches height", "Small"),
             NC_("Swatches height", "Medium"),
-            N_("Large"),
-            N_("Huge")
+            NC_("Swatches height", "Large"),
+            NC_("Swatches height", "Huge")
         };
 
         Gtk::MenuItem *sizeItem = manage(new Gtk::MenuItem(heightItemLabel));
@@ -148,7 +148,7 @@ void Panel::_init()
 
         Gtk::RadioMenuItem::Group heightGroup;
         for (unsigned int i = 0; i < G_N_ELEMENTS(heightLabels); i++) {
-            Glib::ustring _label(Q_(heightLabels[i]));
+            Glib::ustring _label(g_dpgettext2(NULL, "Swatches height", heightLabels[i]));
             Gtk::RadioMenuItem* _item = manage(new Gtk::RadioMenuItem(heightGroup, _label));
             sizeMenu->append(*_item);
             if (i == panel_size) {
@@ -165,11 +165,11 @@ void Panel::_init()
 
         //TRANSLATORS: Indicates width of colour swatches
         const gchar *widthLabels[] = {
-            N_("Narrower"),
-            N_("Narrow"),
+            NC_("Swatches width", "Narrower"),
+            NC_("Swatches width", "Narrow"),
             NC_("Swatches width", "Medium"),
-            N_("Wide"),
-            N_("Wider")
+            NC_("Swatches width", "Wide"),
+            NC_("Swatches width", "Wider")
         };
 
         Gtk::MenuItem *item = manage( new Gtk::MenuItem(widthItemLabel));
@@ -188,7 +188,7 @@ void Panel::_init()
             }
         }
         for ( guint i = 0; i < G_N_ELEMENTS(widthLabels); ++i ) {
-            Glib::ustring _label(Q_(widthLabels[i]));
+            Glib::ustring _label(g_dpgettext2(NULL, "Swatches width", widthLabels[i]));
             Gtk::RadioMenuItem *_item = manage(new Gtk::RadioMenuItem(widthGroup, _label));
             type_menu->append(*_item);
             if ( i <= hot_index ) {
-- 
2.30.2