Incorporated FieldButton into ColorPaletteDialog. Tweaked ColorPaletteDialog.

2019-07-21 17:08:24 -04:00
parent 8fa34325a5
commit 1e1db1fc89
9 changed files with 112 additions and 339 deletions
@@ -1133,10 +1133,6 @@
        <source>Custom color...</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Merge key...</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Custom Color</source>
        <translation type="unfinished"></translation>
@@ -1145,6 +1141,18 @@
        <source>Custom color #%1</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Use key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Standard Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recent Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>glabels::FieldButton</name>