From 9917e9d4c206a87378f9f35741d0b09ec559c6ce Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Sun, 26 Nov 2017 14:34:26 -0500
Subject: [PATCH] Don't use tr() in static initialization.

---
 glabels/ColorPaletteDialog.cpp |  74 +++---
 glabels/ColorPaletteDialog.h   |   2 +-
 translations/glabels_C.ts      | 399 +++++++++++++++------------------
 3 files changed, 221 insertions(+), 254 deletions(-)

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 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Color name</name>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="40"/>
+        <source>Light Scarlet Red</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="41"/>
+        <source>Light Orange</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="42"/>
+        <source>Light Butter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="43"/>
+        <source>Light Chameleon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="44"/>
+        <source>Light Sky Blue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="45"/>
+        <source>Light Plum</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="46"/>
+        <source>Light Chocolate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="47"/>
+        <source>Light Aluminum 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="48"/>
+        <source>Light Aluminum 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="50"/>
+        <source>Scarlet Red</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="51"/>
+        <source>Orange</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="52"/>
+        <source>Butter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="53"/>
+        <source>Chameleon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="54"/>
+        <source>Sky Blue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="55"/>
+        <source>Plum</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="56"/>
+        <source>Chocolate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="57"/>
+        <source>Aluminum 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="58"/>
+        <source>Aluminum 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="60"/>
+        <source>Dark Scarlet Red</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="61"/>
+        <source>Dark Orange</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="62"/>
+        <source>Dark Butter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="63"/>
+        <source>Dark Chameleon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="64"/>
+        <source>Dark Sky Blue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="65"/>
+        <source>Dark Plum</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="66"/>
+        <source>Dark Chocolate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="67"/>
+        <source>Dark Aluminum 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="68"/>
+        <source>Dark Aluminum 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="70"/>
+        <source>Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="71"/>
+        <source>Very Dark Gray</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="72"/>
+        <source>Darker Gray</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="73"/>
+        <source>Dark Gray</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="74"/>
+        <source>Medium Gray</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="75"/>
+        <source>Light Gray</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="76"/>
+        <source>Lighter Gray</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="77"/>
+        <source>Very Light Gray</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../glabels/ColorPaletteDialog.cpp" line="78"/>
+        <source>White</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MergeView</name>
     <message>
@@ -627,222 +810,6 @@
 </context>
 <context>
     <name>glabels::ColorPaletteDialog</name>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="40"/>
-        <source>Light Scarlet Red</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="41"/>
-        <source>Light Orange</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="42"/>
-        <source>Light Butter</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="43"/>
-        <source>Light Chameleon</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="44"/>
-        <source>Light Sky Blue</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="45"/>
-        <source>Light Plum</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="46"/>
-        <source>Light Chocolate</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="47"/>
-        <source>Light Aluminum 1</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="48"/>
-        <source>Light Aluminum 2</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="50"/>
-        <source>Scarlet Red</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="51"/>
-        <source>Orange</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="52"/>
-        <source>Butter</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="53"/>
-        <source>Chameleon</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="54"/>
-        <source>Sky Blue</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="55"/>
-        <source>Plum</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="56"/>
-        <source>Chocolate</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="57"/>
-        <source>Aluminum 1</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="58"/>
-        <source>Aluminum 2</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="60"/>
-        <source>Dark Scarlet Red</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="61"/>
-        <source>Dark Orange</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="62"/>
-        <source>Dark Butter</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="63"/>
-        <source>Dark Chameleon</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="64"/>
-        <source>Dark Sky Blue</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="65"/>
-        <source>Dark Plum</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="66"/>
-        <source>Dark Chocolate</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="67"/>
-        <source>Dark Aluminum 1</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="68"/>
-        <source>Dark Aluminum 2</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="70"/>
-        <source>Black</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="71"/>
-        <source>Very Dark Gray</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="72"/>
-        <source>Darker Gray</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="73"/>
-        <source>Dark Gray</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="74"/>
-        <source>Medium Gray</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="75"/>
-        <source>Light Gray</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="76"/>
-        <source>Lighter Gray</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="77"/>
-        <source>Very Light Gray</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../glabels/ColorPaletteDialog.cpp" line="78"/>
-        <source>White</source>
-        <comment>Color name</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../glabels/ColorPaletteDialog.cpp" line="152"/>
         <source>Custom color...</source>