diff --git a/glabels/ColorPaletteDialog.cpp b/glabels/ColorPaletteDialog.cpp
index a89a707..cab3dae 100644
--- a/glabels/ColorPaletteDialog.cpp
+++ b/glabels/ColorPaletteDialog.cpp
@@ -37,45 +37,45 @@ namespace glabels
//
ColorPaletteDialog::ColorTableEntry ColorPaletteDialog::mColorTable[] = {
- { "#ef2929", tr("Light Scarlet Red", "Color name") },
- { "#fcaf3e", tr("Light Orange", "Color name") },
- { "#fce94f", tr("Light Butter", "Color name") },
- { "#8ae234", tr("Light Chameleon", "Color name") },
- { "#729fcf", tr("Light Sky Blue", "Color name") },
- { "#ad7fa8", tr("Light Plum", "Color name") },
- { "#e9b96e", tr("Light Chocolate", "Color name") },
- { "#888a85", tr("Light Aluminum 1", "Color name") },
- { "#eeeeec", tr("Light Aluminum 2", "Color name") },
+ { "#ef2929", QT_TRANSLATE_NOOP("Color name", "Light Scarlet Red") },
+ { "#fcaf3e", QT_TRANSLATE_NOOP("Color name", "Light Orange") },
+ { "#fce94f", QT_TRANSLATE_NOOP("Color name", "Light Butter") },
+ { "#8ae234", QT_TRANSLATE_NOOP("Color name", "Light Chameleon") },
+ { "#729fcf", QT_TRANSLATE_NOOP("Color name", "Light Sky Blue") },
+ { "#ad7fa8", QT_TRANSLATE_NOOP("Color name", "Light Plum") },
+ { "#e9b96e", QT_TRANSLATE_NOOP("Color name", "Light Chocolate") },
+ { "#888a85", QT_TRANSLATE_NOOP("Color name", "Light Aluminum 1") },
+ { "#eeeeec", QT_TRANSLATE_NOOP("Color name", "Light Aluminum 2") },
- { "#cc0000", tr("Scarlet Red", "Color name") },
- { "#f57900", tr("Orange", "Color name") },
- { "#edd400", tr("Butter", "Color name") },
- { "#73d216", tr("Chameleon", "Color name") },
- { "#3465a4", tr("Sky Blue", "Color name") },
- { "#75507b", tr("Plum", "Color name") },
- { "#c17d11", tr("Chocolate", "Color name") },
- { "#555753", tr("Aluminum 1", "Color name") },
- { "#d3d7cf", tr("Aluminum 2", "Color name") },
+ { "#cc0000", QT_TRANSLATE_NOOP("Color name", "Scarlet Red") },
+ { "#f57900", QT_TRANSLATE_NOOP("Color name", "Orange") },
+ { "#edd400", QT_TRANSLATE_NOOP("Color name", "Butter") },
+ { "#73d216", QT_TRANSLATE_NOOP("Color name", "Chameleon") },
+ { "#3465a4", QT_TRANSLATE_NOOP("Color name", "Sky Blue") },
+ { "#75507b", QT_TRANSLATE_NOOP("Color name", "Plum") },
+ { "#c17d11", QT_TRANSLATE_NOOP("Color name", "Chocolate") },
+ { "#555753", QT_TRANSLATE_NOOP("Color name", "Aluminum 1") },
+ { "#d3d7cf", QT_TRANSLATE_NOOP("Color name", "Aluminum 2") },
- { "#a40000", tr("Dark Scarlet Red", "Color name") },
- { "#ce5c00", tr("Dark Orange", "Color name") },
- { "#c4a000", tr("Dark Butter", "Color name") },
- { "#4e9a06", tr("Dark Chameleon", "Color name") },
- { "#204a87", tr("Dark Sky Blue", "Color name") },
- { "#5c3566", tr("Dark Plum", "Color name") },
- { "#8f5902", tr("Dark Chocolate", "Color name") },
- { "#2e3436", tr("Dark Aluminum 1", "Color name") },
- { "#babdb6", tr("Dark Aluminum 2", "Color name") },
+ { "#a40000", QT_TRANSLATE_NOOP("Color name", "Dark Scarlet Red") },
+ { "#ce5c00", QT_TRANSLATE_NOOP("Color name", "Dark Orange") },
+ { "#c4a000", QT_TRANSLATE_NOOP("Color name", "Dark Butter") },
+ { "#4e9a06", QT_TRANSLATE_NOOP("Color name", "Dark Chameleon") },
+ { "#204a87", QT_TRANSLATE_NOOP("Color name", "Dark Sky Blue") },
+ { "#5c3566", QT_TRANSLATE_NOOP("Color name", "Dark Plum") },
+ { "#8f5902", QT_TRANSLATE_NOOP("Color name", "Dark Chocolate") },
+ { "#2e3436", QT_TRANSLATE_NOOP("Color name", "Dark Aluminum 1") },
+ { "#babdb6", QT_TRANSLATE_NOOP("Color name", "Dark Aluminum 2") },
- { "#000000", tr("Black", "Color name") },
- { "#2e3436", tr("Very Dark Gray", "Color name") },
- { "#555753", tr("Darker Gray", "Color name") },
- { "#888a85", tr("Dark Gray", "Color name") },
- { "#babdb6", tr("Medium Gray", "Color name") },
- { "#d3d7cf", tr("Light Gray", "Color name") },
- { "#eeeeec", tr("Lighter Gray", "Color name") },
- { "#f3f3f3", tr("Very Light Gray", "Color name") },
- { "#ffffff", tr("White", "Color name") }
+ { "#000000", QT_TRANSLATE_NOOP("Color name", "Black") },
+ { "#2e3436", QT_TRANSLATE_NOOP("Color name", "Very Dark Gray") },
+ { "#555753", QT_TRANSLATE_NOOP("Color name", "Darker Gray") },
+ { "#888a85", QT_TRANSLATE_NOOP("Color name", "Dark Gray") },
+ { "#babdb6", QT_TRANSLATE_NOOP("Color name", "Medium Gray") },
+ { "#d3d7cf", QT_TRANSLATE_NOOP("Color name", "Light Gray") },
+ { "#eeeeec", QT_TRANSLATE_NOOP("Color name", "Lighter Gray") },
+ { "#f3f3f3", QT_TRANSLATE_NOOP("Color name", "Very Light Gray") },
+ { "#ffffff", QT_TRANSLATE_NOOP("Color name", "White") }
};
@@ -118,7 +118,7 @@ namespace glabels
ColorPaletteItem* item = new ColorPaletteItem( i,
QColor( mColorTable[i].colorSpec ),
- mColorTable[i].name );
+ tr(mColorTable[i].trname) );
connect( item, SIGNAL(activated(int)), this, SLOT(onPaletteItemActivated(int)) );
mainPaletteLayout->addWidget( item, iRow, iCol );
diff --git a/glabels/ColorPaletteDialog.h b/glabels/ColorPaletteDialog.h
index 56c1ce2..5bc8379 100644
--- a/glabels/ColorPaletteDialog.h
+++ b/glabels/ColorPaletteDialog.h
@@ -103,7 +103,7 @@ namespace glabels
typedef struct {
QString colorSpec;
- QString name;
+ const char* trname;
} ColorTableEntry;
static ColorTableEntry mColorTable[];
diff --git a/translations/glabels_C.ts b/translations/glabels_C.ts
index 01f89a5..c8926c6 100644
--- a/translations/glabels_C.ts
+++ b/translations/glabels_C.ts
@@ -24,6 +24,189 @@
+
+ Color name
+
+
+ Light Scarlet Red
+
+
+
+
+ Light Orange
+
+
+
+
+ Light Butter
+
+
+
+
+ Light Chameleon
+
+
+
+
+ Light Sky Blue
+
+
+
+
+ Light Plum
+
+
+
+
+ Light Chocolate
+
+
+
+
+ Light Aluminum 1
+
+
+
+
+ Light Aluminum 2
+
+
+
+
+ Scarlet Red
+
+
+
+
+ Orange
+
+
+
+
+ Butter
+
+
+
+
+ Chameleon
+
+
+
+
+ Sky Blue
+
+
+
+
+ Plum
+
+
+
+
+ Chocolate
+
+
+
+
+ Aluminum 1
+
+
+
+
+ Aluminum 2
+
+
+
+
+ Dark Scarlet Red
+
+
+
+
+ Dark Orange
+
+
+
+
+ Dark Butter
+
+
+
+
+ Dark Chameleon
+
+
+
+
+ Dark Sky Blue
+
+
+
+
+ Dark Plum
+
+
+
+
+ Dark Chocolate
+
+
+
+
+ Dark Aluminum 1
+
+
+
+
+ Dark Aluminum 2
+
+
+
+
+ Black
+
+
+
+
+ Very Dark Gray
+
+
+
+
+ Darker Gray
+
+
+
+
+ Dark Gray
+
+
+
+
+ Medium Gray
+
+
+
+
+ Light Gray
+
+
+
+
+ Lighter Gray
+
+
+
+
+ Very Light Gray
+
+
+
+
+ White
+
+
+
MergeView
@@ -627,222 +810,6 @@
glabels::ColorPaletteDialog
-
-
- Light Scarlet Red
- Color name
-
-
-
-
- Light Orange
- Color name
-
-
-
-
- Light Butter
- Color name
-
-
-
-
- Light Chameleon
- Color name
-
-
-
-
- Light Sky Blue
- Color name
-
-
-
-
- Light Plum
- Color name
-
-
-
-
- Light Chocolate
- Color name
-
-
-
-
- Light Aluminum 1
- Color name
-
-
-
-
- Light Aluminum 2
- Color name
-
-
-
-
- Scarlet Red
- Color name
-
-
-
-
- Orange
- Color name
-
-
-
-
- Butter
- Color name
-
-
-
-
- Chameleon
- Color name
-
-
-
-
- Sky Blue
- Color name
-
-
-
-
- Plum
- Color name
-
-
-
-
- Chocolate
- Color name
-
-
-
-
- Aluminum 1
- Color name
-
-
-
-
- Aluminum 2
- Color name
-
-
-
-
- Dark Scarlet Red
- Color name
-
-
-
-
- Dark Orange
- Color name
-
-
-
-
- Dark Butter
- Color name
-
-
-
-
- Dark Chameleon
- Color name
-
-
-
-
- Dark Sky Blue
- Color name
-
-
-
-
- Dark Plum
- Color name
-
-
-
-
- Dark Chocolate
- Color name
-
-
-
-
- Dark Aluminum 1
- Color name
-
-
-
-
- Dark Aluminum 2
- Color name
-
-
-
-
- Black
- Color name
-
-
-
-
- Very Dark Gray
- Color name
-
-
-
-
- Darker Gray
- Color name
-
-
-
-
- Dark Gray
- Color name
-
-
-
-
- Medium Gray
- Color name
-
-
-
-
- Light Gray
- Color name
-
-
-
-
- Lighter Gray
- Color name
-
-
-
-
- Very Light Gray
- Color name
-
-
-
-
- White
- Color name
-
-
Custom color...