Bug 449260 - Add DSL to easily author NLS-Files and generate accessor

classes

12 files changed, 1550 insertions, 1681 deletions

diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/NLSDslParser.java b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/NLSDslParser.java
index a19d8526d..bf2c7c636 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/NLSDslParser.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/NLSDslParser.java
@@ -37,7 +37,7 @@ public class NLSDslParser extends AbstractContentAssistParser {
 			nameMappings = new HashMap<AbstractElement, String>() {
 				private static final long serialVersionUID = 1L;
 				{
-					put(grammarAccess.getMessageEntryAccess().getAlternatives_3(), "rule__MessageEntry__Alternatives_3");
+					put(grammarAccess.getMessageEntryAccess().getAlternatives_2(), "rule__MessageEntry__Alternatives_2");
 					put(grammarAccess.getRichStringAccess().getAlternatives(), "rule__RichString__Alternatives");
 					put(grammarAccess.getPredefinedTypesAccess().getAlternatives(), "rule__PredefinedTypes__Alternatives");
 					put(grammarAccess.getNLSAccess().getGroup(), "rule__NLS__Group__0");
@@ -47,9 +47,9 @@ public class NLSDslParser extends AbstractContentAssistParser {
 					put(grammarAccess.getMessageEntryAccess().getGroup(), "rule__MessageEntry__Group__0");
 					put(grammarAccess.getMessageEntryAccess().getGroup_1(), "rule__MessageEntry__Group_1__0");
 					put(grammarAccess.getMessageEntryAccess().getGroup_1_2(), "rule__MessageEntry__Group_1_2__0");
-					put(grammarAccess.getMessageEntryAccess().getGroup_3_0(), "rule__MessageEntry__Group_3_0__0");
-					put(grammarAccess.getMessageEntryAccess().getGroup_3_0_2(), "rule__MessageEntry__Group_3_0_2__0");
-					put(grammarAccess.getMessageEntryAccess().getGroup_3_1(), "rule__MessageEntry__Group_3_1__0");
+					put(grammarAccess.getMessageEntryAccess().getGroup_2_0(), "rule__MessageEntry__Group_2_0__0");
+					put(grammarAccess.getMessageEntryAccess().getGroup_2_0_2(), "rule__MessageEntry__Group_2_0_2__0");
+					put(grammarAccess.getMessageEntryAccess().getGroup_2_1(), "rule__MessageEntry__Group_2_1__0");
 					put(grammarAccess.getMessageParamAccess().getGroup(), "rule__MessageParam__Group__0");
 					put(grammarAccess.getMessageAccess().getGroup(), "rule__Message__Group__0");
 					put(grammarAccess.getRichStringAccess().getGroup_1(), "rule__RichString__Group_1__0");
@@ -70,9 +70,9 @@ public class NLSDslParser extends AbstractContentAssistParser {
 					put(grammarAccess.getMessageEntryAccess().getNameAssignment_0(), "rule__MessageEntry__NameAssignment_0");
 					put(grammarAccess.getMessageEntryAccess().getParamListAssignment_1_1(), "rule__MessageEntry__ParamListAssignment_1_1");
 					put(grammarAccess.getMessageEntryAccess().getParamListAssignment_1_2_1(), "rule__MessageEntry__ParamListAssignment_1_2_1");
-					put(grammarAccess.getMessageEntryAccess().getMessageListAssignment_3_0_1(), "rule__MessageEntry__MessageListAssignment_3_0_1");
-					put(grammarAccess.getMessageEntryAccess().getMessageListAssignment_3_0_2_1(), "rule__MessageEntry__MessageListAssignment_3_0_2_1");
-					put(grammarAccess.getMessageEntryAccess().getEntryRefAssignment_3_1_1(), "rule__MessageEntry__EntryRefAssignment_3_1_1");
+					put(grammarAccess.getMessageEntryAccess().getMessageListAssignment_2_0_1(), "rule__MessageEntry__MessageListAssignment_2_0_1");
+					put(grammarAccess.getMessageEntryAccess().getMessageListAssignment_2_0_2_1(), "rule__MessageEntry__MessageListAssignment_2_0_2_1");
+					put(grammarAccess.getMessageEntryAccess().getEntryRefAssignment_2_1_1(), "rule__MessageEntry__EntryRefAssignment_2_1_1");
 					put(grammarAccess.getMessageParamAccess().getPredefinedAssignment_0(), "rule__MessageParam__PredefinedAssignment_0");
 					put(grammarAccess.getMessageParamAccess().getVarAssignment_1(), "rule__MessageParam__VarAssignment_1");
 					put(grammarAccess.getMessageAccess().getNameAssignment_0(), "rule__Message__NameAssignment_0");
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g
index ed7b9023e..4cf679d15 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g
@@ -497,21 +497,21 @@ finally {
 
 
 
-rule__MessageEntry__Alternatives_3
+rule__MessageEntry__Alternatives_2
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getMessageEntryAccess().getGroup_3_0()); }
-(rule__MessageEntry__Group_3_0__0)
-{ after(grammarAccess.getMessageEntryAccess().getGroup_3_0()); }
+{ before(grammarAccess.getMessageEntryAccess().getGroup_2_0()); }
+(rule__MessageEntry__Group_2_0__0)
+{ after(grammarAccess.getMessageEntryAccess().getGroup_2_0()); }
 )
 
     |(
-{ before(grammarAccess.getMessageEntryAccess().getGroup_3_1()); }
-(rule__MessageEntry__Group_3_1__0)
-{ after(grammarAccess.getMessageEntryAccess().getGroup_3_1()); }
+{ before(grammarAccess.getMessageEntryAccess().getGroup_2_1()); }
+(rule__MessageEntry__Group_2_1__0)
+{ after(grammarAccess.getMessageEntryAccess().getGroup_2_1()); }
 )
 
 ;
@@ -1198,7 +1198,6 @@ rule__MessageEntry__Group__2
     }
 :
 	rule__MessageEntry__Group__2__Impl
-	rule__MessageEntry__Group__3
 ;
 finally {
 	restoreStackSize(stackSize);
@@ -1210,11 +1209,9 @@ rule__MessageEntry__Group__2__Impl
     }
 :
 (
-{ before(grammarAccess.getMessageEntryAccess().getColonKeyword_2()); }
-
-	':' 
-
-{ after(grammarAccess.getMessageEntryAccess().getColonKeyword_2()); }
+{ before(grammarAccess.getMessageEntryAccess().getAlternatives_2()); }
+(rule__MessageEntry__Alternatives_2)
+{ after(grammarAccess.getMessageEntryAccess().getAlternatives_2()); }
 )
 
 ;
@@ -1223,36 +1220,6 @@ finally {
 }
 
 
-rule__MessageEntry__Group__3
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-	rule__MessageEntry__Group__3__Impl
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-rule__MessageEntry__Group__3__Impl
-    @init {
-		int stackSize = keepStackSize();
-    }
-:
-(
-{ before(grammarAccess.getMessageEntryAccess().getAlternatives_3()); }
-(rule__MessageEntry__Alternatives_3)
-{ after(grammarAccess.getMessageEntryAccess().getAlternatives_3()); }
-)
-
-;
-finally {
-	restoreStackSize(stackSize);
-}
-
-
-
-
 
 
 
@@ -1449,29 +1416,29 @@ finally {
 
 
 
-rule__MessageEntry__Group_3_0__0
+rule__MessageEntry__Group_2_0__0
     @init {
 		int stackSize = keepStackSize();
     }
 :
-	rule__MessageEntry__Group_3_0__0__Impl
-	rule__MessageEntry__Group_3_0__1
+	rule__MessageEntry__Group_2_0__0__Impl
+	rule__MessageEntry__Group_2_0__1
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MessageEntry__Group_3_0__0__Impl
+rule__MessageEntry__Group_2_0__0__Impl
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getMessageEntryAccess().getLeftCurlyBracketKeyword_3_0_0()); }
+{ before(grammarAccess.getMessageEntryAccess().getLeftCurlyBracketKeyword_2_0_0()); }
 
 	'{' 
 
-{ after(grammarAccess.getMessageEntryAccess().getLeftCurlyBracketKeyword_3_0_0()); }
+{ after(grammarAccess.getMessageEntryAccess().getLeftCurlyBracketKeyword_2_0_0()); }
 )
 
 ;
@@ -1480,27 +1447,27 @@ finally {
 }
 
 
-rule__MessageEntry__Group_3_0__1
+rule__MessageEntry__Group_2_0__1
     @init {
 		int stackSize = keepStackSize();
     }
 :
-	rule__MessageEntry__Group_3_0__1__Impl
-	rule__MessageEntry__Group_3_0__2
+	rule__MessageEntry__Group_2_0__1__Impl
+	rule__MessageEntry__Group_2_0__2
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MessageEntry__Group_3_0__1__Impl
+rule__MessageEntry__Group_2_0__1__Impl
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getMessageEntryAccess().getMessageListAssignment_3_0_1()); }
-(rule__MessageEntry__MessageListAssignment_3_0_1)
-{ after(grammarAccess.getMessageEntryAccess().getMessageListAssignment_3_0_1()); }
+{ before(grammarAccess.getMessageEntryAccess().getMessageListAssignment_2_0_1()); }
+(rule__MessageEntry__MessageListAssignment_2_0_1)
+{ after(grammarAccess.getMessageEntryAccess().getMessageListAssignment_2_0_1()); }
 )
 
 ;
@@ -1509,27 +1476,27 @@ finally {
 }
 
 
-rule__MessageEntry__Group_3_0__2
+rule__MessageEntry__Group_2_0__2
     @init {
 		int stackSize = keepStackSize();
     }
 :
-	rule__MessageEntry__Group_3_0__2__Impl
-	rule__MessageEntry__Group_3_0__3
+	rule__MessageEntry__Group_2_0__2__Impl
+	rule__MessageEntry__Group_2_0__3
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MessageEntry__Group_3_0__2__Impl
+rule__MessageEntry__Group_2_0__2__Impl
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getMessageEntryAccess().getGroup_3_0_2()); }
-(rule__MessageEntry__Group_3_0_2__0)*
-{ after(grammarAccess.getMessageEntryAccess().getGroup_3_0_2()); }
+{ before(grammarAccess.getMessageEntryAccess().getGroup_2_0_2()); }
+(rule__MessageEntry__Group_2_0_2__0)*
+{ after(grammarAccess.getMessageEntryAccess().getGroup_2_0_2()); }
 )
 
 ;
@@ -1538,28 +1505,28 @@ finally {
 }
 
 
-rule__MessageEntry__Group_3_0__3
+rule__MessageEntry__Group_2_0__3
     @init {
 		int stackSize = keepStackSize();
     }
 :
-	rule__MessageEntry__Group_3_0__3__Impl
+	rule__MessageEntry__Group_2_0__3__Impl
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MessageEntry__Group_3_0__3__Impl
+rule__MessageEntry__Group_2_0__3__Impl
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getMessageEntryAccess().getRightCurlyBracketKeyword_3_0_3()); }
+{ before(grammarAccess.getMessageEntryAccess().getRightCurlyBracketKeyword_2_0_3()); }
 
 	'}' 
 
-{ after(grammarAccess.getMessageEntryAccess().getRightCurlyBracketKeyword_3_0_3()); }
+{ after(grammarAccess.getMessageEntryAccess().getRightCurlyBracketKeyword_2_0_3()); }
 )
 
 ;
@@ -1576,29 +1543,29 @@ finally {
 
 
 
-rule__MessageEntry__Group_3_0_2__0
+rule__MessageEntry__Group_2_0_2__0
     @init {
 		int stackSize = keepStackSize();
     }
 :
-	rule__MessageEntry__Group_3_0_2__0__Impl
-	rule__MessageEntry__Group_3_0_2__1
+	rule__MessageEntry__Group_2_0_2__0__Impl
+	rule__MessageEntry__Group_2_0_2__1
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MessageEntry__Group_3_0_2__0__Impl
+rule__MessageEntry__Group_2_0_2__0__Impl
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getMessageEntryAccess().getCommaKeyword_3_0_2_0()); }
+{ before(grammarAccess.getMessageEntryAccess().getCommaKeyword_2_0_2_0()); }
 
 	',' 
 
-{ after(grammarAccess.getMessageEntryAccess().getCommaKeyword_3_0_2_0()); }
+{ after(grammarAccess.getMessageEntryAccess().getCommaKeyword_2_0_2_0()); }
 )
 
 ;
@@ -1607,26 +1574,26 @@ finally {
 }
 
 
-rule__MessageEntry__Group_3_0_2__1
+rule__MessageEntry__Group_2_0_2__1
     @init {
 		int stackSize = keepStackSize();
     }
 :
-	rule__MessageEntry__Group_3_0_2__1__Impl
+	rule__MessageEntry__Group_2_0_2__1__Impl
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MessageEntry__Group_3_0_2__1__Impl
+rule__MessageEntry__Group_2_0_2__1__Impl
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getMessageEntryAccess().getMessageListAssignment_3_0_2_1()); }
-(rule__MessageEntry__MessageListAssignment_3_0_2_1)
-{ after(grammarAccess.getMessageEntryAccess().getMessageListAssignment_3_0_2_1()); }
+{ before(grammarAccess.getMessageEntryAccess().getMessageListAssignment_2_0_2_1()); }
+(rule__MessageEntry__MessageListAssignment_2_0_2_1)
+{ after(grammarAccess.getMessageEntryAccess().getMessageListAssignment_2_0_2_1()); }
 )
 
 ;
@@ -1639,29 +1606,29 @@ finally {
 
 
 
-rule__MessageEntry__Group_3_1__0
+rule__MessageEntry__Group_2_1__0
     @init {
 		int stackSize = keepStackSize();
     }
 :
-	rule__MessageEntry__Group_3_1__0__Impl
-	rule__MessageEntry__Group_3_1__1
+	rule__MessageEntry__Group_2_1__0__Impl
+	rule__MessageEntry__Group_2_1__1
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MessageEntry__Group_3_1__0__Impl
+rule__MessageEntry__Group_2_1__0__Impl
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getMessageEntryAccess().getLeftSquareBracketKeyword_3_1_0()); }
+{ before(grammarAccess.getMessageEntryAccess().getLeftSquareBracketKeyword_2_1_0()); }
 
 	'[' 
 
-{ after(grammarAccess.getMessageEntryAccess().getLeftSquareBracketKeyword_3_1_0()); }
+{ after(grammarAccess.getMessageEntryAccess().getLeftSquareBracketKeyword_2_1_0()); }
 )
 
 ;
@@ -1670,27 +1637,27 @@ finally {
 }
 
 
-rule__MessageEntry__Group_3_1__1
+rule__MessageEntry__Group_2_1__1
     @init {
 		int stackSize = keepStackSize();
     }
 :
-	rule__MessageEntry__Group_3_1__1__Impl
-	rule__MessageEntry__Group_3_1__2
+	rule__MessageEntry__Group_2_1__1__Impl
+	rule__MessageEntry__Group_2_1__2
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MessageEntry__Group_3_1__1__Impl
+rule__MessageEntry__Group_2_1__1__Impl
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getMessageEntryAccess().getEntryRefAssignment_3_1_1()); }
-(rule__MessageEntry__EntryRefAssignment_3_1_1)
-{ after(grammarAccess.getMessageEntryAccess().getEntryRefAssignment_3_1_1()); }
+{ before(grammarAccess.getMessageEntryAccess().getEntryRefAssignment_2_1_1()); }
+(rule__MessageEntry__EntryRefAssignment_2_1_1)
+{ after(grammarAccess.getMessageEntryAccess().getEntryRefAssignment_2_1_1()); }
 )
 
 ;
@@ -1699,28 +1666,28 @@ finally {
 }
 
 
-rule__MessageEntry__Group_3_1__2
+rule__MessageEntry__Group_2_1__2
     @init {
 		int stackSize = keepStackSize();
     }
 :
-	rule__MessageEntry__Group_3_1__2__Impl
+	rule__MessageEntry__Group_2_1__2__Impl
 ;
 finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MessageEntry__Group_3_1__2__Impl
+rule__MessageEntry__Group_2_1__2__Impl
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getMessageEntryAccess().getRightSquareBracketKeyword_3_1_2()); }
+{ before(grammarAccess.getMessageEntryAccess().getRightSquareBracketKeyword_2_1_2()); }
 
 	']' 
 
-{ after(grammarAccess.getMessageEntryAccess().getRightSquareBracketKeyword_3_1_2()); }
+{ after(grammarAccess.getMessageEntryAccess().getRightSquareBracketKeyword_2_1_2()); }
 )
 
 ;
@@ -2501,14 +2468,14 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MessageEntry__MessageListAssignment_3_0_1
+rule__MessageEntry__MessageListAssignment_2_0_1
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_3_0_1_0()); }
-	ruleMessage{ after(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_3_0_1_0()); }
+{ before(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_2_0_1_0()); }
+	ruleMessage{ after(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_2_0_1_0()); }
 )
 
 ;
@@ -2516,14 +2483,14 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MessageEntry__MessageListAssignment_3_0_2_1
+rule__MessageEntry__MessageListAssignment_2_0_2_1
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_3_0_2_1_0()); }
-	ruleMessage{ after(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_3_0_2_1_0()); }
+{ before(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_2_0_2_1_0()); }
+	ruleMessage{ after(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_2_0_2_1_0()); }
 )
 
 ;
@@ -2531,18 +2498,18 @@ finally {
 	restoreStackSize(stackSize);
 }
 
-rule__MessageEntry__EntryRefAssignment_3_1_1
+rule__MessageEntry__EntryRefAssignment_2_1_1
     @init {
 		int stackSize = keepStackSize();
     }
 :
 (
-{ before(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryCrossReference_3_1_1_0()); }
+{ before(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryCrossReference_2_1_1_0()); }
 (
-{ before(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryQualifiedNameParserRuleCall_3_1_1_0_1()); }
-	ruleQualifiedName{ after(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryQualifiedNameParserRuleCall_3_1_1_0_1()); }
+{ before(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryQualifiedNameParserRuleCall_2_1_1_0_1()); }
+	ruleQualifiedName{ after(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryQualifiedNameParserRuleCall_2_1_1_0_1()); }
 )
-{ after(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryCrossReference_3_1_1_0()); }
+{ after(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryCrossReference_2_1_1_0()); }
 )
 
 ;
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.tokens b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.tokens
index 880c64d51..0641884e2 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.tokens
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.tokens
@@ -1,14 +1,14 @@
-'('=27
-')'=28
-','=29
+'('=26
+')'=27
+','=28
 '.'=32
-':'=26
+':'=31
 'ANY'=16
 'DATE'=18
 'NUMBER'=17
 'TEMPORAL'=19
-'['=30
-']'=31
+'['=29
+']'=30
 'bundle'=23
 'default'=24
 'formatter'=25
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDslLexer.java b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDslLexer.java
index 541e30c57..ca5cea1f6 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDslLexer.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDslLexer.java
@@ -269,10 +269,10 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:21:7: ( ':' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:21:9: ':'
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:21:7: ( '(' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:21:9: '('
             {
-            match(':'); 
+            match('('); 
 
             }
 
@@ -289,10 +289,10 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:22:7: ( '(' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:22:9: '('
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:22:7: ( ')' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:22:9: ')'
             {
-            match('('); 
+            match(')'); 
 
             }
 
@@ -309,10 +309,10 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:23:7: ( ')' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:23:9: ')'
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:23:7: ( ',' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:23:9: ','
             {
-            match(')'); 
+            match(','); 
 
             }
 
@@ -329,10 +329,10 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:24:7: ( ',' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:24:9: ','
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:24:7: ( '[' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:24:9: '['
             {
-            match(','); 
+            match('['); 
 
             }
 
@@ -349,10 +349,10 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:25:7: ( '[' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:25:9: '['
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:25:7: ( ']' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:25:9: ']'
             {
-            match('['); 
+            match(']'); 
 
             }
 
@@ -369,10 +369,10 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:26:7: ( ']' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:26:9: ']'
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:26:7: ( ':' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:26:9: ':'
             {
-            match(']'); 
+            match(':'); 
 
             }
 
@@ -409,12 +409,12 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_RICH_TEXT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2813:16: ( '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2813:18: '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2780:16: ( '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2780:18: '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF )
             {
             match("'''"); 
 
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2813:27: ( RULE_IN_RICH_STRING )*
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2780:27: ( RULE_IN_RICH_STRING )*
             loop1:
             do {
                 int alt1=2;
@@ -445,7 +445,7 @@ public class InternalNLSDslLexer extends Lexer {
 
                 switch (alt1) {
             	case 1 :
-            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2813:27: RULE_IN_RICH_STRING
+            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2780:27: RULE_IN_RICH_STRING
             	    {
             	    mRULE_IN_RICH_STRING(); 
 
@@ -457,7 +457,7 @@ public class InternalNLSDslLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2813:48: ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2780:48: ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -480,7 +480,7 @@ public class InternalNLSDslLexer extends Lexer {
                 alt4=2;}
             switch (alt4) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2813:49: '\\'\\'\\''
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2780:49: '\\'\\'\\''
                     {
                     match("'''"); 
 
@@ -488,9 +488,9 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2813:58: ( '\\'' ( '\\'' )? )? EOF
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2780:58: ( '\\'' ( '\\'' )? )? EOF
                     {
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2813:58: ( '\\'' ( '\\'' )? )?
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2780:58: ( '\\'' ( '\\'' )? )?
                     int alt3=2;
                     int LA3_0 = input.LA(1);
 
@@ -499,10 +499,10 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     switch (alt3) {
                         case 1 :
-                            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2813:59: '\\'' ( '\\'' )?
+                            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2780:59: '\\'' ( '\\'' )?
                             {
                             match('\''); 
-                            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2813:64: ( '\\'' )?
+                            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2780:64: ( '\\'' )?
                             int alt2=2;
                             int LA2_0 = input.LA(1);
 
@@ -511,7 +511,7 @@ public class InternalNLSDslLexer extends Lexer {
                             }
                             switch (alt2) {
                                 case 1 :
-                                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2813:64: '\\''
+                                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2780:64: '\\''
                                     {
                                     match('\''); 
 
@@ -549,12 +549,12 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_RICH_TEXT_START;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2815:22: ( '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2815:24: '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB'
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2782:22: ( '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2782:24: '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB'
             {
             match("'''"); 
 
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2815:33: ( RULE_IN_RICH_STRING )*
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2782:33: ( RULE_IN_RICH_STRING )*
             loop5:
             do {
                 int alt5=2;
@@ -585,7 +585,7 @@ public class InternalNLSDslLexer extends Lexer {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2815:33: RULE_IN_RICH_STRING
+            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2782:33: RULE_IN_RICH_STRING
             	    {
             	    mRULE_IN_RICH_STRING(); 
 
@@ -597,7 +597,7 @@ public class InternalNLSDslLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2815:54: ( '\\'' ( '\\'' )? )?
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2782:54: ( '\\'' ( '\\'' )? )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -606,10 +606,10 @@ public class InternalNLSDslLexer extends Lexer {
             }
             switch (alt7) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2815:55: '\\'' ( '\\'' )?
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2782:55: '\\'' ( '\\'' )?
                     {
                     match('\''); 
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2815:60: ( '\\'' )?
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2782:60: ( '\\'' )?
                     int alt6=2;
                     int LA6_0 = input.LA(1);
 
@@ -618,7 +618,7 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     switch (alt6) {
                         case 1 :
-                            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2815:60: '\\''
+                            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2782:60: '\\''
                             {
                             match('\''); 
 
@@ -650,11 +650,11 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_RICH_TEXT_END;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2817:20: ( '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2817:22: '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2784:20: ( '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2784:22: '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF )
             {
             match('\u00BB'); 
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2817:31: ( RULE_IN_RICH_STRING )*
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2784:31: ( RULE_IN_RICH_STRING )*
             loop8:
             do {
                 int alt8=2;
@@ -685,7 +685,7 @@ public class InternalNLSDslLexer extends Lexer {
 
                 switch (alt8) {
             	case 1 :
-            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2817:31: RULE_IN_RICH_STRING
+            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2784:31: RULE_IN_RICH_STRING
             	    {
             	    mRULE_IN_RICH_STRING(); 
 
@@ -697,7 +697,7 @@ public class InternalNLSDslLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2817:52: ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2784:52: ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF )
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -720,7 +720,7 @@ public class InternalNLSDslLexer extends Lexer {
                 alt11=2;}
             switch (alt11) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2817:53: '\\'\\'\\''
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2784:53: '\\'\\'\\''
                     {
                     match("'''"); 
 
@@ -728,9 +728,9 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2817:62: ( '\\'' ( '\\'' )? )? EOF
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2784:62: ( '\\'' ( '\\'' )? )? EOF
                     {
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2817:62: ( '\\'' ( '\\'' )? )?
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2784:62: ( '\\'' ( '\\'' )? )?
                     int alt10=2;
                     int LA10_0 = input.LA(1);
 
@@ -739,10 +739,10 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     switch (alt10) {
                         case 1 :
-                            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2817:63: '\\'' ( '\\'' )?
+                            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2784:63: '\\'' ( '\\'' )?
                             {
                             match('\''); 
-                            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2817:68: ( '\\'' )?
+                            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2784:68: ( '\\'' )?
                             int alt9=2;
                             int LA9_0 = input.LA(1);
 
@@ -751,7 +751,7 @@ public class InternalNLSDslLexer extends Lexer {
                             }
                             switch (alt9) {
                                 case 1 :
-                                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2817:68: '\\''
+                                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2784:68: '\\''
                                     {
                                     match('\''); 
 
@@ -789,11 +789,11 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_RICH_TEXT_INBETWEEN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2819:26: ( '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2819:28: '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB'
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2786:26: ( '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2786:28: '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB'
             {
             match('\u00BB'); 
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2819:37: ( RULE_IN_RICH_STRING )*
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2786:37: ( RULE_IN_RICH_STRING )*
             loop12:
             do {
                 int alt12=2;
@@ -824,7 +824,7 @@ public class InternalNLSDslLexer extends Lexer {
 
                 switch (alt12) {
             	case 1 :
-            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2819:37: RULE_IN_RICH_STRING
+            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2786:37: RULE_IN_RICH_STRING
             	    {
             	    mRULE_IN_RICH_STRING(); 
 
@@ -836,7 +836,7 @@ public class InternalNLSDslLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2819:58: ( '\\'' ( '\\'' )? )?
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2786:58: ( '\\'' ( '\\'' )? )?
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -845,10 +845,10 @@ public class InternalNLSDslLexer extends Lexer {
             }
             switch (alt14) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2819:59: '\\'' ( '\\'' )?
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2786:59: '\\'' ( '\\'' )?
                     {
                     match('\''); 
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2819:64: ( '\\'' )?
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2786:64: ( '\\'' )?
                     int alt13=2;
                     int LA13_0 = input.LA(1);
 
@@ -857,7 +857,7 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     switch (alt13) {
                         case 1 :
-                            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2819:64: '\\''
+                            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2786:64: '\\''
                             {
                             match('\''); 
 
@@ -887,10 +887,10 @@ public class InternalNLSDslLexer extends Lexer {
     // $ANTLR start "RULE_IN_RICH_STRING"
     public final void mRULE_IN_RICH_STRING() throws RecognitionException {
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2821:30: ( ( '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | ~ ( ( '\\u00AB' | '\\'' ) ) ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2821:32: ( '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | ~ ( ( '\\u00AB' | '\\'' ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2788:30: ( ( '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | ~ ( ( '\\u00AB' | '\\'' ) ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2788:32: ( '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | ~ ( ( '\\u00AB' | '\\'' ) ) )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2821:32: ( '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | ~ ( ( '\\u00AB' | '\\'' ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2788:32: ( '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | ~ ( ( '\\u00AB' | '\\'' ) ) )
             int alt15=3;
             int LA15_0 = input.LA(1);
 
@@ -921,7 +921,7 @@ public class InternalNLSDslLexer extends Lexer {
             }
             switch (alt15) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2821:33: '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) )
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2788:33: '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) )
                     {
                     match("''"); 
 
@@ -938,7 +938,7 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2821:59: '\\'' ~ ( ( '\\u00AB' | '\\'' ) )
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2788:59: '\\'' ~ ( ( '\\u00AB' | '\\'' ) )
                     {
                     match('\''); 
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='\u00AA')||(input.LA(1)>='\u00AC' && input.LA(1)<='\uFFFF') ) {
@@ -954,7 +954,7 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2821:83: ~ ( ( '\\u00AB' | '\\'' ) )
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2788:83: ~ ( ( '\\u00AB' | '\\'' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='\u00AA')||(input.LA(1)>='\u00AC' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -985,10 +985,10 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2823:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2823:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2790:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2790:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2823:11: ( '^' )?
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2790:11: ( '^' )?
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -997,7 +997,7 @@ public class InternalNLSDslLexer extends Lexer {
             }
             switch (alt16) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2823:11: '^'
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2790:11: '^'
                     {
                     match('^'); 
 
@@ -1015,7 +1015,7 @@ public class InternalNLSDslLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2823:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2790:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop17:
             do {
                 int alt17=2;
@@ -1064,10 +1064,10 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2825:10: ( ( '0' .. '9' )+ )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2825:12: ( '0' .. '9' )+
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2792:10: ( ( '0' .. '9' )+ )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2792:12: ( '0' .. '9' )+
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2825:12: ( '0' .. '9' )+
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2792:12: ( '0' .. '9' )+
             int cnt18=0;
             loop18:
             do {
@@ -1081,7 +1081,7 @@ public class InternalNLSDslLexer extends Lexer {
 
                 switch (alt18) {
             	case 1 :
-            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2825:13: '0' .. '9'
+            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2792:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1113,10 +1113,10 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2827:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2827:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2794:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2794:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2827:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2794:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -1134,10 +1134,10 @@ public class InternalNLSDslLexer extends Lexer {
             }
             switch (alt21) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2827:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2794:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2827:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2794:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop19:
                     do {
                         int alt19=3;
@@ -1153,7 +1153,7 @@ public class InternalNLSDslLexer extends Lexer {
 
                         switch (alt19) {
                     	case 1 :
-                    	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2827:21: '\\\\' .
+                    	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2794:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1161,7 +1161,7 @@ public class InternalNLSDslLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2827:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2794:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1186,10 +1186,10 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2827:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2794:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2827:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2794:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop20:
                     do {
                         int alt20=3;
@@ -1205,7 +1205,7 @@ public class InternalNLSDslLexer extends Lexer {
 
                         switch (alt20) {
                     	case 1 :
-                    	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2827:54: '\\\\' .
+                    	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2794:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1213,7 +1213,7 @@ public class InternalNLSDslLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2827:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2794:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1256,12 +1256,12 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2829:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2829:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2796:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2796:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2829:24: ( options {greedy=false; } : . )*
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2796:24: ( options {greedy=false; } : . )*
             loop22:
             do {
                 int alt22=2;
@@ -1286,7 +1286,7 @@ public class InternalNLSDslLexer extends Lexer {
 
                 switch (alt22) {
             	case 1 :
-            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2829:52: .
+            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2796:52: .
             	    {
             	    matchAny(); 
 
@@ -1316,12 +1316,12 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2831:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2831:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2798:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2798:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2831:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2798:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop23:
             do {
                 int alt23=2;
@@ -1334,7 +1334,7 @@ public class InternalNLSDslLexer extends Lexer {
 
                 switch (alt23) {
             	case 1 :
-            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2831:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2798:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -1354,7 +1354,7 @@ public class InternalNLSDslLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2831:40: ( ( '\\r' )? '\\n' )?
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2798:40: ( ( '\\r' )? '\\n' )?
             int alt25=2;
             int LA25_0 = input.LA(1);
 
@@ -1363,9 +1363,9 @@ public class InternalNLSDslLexer extends Lexer {
             }
             switch (alt25) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2831:41: ( '\\r' )? '\\n'
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2798:41: ( '\\r' )? '\\n'
                     {
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2831:41: ( '\\r' )?
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2798:41: ( '\\r' )?
                     int alt24=2;
                     int LA24_0 = input.LA(1);
 
@@ -1374,7 +1374,7 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     switch (alt24) {
                         case 1 :
-                            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2831:41: '\\r'
+                            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2798:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1406,10 +1406,10 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2833:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2833:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2800:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2800:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2833:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2800:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt26=0;
             loop26:
             do {
@@ -1463,8 +1463,8 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2835:16: ( . )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2835:18: .
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2802:16: ( . )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2802:18: .
             {
             matchAny(); 
 
@@ -1699,7 +1699,7 @@ public class InternalNLSDslLexer extends Lexer {
     static final String DFA27_specialS =
         "\1\2\21\uffff\1\6\1\7\3\uffff\1\5\27\uffff\1\1\1\16\16\uffff\1\12\1\0\1\15\10\uffff\1\3\1\13\2\uffff\1\14\7\uffff\1\4\1\11\6\uffff\1\10\15\uffff}>";
     static final String[] DFA27_transitionS = {
-            "\11\32\2\31\2\32\1\31\22\32\1\31\1\32\1\27\4\32\1\22\1\14\1\15\2\32\1\16\1\32\1\21\1\30\12\26\1\13\6\32\1\1\2\25\1\3\11\25\1\2\5\25\1\4\6\25\1\17\1\32\1\20\1\24\1\25\1\32\1\25\1\10\1\25\1\11\1\25\1\12\11\25\1\7\12\25\1\5\1\32\1\6\75\32\1\23\uff44\32",
+            "\11\32\2\31\2\32\1\31\22\32\1\31\1\32\1\27\4\32\1\22\1\13\1\14\2\32\1\15\1\32\1\21\1\30\12\26\1\20\6\32\1\1\2\25\1\3\11\25\1\2\5\25\1\4\6\25\1\16\1\32\1\17\1\24\1\25\1\32\1\25\1\10\1\25\1\11\1\25\1\12\11\25\1\7\12\25\1\5\1\32\1\6\75\32\1\23\uff44\32",
             "\1\33",
             "\1\35",
             "\1\36",
@@ -1895,17 +1895,17 @@ public class InternalNLSDslLexer extends Lexer {
 
                         else if ( (LA27_0=='f') ) {s = 10;}
 
-                        else if ( (LA27_0==':') ) {s = 11;}
+                        else if ( (LA27_0=='(') ) {s = 11;}
 
-                        else if ( (LA27_0=='(') ) {s = 12;}
+                        else if ( (LA27_0==')') ) {s = 12;}
 
-                        else if ( (LA27_0==')') ) {s = 13;}
+                        else if ( (LA27_0==',') ) {s = 13;}
 
-                        else if ( (LA27_0==',') ) {s = 14;}
+                        else if ( (LA27_0=='[') ) {s = 14;}
 
-                        else if ( (LA27_0=='[') ) {s = 15;}
+                        else if ( (LA27_0==']') ) {s = 15;}
 
-                        else if ( (LA27_0==']') ) {s = 16;}
+                        else if ( (LA27_0==':') ) {s = 16;}
 
                         else if ( (LA27_0=='.') ) {s = 17;}
 
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDslParser.java b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDslParser.java
index dc9391829..a4c06089e 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDslParser.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDslParser.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
 @SuppressWarnings("all")
 public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_RICH_TEXT", "RULE_RICH_TEXT_START", "RULE_RICH_TEXT_END", "RULE_RICH_TEXT_INBETWEEN", "RULE_STRING", "RULE_IN_RICH_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'ANY'", "'NUMBER'", "'DATE'", "'TEMPORAL'", "'{'", "'}'", "'package'", "'bundle'", "'default'", "'formatter'", "':'", "'('", "')'", "','", "'['", "']'", "'.'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_RICH_TEXT", "RULE_RICH_TEXT_START", "RULE_RICH_TEXT_END", "RULE_RICH_TEXT_INBETWEEN", "RULE_STRING", "RULE_IN_RICH_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'ANY'", "'NUMBER'", "'DATE'", "'TEMPORAL'", "'{'", "'}'", "'package'", "'bundle'", "'default'", "'formatter'", "'('", "')'", "','", "'['", "']'", "':'", "'.'"
     };
     public static final int RULE_STRING=9;
     public static final int RULE_SL_COMMENT=13;
@@ -1409,21 +1409,21 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rulePredefinedTypes"
 
 
-    // $ANTLR start "rule__MessageEntry__Alternatives_3"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:500:1: rule__MessageEntry__Alternatives_3 : ( ( ( rule__MessageEntry__Group_3_0__0 ) ) | ( ( rule__MessageEntry__Group_3_1__0 ) ) );
-    public final void rule__MessageEntry__Alternatives_3() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__Alternatives_2"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:500:1: rule__MessageEntry__Alternatives_2 : ( ( ( rule__MessageEntry__Group_2_0__0 ) ) | ( ( rule__MessageEntry__Group_2_1__0 ) ) );
+    public final void rule__MessageEntry__Alternatives_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:504:1: ( ( ( rule__MessageEntry__Group_3_0__0 ) ) | ( ( rule__MessageEntry__Group_3_1__0 ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:504:1: ( ( ( rule__MessageEntry__Group_2_0__0 ) ) | ( ( rule__MessageEntry__Group_2_1__0 ) ) )
             int alt1=2;
             int LA1_0 = input.LA(1);
 
             if ( (LA1_0==20) ) {
                 alt1=1;
             }
-            else if ( (LA1_0==30) ) {
+            else if ( (LA1_0==29) ) {
                 alt1=2;
             }
             else {
@@ -1435,19 +1435,19 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
             }
             switch (alt1) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:505:1: ( ( rule__MessageEntry__Group_3_0__0 ) )
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:505:1: ( ( rule__MessageEntry__Group_2_0__0 ) )
                     {
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:505:1: ( ( rule__MessageEntry__Group_3_0__0 ) )
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:506:1: ( rule__MessageEntry__Group_3_0__0 )
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:505:1: ( ( rule__MessageEntry__Group_2_0__0 ) )
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:506:1: ( rule__MessageEntry__Group_2_0__0 )
                     {
                     if ( state.backtracking==0 ) {
-                       before(grammarAccess.getMessageEntryAccess().getGroup_3_0()); 
+                       before(grammarAccess.getMessageEntryAccess().getGroup_2_0()); 
                     }
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:507:1: ( rule__MessageEntry__Group_3_0__0 )
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:507:2: rule__MessageEntry__Group_3_0__0
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:507:1: ( rule__MessageEntry__Group_2_0__0 )
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:507:2: rule__MessageEntry__Group_2_0__0
                     {
-                    pushFollow(FOLLOW_rule__MessageEntry__Group_3_0__0_in_rule__MessageEntry__Alternatives_31011);
-                    rule__MessageEntry__Group_3_0__0();
+                    pushFollow(FOLLOW_rule__MessageEntry__Group_2_0__0_in_rule__MessageEntry__Alternatives_21011);
+                    rule__MessageEntry__Group_2_0__0();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -1455,7 +1455,7 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
                     }
 
                     if ( state.backtracking==0 ) {
-                       after(grammarAccess.getMessageEntryAccess().getGroup_3_0()); 
+                       after(grammarAccess.getMessageEntryAccess().getGroup_2_0()); 
                     }
 
                     }
@@ -1464,19 +1464,19 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:511:6: ( ( rule__MessageEntry__Group_3_1__0 ) )
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:511:6: ( ( rule__MessageEntry__Group_2_1__0 ) )
                     {
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:511:6: ( ( rule__MessageEntry__Group_3_1__0 ) )
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:512:1: ( rule__MessageEntry__Group_3_1__0 )
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:511:6: ( ( rule__MessageEntry__Group_2_1__0 ) )
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:512:1: ( rule__MessageEntry__Group_2_1__0 )
                     {
                     if ( state.backtracking==0 ) {
-                       before(grammarAccess.getMessageEntryAccess().getGroup_3_1()); 
+                       before(grammarAccess.getMessageEntryAccess().getGroup_2_1()); 
                     }
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:513:1: ( rule__MessageEntry__Group_3_1__0 )
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:513:2: rule__MessageEntry__Group_3_1__0
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:513:1: ( rule__MessageEntry__Group_2_1__0 )
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:513:2: rule__MessageEntry__Group_2_1__0
                     {
-                    pushFollow(FOLLOW_rule__MessageEntry__Group_3_1__0_in_rule__MessageEntry__Alternatives_31029);
-                    rule__MessageEntry__Group_3_1__0();
+                    pushFollow(FOLLOW_rule__MessageEntry__Group_2_1__0_in_rule__MessageEntry__Alternatives_21029);
+                    rule__MessageEntry__Group_2_1__0();
 
                     state._fsp--;
                     if (state.failed) return ;
@@ -1484,7 +1484,7 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
                     }
 
                     if ( state.backtracking==0 ) {
-                       after(grammarAccess.getMessageEntryAccess().getGroup_3_1()); 
+                       after(grammarAccess.getMessageEntryAccess().getGroup_2_1()); 
                     }
 
                     }
@@ -1506,7 +1506,7 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Alternatives_3"
+    // $ANTLR end "rule__MessageEntry__Alternatives_2"
 
 
     // $ANTLR start "rule__RichString__Alternatives"
@@ -3448,7 +3448,7 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
             int alt8=2;
             int LA8_0 = input.LA(1);
 
-            if ( (LA8_0==27) ) {
+            if ( (LA8_0==26) ) {
                 alt8=1;
             }
             switch (alt8) {
@@ -3491,25 +3491,20 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageEntry__Group__2"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1195:1: rule__MessageEntry__Group__2 : rule__MessageEntry__Group__2__Impl rule__MessageEntry__Group__3 ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1195:1: rule__MessageEntry__Group__2 : rule__MessageEntry__Group__2__Impl ;
     public final void rule__MessageEntry__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1199:1: ( rule__MessageEntry__Group__2__Impl rule__MessageEntry__Group__3 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1200:2: rule__MessageEntry__Group__2__Impl rule__MessageEntry__Group__3
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1199:1: ( rule__MessageEntry__Group__2__Impl )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1200:2: rule__MessageEntry__Group__2__Impl
             {
             pushFollow(FOLLOW_rule__MessageEntry__Group__2__Impl_in_rule__MessageEntry__Group__22425);
             rule__MessageEntry__Group__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MessageEntry__Group__3_in_rule__MessageEntry__Group__22428);
-            rule__MessageEntry__Group__3();
-
-            state._fsp--;
-            if (state.failed) return ;
 
             }
 
@@ -3529,100 +3524,26 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageEntry__Group__2__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1207:1: rule__MessageEntry__Group__2__Impl : ( ':' ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1206:1: rule__MessageEntry__Group__2__Impl : ( ( rule__MessageEntry__Alternatives_2 ) ) ;
     public final void rule__MessageEntry__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1211:1: ( ( ':' ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1212:1: ( ':' )
-            {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1212:1: ( ':' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1213:1: ':'
-            {
-            if ( state.backtracking==0 ) {
-               before(grammarAccess.getMessageEntryAccess().getColonKeyword_2()); 
-            }
-            match(input,26,FOLLOW_26_in_rule__MessageEntry__Group__2__Impl2456); if (state.failed) return ;
-            if ( state.backtracking==0 ) {
-               after(grammarAccess.getMessageEntryAccess().getColonKeyword_2()); 
-            }
-
-            }
-
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__MessageEntry__Group__2__Impl"
-
-
-    // $ANTLR start "rule__MessageEntry__Group__3"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1226:1: rule__MessageEntry__Group__3 : rule__MessageEntry__Group__3__Impl ;
-    public final void rule__MessageEntry__Group__3() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1230:1: ( rule__MessageEntry__Group__3__Impl )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1231:2: rule__MessageEntry__Group__3__Impl
-            {
-            pushFollow(FOLLOW_rule__MessageEntry__Group__3__Impl_in_rule__MessageEntry__Group__32487);
-            rule__MessageEntry__Group__3__Impl();
-
-            state._fsp--;
-            if (state.failed) return ;
-
-            }
-
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-            	restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__MessageEntry__Group__3"
-
-
-    // $ANTLR start "rule__MessageEntry__Group__3__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1237:1: rule__MessageEntry__Group__3__Impl : ( ( rule__MessageEntry__Alternatives_3 ) ) ;
-    public final void rule__MessageEntry__Group__3__Impl() throws RecognitionException {
-
-        		int stackSize = keepStackSize();
-            
-        try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1241:1: ( ( ( rule__MessageEntry__Alternatives_3 ) ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1242:1: ( ( rule__MessageEntry__Alternatives_3 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1210:1: ( ( ( rule__MessageEntry__Alternatives_2 ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1211:1: ( ( rule__MessageEntry__Alternatives_2 ) )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1242:1: ( ( rule__MessageEntry__Alternatives_3 ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1243:1: ( rule__MessageEntry__Alternatives_3 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1211:1: ( ( rule__MessageEntry__Alternatives_2 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1212:1: ( rule__MessageEntry__Alternatives_2 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMessageEntryAccess().getAlternatives_3()); 
+               before(grammarAccess.getMessageEntryAccess().getAlternatives_2()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1244:1: ( rule__MessageEntry__Alternatives_3 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1244:2: rule__MessageEntry__Alternatives_3
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1213:1: ( rule__MessageEntry__Alternatives_2 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1213:2: rule__MessageEntry__Alternatives_2
             {
-            pushFollow(FOLLOW_rule__MessageEntry__Alternatives_3_in_rule__MessageEntry__Group__3__Impl2514);
-            rule__MessageEntry__Alternatives_3();
+            pushFollow(FOLLOW_rule__MessageEntry__Alternatives_2_in_rule__MessageEntry__Group__2__Impl2452);
+            rule__MessageEntry__Alternatives_2();
 
             state._fsp--;
             if (state.failed) return ;
@@ -3630,7 +3551,7 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMessageEntryAccess().getAlternatives_3()); 
+               after(grammarAccess.getMessageEntryAccess().getAlternatives_2()); 
             }
 
             }
@@ -3650,25 +3571,25 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Group__3__Impl"
+    // $ANTLR end "rule__MessageEntry__Group__2__Impl"
 
 
     // $ANTLR start "rule__MessageEntry__Group_1__0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1262:1: rule__MessageEntry__Group_1__0 : rule__MessageEntry__Group_1__0__Impl rule__MessageEntry__Group_1__1 ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1229:1: rule__MessageEntry__Group_1__0 : rule__MessageEntry__Group_1__0__Impl rule__MessageEntry__Group_1__1 ;
     public final void rule__MessageEntry__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1266:1: ( rule__MessageEntry__Group_1__0__Impl rule__MessageEntry__Group_1__1 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1267:2: rule__MessageEntry__Group_1__0__Impl rule__MessageEntry__Group_1__1
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1233:1: ( rule__MessageEntry__Group_1__0__Impl rule__MessageEntry__Group_1__1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1234:2: rule__MessageEntry__Group_1__0__Impl rule__MessageEntry__Group_1__1
             {
-            pushFollow(FOLLOW_rule__MessageEntry__Group_1__0__Impl_in_rule__MessageEntry__Group_1__02552);
+            pushFollow(FOLLOW_rule__MessageEntry__Group_1__0__Impl_in_rule__MessageEntry__Group_1__02488);
             rule__MessageEntry__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MessageEntry__Group_1__1_in_rule__MessageEntry__Group_1__02555);
+            pushFollow(FOLLOW_rule__MessageEntry__Group_1__1_in_rule__MessageEntry__Group_1__02491);
             rule__MessageEntry__Group_1__1();
 
             state._fsp--;
@@ -3692,22 +3613,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageEntry__Group_1__0__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1274:1: rule__MessageEntry__Group_1__0__Impl : ( '(' ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1241:1: rule__MessageEntry__Group_1__0__Impl : ( '(' ) ;
     public final void rule__MessageEntry__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1278:1: ( ( '(' ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1279:1: ( '(' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1245:1: ( ( '(' ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1246:1: ( '(' )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1279:1: ( '(' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1280:1: '('
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1246:1: ( '(' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1247:1: '('
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMessageEntryAccess().getLeftParenthesisKeyword_1_0()); 
             }
-            match(input,27,FOLLOW_27_in_rule__MessageEntry__Group_1__0__Impl2583); if (state.failed) return ;
+            match(input,26,FOLLOW_26_in_rule__MessageEntry__Group_1__0__Impl2519); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMessageEntryAccess().getLeftParenthesisKeyword_1_0()); 
             }
@@ -3733,21 +3654,21 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageEntry__Group_1__1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1293:1: rule__MessageEntry__Group_1__1 : rule__MessageEntry__Group_1__1__Impl rule__MessageEntry__Group_1__2 ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1260:1: rule__MessageEntry__Group_1__1 : rule__MessageEntry__Group_1__1__Impl rule__MessageEntry__Group_1__2 ;
     public final void rule__MessageEntry__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1297:1: ( rule__MessageEntry__Group_1__1__Impl rule__MessageEntry__Group_1__2 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1298:2: rule__MessageEntry__Group_1__1__Impl rule__MessageEntry__Group_1__2
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1264:1: ( rule__MessageEntry__Group_1__1__Impl rule__MessageEntry__Group_1__2 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1265:2: rule__MessageEntry__Group_1__1__Impl rule__MessageEntry__Group_1__2
             {
-            pushFollow(FOLLOW_rule__MessageEntry__Group_1__1__Impl_in_rule__MessageEntry__Group_1__12614);
+            pushFollow(FOLLOW_rule__MessageEntry__Group_1__1__Impl_in_rule__MessageEntry__Group_1__12550);
             rule__MessageEntry__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MessageEntry__Group_1__2_in_rule__MessageEntry__Group_1__12617);
+            pushFollow(FOLLOW_rule__MessageEntry__Group_1__2_in_rule__MessageEntry__Group_1__12553);
             rule__MessageEntry__Group_1__2();
 
             state._fsp--;
@@ -3771,25 +3692,25 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageEntry__Group_1__1__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1305:1: rule__MessageEntry__Group_1__1__Impl : ( ( rule__MessageEntry__ParamListAssignment_1_1 ) ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1272:1: rule__MessageEntry__Group_1__1__Impl : ( ( rule__MessageEntry__ParamListAssignment_1_1 ) ) ;
     public final void rule__MessageEntry__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1309:1: ( ( ( rule__MessageEntry__ParamListAssignment_1_1 ) ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1310:1: ( ( rule__MessageEntry__ParamListAssignment_1_1 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1276:1: ( ( ( rule__MessageEntry__ParamListAssignment_1_1 ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1277:1: ( ( rule__MessageEntry__ParamListAssignment_1_1 ) )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1310:1: ( ( rule__MessageEntry__ParamListAssignment_1_1 ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1311:1: ( rule__MessageEntry__ParamListAssignment_1_1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1277:1: ( ( rule__MessageEntry__ParamListAssignment_1_1 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1278:1: ( rule__MessageEntry__ParamListAssignment_1_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMessageEntryAccess().getParamListAssignment_1_1()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1312:1: ( rule__MessageEntry__ParamListAssignment_1_1 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1312:2: rule__MessageEntry__ParamListAssignment_1_1
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1279:1: ( rule__MessageEntry__ParamListAssignment_1_1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1279:2: rule__MessageEntry__ParamListAssignment_1_1
             {
-            pushFollow(FOLLOW_rule__MessageEntry__ParamListAssignment_1_1_in_rule__MessageEntry__Group_1__1__Impl2644);
+            pushFollow(FOLLOW_rule__MessageEntry__ParamListAssignment_1_1_in_rule__MessageEntry__Group_1__1__Impl2580);
             rule__MessageEntry__ParamListAssignment_1_1();
 
             state._fsp--;
@@ -3822,21 +3743,21 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageEntry__Group_1__2"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1322:1: rule__MessageEntry__Group_1__2 : rule__MessageEntry__Group_1__2__Impl rule__MessageEntry__Group_1__3 ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1289:1: rule__MessageEntry__Group_1__2 : rule__MessageEntry__Group_1__2__Impl rule__MessageEntry__Group_1__3 ;
     public final void rule__MessageEntry__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1326:1: ( rule__MessageEntry__Group_1__2__Impl rule__MessageEntry__Group_1__3 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1327:2: rule__MessageEntry__Group_1__2__Impl rule__MessageEntry__Group_1__3
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1293:1: ( rule__MessageEntry__Group_1__2__Impl rule__MessageEntry__Group_1__3 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1294:2: rule__MessageEntry__Group_1__2__Impl rule__MessageEntry__Group_1__3
             {
-            pushFollow(FOLLOW_rule__MessageEntry__Group_1__2__Impl_in_rule__MessageEntry__Group_1__22674);
+            pushFollow(FOLLOW_rule__MessageEntry__Group_1__2__Impl_in_rule__MessageEntry__Group_1__22610);
             rule__MessageEntry__Group_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MessageEntry__Group_1__3_in_rule__MessageEntry__Group_1__22677);
+            pushFollow(FOLLOW_rule__MessageEntry__Group_1__3_in_rule__MessageEntry__Group_1__22613);
             rule__MessageEntry__Group_1__3();
 
             state._fsp--;
@@ -3860,37 +3781,37 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageEntry__Group_1__2__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1334:1: rule__MessageEntry__Group_1__2__Impl : ( ( rule__MessageEntry__Group_1_2__0 )* ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1301:1: rule__MessageEntry__Group_1__2__Impl : ( ( rule__MessageEntry__Group_1_2__0 )* ) ;
     public final void rule__MessageEntry__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1338:1: ( ( ( rule__MessageEntry__Group_1_2__0 )* ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1339:1: ( ( rule__MessageEntry__Group_1_2__0 )* )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1305:1: ( ( ( rule__MessageEntry__Group_1_2__0 )* ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1306:1: ( ( rule__MessageEntry__Group_1_2__0 )* )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1339:1: ( ( rule__MessageEntry__Group_1_2__0 )* )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1340:1: ( rule__MessageEntry__Group_1_2__0 )*
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1306:1: ( ( rule__MessageEntry__Group_1_2__0 )* )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1307:1: ( rule__MessageEntry__Group_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMessageEntryAccess().getGroup_1_2()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1341:1: ( rule__MessageEntry__Group_1_2__0 )*
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1308:1: ( rule__MessageEntry__Group_1_2__0 )*
             loop9:
             do {
                 int alt9=2;
                 int LA9_0 = input.LA(1);
 
-                if ( (LA9_0==29) ) {
+                if ( (LA9_0==28) ) {
                     alt9=1;
                 }
 
 
                 switch (alt9) {
             	case 1 :
-            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1341:2: rule__MessageEntry__Group_1_2__0
+            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1308:2: rule__MessageEntry__Group_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__MessageEntry__Group_1_2__0_in_rule__MessageEntry__Group_1__2__Impl2704);
+            	    pushFollow(FOLLOW_rule__MessageEntry__Group_1_2__0_in_rule__MessageEntry__Group_1__2__Impl2640);
             	    rule__MessageEntry__Group_1_2__0();
 
             	    state._fsp--;
@@ -3929,16 +3850,16 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageEntry__Group_1__3"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1351:1: rule__MessageEntry__Group_1__3 : rule__MessageEntry__Group_1__3__Impl ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1318:1: rule__MessageEntry__Group_1__3 : rule__MessageEntry__Group_1__3__Impl ;
     public final void rule__MessageEntry__Group_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1355:1: ( rule__MessageEntry__Group_1__3__Impl )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1356:2: rule__MessageEntry__Group_1__3__Impl
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1322:1: ( rule__MessageEntry__Group_1__3__Impl )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1323:2: rule__MessageEntry__Group_1__3__Impl
             {
-            pushFollow(FOLLOW_rule__MessageEntry__Group_1__3__Impl_in_rule__MessageEntry__Group_1__32735);
+            pushFollow(FOLLOW_rule__MessageEntry__Group_1__3__Impl_in_rule__MessageEntry__Group_1__32671);
             rule__MessageEntry__Group_1__3__Impl();
 
             state._fsp--;
@@ -3962,22 +3883,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageEntry__Group_1__3__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1362:1: rule__MessageEntry__Group_1__3__Impl : ( ')' ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1329:1: rule__MessageEntry__Group_1__3__Impl : ( ')' ) ;
     public final void rule__MessageEntry__Group_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1366:1: ( ( ')' ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1367:1: ( ')' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1333:1: ( ( ')' ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1334:1: ( ')' )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1367:1: ( ')' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1368:1: ')'
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1334:1: ( ')' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1335:1: ')'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMessageEntryAccess().getRightParenthesisKeyword_1_3()); 
             }
-            match(input,28,FOLLOW_28_in_rule__MessageEntry__Group_1__3__Impl2763); if (state.failed) return ;
+            match(input,27,FOLLOW_27_in_rule__MessageEntry__Group_1__3__Impl2699); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMessageEntryAccess().getRightParenthesisKeyword_1_3()); 
             }
@@ -4003,21 +3924,21 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageEntry__Group_1_2__0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1389:1: rule__MessageEntry__Group_1_2__0 : rule__MessageEntry__Group_1_2__0__Impl rule__MessageEntry__Group_1_2__1 ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1356:1: rule__MessageEntry__Group_1_2__0 : rule__MessageEntry__Group_1_2__0__Impl rule__MessageEntry__Group_1_2__1 ;
     public final void rule__MessageEntry__Group_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1393:1: ( rule__MessageEntry__Group_1_2__0__Impl rule__MessageEntry__Group_1_2__1 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1394:2: rule__MessageEntry__Group_1_2__0__Impl rule__MessageEntry__Group_1_2__1
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1360:1: ( rule__MessageEntry__Group_1_2__0__Impl rule__MessageEntry__Group_1_2__1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1361:2: rule__MessageEntry__Group_1_2__0__Impl rule__MessageEntry__Group_1_2__1
             {
-            pushFollow(FOLLOW_rule__MessageEntry__Group_1_2__0__Impl_in_rule__MessageEntry__Group_1_2__02802);
+            pushFollow(FOLLOW_rule__MessageEntry__Group_1_2__0__Impl_in_rule__MessageEntry__Group_1_2__02738);
             rule__MessageEntry__Group_1_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MessageEntry__Group_1_2__1_in_rule__MessageEntry__Group_1_2__02805);
+            pushFollow(FOLLOW_rule__MessageEntry__Group_1_2__1_in_rule__MessageEntry__Group_1_2__02741);
             rule__MessageEntry__Group_1_2__1();
 
             state._fsp--;
@@ -4041,22 +3962,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageEntry__Group_1_2__0__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1401:1: rule__MessageEntry__Group_1_2__0__Impl : ( ',' ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1368:1: rule__MessageEntry__Group_1_2__0__Impl : ( ',' ) ;
     public final void rule__MessageEntry__Group_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1405:1: ( ( ',' ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1406:1: ( ',' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1372:1: ( ( ',' ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1373:1: ( ',' )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1406:1: ( ',' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1407:1: ','
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1373:1: ( ',' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1374:1: ','
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMessageEntryAccess().getCommaKeyword_1_2_0()); 
             }
-            match(input,29,FOLLOW_29_in_rule__MessageEntry__Group_1_2__0__Impl2833); if (state.failed) return ;
+            match(input,28,FOLLOW_28_in_rule__MessageEntry__Group_1_2__0__Impl2769); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMessageEntryAccess().getCommaKeyword_1_2_0()); 
             }
@@ -4082,16 +4003,16 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageEntry__Group_1_2__1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1420:1: rule__MessageEntry__Group_1_2__1 : rule__MessageEntry__Group_1_2__1__Impl ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1387:1: rule__MessageEntry__Group_1_2__1 : rule__MessageEntry__Group_1_2__1__Impl ;
     public final void rule__MessageEntry__Group_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1424:1: ( rule__MessageEntry__Group_1_2__1__Impl )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1425:2: rule__MessageEntry__Group_1_2__1__Impl
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1391:1: ( rule__MessageEntry__Group_1_2__1__Impl )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1392:2: rule__MessageEntry__Group_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__MessageEntry__Group_1_2__1__Impl_in_rule__MessageEntry__Group_1_2__12864);
+            pushFollow(FOLLOW_rule__MessageEntry__Group_1_2__1__Impl_in_rule__MessageEntry__Group_1_2__12800);
             rule__MessageEntry__Group_1_2__1__Impl();
 
             state._fsp--;
@@ -4115,25 +4036,25 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageEntry__Group_1_2__1__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1431:1: rule__MessageEntry__Group_1_2__1__Impl : ( ( rule__MessageEntry__ParamListAssignment_1_2_1 ) ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1398:1: rule__MessageEntry__Group_1_2__1__Impl : ( ( rule__MessageEntry__ParamListAssignment_1_2_1 ) ) ;
     public final void rule__MessageEntry__Group_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1435:1: ( ( ( rule__MessageEntry__ParamListAssignment_1_2_1 ) ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1436:1: ( ( rule__MessageEntry__ParamListAssignment_1_2_1 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1402:1: ( ( ( rule__MessageEntry__ParamListAssignment_1_2_1 ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1403:1: ( ( rule__MessageEntry__ParamListAssignment_1_2_1 ) )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1436:1: ( ( rule__MessageEntry__ParamListAssignment_1_2_1 ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1437:1: ( rule__MessageEntry__ParamListAssignment_1_2_1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1403:1: ( ( rule__MessageEntry__ParamListAssignment_1_2_1 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1404:1: ( rule__MessageEntry__ParamListAssignment_1_2_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMessageEntryAccess().getParamListAssignment_1_2_1()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1438:1: ( rule__MessageEntry__ParamListAssignment_1_2_1 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1438:2: rule__MessageEntry__ParamListAssignment_1_2_1
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1405:1: ( rule__MessageEntry__ParamListAssignment_1_2_1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1405:2: rule__MessageEntry__ParamListAssignment_1_2_1
             {
-            pushFollow(FOLLOW_rule__MessageEntry__ParamListAssignment_1_2_1_in_rule__MessageEntry__Group_1_2__1__Impl2891);
+            pushFollow(FOLLOW_rule__MessageEntry__ParamListAssignment_1_2_1_in_rule__MessageEntry__Group_1_2__1__Impl2827);
             rule__MessageEntry__ParamListAssignment_1_2_1();
 
             state._fsp--;
@@ -4165,23 +4086,23 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__MessageEntry__Group_1_2__1__Impl"
 
 
-    // $ANTLR start "rule__MessageEntry__Group_3_0__0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1452:1: rule__MessageEntry__Group_3_0__0 : rule__MessageEntry__Group_3_0__0__Impl rule__MessageEntry__Group_3_0__1 ;
-    public final void rule__MessageEntry__Group_3_0__0() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__Group_2_0__0"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1419:1: rule__MessageEntry__Group_2_0__0 : rule__MessageEntry__Group_2_0__0__Impl rule__MessageEntry__Group_2_0__1 ;
+    public final void rule__MessageEntry__Group_2_0__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1456:1: ( rule__MessageEntry__Group_3_0__0__Impl rule__MessageEntry__Group_3_0__1 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1457:2: rule__MessageEntry__Group_3_0__0__Impl rule__MessageEntry__Group_3_0__1
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1423:1: ( rule__MessageEntry__Group_2_0__0__Impl rule__MessageEntry__Group_2_0__1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1424:2: rule__MessageEntry__Group_2_0__0__Impl rule__MessageEntry__Group_2_0__1
             {
-            pushFollow(FOLLOW_rule__MessageEntry__Group_3_0__0__Impl_in_rule__MessageEntry__Group_3_0__02925);
-            rule__MessageEntry__Group_3_0__0__Impl();
+            pushFollow(FOLLOW_rule__MessageEntry__Group_2_0__0__Impl_in_rule__MessageEntry__Group_2_0__02861);
+            rule__MessageEntry__Group_2_0__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MessageEntry__Group_3_0__1_in_rule__MessageEntry__Group_3_0__02928);
-            rule__MessageEntry__Group_3_0__1();
+            pushFollow(FOLLOW_rule__MessageEntry__Group_2_0__1_in_rule__MessageEntry__Group_2_0__02864);
+            rule__MessageEntry__Group_2_0__1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -4200,28 +4121,28 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Group_3_0__0"
+    // $ANTLR end "rule__MessageEntry__Group_2_0__0"
 
 
-    // $ANTLR start "rule__MessageEntry__Group_3_0__0__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1464:1: rule__MessageEntry__Group_3_0__0__Impl : ( '{' ) ;
-    public final void rule__MessageEntry__Group_3_0__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__Group_2_0__0__Impl"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1431:1: rule__MessageEntry__Group_2_0__0__Impl : ( '{' ) ;
+    public final void rule__MessageEntry__Group_2_0__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1468:1: ( ( '{' ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1469:1: ( '{' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1435:1: ( ( '{' ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1436:1: ( '{' )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1469:1: ( '{' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1470:1: '{'
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1436:1: ( '{' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1437:1: '{'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMessageEntryAccess().getLeftCurlyBracketKeyword_3_0_0()); 
+               before(grammarAccess.getMessageEntryAccess().getLeftCurlyBracketKeyword_2_0_0()); 
             }
-            match(input,20,FOLLOW_20_in_rule__MessageEntry__Group_3_0__0__Impl2956); if (state.failed) return ;
+            match(input,20,FOLLOW_20_in_rule__MessageEntry__Group_2_0__0__Impl2892); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMessageEntryAccess().getLeftCurlyBracketKeyword_3_0_0()); 
+               after(grammarAccess.getMessageEntryAccess().getLeftCurlyBracketKeyword_2_0_0()); 
             }
 
             }
@@ -4241,26 +4162,26 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Group_3_0__0__Impl"
+    // $ANTLR end "rule__MessageEntry__Group_2_0__0__Impl"
 
 
-    // $ANTLR start "rule__MessageEntry__Group_3_0__1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1483:1: rule__MessageEntry__Group_3_0__1 : rule__MessageEntry__Group_3_0__1__Impl rule__MessageEntry__Group_3_0__2 ;
-    public final void rule__MessageEntry__Group_3_0__1() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__Group_2_0__1"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1450:1: rule__MessageEntry__Group_2_0__1 : rule__MessageEntry__Group_2_0__1__Impl rule__MessageEntry__Group_2_0__2 ;
+    public final void rule__MessageEntry__Group_2_0__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1487:1: ( rule__MessageEntry__Group_3_0__1__Impl rule__MessageEntry__Group_3_0__2 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1488:2: rule__MessageEntry__Group_3_0__1__Impl rule__MessageEntry__Group_3_0__2
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1454:1: ( rule__MessageEntry__Group_2_0__1__Impl rule__MessageEntry__Group_2_0__2 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1455:2: rule__MessageEntry__Group_2_0__1__Impl rule__MessageEntry__Group_2_0__2
             {
-            pushFollow(FOLLOW_rule__MessageEntry__Group_3_0__1__Impl_in_rule__MessageEntry__Group_3_0__12987);
-            rule__MessageEntry__Group_3_0__1__Impl();
+            pushFollow(FOLLOW_rule__MessageEntry__Group_2_0__1__Impl_in_rule__MessageEntry__Group_2_0__12923);
+            rule__MessageEntry__Group_2_0__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MessageEntry__Group_3_0__2_in_rule__MessageEntry__Group_3_0__12990);
-            rule__MessageEntry__Group_3_0__2();
+            pushFollow(FOLLOW_rule__MessageEntry__Group_2_0__2_in_rule__MessageEntry__Group_2_0__12926);
+            rule__MessageEntry__Group_2_0__2();
 
             state._fsp--;
             if (state.failed) return ;
@@ -4279,30 +4200,30 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Group_3_0__1"
+    // $ANTLR end "rule__MessageEntry__Group_2_0__1"
 
 
-    // $ANTLR start "rule__MessageEntry__Group_3_0__1__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1495:1: rule__MessageEntry__Group_3_0__1__Impl : ( ( rule__MessageEntry__MessageListAssignment_3_0_1 ) ) ;
-    public final void rule__MessageEntry__Group_3_0__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__Group_2_0__1__Impl"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1462:1: rule__MessageEntry__Group_2_0__1__Impl : ( ( rule__MessageEntry__MessageListAssignment_2_0_1 ) ) ;
+    public final void rule__MessageEntry__Group_2_0__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1499:1: ( ( ( rule__MessageEntry__MessageListAssignment_3_0_1 ) ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1500:1: ( ( rule__MessageEntry__MessageListAssignment_3_0_1 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1466:1: ( ( ( rule__MessageEntry__MessageListAssignment_2_0_1 ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1467:1: ( ( rule__MessageEntry__MessageListAssignment_2_0_1 ) )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1500:1: ( ( rule__MessageEntry__MessageListAssignment_3_0_1 ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1501:1: ( rule__MessageEntry__MessageListAssignment_3_0_1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1467:1: ( ( rule__MessageEntry__MessageListAssignment_2_0_1 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1468:1: ( rule__MessageEntry__MessageListAssignment_2_0_1 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMessageEntryAccess().getMessageListAssignment_3_0_1()); 
+               before(grammarAccess.getMessageEntryAccess().getMessageListAssignment_2_0_1()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1502:1: ( rule__MessageEntry__MessageListAssignment_3_0_1 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1502:2: rule__MessageEntry__MessageListAssignment_3_0_1
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1469:1: ( rule__MessageEntry__MessageListAssignment_2_0_1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1469:2: rule__MessageEntry__MessageListAssignment_2_0_1
             {
-            pushFollow(FOLLOW_rule__MessageEntry__MessageListAssignment_3_0_1_in_rule__MessageEntry__Group_3_0__1__Impl3017);
-            rule__MessageEntry__MessageListAssignment_3_0_1();
+            pushFollow(FOLLOW_rule__MessageEntry__MessageListAssignment_2_0_1_in_rule__MessageEntry__Group_2_0__1__Impl2953);
+            rule__MessageEntry__MessageListAssignment_2_0_1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -4310,7 +4231,7 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMessageEntryAccess().getMessageListAssignment_3_0_1()); 
+               after(grammarAccess.getMessageEntryAccess().getMessageListAssignment_2_0_1()); 
             }
 
             }
@@ -4330,26 +4251,26 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Group_3_0__1__Impl"
+    // $ANTLR end "rule__MessageEntry__Group_2_0__1__Impl"
 
 
-    // $ANTLR start "rule__MessageEntry__Group_3_0__2"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1512:1: rule__MessageEntry__Group_3_0__2 : rule__MessageEntry__Group_3_0__2__Impl rule__MessageEntry__Group_3_0__3 ;
-    public final void rule__MessageEntry__Group_3_0__2() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__Group_2_0__2"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1479:1: rule__MessageEntry__Group_2_0__2 : rule__MessageEntry__Group_2_0__2__Impl rule__MessageEntry__Group_2_0__3 ;
+    public final void rule__MessageEntry__Group_2_0__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1516:1: ( rule__MessageEntry__Group_3_0__2__Impl rule__MessageEntry__Group_3_0__3 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1517:2: rule__MessageEntry__Group_3_0__2__Impl rule__MessageEntry__Group_3_0__3
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1483:1: ( rule__MessageEntry__Group_2_0__2__Impl rule__MessageEntry__Group_2_0__3 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1484:2: rule__MessageEntry__Group_2_0__2__Impl rule__MessageEntry__Group_2_0__3
             {
-            pushFollow(FOLLOW_rule__MessageEntry__Group_3_0__2__Impl_in_rule__MessageEntry__Group_3_0__23047);
-            rule__MessageEntry__Group_3_0__2__Impl();
+            pushFollow(FOLLOW_rule__MessageEntry__Group_2_0__2__Impl_in_rule__MessageEntry__Group_2_0__22983);
+            rule__MessageEntry__Group_2_0__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MessageEntry__Group_3_0__3_in_rule__MessageEntry__Group_3_0__23050);
-            rule__MessageEntry__Group_3_0__3();
+            pushFollow(FOLLOW_rule__MessageEntry__Group_2_0__3_in_rule__MessageEntry__Group_2_0__22986);
+            rule__MessageEntry__Group_2_0__3();
 
             state._fsp--;
             if (state.failed) return ;
@@ -4368,42 +4289,42 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Group_3_0__2"
+    // $ANTLR end "rule__MessageEntry__Group_2_0__2"
 
 
-    // $ANTLR start "rule__MessageEntry__Group_3_0__2__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1524:1: rule__MessageEntry__Group_3_0__2__Impl : ( ( rule__MessageEntry__Group_3_0_2__0 )* ) ;
-    public final void rule__MessageEntry__Group_3_0__2__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__Group_2_0__2__Impl"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1491:1: rule__MessageEntry__Group_2_0__2__Impl : ( ( rule__MessageEntry__Group_2_0_2__0 )* ) ;
+    public final void rule__MessageEntry__Group_2_0__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1528:1: ( ( ( rule__MessageEntry__Group_3_0_2__0 )* ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1529:1: ( ( rule__MessageEntry__Group_3_0_2__0 )* )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1495:1: ( ( ( rule__MessageEntry__Group_2_0_2__0 )* ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1496:1: ( ( rule__MessageEntry__Group_2_0_2__0 )* )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1529:1: ( ( rule__MessageEntry__Group_3_0_2__0 )* )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1530:1: ( rule__MessageEntry__Group_3_0_2__0 )*
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1496:1: ( ( rule__MessageEntry__Group_2_0_2__0 )* )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1497:1: ( rule__MessageEntry__Group_2_0_2__0 )*
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMessageEntryAccess().getGroup_3_0_2()); 
+               before(grammarAccess.getMessageEntryAccess().getGroup_2_0_2()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1531:1: ( rule__MessageEntry__Group_3_0_2__0 )*
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1498:1: ( rule__MessageEntry__Group_2_0_2__0 )*
             loop10:
             do {
                 int alt10=2;
                 int LA10_0 = input.LA(1);
 
-                if ( (LA10_0==29) ) {
+                if ( (LA10_0==28) ) {
                     alt10=1;
                 }
 
 
                 switch (alt10) {
             	case 1 :
-            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1531:2: rule__MessageEntry__Group_3_0_2__0
+            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1498:2: rule__MessageEntry__Group_2_0_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__MessageEntry__Group_3_0_2__0_in_rule__MessageEntry__Group_3_0__2__Impl3077);
-            	    rule__MessageEntry__Group_3_0_2__0();
+            	    pushFollow(FOLLOW_rule__MessageEntry__Group_2_0_2__0_in_rule__MessageEntry__Group_2_0__2__Impl3013);
+            	    rule__MessageEntry__Group_2_0_2__0();
 
             	    state._fsp--;
             	    if (state.failed) return ;
@@ -4417,7 +4338,7 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
             } while (true);
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMessageEntryAccess().getGroup_3_0_2()); 
+               after(grammarAccess.getMessageEntryAccess().getGroup_2_0_2()); 
             }
 
             }
@@ -4437,21 +4358,21 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Group_3_0__2__Impl"
+    // $ANTLR end "rule__MessageEntry__Group_2_0__2__Impl"
 
 
-    // $ANTLR start "rule__MessageEntry__Group_3_0__3"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1541:1: rule__MessageEntry__Group_3_0__3 : rule__MessageEntry__Group_3_0__3__Impl ;
-    public final void rule__MessageEntry__Group_3_0__3() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__Group_2_0__3"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1508:1: rule__MessageEntry__Group_2_0__3 : rule__MessageEntry__Group_2_0__3__Impl ;
+    public final void rule__MessageEntry__Group_2_0__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1545:1: ( rule__MessageEntry__Group_3_0__3__Impl )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1546:2: rule__MessageEntry__Group_3_0__3__Impl
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1512:1: ( rule__MessageEntry__Group_2_0__3__Impl )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1513:2: rule__MessageEntry__Group_2_0__3__Impl
             {
-            pushFollow(FOLLOW_rule__MessageEntry__Group_3_0__3__Impl_in_rule__MessageEntry__Group_3_0__33108);
-            rule__MessageEntry__Group_3_0__3__Impl();
+            pushFollow(FOLLOW_rule__MessageEntry__Group_2_0__3__Impl_in_rule__MessageEntry__Group_2_0__33044);
+            rule__MessageEntry__Group_2_0__3__Impl();
 
             state._fsp--;
             if (state.failed) return ;
@@ -4470,28 +4391,28 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Group_3_0__3"
+    // $ANTLR end "rule__MessageEntry__Group_2_0__3"
 
 
-    // $ANTLR start "rule__MessageEntry__Group_3_0__3__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1552:1: rule__MessageEntry__Group_3_0__3__Impl : ( '}' ) ;
-    public final void rule__MessageEntry__Group_3_0__3__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__Group_2_0__3__Impl"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1519:1: rule__MessageEntry__Group_2_0__3__Impl : ( '}' ) ;
+    public final void rule__MessageEntry__Group_2_0__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1556:1: ( ( '}' ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1557:1: ( '}' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1523:1: ( ( '}' ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1524:1: ( '}' )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1557:1: ( '}' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1558:1: '}'
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1524:1: ( '}' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1525:1: '}'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMessageEntryAccess().getRightCurlyBracketKeyword_3_0_3()); 
+               before(grammarAccess.getMessageEntryAccess().getRightCurlyBracketKeyword_2_0_3()); 
             }
-            match(input,21,FOLLOW_21_in_rule__MessageEntry__Group_3_0__3__Impl3136); if (state.failed) return ;
+            match(input,21,FOLLOW_21_in_rule__MessageEntry__Group_2_0__3__Impl3072); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMessageEntryAccess().getRightCurlyBracketKeyword_3_0_3()); 
+               after(grammarAccess.getMessageEntryAccess().getRightCurlyBracketKeyword_2_0_3()); 
             }
 
             }
@@ -4511,26 +4432,26 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Group_3_0__3__Impl"
+    // $ANTLR end "rule__MessageEntry__Group_2_0__3__Impl"
 
 
-    // $ANTLR start "rule__MessageEntry__Group_3_0_2__0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1579:1: rule__MessageEntry__Group_3_0_2__0 : rule__MessageEntry__Group_3_0_2__0__Impl rule__MessageEntry__Group_3_0_2__1 ;
-    public final void rule__MessageEntry__Group_3_0_2__0() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__Group_2_0_2__0"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1546:1: rule__MessageEntry__Group_2_0_2__0 : rule__MessageEntry__Group_2_0_2__0__Impl rule__MessageEntry__Group_2_0_2__1 ;
+    public final void rule__MessageEntry__Group_2_0_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1583:1: ( rule__MessageEntry__Group_3_0_2__0__Impl rule__MessageEntry__Group_3_0_2__1 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1584:2: rule__MessageEntry__Group_3_0_2__0__Impl rule__MessageEntry__Group_3_0_2__1
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1550:1: ( rule__MessageEntry__Group_2_0_2__0__Impl rule__MessageEntry__Group_2_0_2__1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1551:2: rule__MessageEntry__Group_2_0_2__0__Impl rule__MessageEntry__Group_2_0_2__1
             {
-            pushFollow(FOLLOW_rule__MessageEntry__Group_3_0_2__0__Impl_in_rule__MessageEntry__Group_3_0_2__03175);
-            rule__MessageEntry__Group_3_0_2__0__Impl();
+            pushFollow(FOLLOW_rule__MessageEntry__Group_2_0_2__0__Impl_in_rule__MessageEntry__Group_2_0_2__03111);
+            rule__MessageEntry__Group_2_0_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MessageEntry__Group_3_0_2__1_in_rule__MessageEntry__Group_3_0_2__03178);
-            rule__MessageEntry__Group_3_0_2__1();
+            pushFollow(FOLLOW_rule__MessageEntry__Group_2_0_2__1_in_rule__MessageEntry__Group_2_0_2__03114);
+            rule__MessageEntry__Group_2_0_2__1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -4549,28 +4470,28 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Group_3_0_2__0"
+    // $ANTLR end "rule__MessageEntry__Group_2_0_2__0"
 
 
-    // $ANTLR start "rule__MessageEntry__Group_3_0_2__0__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1591:1: rule__MessageEntry__Group_3_0_2__0__Impl : ( ',' ) ;
-    public final void rule__MessageEntry__Group_3_0_2__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__Group_2_0_2__0__Impl"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1558:1: rule__MessageEntry__Group_2_0_2__0__Impl : ( ',' ) ;
+    public final void rule__MessageEntry__Group_2_0_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1595:1: ( ( ',' ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1596:1: ( ',' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1562:1: ( ( ',' ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1563:1: ( ',' )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1596:1: ( ',' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1597:1: ','
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1563:1: ( ',' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1564:1: ','
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMessageEntryAccess().getCommaKeyword_3_0_2_0()); 
+               before(grammarAccess.getMessageEntryAccess().getCommaKeyword_2_0_2_0()); 
             }
-            match(input,29,FOLLOW_29_in_rule__MessageEntry__Group_3_0_2__0__Impl3206); if (state.failed) return ;
+            match(input,28,FOLLOW_28_in_rule__MessageEntry__Group_2_0_2__0__Impl3142); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMessageEntryAccess().getCommaKeyword_3_0_2_0()); 
+               after(grammarAccess.getMessageEntryAccess().getCommaKeyword_2_0_2_0()); 
             }
 
             }
@@ -4590,21 +4511,21 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Group_3_0_2__0__Impl"
+    // $ANTLR end "rule__MessageEntry__Group_2_0_2__0__Impl"
 
 
-    // $ANTLR start "rule__MessageEntry__Group_3_0_2__1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1610:1: rule__MessageEntry__Group_3_0_2__1 : rule__MessageEntry__Group_3_0_2__1__Impl ;
-    public final void rule__MessageEntry__Group_3_0_2__1() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__Group_2_0_2__1"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1577:1: rule__MessageEntry__Group_2_0_2__1 : rule__MessageEntry__Group_2_0_2__1__Impl ;
+    public final void rule__MessageEntry__Group_2_0_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1614:1: ( rule__MessageEntry__Group_3_0_2__1__Impl )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1615:2: rule__MessageEntry__Group_3_0_2__1__Impl
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1581:1: ( rule__MessageEntry__Group_2_0_2__1__Impl )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1582:2: rule__MessageEntry__Group_2_0_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__MessageEntry__Group_3_0_2__1__Impl_in_rule__MessageEntry__Group_3_0_2__13237);
-            rule__MessageEntry__Group_3_0_2__1__Impl();
+            pushFollow(FOLLOW_rule__MessageEntry__Group_2_0_2__1__Impl_in_rule__MessageEntry__Group_2_0_2__13173);
+            rule__MessageEntry__Group_2_0_2__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
@@ -4623,30 +4544,30 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Group_3_0_2__1"
+    // $ANTLR end "rule__MessageEntry__Group_2_0_2__1"
 
 
-    // $ANTLR start "rule__MessageEntry__Group_3_0_2__1__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1621:1: rule__MessageEntry__Group_3_0_2__1__Impl : ( ( rule__MessageEntry__MessageListAssignment_3_0_2_1 ) ) ;
-    public final void rule__MessageEntry__Group_3_0_2__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__Group_2_0_2__1__Impl"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1588:1: rule__MessageEntry__Group_2_0_2__1__Impl : ( ( rule__MessageEntry__MessageListAssignment_2_0_2_1 ) ) ;
+    public final void rule__MessageEntry__Group_2_0_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1625:1: ( ( ( rule__MessageEntry__MessageListAssignment_3_0_2_1 ) ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1626:1: ( ( rule__MessageEntry__MessageListAssignment_3_0_2_1 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1592:1: ( ( ( rule__MessageEntry__MessageListAssignment_2_0_2_1 ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1593:1: ( ( rule__MessageEntry__MessageListAssignment_2_0_2_1 ) )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1626:1: ( ( rule__MessageEntry__MessageListAssignment_3_0_2_1 ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1627:1: ( rule__MessageEntry__MessageListAssignment_3_0_2_1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1593:1: ( ( rule__MessageEntry__MessageListAssignment_2_0_2_1 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1594:1: ( rule__MessageEntry__MessageListAssignment_2_0_2_1 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMessageEntryAccess().getMessageListAssignment_3_0_2_1()); 
+               before(grammarAccess.getMessageEntryAccess().getMessageListAssignment_2_0_2_1()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1628:1: ( rule__MessageEntry__MessageListAssignment_3_0_2_1 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1628:2: rule__MessageEntry__MessageListAssignment_3_0_2_1
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1595:1: ( rule__MessageEntry__MessageListAssignment_2_0_2_1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1595:2: rule__MessageEntry__MessageListAssignment_2_0_2_1
             {
-            pushFollow(FOLLOW_rule__MessageEntry__MessageListAssignment_3_0_2_1_in_rule__MessageEntry__Group_3_0_2__1__Impl3264);
-            rule__MessageEntry__MessageListAssignment_3_0_2_1();
+            pushFollow(FOLLOW_rule__MessageEntry__MessageListAssignment_2_0_2_1_in_rule__MessageEntry__Group_2_0_2__1__Impl3200);
+            rule__MessageEntry__MessageListAssignment_2_0_2_1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -4654,7 +4575,7 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMessageEntryAccess().getMessageListAssignment_3_0_2_1()); 
+               after(grammarAccess.getMessageEntryAccess().getMessageListAssignment_2_0_2_1()); 
             }
 
             }
@@ -4674,26 +4595,26 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Group_3_0_2__1__Impl"
+    // $ANTLR end "rule__MessageEntry__Group_2_0_2__1__Impl"
 
 
-    // $ANTLR start "rule__MessageEntry__Group_3_1__0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1642:1: rule__MessageEntry__Group_3_1__0 : rule__MessageEntry__Group_3_1__0__Impl rule__MessageEntry__Group_3_1__1 ;
-    public final void rule__MessageEntry__Group_3_1__0() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__Group_2_1__0"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1609:1: rule__MessageEntry__Group_2_1__0 : rule__MessageEntry__Group_2_1__0__Impl rule__MessageEntry__Group_2_1__1 ;
+    public final void rule__MessageEntry__Group_2_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1646:1: ( rule__MessageEntry__Group_3_1__0__Impl rule__MessageEntry__Group_3_1__1 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1647:2: rule__MessageEntry__Group_3_1__0__Impl rule__MessageEntry__Group_3_1__1
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1613:1: ( rule__MessageEntry__Group_2_1__0__Impl rule__MessageEntry__Group_2_1__1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1614:2: rule__MessageEntry__Group_2_1__0__Impl rule__MessageEntry__Group_2_1__1
             {
-            pushFollow(FOLLOW_rule__MessageEntry__Group_3_1__0__Impl_in_rule__MessageEntry__Group_3_1__03298);
-            rule__MessageEntry__Group_3_1__0__Impl();
+            pushFollow(FOLLOW_rule__MessageEntry__Group_2_1__0__Impl_in_rule__MessageEntry__Group_2_1__03234);
+            rule__MessageEntry__Group_2_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MessageEntry__Group_3_1__1_in_rule__MessageEntry__Group_3_1__03301);
-            rule__MessageEntry__Group_3_1__1();
+            pushFollow(FOLLOW_rule__MessageEntry__Group_2_1__1_in_rule__MessageEntry__Group_2_1__03237);
+            rule__MessageEntry__Group_2_1__1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -4712,28 +4633,28 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Group_3_1__0"
+    // $ANTLR end "rule__MessageEntry__Group_2_1__0"
 
 
-    // $ANTLR start "rule__MessageEntry__Group_3_1__0__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1654:1: rule__MessageEntry__Group_3_1__0__Impl : ( '[' ) ;
-    public final void rule__MessageEntry__Group_3_1__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__Group_2_1__0__Impl"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1621:1: rule__MessageEntry__Group_2_1__0__Impl : ( '[' ) ;
+    public final void rule__MessageEntry__Group_2_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1658:1: ( ( '[' ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1659:1: ( '[' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1625:1: ( ( '[' ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1626:1: ( '[' )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1659:1: ( '[' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1660:1: '['
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1626:1: ( '[' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1627:1: '['
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMessageEntryAccess().getLeftSquareBracketKeyword_3_1_0()); 
+               before(grammarAccess.getMessageEntryAccess().getLeftSquareBracketKeyword_2_1_0()); 
             }
-            match(input,30,FOLLOW_30_in_rule__MessageEntry__Group_3_1__0__Impl3329); if (state.failed) return ;
+            match(input,29,FOLLOW_29_in_rule__MessageEntry__Group_2_1__0__Impl3265); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMessageEntryAccess().getLeftSquareBracketKeyword_3_1_0()); 
+               after(grammarAccess.getMessageEntryAccess().getLeftSquareBracketKeyword_2_1_0()); 
             }
 
             }
@@ -4753,26 +4674,26 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Group_3_1__0__Impl"
+    // $ANTLR end "rule__MessageEntry__Group_2_1__0__Impl"
 
 
-    // $ANTLR start "rule__MessageEntry__Group_3_1__1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1673:1: rule__MessageEntry__Group_3_1__1 : rule__MessageEntry__Group_3_1__1__Impl rule__MessageEntry__Group_3_1__2 ;
-    public final void rule__MessageEntry__Group_3_1__1() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__Group_2_1__1"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1640:1: rule__MessageEntry__Group_2_1__1 : rule__MessageEntry__Group_2_1__1__Impl rule__MessageEntry__Group_2_1__2 ;
+    public final void rule__MessageEntry__Group_2_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1677:1: ( rule__MessageEntry__Group_3_1__1__Impl rule__MessageEntry__Group_3_1__2 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1678:2: rule__MessageEntry__Group_3_1__1__Impl rule__MessageEntry__Group_3_1__2
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1644:1: ( rule__MessageEntry__Group_2_1__1__Impl rule__MessageEntry__Group_2_1__2 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1645:2: rule__MessageEntry__Group_2_1__1__Impl rule__MessageEntry__Group_2_1__2
             {
-            pushFollow(FOLLOW_rule__MessageEntry__Group_3_1__1__Impl_in_rule__MessageEntry__Group_3_1__13360);
-            rule__MessageEntry__Group_3_1__1__Impl();
+            pushFollow(FOLLOW_rule__MessageEntry__Group_2_1__1__Impl_in_rule__MessageEntry__Group_2_1__13296);
+            rule__MessageEntry__Group_2_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MessageEntry__Group_3_1__2_in_rule__MessageEntry__Group_3_1__13363);
-            rule__MessageEntry__Group_3_1__2();
+            pushFollow(FOLLOW_rule__MessageEntry__Group_2_1__2_in_rule__MessageEntry__Group_2_1__13299);
+            rule__MessageEntry__Group_2_1__2();
 
             state._fsp--;
             if (state.failed) return ;
@@ -4791,30 +4712,30 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Group_3_1__1"
+    // $ANTLR end "rule__MessageEntry__Group_2_1__1"
 
 
-    // $ANTLR start "rule__MessageEntry__Group_3_1__1__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1685:1: rule__MessageEntry__Group_3_1__1__Impl : ( ( rule__MessageEntry__EntryRefAssignment_3_1_1 ) ) ;
-    public final void rule__MessageEntry__Group_3_1__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__Group_2_1__1__Impl"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1652:1: rule__MessageEntry__Group_2_1__1__Impl : ( ( rule__MessageEntry__EntryRefAssignment_2_1_1 ) ) ;
+    public final void rule__MessageEntry__Group_2_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1689:1: ( ( ( rule__MessageEntry__EntryRefAssignment_3_1_1 ) ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1690:1: ( ( rule__MessageEntry__EntryRefAssignment_3_1_1 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1656:1: ( ( ( rule__MessageEntry__EntryRefAssignment_2_1_1 ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1657:1: ( ( rule__MessageEntry__EntryRefAssignment_2_1_1 ) )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1690:1: ( ( rule__MessageEntry__EntryRefAssignment_3_1_1 ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1691:1: ( rule__MessageEntry__EntryRefAssignment_3_1_1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1657:1: ( ( rule__MessageEntry__EntryRefAssignment_2_1_1 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1658:1: ( rule__MessageEntry__EntryRefAssignment_2_1_1 )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMessageEntryAccess().getEntryRefAssignment_3_1_1()); 
+               before(grammarAccess.getMessageEntryAccess().getEntryRefAssignment_2_1_1()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1692:1: ( rule__MessageEntry__EntryRefAssignment_3_1_1 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1692:2: rule__MessageEntry__EntryRefAssignment_3_1_1
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1659:1: ( rule__MessageEntry__EntryRefAssignment_2_1_1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1659:2: rule__MessageEntry__EntryRefAssignment_2_1_1
             {
-            pushFollow(FOLLOW_rule__MessageEntry__EntryRefAssignment_3_1_1_in_rule__MessageEntry__Group_3_1__1__Impl3390);
-            rule__MessageEntry__EntryRefAssignment_3_1_1();
+            pushFollow(FOLLOW_rule__MessageEntry__EntryRefAssignment_2_1_1_in_rule__MessageEntry__Group_2_1__1__Impl3326);
+            rule__MessageEntry__EntryRefAssignment_2_1_1();
 
             state._fsp--;
             if (state.failed) return ;
@@ -4822,7 +4743,7 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMessageEntryAccess().getEntryRefAssignment_3_1_1()); 
+               after(grammarAccess.getMessageEntryAccess().getEntryRefAssignment_2_1_1()); 
             }
 
             }
@@ -4842,21 +4763,21 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Group_3_1__1__Impl"
+    // $ANTLR end "rule__MessageEntry__Group_2_1__1__Impl"
 
 
-    // $ANTLR start "rule__MessageEntry__Group_3_1__2"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1702:1: rule__MessageEntry__Group_3_1__2 : rule__MessageEntry__Group_3_1__2__Impl ;
-    public final void rule__MessageEntry__Group_3_1__2() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__Group_2_1__2"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1669:1: rule__MessageEntry__Group_2_1__2 : rule__MessageEntry__Group_2_1__2__Impl ;
+    public final void rule__MessageEntry__Group_2_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1706:1: ( rule__MessageEntry__Group_3_1__2__Impl )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1707:2: rule__MessageEntry__Group_3_1__2__Impl
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1673:1: ( rule__MessageEntry__Group_2_1__2__Impl )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1674:2: rule__MessageEntry__Group_2_1__2__Impl
             {
-            pushFollow(FOLLOW_rule__MessageEntry__Group_3_1__2__Impl_in_rule__MessageEntry__Group_3_1__23420);
-            rule__MessageEntry__Group_3_1__2__Impl();
+            pushFollow(FOLLOW_rule__MessageEntry__Group_2_1__2__Impl_in_rule__MessageEntry__Group_2_1__23356);
+            rule__MessageEntry__Group_2_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
@@ -4875,28 +4796,28 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Group_3_1__2"
+    // $ANTLR end "rule__MessageEntry__Group_2_1__2"
 
 
-    // $ANTLR start "rule__MessageEntry__Group_3_1__2__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1713:1: rule__MessageEntry__Group_3_1__2__Impl : ( ']' ) ;
-    public final void rule__MessageEntry__Group_3_1__2__Impl() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__Group_2_1__2__Impl"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1680:1: rule__MessageEntry__Group_2_1__2__Impl : ( ']' ) ;
+    public final void rule__MessageEntry__Group_2_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1717:1: ( ( ']' ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1718:1: ( ']' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1684:1: ( ( ']' ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1685:1: ( ']' )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1718:1: ( ']' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1719:1: ']'
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1685:1: ( ']' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1686:1: ']'
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMessageEntryAccess().getRightSquareBracketKeyword_3_1_2()); 
+               before(grammarAccess.getMessageEntryAccess().getRightSquareBracketKeyword_2_1_2()); 
             }
-            match(input,31,FOLLOW_31_in_rule__MessageEntry__Group_3_1__2__Impl3448); if (state.failed) return ;
+            match(input,30,FOLLOW_30_in_rule__MessageEntry__Group_2_1__2__Impl3384); if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMessageEntryAccess().getRightSquareBracketKeyword_3_1_2()); 
+               after(grammarAccess.getMessageEntryAccess().getRightSquareBracketKeyword_2_1_2()); 
             }
 
             }
@@ -4916,25 +4837,25 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__Group_3_1__2__Impl"
+    // $ANTLR end "rule__MessageEntry__Group_2_1__2__Impl"
 
 
     // $ANTLR start "rule__MessageParam__Group__0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1738:1: rule__MessageParam__Group__0 : rule__MessageParam__Group__0__Impl rule__MessageParam__Group__1 ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1705:1: rule__MessageParam__Group__0 : rule__MessageParam__Group__0__Impl rule__MessageParam__Group__1 ;
     public final void rule__MessageParam__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1742:1: ( rule__MessageParam__Group__0__Impl rule__MessageParam__Group__1 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1743:2: rule__MessageParam__Group__0__Impl rule__MessageParam__Group__1
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1709:1: ( rule__MessageParam__Group__0__Impl rule__MessageParam__Group__1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1710:2: rule__MessageParam__Group__0__Impl rule__MessageParam__Group__1
             {
-            pushFollow(FOLLOW_rule__MessageParam__Group__0__Impl_in_rule__MessageParam__Group__03485);
+            pushFollow(FOLLOW_rule__MessageParam__Group__0__Impl_in_rule__MessageParam__Group__03421);
             rule__MessageParam__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__MessageParam__Group__1_in_rule__MessageParam__Group__03488);
+            pushFollow(FOLLOW_rule__MessageParam__Group__1_in_rule__MessageParam__Group__03424);
             rule__MessageParam__Group__1();
 
             state._fsp--;
@@ -4958,25 +4879,25 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageParam__Group__0__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1750:1: rule__MessageParam__Group__0__Impl : ( ( rule__MessageParam__PredefinedAssignment_0 ) ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1717:1: rule__MessageParam__Group__0__Impl : ( ( rule__MessageParam__PredefinedAssignment_0 ) ) ;
     public final void rule__MessageParam__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1754:1: ( ( ( rule__MessageParam__PredefinedAssignment_0 ) ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1755:1: ( ( rule__MessageParam__PredefinedAssignment_0 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1721:1: ( ( ( rule__MessageParam__PredefinedAssignment_0 ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1722:1: ( ( rule__MessageParam__PredefinedAssignment_0 ) )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1755:1: ( ( rule__MessageParam__PredefinedAssignment_0 ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1756:1: ( rule__MessageParam__PredefinedAssignment_0 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1722:1: ( ( rule__MessageParam__PredefinedAssignment_0 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1723:1: ( rule__MessageParam__PredefinedAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMessageParamAccess().getPredefinedAssignment_0()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1757:1: ( rule__MessageParam__PredefinedAssignment_0 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1757:2: rule__MessageParam__PredefinedAssignment_0
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1724:1: ( rule__MessageParam__PredefinedAssignment_0 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1724:2: rule__MessageParam__PredefinedAssignment_0
             {
-            pushFollow(FOLLOW_rule__MessageParam__PredefinedAssignment_0_in_rule__MessageParam__Group__0__Impl3515);
+            pushFollow(FOLLOW_rule__MessageParam__PredefinedAssignment_0_in_rule__MessageParam__Group__0__Impl3451);
             rule__MessageParam__PredefinedAssignment_0();
 
             state._fsp--;
@@ -5009,16 +4930,16 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageParam__Group__1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1767:1: rule__MessageParam__Group__1 : rule__MessageParam__Group__1__Impl ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1734:1: rule__MessageParam__Group__1 : rule__MessageParam__Group__1__Impl ;
     public final void rule__MessageParam__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1771:1: ( rule__MessageParam__Group__1__Impl )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1772:2: rule__MessageParam__Group__1__Impl
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1738:1: ( rule__MessageParam__Group__1__Impl )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1739:2: rule__MessageParam__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__MessageParam__Group__1__Impl_in_rule__MessageParam__Group__13545);
+            pushFollow(FOLLOW_rule__MessageParam__Group__1__Impl_in_rule__MessageParam__Group__13481);
             rule__MessageParam__Group__1__Impl();
 
             state._fsp--;
@@ -5042,25 +4963,25 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageParam__Group__1__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1778:1: rule__MessageParam__Group__1__Impl : ( ( rule__MessageParam__VarAssignment_1 ) ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1745:1: rule__MessageParam__Group__1__Impl : ( ( rule__MessageParam__VarAssignment_1 ) ) ;
     public final void rule__MessageParam__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1782:1: ( ( ( rule__MessageParam__VarAssignment_1 ) ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1783:1: ( ( rule__MessageParam__VarAssignment_1 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1749:1: ( ( ( rule__MessageParam__VarAssignment_1 ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1750:1: ( ( rule__MessageParam__VarAssignment_1 ) )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1783:1: ( ( rule__MessageParam__VarAssignment_1 ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1784:1: ( rule__MessageParam__VarAssignment_1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1750:1: ( ( rule__MessageParam__VarAssignment_1 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1751:1: ( rule__MessageParam__VarAssignment_1 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMessageParamAccess().getVarAssignment_1()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1785:1: ( rule__MessageParam__VarAssignment_1 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1785:2: rule__MessageParam__VarAssignment_1
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1752:1: ( rule__MessageParam__VarAssignment_1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1752:2: rule__MessageParam__VarAssignment_1
             {
-            pushFollow(FOLLOW_rule__MessageParam__VarAssignment_1_in_rule__MessageParam__Group__1__Impl3572);
+            pushFollow(FOLLOW_rule__MessageParam__VarAssignment_1_in_rule__MessageParam__Group__1__Impl3508);
             rule__MessageParam__VarAssignment_1();
 
             state._fsp--;
@@ -5093,21 +5014,21 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1799:1: rule__Message__Group__0 : rule__Message__Group__0__Impl rule__Message__Group__1 ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1766:1: rule__Message__Group__0 : rule__Message__Group__0__Impl rule__Message__Group__1 ;
     public final void rule__Message__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1803:1: ( rule__Message__Group__0__Impl rule__Message__Group__1 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1804:2: rule__Message__Group__0__Impl rule__Message__Group__1
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1770:1: ( rule__Message__Group__0__Impl rule__Message__Group__1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1771:2: rule__Message__Group__0__Impl rule__Message__Group__1
             {
-            pushFollow(FOLLOW_rule__Message__Group__0__Impl_in_rule__Message__Group__03606);
+            pushFollow(FOLLOW_rule__Message__Group__0__Impl_in_rule__Message__Group__03542);
             rule__Message__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Message__Group__1_in_rule__Message__Group__03609);
+            pushFollow(FOLLOW_rule__Message__Group__1_in_rule__Message__Group__03545);
             rule__Message__Group__1();
 
             state._fsp--;
@@ -5131,25 +5052,25 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__0__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1811:1: rule__Message__Group__0__Impl : ( ( rule__Message__NameAssignment_0 ) ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1778:1: rule__Message__Group__0__Impl : ( ( rule__Message__NameAssignment_0 ) ) ;
     public final void rule__Message__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1815:1: ( ( ( rule__Message__NameAssignment_0 ) ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1816:1: ( ( rule__Message__NameAssignment_0 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1782:1: ( ( ( rule__Message__NameAssignment_0 ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1783:1: ( ( rule__Message__NameAssignment_0 ) )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1816:1: ( ( rule__Message__NameAssignment_0 ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1817:1: ( rule__Message__NameAssignment_0 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1783:1: ( ( rule__Message__NameAssignment_0 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1784:1: ( rule__Message__NameAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMessageAccess().getNameAssignment_0()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1818:1: ( rule__Message__NameAssignment_0 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1818:2: rule__Message__NameAssignment_0
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1785:1: ( rule__Message__NameAssignment_0 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1785:2: rule__Message__NameAssignment_0
             {
-            pushFollow(FOLLOW_rule__Message__NameAssignment_0_in_rule__Message__Group__0__Impl3636);
+            pushFollow(FOLLOW_rule__Message__NameAssignment_0_in_rule__Message__Group__0__Impl3572);
             rule__Message__NameAssignment_0();
 
             state._fsp--;
@@ -5182,21 +5103,21 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1828:1: rule__Message__Group__1 : rule__Message__Group__1__Impl rule__Message__Group__2 ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1795:1: rule__Message__Group__1 : rule__Message__Group__1__Impl rule__Message__Group__2 ;
     public final void rule__Message__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1832:1: ( rule__Message__Group__1__Impl rule__Message__Group__2 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1833:2: rule__Message__Group__1__Impl rule__Message__Group__2
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1799:1: ( rule__Message__Group__1__Impl rule__Message__Group__2 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1800:2: rule__Message__Group__1__Impl rule__Message__Group__2
             {
-            pushFollow(FOLLOW_rule__Message__Group__1__Impl_in_rule__Message__Group__13666);
+            pushFollow(FOLLOW_rule__Message__Group__1__Impl_in_rule__Message__Group__13602);
             rule__Message__Group__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__Message__Group__2_in_rule__Message__Group__13669);
+            pushFollow(FOLLOW_rule__Message__Group__2_in_rule__Message__Group__13605);
             rule__Message__Group__2();
 
             state._fsp--;
@@ -5220,22 +5141,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__1__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1840:1: rule__Message__Group__1__Impl : ( ':' ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1807:1: rule__Message__Group__1__Impl : ( ':' ) ;
     public final void rule__Message__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1844:1: ( ( ':' ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1845:1: ( ':' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1811:1: ( ( ':' ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1812:1: ( ':' )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1845:1: ( ':' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1846:1: ':'
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1812:1: ( ':' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1813:1: ':'
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMessageAccess().getColonKeyword_1()); 
             }
-            match(input,26,FOLLOW_26_in_rule__Message__Group__1__Impl3697); if (state.failed) return ;
+            match(input,31,FOLLOW_31_in_rule__Message__Group__1__Impl3633); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMessageAccess().getColonKeyword_1()); 
             }
@@ -5261,16 +5182,16 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__2"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1859:1: rule__Message__Group__2 : rule__Message__Group__2__Impl ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1826:1: rule__Message__Group__2 : rule__Message__Group__2__Impl ;
     public final void rule__Message__Group__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1863:1: ( rule__Message__Group__2__Impl )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1864:2: rule__Message__Group__2__Impl
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1830:1: ( rule__Message__Group__2__Impl )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1831:2: rule__Message__Group__2__Impl
             {
-            pushFollow(FOLLOW_rule__Message__Group__2__Impl_in_rule__Message__Group__23728);
+            pushFollow(FOLLOW_rule__Message__Group__2__Impl_in_rule__Message__Group__23664);
             rule__Message__Group__2__Impl();
 
             state._fsp--;
@@ -5294,25 +5215,25 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__Group__2__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1870:1: rule__Message__Group__2__Impl : ( ( rule__Message__MessageAssignment_2 ) ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1837:1: rule__Message__Group__2__Impl : ( ( rule__Message__MessageAssignment_2 ) ) ;
     public final void rule__Message__Group__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1874:1: ( ( ( rule__Message__MessageAssignment_2 ) ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1875:1: ( ( rule__Message__MessageAssignment_2 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1841:1: ( ( ( rule__Message__MessageAssignment_2 ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1842:1: ( ( rule__Message__MessageAssignment_2 ) )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1875:1: ( ( rule__Message__MessageAssignment_2 ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1876:1: ( rule__Message__MessageAssignment_2 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1842:1: ( ( rule__Message__MessageAssignment_2 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1843:1: ( rule__Message__MessageAssignment_2 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMessageAccess().getMessageAssignment_2()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1877:1: ( rule__Message__MessageAssignment_2 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1877:2: rule__Message__MessageAssignment_2
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1844:1: ( rule__Message__MessageAssignment_2 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1844:2: rule__Message__MessageAssignment_2
             {
-            pushFollow(FOLLOW_rule__Message__MessageAssignment_2_in_rule__Message__Group__2__Impl3755);
+            pushFollow(FOLLOW_rule__Message__MessageAssignment_2_in_rule__Message__Group__2__Impl3691);
             rule__Message__MessageAssignment_2();
 
             state._fsp--;
@@ -5345,21 +5266,21 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichString__Group_1__0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1893:1: rule__RichString__Group_1__0 : rule__RichString__Group_1__0__Impl rule__RichString__Group_1__1 ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1860:1: rule__RichString__Group_1__0 : rule__RichString__Group_1__0__Impl rule__RichString__Group_1__1 ;
     public final void rule__RichString__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1897:1: ( rule__RichString__Group_1__0__Impl rule__RichString__Group_1__1 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1898:2: rule__RichString__Group_1__0__Impl rule__RichString__Group_1__1
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1864:1: ( rule__RichString__Group_1__0__Impl rule__RichString__Group_1__1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1865:2: rule__RichString__Group_1__0__Impl rule__RichString__Group_1__1
             {
-            pushFollow(FOLLOW_rule__RichString__Group_1__0__Impl_in_rule__RichString__Group_1__03791);
+            pushFollow(FOLLOW_rule__RichString__Group_1__0__Impl_in_rule__RichString__Group_1__03727);
             rule__RichString__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RichString__Group_1__1_in_rule__RichString__Group_1__03794);
+            pushFollow(FOLLOW_rule__RichString__Group_1__1_in_rule__RichString__Group_1__03730);
             rule__RichString__Group_1__1();
 
             state._fsp--;
@@ -5383,25 +5304,25 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichString__Group_1__0__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1905:1: rule__RichString__Group_1__0__Impl : ( ( rule__RichString__ExpressionsAssignment_1_0 ) ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1872:1: rule__RichString__Group_1__0__Impl : ( ( rule__RichString__ExpressionsAssignment_1_0 ) ) ;
     public final void rule__RichString__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1909:1: ( ( ( rule__RichString__ExpressionsAssignment_1_0 ) ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1910:1: ( ( rule__RichString__ExpressionsAssignment_1_0 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1876:1: ( ( ( rule__RichString__ExpressionsAssignment_1_0 ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1877:1: ( ( rule__RichString__ExpressionsAssignment_1_0 ) )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1910:1: ( ( rule__RichString__ExpressionsAssignment_1_0 ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1911:1: ( rule__RichString__ExpressionsAssignment_1_0 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1877:1: ( ( rule__RichString__ExpressionsAssignment_1_0 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1878:1: ( rule__RichString__ExpressionsAssignment_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichStringAccess().getExpressionsAssignment_1_0()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1912:1: ( rule__RichString__ExpressionsAssignment_1_0 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1912:2: rule__RichString__ExpressionsAssignment_1_0
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1879:1: ( rule__RichString__ExpressionsAssignment_1_0 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1879:2: rule__RichString__ExpressionsAssignment_1_0
             {
-            pushFollow(FOLLOW_rule__RichString__ExpressionsAssignment_1_0_in_rule__RichString__Group_1__0__Impl3821);
+            pushFollow(FOLLOW_rule__RichString__ExpressionsAssignment_1_0_in_rule__RichString__Group_1__0__Impl3757);
             rule__RichString__ExpressionsAssignment_1_0();
 
             state._fsp--;
@@ -5434,21 +5355,21 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichString__Group_1__1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1922:1: rule__RichString__Group_1__1 : rule__RichString__Group_1__1__Impl rule__RichString__Group_1__2 ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1889:1: rule__RichString__Group_1__1 : rule__RichString__Group_1__1__Impl rule__RichString__Group_1__2 ;
     public final void rule__RichString__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1926:1: ( rule__RichString__Group_1__1__Impl rule__RichString__Group_1__2 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1927:2: rule__RichString__Group_1__1__Impl rule__RichString__Group_1__2
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1893:1: ( rule__RichString__Group_1__1__Impl rule__RichString__Group_1__2 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1894:2: rule__RichString__Group_1__1__Impl rule__RichString__Group_1__2
             {
-            pushFollow(FOLLOW_rule__RichString__Group_1__1__Impl_in_rule__RichString__Group_1__13851);
+            pushFollow(FOLLOW_rule__RichString__Group_1__1__Impl_in_rule__RichString__Group_1__13787);
             rule__RichString__Group_1__1__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RichString__Group_1__2_in_rule__RichString__Group_1__13854);
+            pushFollow(FOLLOW_rule__RichString__Group_1__2_in_rule__RichString__Group_1__13790);
             rule__RichString__Group_1__2();
 
             state._fsp--;
@@ -5472,22 +5393,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichString__Group_1__1__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1934:1: rule__RichString__Group_1__1__Impl : ( ( rule__RichString__ExpressionsAssignment_1_1 )? ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1901:1: rule__RichString__Group_1__1__Impl : ( ( rule__RichString__ExpressionsAssignment_1_1 )? ) ;
     public final void rule__RichString__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1938:1: ( ( ( rule__RichString__ExpressionsAssignment_1_1 )? ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1939:1: ( ( rule__RichString__ExpressionsAssignment_1_1 )? )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1905:1: ( ( ( rule__RichString__ExpressionsAssignment_1_1 )? ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1906:1: ( ( rule__RichString__ExpressionsAssignment_1_1 )? )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1939:1: ( ( rule__RichString__ExpressionsAssignment_1_1 )? )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1940:1: ( rule__RichString__ExpressionsAssignment_1_1 )?
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1906:1: ( ( rule__RichString__ExpressionsAssignment_1_1 )? )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1907:1: ( rule__RichString__ExpressionsAssignment_1_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichStringAccess().getExpressionsAssignment_1_1()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1941:1: ( rule__RichString__ExpressionsAssignment_1_1 )?
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1908:1: ( rule__RichString__ExpressionsAssignment_1_1 )?
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -5496,9 +5417,9 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
             }
             switch (alt11) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1941:2: rule__RichString__ExpressionsAssignment_1_1
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1908:2: rule__RichString__ExpressionsAssignment_1_1
                     {
-                    pushFollow(FOLLOW_rule__RichString__ExpressionsAssignment_1_1_in_rule__RichString__Group_1__1__Impl3881);
+                    pushFollow(FOLLOW_rule__RichString__ExpressionsAssignment_1_1_in_rule__RichString__Group_1__1__Impl3817);
                     rule__RichString__ExpressionsAssignment_1_1();
 
                     state._fsp--;
@@ -5534,21 +5455,21 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichString__Group_1__2"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1951:1: rule__RichString__Group_1__2 : rule__RichString__Group_1__2__Impl rule__RichString__Group_1__3 ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1918:1: rule__RichString__Group_1__2 : rule__RichString__Group_1__2__Impl rule__RichString__Group_1__3 ;
     public final void rule__RichString__Group_1__2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1955:1: ( rule__RichString__Group_1__2__Impl rule__RichString__Group_1__3 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1956:2: rule__RichString__Group_1__2__Impl rule__RichString__Group_1__3
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1922:1: ( rule__RichString__Group_1__2__Impl rule__RichString__Group_1__3 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1923:2: rule__RichString__Group_1__2__Impl rule__RichString__Group_1__3
             {
-            pushFollow(FOLLOW_rule__RichString__Group_1__2__Impl_in_rule__RichString__Group_1__23912);
+            pushFollow(FOLLOW_rule__RichString__Group_1__2__Impl_in_rule__RichString__Group_1__23848);
             rule__RichString__Group_1__2__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RichString__Group_1__3_in_rule__RichString__Group_1__23915);
+            pushFollow(FOLLOW_rule__RichString__Group_1__3_in_rule__RichString__Group_1__23851);
             rule__RichString__Group_1__3();
 
             state._fsp--;
@@ -5572,22 +5493,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichString__Group_1__2__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1963:1: rule__RichString__Group_1__2__Impl : ( ( rule__RichString__Group_1_2__0 )* ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1930:1: rule__RichString__Group_1__2__Impl : ( ( rule__RichString__Group_1_2__0 )* ) ;
     public final void rule__RichString__Group_1__2__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1967:1: ( ( ( rule__RichString__Group_1_2__0 )* ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1968:1: ( ( rule__RichString__Group_1_2__0 )* )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1934:1: ( ( ( rule__RichString__Group_1_2__0 )* ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1935:1: ( ( rule__RichString__Group_1_2__0 )* )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1968:1: ( ( rule__RichString__Group_1_2__0 )* )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1969:1: ( rule__RichString__Group_1_2__0 )*
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1935:1: ( ( rule__RichString__Group_1_2__0 )* )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1936:1: ( rule__RichString__Group_1_2__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichStringAccess().getGroup_1_2()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1970:1: ( rule__RichString__Group_1_2__0 )*
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1937:1: ( rule__RichString__Group_1_2__0 )*
             loop12:
             do {
                 int alt12=2;
@@ -5600,9 +5521,9 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
                 switch (alt12) {
             	case 1 :
-            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1970:2: rule__RichString__Group_1_2__0
+            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1937:2: rule__RichString__Group_1_2__0
             	    {
-            	    pushFollow(FOLLOW_rule__RichString__Group_1_2__0_in_rule__RichString__Group_1__2__Impl3942);
+            	    pushFollow(FOLLOW_rule__RichString__Group_1_2__0_in_rule__RichString__Group_1__2__Impl3878);
             	    rule__RichString__Group_1_2__0();
 
             	    state._fsp--;
@@ -5641,16 +5562,16 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichString__Group_1__3"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1980:1: rule__RichString__Group_1__3 : rule__RichString__Group_1__3__Impl ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1947:1: rule__RichString__Group_1__3 : rule__RichString__Group_1__3__Impl ;
     public final void rule__RichString__Group_1__3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1984:1: ( rule__RichString__Group_1__3__Impl )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1985:2: rule__RichString__Group_1__3__Impl
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1951:1: ( rule__RichString__Group_1__3__Impl )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1952:2: rule__RichString__Group_1__3__Impl
             {
-            pushFollow(FOLLOW_rule__RichString__Group_1__3__Impl_in_rule__RichString__Group_1__33973);
+            pushFollow(FOLLOW_rule__RichString__Group_1__3__Impl_in_rule__RichString__Group_1__33909);
             rule__RichString__Group_1__3__Impl();
 
             state._fsp--;
@@ -5674,25 +5595,25 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichString__Group_1__3__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1991:1: rule__RichString__Group_1__3__Impl : ( ( rule__RichString__ExpressionsAssignment_1_3 ) ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1958:1: rule__RichString__Group_1__3__Impl : ( ( rule__RichString__ExpressionsAssignment_1_3 ) ) ;
     public final void rule__RichString__Group_1__3__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1995:1: ( ( ( rule__RichString__ExpressionsAssignment_1_3 ) ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1996:1: ( ( rule__RichString__ExpressionsAssignment_1_3 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1962:1: ( ( ( rule__RichString__ExpressionsAssignment_1_3 ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1963:1: ( ( rule__RichString__ExpressionsAssignment_1_3 ) )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1996:1: ( ( rule__RichString__ExpressionsAssignment_1_3 ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1997:1: ( rule__RichString__ExpressionsAssignment_1_3 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1963:1: ( ( rule__RichString__ExpressionsAssignment_1_3 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1964:1: ( rule__RichString__ExpressionsAssignment_1_3 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichStringAccess().getExpressionsAssignment_1_3()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1998:1: ( rule__RichString__ExpressionsAssignment_1_3 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1998:2: rule__RichString__ExpressionsAssignment_1_3
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1965:1: ( rule__RichString__ExpressionsAssignment_1_3 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1965:2: rule__RichString__ExpressionsAssignment_1_3
             {
-            pushFollow(FOLLOW_rule__RichString__ExpressionsAssignment_1_3_in_rule__RichString__Group_1__3__Impl4000);
+            pushFollow(FOLLOW_rule__RichString__ExpressionsAssignment_1_3_in_rule__RichString__Group_1__3__Impl3936);
             rule__RichString__ExpressionsAssignment_1_3();
 
             state._fsp--;
@@ -5725,21 +5646,21 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichString__Group_1_2__0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2016:1: rule__RichString__Group_1_2__0 : rule__RichString__Group_1_2__0__Impl rule__RichString__Group_1_2__1 ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1983:1: rule__RichString__Group_1_2__0 : rule__RichString__Group_1_2__0__Impl rule__RichString__Group_1_2__1 ;
     public final void rule__RichString__Group_1_2__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2020:1: ( rule__RichString__Group_1_2__0__Impl rule__RichString__Group_1_2__1 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2021:2: rule__RichString__Group_1_2__0__Impl rule__RichString__Group_1_2__1
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1987:1: ( rule__RichString__Group_1_2__0__Impl rule__RichString__Group_1_2__1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1988:2: rule__RichString__Group_1_2__0__Impl rule__RichString__Group_1_2__1
             {
-            pushFollow(FOLLOW_rule__RichString__Group_1_2__0__Impl_in_rule__RichString__Group_1_2__04038);
+            pushFollow(FOLLOW_rule__RichString__Group_1_2__0__Impl_in_rule__RichString__Group_1_2__03974);
             rule__RichString__Group_1_2__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RichString__Group_1_2__1_in_rule__RichString__Group_1_2__04041);
+            pushFollow(FOLLOW_rule__RichString__Group_1_2__1_in_rule__RichString__Group_1_2__03977);
             rule__RichString__Group_1_2__1();
 
             state._fsp--;
@@ -5763,25 +5684,25 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichString__Group_1_2__0__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2028:1: rule__RichString__Group_1_2__0__Impl : ( ( rule__RichString__ExpressionsAssignment_1_2_0 ) ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1995:1: rule__RichString__Group_1_2__0__Impl : ( ( rule__RichString__ExpressionsAssignment_1_2_0 ) ) ;
     public final void rule__RichString__Group_1_2__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2032:1: ( ( ( rule__RichString__ExpressionsAssignment_1_2_0 ) ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2033:1: ( ( rule__RichString__ExpressionsAssignment_1_2_0 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:1999:1: ( ( ( rule__RichString__ExpressionsAssignment_1_2_0 ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2000:1: ( ( rule__RichString__ExpressionsAssignment_1_2_0 ) )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2033:1: ( ( rule__RichString__ExpressionsAssignment_1_2_0 ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2034:1: ( rule__RichString__ExpressionsAssignment_1_2_0 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2000:1: ( ( rule__RichString__ExpressionsAssignment_1_2_0 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2001:1: ( rule__RichString__ExpressionsAssignment_1_2_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichStringAccess().getExpressionsAssignment_1_2_0()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2035:1: ( rule__RichString__ExpressionsAssignment_1_2_0 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2035:2: rule__RichString__ExpressionsAssignment_1_2_0
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2002:1: ( rule__RichString__ExpressionsAssignment_1_2_0 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2002:2: rule__RichString__ExpressionsAssignment_1_2_0
             {
-            pushFollow(FOLLOW_rule__RichString__ExpressionsAssignment_1_2_0_in_rule__RichString__Group_1_2__0__Impl4068);
+            pushFollow(FOLLOW_rule__RichString__ExpressionsAssignment_1_2_0_in_rule__RichString__Group_1_2__0__Impl4004);
             rule__RichString__ExpressionsAssignment_1_2_0();
 
             state._fsp--;
@@ -5814,16 +5735,16 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichString__Group_1_2__1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2045:1: rule__RichString__Group_1_2__1 : rule__RichString__Group_1_2__1__Impl ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2012:1: rule__RichString__Group_1_2__1 : rule__RichString__Group_1_2__1__Impl ;
     public final void rule__RichString__Group_1_2__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2049:1: ( rule__RichString__Group_1_2__1__Impl )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2050:2: rule__RichString__Group_1_2__1__Impl
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2016:1: ( rule__RichString__Group_1_2__1__Impl )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2017:2: rule__RichString__Group_1_2__1__Impl
             {
-            pushFollow(FOLLOW_rule__RichString__Group_1_2__1__Impl_in_rule__RichString__Group_1_2__14098);
+            pushFollow(FOLLOW_rule__RichString__Group_1_2__1__Impl_in_rule__RichString__Group_1_2__14034);
             rule__RichString__Group_1_2__1__Impl();
 
             state._fsp--;
@@ -5847,22 +5768,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichString__Group_1_2__1__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2056:1: rule__RichString__Group_1_2__1__Impl : ( ( rule__RichString__ExpressionsAssignment_1_2_1 )? ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2023:1: rule__RichString__Group_1_2__1__Impl : ( ( rule__RichString__ExpressionsAssignment_1_2_1 )? ) ;
     public final void rule__RichString__Group_1_2__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2060:1: ( ( ( rule__RichString__ExpressionsAssignment_1_2_1 )? ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2061:1: ( ( rule__RichString__ExpressionsAssignment_1_2_1 )? )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2027:1: ( ( ( rule__RichString__ExpressionsAssignment_1_2_1 )? ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2028:1: ( ( rule__RichString__ExpressionsAssignment_1_2_1 )? )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2061:1: ( ( rule__RichString__ExpressionsAssignment_1_2_1 )? )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2062:1: ( rule__RichString__ExpressionsAssignment_1_2_1 )?
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2028:1: ( ( rule__RichString__ExpressionsAssignment_1_2_1 )? )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2029:1: ( rule__RichString__ExpressionsAssignment_1_2_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichStringAccess().getExpressionsAssignment_1_2_1()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2063:1: ( rule__RichString__ExpressionsAssignment_1_2_1 )?
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2030:1: ( rule__RichString__ExpressionsAssignment_1_2_1 )?
             int alt13=2;
             int LA13_0 = input.LA(1);
 
@@ -5871,9 +5792,9 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
             }
             switch (alt13) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2063:2: rule__RichString__ExpressionsAssignment_1_2_1
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2030:2: rule__RichString__ExpressionsAssignment_1_2_1
                     {
-                    pushFollow(FOLLOW_rule__RichString__ExpressionsAssignment_1_2_1_in_rule__RichString__Group_1_2__1__Impl4125);
+                    pushFollow(FOLLOW_rule__RichString__ExpressionsAssignment_1_2_1_in_rule__RichString__Group_1_2__1__Impl4061);
                     rule__RichString__ExpressionsAssignment_1_2_1();
 
                     state._fsp--;
@@ -5909,21 +5830,21 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichVarPart__Group__0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2077:1: rule__RichVarPart__Group__0 : rule__RichVarPart__Group__0__Impl rule__RichVarPart__Group__1 ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2044:1: rule__RichVarPart__Group__0 : rule__RichVarPart__Group__0__Impl rule__RichVarPart__Group__1 ;
     public final void rule__RichVarPart__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2081:1: ( rule__RichVarPart__Group__0__Impl rule__RichVarPart__Group__1 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2082:2: rule__RichVarPart__Group__0__Impl rule__RichVarPart__Group__1
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2048:1: ( rule__RichVarPart__Group__0__Impl rule__RichVarPart__Group__1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2049:2: rule__RichVarPart__Group__0__Impl rule__RichVarPart__Group__1
             {
-            pushFollow(FOLLOW_rule__RichVarPart__Group__0__Impl_in_rule__RichVarPart__Group__04160);
+            pushFollow(FOLLOW_rule__RichVarPart__Group__0__Impl_in_rule__RichVarPart__Group__04096);
             rule__RichVarPart__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RichVarPart__Group__1_in_rule__RichVarPart__Group__04163);
+            pushFollow(FOLLOW_rule__RichVarPart__Group__1_in_rule__RichVarPart__Group__04099);
             rule__RichVarPart__Group__1();
 
             state._fsp--;
@@ -5947,25 +5868,25 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichVarPart__Group__0__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2089:1: rule__RichVarPart__Group__0__Impl : ( ( rule__RichVarPart__KeyAssignment_0 ) ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2056:1: rule__RichVarPart__Group__0__Impl : ( ( rule__RichVarPart__KeyAssignment_0 ) ) ;
     public final void rule__RichVarPart__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2093:1: ( ( ( rule__RichVarPart__KeyAssignment_0 ) ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2094:1: ( ( rule__RichVarPart__KeyAssignment_0 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2060:1: ( ( ( rule__RichVarPart__KeyAssignment_0 ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2061:1: ( ( rule__RichVarPart__KeyAssignment_0 ) )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2094:1: ( ( rule__RichVarPart__KeyAssignment_0 ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2095:1: ( rule__RichVarPart__KeyAssignment_0 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2061:1: ( ( rule__RichVarPart__KeyAssignment_0 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2062:1: ( rule__RichVarPart__KeyAssignment_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichVarPartAccess().getKeyAssignment_0()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2096:1: ( rule__RichVarPart__KeyAssignment_0 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2096:2: rule__RichVarPart__KeyAssignment_0
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2063:1: ( rule__RichVarPart__KeyAssignment_0 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2063:2: rule__RichVarPart__KeyAssignment_0
             {
-            pushFollow(FOLLOW_rule__RichVarPart__KeyAssignment_0_in_rule__RichVarPart__Group__0__Impl4190);
+            pushFollow(FOLLOW_rule__RichVarPart__KeyAssignment_0_in_rule__RichVarPart__Group__0__Impl4126);
             rule__RichVarPart__KeyAssignment_0();
 
             state._fsp--;
@@ -5998,16 +5919,16 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichVarPart__Group__1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2106:1: rule__RichVarPart__Group__1 : rule__RichVarPart__Group__1__Impl ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2073:1: rule__RichVarPart__Group__1 : rule__RichVarPart__Group__1__Impl ;
     public final void rule__RichVarPart__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2110:1: ( rule__RichVarPart__Group__1__Impl )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2111:2: rule__RichVarPart__Group__1__Impl
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2077:1: ( rule__RichVarPart__Group__1__Impl )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2078:2: rule__RichVarPart__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__RichVarPart__Group__1__Impl_in_rule__RichVarPart__Group__14220);
+            pushFollow(FOLLOW_rule__RichVarPart__Group__1__Impl_in_rule__RichVarPart__Group__14156);
             rule__RichVarPart__Group__1__Impl();
 
             state._fsp--;
@@ -6031,22 +5952,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichVarPart__Group__1__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2117:1: rule__RichVarPart__Group__1__Impl : ( ( rule__RichVarPart__Group_1__0 )? ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2084:1: rule__RichVarPart__Group__1__Impl : ( ( rule__RichVarPart__Group_1__0 )? ) ;
     public final void rule__RichVarPart__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2121:1: ( ( ( rule__RichVarPart__Group_1__0 )? ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2122:1: ( ( rule__RichVarPart__Group_1__0 )? )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2088:1: ( ( ( rule__RichVarPart__Group_1__0 )? ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2089:1: ( ( rule__RichVarPart__Group_1__0 )? )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2122:1: ( ( rule__RichVarPart__Group_1__0 )? )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2123:1: ( rule__RichVarPart__Group_1__0 )?
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2089:1: ( ( rule__RichVarPart__Group_1__0 )? )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2090:1: ( rule__RichVarPart__Group_1__0 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichVarPartAccess().getGroup_1()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2124:1: ( rule__RichVarPart__Group_1__0 )?
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2091:1: ( rule__RichVarPart__Group_1__0 )?
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -6055,9 +5976,9 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
             }
             switch (alt14) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2124:2: rule__RichVarPart__Group_1__0
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2091:2: rule__RichVarPart__Group_1__0
                     {
-                    pushFollow(FOLLOW_rule__RichVarPart__Group_1__0_in_rule__RichVarPart__Group__1__Impl4247);
+                    pushFollow(FOLLOW_rule__RichVarPart__Group_1__0_in_rule__RichVarPart__Group__1__Impl4183);
                     rule__RichVarPart__Group_1__0();
 
                     state._fsp--;
@@ -6093,21 +6014,21 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichVarPart__Group_1__0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2138:1: rule__RichVarPart__Group_1__0 : rule__RichVarPart__Group_1__0__Impl rule__RichVarPart__Group_1__1 ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2105:1: rule__RichVarPart__Group_1__0 : rule__RichVarPart__Group_1__0__Impl rule__RichVarPart__Group_1__1 ;
     public final void rule__RichVarPart__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2142:1: ( rule__RichVarPart__Group_1__0__Impl rule__RichVarPart__Group_1__1 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2143:2: rule__RichVarPart__Group_1__0__Impl rule__RichVarPart__Group_1__1
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2109:1: ( rule__RichVarPart__Group_1__0__Impl rule__RichVarPart__Group_1__1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2110:2: rule__RichVarPart__Group_1__0__Impl rule__RichVarPart__Group_1__1
             {
-            pushFollow(FOLLOW_rule__RichVarPart__Group_1__0__Impl_in_rule__RichVarPart__Group_1__04282);
+            pushFollow(FOLLOW_rule__RichVarPart__Group_1__0__Impl_in_rule__RichVarPart__Group_1__04218);
             rule__RichVarPart__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__RichVarPart__Group_1__1_in_rule__RichVarPart__Group_1__04285);
+            pushFollow(FOLLOW_rule__RichVarPart__Group_1__1_in_rule__RichVarPart__Group_1__04221);
             rule__RichVarPart__Group_1__1();
 
             state._fsp--;
@@ -6131,25 +6052,25 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichVarPart__Group_1__0__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2150:1: rule__RichVarPart__Group_1__0__Impl : ( ( rule__RichVarPart__FormatAssignment_1_0 ) ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2117:1: rule__RichVarPart__Group_1__0__Impl : ( ( rule__RichVarPart__FormatAssignment_1_0 ) ) ;
     public final void rule__RichVarPart__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2154:1: ( ( ( rule__RichVarPart__FormatAssignment_1_0 ) ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2155:1: ( ( rule__RichVarPart__FormatAssignment_1_0 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2121:1: ( ( ( rule__RichVarPart__FormatAssignment_1_0 ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2122:1: ( ( rule__RichVarPart__FormatAssignment_1_0 ) )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2155:1: ( ( rule__RichVarPart__FormatAssignment_1_0 ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2156:1: ( rule__RichVarPart__FormatAssignment_1_0 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2122:1: ( ( rule__RichVarPart__FormatAssignment_1_0 ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2123:1: ( rule__RichVarPart__FormatAssignment_1_0 )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichVarPartAccess().getFormatAssignment_1_0()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2157:1: ( rule__RichVarPart__FormatAssignment_1_0 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2157:2: rule__RichVarPart__FormatAssignment_1_0
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2124:1: ( rule__RichVarPart__FormatAssignment_1_0 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2124:2: rule__RichVarPart__FormatAssignment_1_0
             {
-            pushFollow(FOLLOW_rule__RichVarPart__FormatAssignment_1_0_in_rule__RichVarPart__Group_1__0__Impl4312);
+            pushFollow(FOLLOW_rule__RichVarPart__FormatAssignment_1_0_in_rule__RichVarPart__Group_1__0__Impl4248);
             rule__RichVarPart__FormatAssignment_1_0();
 
             state._fsp--;
@@ -6182,16 +6103,16 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichVarPart__Group_1__1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2167:1: rule__RichVarPart__Group_1__1 : rule__RichVarPart__Group_1__1__Impl ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2134:1: rule__RichVarPart__Group_1__1 : rule__RichVarPart__Group_1__1__Impl ;
     public final void rule__RichVarPart__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2171:1: ( rule__RichVarPart__Group_1__1__Impl )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2172:2: rule__RichVarPart__Group_1__1__Impl
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2138:1: ( rule__RichVarPart__Group_1__1__Impl )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2139:2: rule__RichVarPart__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__RichVarPart__Group_1__1__Impl_in_rule__RichVarPart__Group_1__14342);
+            pushFollow(FOLLOW_rule__RichVarPart__Group_1__1__Impl_in_rule__RichVarPart__Group_1__14278);
             rule__RichVarPart__Group_1__1__Impl();
 
             state._fsp--;
@@ -6215,22 +6136,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichVarPart__Group_1__1__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2178:1: rule__RichVarPart__Group_1__1__Impl : ( ( rule__RichVarPart__FormatterClassAssignment_1_1 )? ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2145:1: rule__RichVarPart__Group_1__1__Impl : ( ( rule__RichVarPart__FormatterClassAssignment_1_1 )? ) ;
     public final void rule__RichVarPart__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2182:1: ( ( ( rule__RichVarPart__FormatterClassAssignment_1_1 )? ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2183:1: ( ( rule__RichVarPart__FormatterClassAssignment_1_1 )? )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2149:1: ( ( ( rule__RichVarPart__FormatterClassAssignment_1_1 )? ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2150:1: ( ( rule__RichVarPart__FormatterClassAssignment_1_1 )? )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2183:1: ( ( rule__RichVarPart__FormatterClassAssignment_1_1 )? )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2184:1: ( rule__RichVarPart__FormatterClassAssignment_1_1 )?
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2150:1: ( ( rule__RichVarPart__FormatterClassAssignment_1_1 )? )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2151:1: ( rule__RichVarPart__FormatterClassAssignment_1_1 )?
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichVarPartAccess().getFormatterClassAssignment_1_1()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2185:1: ( rule__RichVarPart__FormatterClassAssignment_1_1 )?
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2152:1: ( rule__RichVarPart__FormatterClassAssignment_1_1 )?
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -6239,9 +6160,9 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
             }
             switch (alt15) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2185:2: rule__RichVarPart__FormatterClassAssignment_1_1
+                    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2152:2: rule__RichVarPart__FormatterClassAssignment_1_1
                     {
-                    pushFollow(FOLLOW_rule__RichVarPart__FormatterClassAssignment_1_1_in_rule__RichVarPart__Group_1__1__Impl4369);
+                    pushFollow(FOLLOW_rule__RichVarPart__FormatterClassAssignment_1_1_in_rule__RichVarPart__Group_1__1__Impl4305);
                     rule__RichVarPart__FormatterClassAssignment_1_1();
 
                     state._fsp--;
@@ -6277,21 +6198,21 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group__0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2199:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2166:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
     public final void rule__QualifiedName__Group__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2203:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2204:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2170:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2171:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__04404);
+            pushFollow(FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__04340);
             rule__QualifiedName__Group__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__04407);
+            pushFollow(FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__04343);
             rule__QualifiedName__Group__1();
 
             state._fsp--;
@@ -6315,22 +6236,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group__0__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2211:1: rule__QualifiedName__Group__0__Impl : ( ruleValidID ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2178:1: rule__QualifiedName__Group__0__Impl : ( ruleValidID ) ;
     public final void rule__QualifiedName__Group__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2215:1: ( ( ruleValidID ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2216:1: ( ruleValidID )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2182:1: ( ( ruleValidID ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2183:1: ( ruleValidID )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2216:1: ( ruleValidID )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2217:1: ruleValidID
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2183:1: ( ruleValidID )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2184:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_0()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__QualifiedName__Group__0__Impl4434);
+            pushFollow(FOLLOW_ruleValidID_in_rule__QualifiedName__Group__0__Impl4370);
             ruleValidID();
 
             state._fsp--;
@@ -6360,16 +6281,16 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group__1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2228:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2195:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl ;
     public final void rule__QualifiedName__Group__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2232:1: ( rule__QualifiedName__Group__1__Impl )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2233:2: rule__QualifiedName__Group__1__Impl
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2199:1: ( rule__QualifiedName__Group__1__Impl )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2200:2: rule__QualifiedName__Group__1__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__14463);
+            pushFollow(FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__14399);
             rule__QualifiedName__Group__1__Impl();
 
             state._fsp--;
@@ -6393,22 +6314,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group__1__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2239:1: rule__QualifiedName__Group__1__Impl : ( ( rule__QualifiedName__Group_1__0 )* ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2206:1: rule__QualifiedName__Group__1__Impl : ( ( rule__QualifiedName__Group_1__0 )* ) ;
     public final void rule__QualifiedName__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2243:1: ( ( ( rule__QualifiedName__Group_1__0 )* ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2244:1: ( ( rule__QualifiedName__Group_1__0 )* )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2210:1: ( ( ( rule__QualifiedName__Group_1__0 )* ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2211:1: ( ( rule__QualifiedName__Group_1__0 )* )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2244:1: ( ( rule__QualifiedName__Group_1__0 )* )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2245:1: ( rule__QualifiedName__Group_1__0 )*
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2211:1: ( ( rule__QualifiedName__Group_1__0 )* )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2212:1: ( rule__QualifiedName__Group_1__0 )*
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getGroup_1()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2246:1: ( rule__QualifiedName__Group_1__0 )*
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2213:1: ( rule__QualifiedName__Group_1__0 )*
             loop16:
             do {
                 int alt16=2;
@@ -6421,9 +6342,9 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
                 switch (alt16) {
             	case 1 :
-            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2246:2: rule__QualifiedName__Group_1__0
+            	    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2213:2: rule__QualifiedName__Group_1__0
             	    {
-            	    pushFollow(FOLLOW_rule__QualifiedName__Group_1__0_in_rule__QualifiedName__Group__1__Impl4490);
+            	    pushFollow(FOLLOW_rule__QualifiedName__Group_1__0_in_rule__QualifiedName__Group__1__Impl4426);
             	    rule__QualifiedName__Group_1__0();
 
             	    state._fsp--;
@@ -6462,21 +6383,21 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2260:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2227:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
     public final void rule__QualifiedName__Group_1__0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2264:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2265:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2231:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2232:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group_1__0__Impl_in_rule__QualifiedName__Group_1__04525);
+            pushFollow(FOLLOW_rule__QualifiedName__Group_1__0__Impl_in_rule__QualifiedName__Group_1__04461);
             rule__QualifiedName__Group_1__0__Impl();
 
             state._fsp--;
             if (state.failed) return ;
-            pushFollow(FOLLOW_rule__QualifiedName__Group_1__1_in_rule__QualifiedName__Group_1__04528);
+            pushFollow(FOLLOW_rule__QualifiedName__Group_1__1_in_rule__QualifiedName__Group_1__04464);
             rule__QualifiedName__Group_1__1();
 
             state._fsp--;
@@ -6500,25 +6421,25 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2272:1: rule__QualifiedName__Group_1__0__Impl : ( ( '.' ) ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2239:1: rule__QualifiedName__Group_1__0__Impl : ( ( '.' ) ) ;
     public final void rule__QualifiedName__Group_1__0__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2276:1: ( ( ( '.' ) ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2277:1: ( ( '.' ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2243:1: ( ( ( '.' ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2244:1: ( ( '.' ) )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2277:1: ( ( '.' ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2278:1: ( '.' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2244:1: ( ( '.' ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2245:1: ( '.' )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getFullStopKeyword_1_0()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2279:1: ( '.' )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2280:2: '.'
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2246:1: ( '.' )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2247:2: '.'
             {
-            match(input,32,FOLLOW_32_in_rule__QualifiedName__Group_1__0__Impl4557); if (state.failed) return ;
+            match(input,32,FOLLOW_32_in_rule__QualifiedName__Group_1__0__Impl4493); if (state.failed) return ;
 
             }
 
@@ -6547,16 +6468,16 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2291:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2258:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl ;
     public final void rule__QualifiedName__Group_1__1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2295:1: ( rule__QualifiedName__Group_1__1__Impl )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2296:2: rule__QualifiedName__Group_1__1__Impl
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2262:1: ( rule__QualifiedName__Group_1__1__Impl )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2263:2: rule__QualifiedName__Group_1__1__Impl
             {
-            pushFollow(FOLLOW_rule__QualifiedName__Group_1__1__Impl_in_rule__QualifiedName__Group_1__14589);
+            pushFollow(FOLLOW_rule__QualifiedName__Group_1__1__Impl_in_rule__QualifiedName__Group_1__14525);
             rule__QualifiedName__Group_1__1__Impl();
 
             state._fsp--;
@@ -6580,22 +6501,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1__Impl"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2302:1: rule__QualifiedName__Group_1__1__Impl : ( ruleValidID ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2269:1: rule__QualifiedName__Group_1__1__Impl : ( ruleValidID ) ;
     public final void rule__QualifiedName__Group_1__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2306:1: ( ( ruleValidID ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2307:1: ( ruleValidID )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2273:1: ( ( ruleValidID ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2274:1: ( ruleValidID )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2307:1: ( ruleValidID )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2308:1: ruleValidID
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2274:1: ( ruleValidID )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2275:1: ruleValidID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_1_1()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_rule__QualifiedName__Group_1__1__Impl4616);
+            pushFollow(FOLLOW_ruleValidID_in_rule__QualifiedName__Group_1__1__Impl4552);
             ruleValidID();
 
             state._fsp--;
@@ -6625,22 +6546,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NLS__PackageAssignment_0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2324:1: rule__NLS__PackageAssignment_0 : ( rulePackageDeclaration ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2291:1: rule__NLS__PackageAssignment_0 : ( rulePackageDeclaration ) ;
     public final void rule__NLS__PackageAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2328:1: ( ( rulePackageDeclaration ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2329:1: ( rulePackageDeclaration )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2295:1: ( ( rulePackageDeclaration ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2296:1: ( rulePackageDeclaration )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2329:1: ( rulePackageDeclaration )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2330:1: rulePackageDeclaration
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2296:1: ( rulePackageDeclaration )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2297:1: rulePackageDeclaration
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNLSAccess().getPackagePackageDeclarationParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_rulePackageDeclaration_in_rule__NLS__PackageAssignment_04654);
+            pushFollow(FOLLOW_rulePackageDeclaration_in_rule__NLS__PackageAssignment_04590);
             rulePackageDeclaration();
 
             state._fsp--;
@@ -6670,22 +6591,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NLS__BundleListAssignment_2"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2339:1: rule__NLS__BundleListAssignment_2 : ( ruleNLSBundle ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2306:1: rule__NLS__BundleListAssignment_2 : ( ruleNLSBundle ) ;
     public final void rule__NLS__BundleListAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2343:1: ( ( ruleNLSBundle ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2344:1: ( ruleNLSBundle )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2310:1: ( ( ruleNLSBundle ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2311:1: ( ruleNLSBundle )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2344:1: ( ruleNLSBundle )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2345:1: ruleNLSBundle
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2311:1: ( ruleNLSBundle )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2312:1: ruleNLSBundle
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNLSAccess().getBundleListNLSBundleParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleNLSBundle_in_rule__NLS__BundleListAssignment_24685);
+            pushFollow(FOLLOW_ruleNLSBundle_in_rule__NLS__BundleListAssignment_24621);
             ruleNLSBundle();
 
             state._fsp--;
@@ -6715,22 +6636,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PackageDeclaration__NameAssignment_1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2354:1: rule__PackageDeclaration__NameAssignment_1 : ( ruleQualifiedName ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2321:1: rule__PackageDeclaration__NameAssignment_1 : ( ruleQualifiedName ) ;
     public final void rule__PackageDeclaration__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2358:1: ( ( ruleQualifiedName ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2359:1: ( ruleQualifiedName )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2325:1: ( ( ruleQualifiedName ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2326:1: ( ruleQualifiedName )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2359:1: ( ruleQualifiedName )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2360:1: ruleQualifiedName
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2326:1: ( ruleQualifiedName )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2327:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getPackageDeclarationAccess().getNameQualifiedNameParserRuleCall_1_0()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__PackageDeclaration__NameAssignment_14716);
+            pushFollow(FOLLOW_ruleQualifiedName_in_rule__PackageDeclaration__NameAssignment_14652);
             ruleQualifiedName();
 
             state._fsp--;
@@ -6760,22 +6681,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NLSBundle__NameAssignment_1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2369:1: rule__NLSBundle__NameAssignment_1 : ( RULE_ID ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2336:1: rule__NLSBundle__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__NLSBundle__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2373:1: ( ( RULE_ID ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2374:1: ( RULE_ID )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2340:1: ( ( RULE_ID ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2341:1: ( RULE_ID )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2374:1: ( RULE_ID )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2375:1: RULE_ID
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2341:1: ( RULE_ID )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2342:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNLSBundleAccess().getNameIDTerminalRuleCall_1_0()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__NLSBundle__NameAssignment_14747); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__NLSBundle__NameAssignment_14683); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNLSBundleAccess().getNameIDTerminalRuleCall_1_0()); 
             }
@@ -6801,22 +6722,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NLSBundle__LangAssignment_3"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2384:1: rule__NLSBundle__LangAssignment_3 : ( RULE_ID ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2351:1: rule__NLSBundle__LangAssignment_3 : ( RULE_ID ) ;
     public final void rule__NLSBundle__LangAssignment_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2388:1: ( ( RULE_ID ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2389:1: ( RULE_ID )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2355:1: ( ( RULE_ID ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2356:1: ( RULE_ID )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2389:1: ( RULE_ID )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2390:1: RULE_ID
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2356:1: ( RULE_ID )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2357:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNLSBundleAccess().getLangIDTerminalRuleCall_3_0()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__NLSBundle__LangAssignment_34778); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__NLSBundle__LangAssignment_34714); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNLSBundleAccess().getLangIDTerminalRuleCall_3_0()); 
             }
@@ -6842,22 +6763,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NLSBundle__FormatterListAssignment_5"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2399:1: rule__NLSBundle__FormatterListAssignment_5 : ( ruleNLSFormatter ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2366:1: rule__NLSBundle__FormatterListAssignment_5 : ( ruleNLSFormatter ) ;
     public final void rule__NLSBundle__FormatterListAssignment_5() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2403:1: ( ( ruleNLSFormatter ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2404:1: ( ruleNLSFormatter )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2370:1: ( ( ruleNLSFormatter ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2371:1: ( ruleNLSFormatter )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2404:1: ( ruleNLSFormatter )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2405:1: ruleNLSFormatter
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2371:1: ( ruleNLSFormatter )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2372:1: ruleNLSFormatter
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNLSBundleAccess().getFormatterListNLSFormatterParserRuleCall_5_0()); 
             }
-            pushFollow(FOLLOW_ruleNLSFormatter_in_rule__NLSBundle__FormatterListAssignment_54809);
+            pushFollow(FOLLOW_ruleNLSFormatter_in_rule__NLSBundle__FormatterListAssignment_54745);
             ruleNLSFormatter();
 
             state._fsp--;
@@ -6887,22 +6808,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NLSBundle__MessageEntryListAssignment_6"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2414:1: rule__NLSBundle__MessageEntryListAssignment_6 : ( ruleMessageEntry ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2381:1: rule__NLSBundle__MessageEntryListAssignment_6 : ( ruleMessageEntry ) ;
     public final void rule__NLSBundle__MessageEntryListAssignment_6() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2418:1: ( ( ruleMessageEntry ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2419:1: ( ruleMessageEntry )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2385:1: ( ( ruleMessageEntry ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2386:1: ( ruleMessageEntry )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2419:1: ( ruleMessageEntry )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2420:1: ruleMessageEntry
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2386:1: ( ruleMessageEntry )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2387:1: ruleMessageEntry
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNLSBundleAccess().getMessageEntryListMessageEntryParserRuleCall_6_0()); 
             }
-            pushFollow(FOLLOW_ruleMessageEntry_in_rule__NLSBundle__MessageEntryListAssignment_64840);
+            pushFollow(FOLLOW_ruleMessageEntry_in_rule__NLSBundle__MessageEntryListAssignment_64776);
             ruleMessageEntry();
 
             state._fsp--;
@@ -6932,22 +6853,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NLSFormatter__NameAssignment_1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2429:1: rule__NLSFormatter__NameAssignment_1 : ( RULE_ID ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2396:1: rule__NLSFormatter__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__NLSFormatter__NameAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2433:1: ( ( RULE_ID ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2434:1: ( RULE_ID )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2400:1: ( ( RULE_ID ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2401:1: ( RULE_ID )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2434:1: ( RULE_ID )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2435:1: RULE_ID
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2401:1: ( RULE_ID )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2402:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNLSFormatterAccess().getNameIDTerminalRuleCall_1_0()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__NLSFormatter__NameAssignment_14871); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__NLSFormatter__NameAssignment_14807); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getNLSFormatterAccess().getNameIDTerminalRuleCall_1_0()); 
             }
@@ -6973,22 +6894,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NLSFormatter__ClassRefAssignment_2"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2444:1: rule__NLSFormatter__ClassRefAssignment_2 : ( ruleQualifiedName ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2411:1: rule__NLSFormatter__ClassRefAssignment_2 : ( ruleQualifiedName ) ;
     public final void rule__NLSFormatter__ClassRefAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2448:1: ( ( ruleQualifiedName ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2449:1: ( ruleQualifiedName )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2415:1: ( ( ruleQualifiedName ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2416:1: ( ruleQualifiedName )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2449:1: ( ruleQualifiedName )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2450:1: ruleQualifiedName
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2416:1: ( ruleQualifiedName )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2417:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getNLSFormatterAccess().getClassRefQualifiedNameParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__NLSFormatter__ClassRefAssignment_24902);
+            pushFollow(FOLLOW_ruleQualifiedName_in_rule__NLSFormatter__ClassRefAssignment_24838);
             ruleQualifiedName();
 
             state._fsp--;
@@ -7018,22 +6939,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageEntry__NameAssignment_0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2459:1: rule__MessageEntry__NameAssignment_0 : ( RULE_ID ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2426:1: rule__MessageEntry__NameAssignment_0 : ( RULE_ID ) ;
     public final void rule__MessageEntry__NameAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2463:1: ( ( RULE_ID ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2464:1: ( RULE_ID )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2430:1: ( ( RULE_ID ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2431:1: ( RULE_ID )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2464:1: ( RULE_ID )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2465:1: RULE_ID
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2431:1: ( RULE_ID )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2432:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMessageEntryAccess().getNameIDTerminalRuleCall_0_0()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__MessageEntry__NameAssignment_04933); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__MessageEntry__NameAssignment_04869); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMessageEntryAccess().getNameIDTerminalRuleCall_0_0()); 
             }
@@ -7059,22 +6980,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageEntry__ParamListAssignment_1_1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2474:1: rule__MessageEntry__ParamListAssignment_1_1 : ( ruleMessageParam ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2441:1: rule__MessageEntry__ParamListAssignment_1_1 : ( ruleMessageParam ) ;
     public final void rule__MessageEntry__ParamListAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2478:1: ( ( ruleMessageParam ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2479:1: ( ruleMessageParam )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2445:1: ( ( ruleMessageParam ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2446:1: ( ruleMessageParam )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2479:1: ( ruleMessageParam )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2480:1: ruleMessageParam
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2446:1: ( ruleMessageParam )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2447:1: ruleMessageParam
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMessageEntryAccess().getParamListMessageParamParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleMessageParam_in_rule__MessageEntry__ParamListAssignment_1_14964);
+            pushFollow(FOLLOW_ruleMessageParam_in_rule__MessageEntry__ParamListAssignment_1_14900);
             ruleMessageParam();
 
             state._fsp--;
@@ -7104,22 +7025,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageEntry__ParamListAssignment_1_2_1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2489:1: rule__MessageEntry__ParamListAssignment_1_2_1 : ( ruleMessageParam ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2456:1: rule__MessageEntry__ParamListAssignment_1_2_1 : ( ruleMessageParam ) ;
     public final void rule__MessageEntry__ParamListAssignment_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2493:1: ( ( ruleMessageParam ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2494:1: ( ruleMessageParam )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2460:1: ( ( ruleMessageParam ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2461:1: ( ruleMessageParam )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2494:1: ( ruleMessageParam )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2495:1: ruleMessageParam
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2461:1: ( ruleMessageParam )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2462:1: ruleMessageParam
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMessageEntryAccess().getParamListMessageParamParserRuleCall_1_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleMessageParam_in_rule__MessageEntry__ParamListAssignment_1_2_14995);
+            pushFollow(FOLLOW_ruleMessageParam_in_rule__MessageEntry__ParamListAssignment_1_2_14931);
             ruleMessageParam();
 
             state._fsp--;
@@ -7148,29 +7069,29 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__MessageEntry__ParamListAssignment_1_2_1"
 
 
-    // $ANTLR start "rule__MessageEntry__MessageListAssignment_3_0_1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2504:1: rule__MessageEntry__MessageListAssignment_3_0_1 : ( ruleMessage ) ;
-    public final void rule__MessageEntry__MessageListAssignment_3_0_1() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__MessageListAssignment_2_0_1"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2471:1: rule__MessageEntry__MessageListAssignment_2_0_1 : ( ruleMessage ) ;
+    public final void rule__MessageEntry__MessageListAssignment_2_0_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2508:1: ( ( ruleMessage ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2509:1: ( ruleMessage )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2475:1: ( ( ruleMessage ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2476:1: ( ruleMessage )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2509:1: ( ruleMessage )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2510:1: ruleMessage
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2476:1: ( ruleMessage )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2477:1: ruleMessage
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_3_0_1_0()); 
+               before(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_2_0_1_0()); 
             }
-            pushFollow(FOLLOW_ruleMessage_in_rule__MessageEntry__MessageListAssignment_3_0_15026);
+            pushFollow(FOLLOW_ruleMessage_in_rule__MessageEntry__MessageListAssignment_2_0_14962);
             ruleMessage();
 
             state._fsp--;
             if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_3_0_1_0()); 
+               after(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_2_0_1_0()); 
             }
 
             }
@@ -7190,32 +7111,32 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__MessageListAssignment_3_0_1"
+    // $ANTLR end "rule__MessageEntry__MessageListAssignment_2_0_1"
 
 
-    // $ANTLR start "rule__MessageEntry__MessageListAssignment_3_0_2_1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2519:1: rule__MessageEntry__MessageListAssignment_3_0_2_1 : ( ruleMessage ) ;
-    public final void rule__MessageEntry__MessageListAssignment_3_0_2_1() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__MessageListAssignment_2_0_2_1"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2486:1: rule__MessageEntry__MessageListAssignment_2_0_2_1 : ( ruleMessage ) ;
+    public final void rule__MessageEntry__MessageListAssignment_2_0_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2523:1: ( ( ruleMessage ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2524:1: ( ruleMessage )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2490:1: ( ( ruleMessage ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2491:1: ( ruleMessage )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2524:1: ( ruleMessage )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2525:1: ruleMessage
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2491:1: ( ruleMessage )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2492:1: ruleMessage
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_3_0_2_1_0()); 
+               before(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_2_0_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleMessage_in_rule__MessageEntry__MessageListAssignment_3_0_2_15057);
+            pushFollow(FOLLOW_ruleMessage_in_rule__MessageEntry__MessageListAssignment_2_0_2_14993);
             ruleMessage();
 
             state._fsp--;
             if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_3_0_2_1_0()); 
+               after(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_2_0_2_1_0()); 
             }
 
             }
@@ -7235,44 +7156,44 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__MessageListAssignment_3_0_2_1"
+    // $ANTLR end "rule__MessageEntry__MessageListAssignment_2_0_2_1"
 
 
-    // $ANTLR start "rule__MessageEntry__EntryRefAssignment_3_1_1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2534:1: rule__MessageEntry__EntryRefAssignment_3_1_1 : ( ( ruleQualifiedName ) ) ;
-    public final void rule__MessageEntry__EntryRefAssignment_3_1_1() throws RecognitionException {
+    // $ANTLR start "rule__MessageEntry__EntryRefAssignment_2_1_1"
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2501:1: rule__MessageEntry__EntryRefAssignment_2_1_1 : ( ( ruleQualifiedName ) ) ;
+    public final void rule__MessageEntry__EntryRefAssignment_2_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2538:1: ( ( ( ruleQualifiedName ) ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2539:1: ( ( ruleQualifiedName ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2505:1: ( ( ( ruleQualifiedName ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2506:1: ( ( ruleQualifiedName ) )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2539:1: ( ( ruleQualifiedName ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2540:1: ( ruleQualifiedName )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2506:1: ( ( ruleQualifiedName ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2507:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryCrossReference_3_1_1_0()); 
+               before(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryCrossReference_2_1_1_0()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2541:1: ( ruleQualifiedName )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2542:1: ruleQualifiedName
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2508:1: ( ruleQualifiedName )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2509:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
-               before(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryQualifiedNameParserRuleCall_3_1_1_0_1()); 
+               before(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryQualifiedNameParserRuleCall_2_1_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__MessageEntry__EntryRefAssignment_3_1_15092);
+            pushFollow(FOLLOW_ruleQualifiedName_in_rule__MessageEntry__EntryRefAssignment_2_1_15028);
             ruleQualifiedName();
 
             state._fsp--;
             if (state.failed) return ;
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryQualifiedNameParserRuleCall_3_1_1_0_1()); 
+               after(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryQualifiedNameParserRuleCall_2_1_1_0_1()); 
             }
 
             }
 
             if ( state.backtracking==0 ) {
-               after(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryCrossReference_3_1_1_0()); 
+               after(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryCrossReference_2_1_1_0()); 
             }
 
             }
@@ -7292,26 +7213,26 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__MessageEntry__EntryRefAssignment_3_1_1"
+    // $ANTLR end "rule__MessageEntry__EntryRefAssignment_2_1_1"
 
 
     // $ANTLR start "rule__MessageParam__PredefinedAssignment_0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2553:1: rule__MessageParam__PredefinedAssignment_0 : ( rulePredefinedTypes ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2520:1: rule__MessageParam__PredefinedAssignment_0 : ( rulePredefinedTypes ) ;
     public final void rule__MessageParam__PredefinedAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2557:1: ( ( rulePredefinedTypes ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2558:1: ( rulePredefinedTypes )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2524:1: ( ( rulePredefinedTypes ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2525:1: ( rulePredefinedTypes )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2558:1: ( rulePredefinedTypes )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2559:1: rulePredefinedTypes
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2525:1: ( rulePredefinedTypes )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2526:1: rulePredefinedTypes
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMessageParamAccess().getPredefinedPredefinedTypesEnumRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_rulePredefinedTypes_in_rule__MessageParam__PredefinedAssignment_05127);
+            pushFollow(FOLLOW_rulePredefinedTypes_in_rule__MessageParam__PredefinedAssignment_05063);
             rulePredefinedTypes();
 
             state._fsp--;
@@ -7341,22 +7262,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__MessageParam__VarAssignment_1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2568:1: rule__MessageParam__VarAssignment_1 : ( RULE_ID ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2535:1: rule__MessageParam__VarAssignment_1 : ( RULE_ID ) ;
     public final void rule__MessageParam__VarAssignment_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2572:1: ( ( RULE_ID ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2573:1: ( RULE_ID )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2539:1: ( ( RULE_ID ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2540:1: ( RULE_ID )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2573:1: ( RULE_ID )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2574:1: RULE_ID
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2540:1: ( RULE_ID )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2541:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMessageParamAccess().getVarIDTerminalRuleCall_1_0()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__MessageParam__VarAssignment_15158); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__MessageParam__VarAssignment_15094); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMessageParamAccess().getVarIDTerminalRuleCall_1_0()); 
             }
@@ -7382,22 +7303,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__NameAssignment_0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2583:1: rule__Message__NameAssignment_0 : ( RULE_ID ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2550:1: rule__Message__NameAssignment_0 : ( RULE_ID ) ;
     public final void rule__Message__NameAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2587:1: ( ( RULE_ID ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2588:1: ( RULE_ID )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2554:1: ( ( RULE_ID ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2555:1: ( RULE_ID )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2588:1: ( RULE_ID )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2589:1: RULE_ID
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2555:1: ( RULE_ID )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2556:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMessageAccess().getNameIDTerminalRuleCall_0_0()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__Message__NameAssignment_05189); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__Message__NameAssignment_05125); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getMessageAccess().getNameIDTerminalRuleCall_0_0()); 
             }
@@ -7423,22 +7344,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Message__MessageAssignment_2"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2598:1: rule__Message__MessageAssignment_2 : ( ruleRichString ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2565:1: rule__Message__MessageAssignment_2 : ( ruleRichString ) ;
     public final void rule__Message__MessageAssignment_2() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2602:1: ( ( ruleRichString ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2603:1: ( ruleRichString )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2569:1: ( ( ruleRichString ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2570:1: ( ruleRichString )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2603:1: ( ruleRichString )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2604:1: ruleRichString
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2570:1: ( ruleRichString )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2571:1: ruleRichString
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getMessageAccess().getMessageRichStringParserRuleCall_2_0()); 
             }
-            pushFollow(FOLLOW_ruleRichString_in_rule__Message__MessageAssignment_25220);
+            pushFollow(FOLLOW_ruleRichString_in_rule__Message__MessageAssignment_25156);
             ruleRichString();
 
             state._fsp--;
@@ -7468,22 +7389,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichString__ExpressionsAssignment_0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2613:1: rule__RichString__ExpressionsAssignment_0 : ( ruleRichStringLiteral ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2580:1: rule__RichString__ExpressionsAssignment_0 : ( ruleRichStringLiteral ) ;
     public final void rule__RichString__ExpressionsAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2617:1: ( ( ruleRichStringLiteral ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2618:1: ( ruleRichStringLiteral )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2584:1: ( ( ruleRichStringLiteral ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2585:1: ( ruleRichStringLiteral )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2618:1: ( ruleRichStringLiteral )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2619:1: ruleRichStringLiteral
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2585:1: ( ruleRichStringLiteral )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2586:1: ruleRichStringLiteral
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichStringAccess().getExpressionsRichStringLiteralParserRuleCall_0_0()); 
             }
-            pushFollow(FOLLOW_ruleRichStringLiteral_in_rule__RichString__ExpressionsAssignment_05251);
+            pushFollow(FOLLOW_ruleRichStringLiteral_in_rule__RichString__ExpressionsAssignment_05187);
             ruleRichStringLiteral();
 
             state._fsp--;
@@ -7513,22 +7434,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichString__ExpressionsAssignment_1_0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2628:1: rule__RichString__ExpressionsAssignment_1_0 : ( ruleRichStringLiteralStart ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2595:1: rule__RichString__ExpressionsAssignment_1_0 : ( ruleRichStringLiteralStart ) ;
     public final void rule__RichString__ExpressionsAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2632:1: ( ( ruleRichStringLiteralStart ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2633:1: ( ruleRichStringLiteralStart )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2599:1: ( ( ruleRichStringLiteralStart ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2600:1: ( ruleRichStringLiteralStart )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2633:1: ( ruleRichStringLiteralStart )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2634:1: ruleRichStringLiteralStart
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2600:1: ( ruleRichStringLiteralStart )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2601:1: ruleRichStringLiteralStart
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichStringAccess().getExpressionsRichStringLiteralStartParserRuleCall_1_0_0()); 
             }
-            pushFollow(FOLLOW_ruleRichStringLiteralStart_in_rule__RichString__ExpressionsAssignment_1_05282);
+            pushFollow(FOLLOW_ruleRichStringLiteralStart_in_rule__RichString__ExpressionsAssignment_1_05218);
             ruleRichStringLiteralStart();
 
             state._fsp--;
@@ -7558,22 +7479,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichString__ExpressionsAssignment_1_1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2643:1: rule__RichString__ExpressionsAssignment_1_1 : ( ruleRichVarPart ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2610:1: rule__RichString__ExpressionsAssignment_1_1 : ( ruleRichVarPart ) ;
     public final void rule__RichString__ExpressionsAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2647:1: ( ( ruleRichVarPart ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2648:1: ( ruleRichVarPart )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2614:1: ( ( ruleRichVarPart ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2615:1: ( ruleRichVarPart )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2648:1: ( ruleRichVarPart )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2649:1: ruleRichVarPart
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2615:1: ( ruleRichVarPart )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2616:1: ruleRichVarPart
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichStringAccess().getExpressionsRichVarPartParserRuleCall_1_1_0()); 
             }
-            pushFollow(FOLLOW_ruleRichVarPart_in_rule__RichString__ExpressionsAssignment_1_15313);
+            pushFollow(FOLLOW_ruleRichVarPart_in_rule__RichString__ExpressionsAssignment_1_15249);
             ruleRichVarPart();
 
             state._fsp--;
@@ -7603,22 +7524,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichString__ExpressionsAssignment_1_2_0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2658:1: rule__RichString__ExpressionsAssignment_1_2_0 : ( ruleRichStringLiteralInbetween ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2625:1: rule__RichString__ExpressionsAssignment_1_2_0 : ( ruleRichStringLiteralInbetween ) ;
     public final void rule__RichString__ExpressionsAssignment_1_2_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2662:1: ( ( ruleRichStringLiteralInbetween ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2663:1: ( ruleRichStringLiteralInbetween )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2629:1: ( ( ruleRichStringLiteralInbetween ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2630:1: ( ruleRichStringLiteralInbetween )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2663:1: ( ruleRichStringLiteralInbetween )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2664:1: ruleRichStringLiteralInbetween
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2630:1: ( ruleRichStringLiteralInbetween )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2631:1: ruleRichStringLiteralInbetween
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichStringAccess().getExpressionsRichStringLiteralInbetweenParserRuleCall_1_2_0_0()); 
             }
-            pushFollow(FOLLOW_ruleRichStringLiteralInbetween_in_rule__RichString__ExpressionsAssignment_1_2_05344);
+            pushFollow(FOLLOW_ruleRichStringLiteralInbetween_in_rule__RichString__ExpressionsAssignment_1_2_05280);
             ruleRichStringLiteralInbetween();
 
             state._fsp--;
@@ -7648,22 +7569,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichString__ExpressionsAssignment_1_2_1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2673:1: rule__RichString__ExpressionsAssignment_1_2_1 : ( ruleRichVarPart ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2640:1: rule__RichString__ExpressionsAssignment_1_2_1 : ( ruleRichVarPart ) ;
     public final void rule__RichString__ExpressionsAssignment_1_2_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2677:1: ( ( ruleRichVarPart ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2678:1: ( ruleRichVarPart )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2644:1: ( ( ruleRichVarPart ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2645:1: ( ruleRichVarPart )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2678:1: ( ruleRichVarPart )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2679:1: ruleRichVarPart
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2645:1: ( ruleRichVarPart )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2646:1: ruleRichVarPart
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichStringAccess().getExpressionsRichVarPartParserRuleCall_1_2_1_0()); 
             }
-            pushFollow(FOLLOW_ruleRichVarPart_in_rule__RichString__ExpressionsAssignment_1_2_15375);
+            pushFollow(FOLLOW_ruleRichVarPart_in_rule__RichString__ExpressionsAssignment_1_2_15311);
             ruleRichVarPart();
 
             state._fsp--;
@@ -7693,22 +7614,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichString__ExpressionsAssignment_1_3"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2688:1: rule__RichString__ExpressionsAssignment_1_3 : ( ruleRichStringLiteralEnd ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2655:1: rule__RichString__ExpressionsAssignment_1_3 : ( ruleRichStringLiteralEnd ) ;
     public final void rule__RichString__ExpressionsAssignment_1_3() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2692:1: ( ( ruleRichStringLiteralEnd ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2693:1: ( ruleRichStringLiteralEnd )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2659:1: ( ( ruleRichStringLiteralEnd ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2660:1: ( ruleRichStringLiteralEnd )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2693:1: ( ruleRichStringLiteralEnd )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2694:1: ruleRichStringLiteralEnd
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2660:1: ( ruleRichStringLiteralEnd )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2661:1: ruleRichStringLiteralEnd
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichStringAccess().getExpressionsRichStringLiteralEndParserRuleCall_1_3_0()); 
             }
-            pushFollow(FOLLOW_ruleRichStringLiteralEnd_in_rule__RichString__ExpressionsAssignment_1_35406);
+            pushFollow(FOLLOW_ruleRichStringLiteralEnd_in_rule__RichString__ExpressionsAssignment_1_35342);
             ruleRichStringLiteralEnd();
 
             state._fsp--;
@@ -7738,22 +7659,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichStringLiteral__ValueAssignment"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2703:1: rule__RichStringLiteral__ValueAssignment : ( RULE_RICH_TEXT ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2670:1: rule__RichStringLiteral__ValueAssignment : ( RULE_RICH_TEXT ) ;
     public final void rule__RichStringLiteral__ValueAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2707:1: ( ( RULE_RICH_TEXT ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2708:1: ( RULE_RICH_TEXT )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2674:1: ( ( RULE_RICH_TEXT ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2675:1: ( RULE_RICH_TEXT )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2708:1: ( RULE_RICH_TEXT )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2709:1: RULE_RICH_TEXT
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2675:1: ( RULE_RICH_TEXT )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2676:1: RULE_RICH_TEXT
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichStringLiteralAccess().getValueRICH_TEXTTerminalRuleCall_0()); 
             }
-            match(input,RULE_RICH_TEXT,FOLLOW_RULE_RICH_TEXT_in_rule__RichStringLiteral__ValueAssignment5437); if (state.failed) return ;
+            match(input,RULE_RICH_TEXT,FOLLOW_RULE_RICH_TEXT_in_rule__RichStringLiteral__ValueAssignment5373); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRichStringLiteralAccess().getValueRICH_TEXTTerminalRuleCall_0()); 
             }
@@ -7779,22 +7700,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichStringLiteralStart__ValueAssignment"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2718:1: rule__RichStringLiteralStart__ValueAssignment : ( RULE_RICH_TEXT_START ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2685:1: rule__RichStringLiteralStart__ValueAssignment : ( RULE_RICH_TEXT_START ) ;
     public final void rule__RichStringLiteralStart__ValueAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2722:1: ( ( RULE_RICH_TEXT_START ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2723:1: ( RULE_RICH_TEXT_START )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2689:1: ( ( RULE_RICH_TEXT_START ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2690:1: ( RULE_RICH_TEXT_START )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2723:1: ( RULE_RICH_TEXT_START )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2724:1: RULE_RICH_TEXT_START
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2690:1: ( RULE_RICH_TEXT_START )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2691:1: RULE_RICH_TEXT_START
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichStringLiteralStartAccess().getValueRICH_TEXT_STARTTerminalRuleCall_0()); 
             }
-            match(input,RULE_RICH_TEXT_START,FOLLOW_RULE_RICH_TEXT_START_in_rule__RichStringLiteralStart__ValueAssignment5468); if (state.failed) return ;
+            match(input,RULE_RICH_TEXT_START,FOLLOW_RULE_RICH_TEXT_START_in_rule__RichStringLiteralStart__ValueAssignment5404); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRichStringLiteralStartAccess().getValueRICH_TEXT_STARTTerminalRuleCall_0()); 
             }
@@ -7820,22 +7741,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichStringLiteralEnd__ValueAssignment"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2733:1: rule__RichStringLiteralEnd__ValueAssignment : ( RULE_RICH_TEXT_END ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2700:1: rule__RichStringLiteralEnd__ValueAssignment : ( RULE_RICH_TEXT_END ) ;
     public final void rule__RichStringLiteralEnd__ValueAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2737:1: ( ( RULE_RICH_TEXT_END ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2738:1: ( RULE_RICH_TEXT_END )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2704:1: ( ( RULE_RICH_TEXT_END ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2705:1: ( RULE_RICH_TEXT_END )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2738:1: ( RULE_RICH_TEXT_END )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2739:1: RULE_RICH_TEXT_END
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2705:1: ( RULE_RICH_TEXT_END )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2706:1: RULE_RICH_TEXT_END
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichStringLiteralEndAccess().getValueRICH_TEXT_ENDTerminalRuleCall_0()); 
             }
-            match(input,RULE_RICH_TEXT_END,FOLLOW_RULE_RICH_TEXT_END_in_rule__RichStringLiteralEnd__ValueAssignment5499); if (state.failed) return ;
+            match(input,RULE_RICH_TEXT_END,FOLLOW_RULE_RICH_TEXT_END_in_rule__RichStringLiteralEnd__ValueAssignment5435); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRichStringLiteralEndAccess().getValueRICH_TEXT_ENDTerminalRuleCall_0()); 
             }
@@ -7861,22 +7782,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichStringLiteralInbetween__ValueAssignment"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2748:1: rule__RichStringLiteralInbetween__ValueAssignment : ( RULE_RICH_TEXT_INBETWEEN ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2715:1: rule__RichStringLiteralInbetween__ValueAssignment : ( RULE_RICH_TEXT_INBETWEEN ) ;
     public final void rule__RichStringLiteralInbetween__ValueAssignment() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2752:1: ( ( RULE_RICH_TEXT_INBETWEEN ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2753:1: ( RULE_RICH_TEXT_INBETWEEN )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2719:1: ( ( RULE_RICH_TEXT_INBETWEEN ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2720:1: ( RULE_RICH_TEXT_INBETWEEN )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2753:1: ( RULE_RICH_TEXT_INBETWEEN )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2754:1: RULE_RICH_TEXT_INBETWEEN
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2720:1: ( RULE_RICH_TEXT_INBETWEEN )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2721:1: RULE_RICH_TEXT_INBETWEEN
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichStringLiteralInbetweenAccess().getValueRICH_TEXT_INBETWEENTerminalRuleCall_0()); 
             }
-            match(input,RULE_RICH_TEXT_INBETWEEN,FOLLOW_RULE_RICH_TEXT_INBETWEEN_in_rule__RichStringLiteralInbetween__ValueAssignment5530); if (state.failed) return ;
+            match(input,RULE_RICH_TEXT_INBETWEEN,FOLLOW_RULE_RICH_TEXT_INBETWEEN_in_rule__RichStringLiteralInbetween__ValueAssignment5466); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRichStringLiteralInbetweenAccess().getValueRICH_TEXT_INBETWEENTerminalRuleCall_0()); 
             }
@@ -7902,22 +7823,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichVarPart__KeyAssignment_0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2763:1: rule__RichVarPart__KeyAssignment_0 : ( RULE_ID ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2730:1: rule__RichVarPart__KeyAssignment_0 : ( RULE_ID ) ;
     public final void rule__RichVarPart__KeyAssignment_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2767:1: ( ( RULE_ID ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2768:1: ( RULE_ID )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2734:1: ( ( RULE_ID ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2735:1: ( RULE_ID )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2768:1: ( RULE_ID )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2769:1: RULE_ID
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2735:1: ( RULE_ID )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2736:1: RULE_ID
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichVarPartAccess().getKeyIDTerminalRuleCall_0_0()); 
             }
-            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__RichVarPart__KeyAssignment_05561); if (state.failed) return ;
+            match(input,RULE_ID,FOLLOW_RULE_ID_in_rule__RichVarPart__KeyAssignment_05497); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRichVarPartAccess().getKeyIDTerminalRuleCall_0_0()); 
             }
@@ -7943,22 +7864,22 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichVarPart__FormatAssignment_1_0"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2778:1: rule__RichVarPart__FormatAssignment_1_0 : ( RULE_STRING ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2745:1: rule__RichVarPart__FormatAssignment_1_0 : ( RULE_STRING ) ;
     public final void rule__RichVarPart__FormatAssignment_1_0() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2782:1: ( ( RULE_STRING ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2783:1: ( RULE_STRING )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2749:1: ( ( RULE_STRING ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2750:1: ( RULE_STRING )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2783:1: ( RULE_STRING )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2784:1: RULE_STRING
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2750:1: ( RULE_STRING )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2751:1: RULE_STRING
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichVarPartAccess().getFormatSTRINGTerminalRuleCall_1_0_0()); 
             }
-            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__RichVarPart__FormatAssignment_1_05592); if (state.failed) return ;
+            match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rule__RichVarPart__FormatAssignment_1_05528); if (state.failed) return ;
             if ( state.backtracking==0 ) {
                after(grammarAccess.getRichVarPartAccess().getFormatSTRINGTerminalRuleCall_1_0_0()); 
             }
@@ -7984,28 +7905,28 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RichVarPart__FormatterClassAssignment_1_1"
-    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2793:1: rule__RichVarPart__FormatterClassAssignment_1_1 : ( ( ruleQualifiedName ) ) ;
+    // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2760:1: rule__RichVarPart__FormatterClassAssignment_1_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__RichVarPart__FormatterClassAssignment_1_1() throws RecognitionException {
 
         		int stackSize = keepStackSize();
             
         try {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2797:1: ( ( ( ruleQualifiedName ) ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2798:1: ( ( ruleQualifiedName ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2764:1: ( ( ( ruleQualifiedName ) ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2765:1: ( ( ruleQualifiedName ) )
             {
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2798:1: ( ( ruleQualifiedName ) )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2799:1: ( ruleQualifiedName )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2765:1: ( ( ruleQualifiedName ) )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2766:1: ( ruleQualifiedName )
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichVarPartAccess().getFormatterClassNLSFormatterCrossReference_1_1_0()); 
             }
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2800:1: ( ruleQualifiedName )
-            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2801:1: ruleQualifiedName
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2767:1: ( ruleQualifiedName )
+            // ../org.eclipse.fx.ide.l10n.ui/src-gen/org/eclipse/fx/ide/l10n/ui/contentassist/antlr/internal/InternalNLSDsl.g:2768:1: ruleQualifiedName
             {
             if ( state.backtracking==0 ) {
                before(grammarAccess.getRichVarPartAccess().getFormatterClassNLSFormatterQualifiedNameParserRuleCall_1_1_0_1()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_rule__RichVarPart__FormatterClassAssignment_1_15627);
+            pushFollow(FOLLOW_ruleQualifiedName_in_rule__RichVarPart__FormatterClassAssignment_1_15563);
             ruleQualifiedName();
 
             state._fsp--;
@@ -8090,8 +8011,8 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
     public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName913 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule__QualifiedName__Group__0_in_ruleQualifiedName939 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule__PredefinedTypes__Alternatives_in_rulePredefinedTypes976 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_3_0__0_in_rule__MessageEntry__Alternatives_31011 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_3_1__0_in_rule__MessageEntry__Alternatives_31029 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_2_0__0_in_rule__MessageEntry__Alternatives_21011 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_2_1__0_in_rule__MessageEntry__Alternatives_21029 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule__RichString__ExpressionsAssignment_0_in_rule__RichString__Alternatives1062 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule__RichString__Group_1__0_in_rule__RichString__Alternatives1080 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_16_in_rule__PredefinedTypes__Alternatives1114 = new BitSet(new long[]{0x0000000000000002L});
@@ -8147,137 +8068,134 @@ public class InternalNLSDslParser extends AbstractInternalContentAssistParser {
     public static final BitSet FOLLOW_rule__NLSFormatter__NameAssignment_1_in_rule__NLSFormatter__Group__1__Impl2211 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule__NLSFormatter__Group__2__Impl_in_rule__NLSFormatter__Group__22241 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule__NLSFormatter__ClassRefAssignment_2_in_rule__NLSFormatter__Group__2__Impl2268 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group__0__Impl_in_rule__MessageEntry__Group__02304 = new BitSet(new long[]{0x000000000C000000L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group__0__Impl_in_rule__MessageEntry__Group__02304 = new BitSet(new long[]{0x0000000024100000L});
     public static final BitSet FOLLOW_rule__MessageEntry__Group__1_in_rule__MessageEntry__Group__02307 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule__MessageEntry__NameAssignment_0_in_rule__MessageEntry__Group__0__Impl2334 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group__1__Impl_in_rule__MessageEntry__Group__12364 = new BitSet(new long[]{0x000000000C000000L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group__1__Impl_in_rule__MessageEntry__Group__12364 = new BitSet(new long[]{0x0000000024100000L});
     public static final BitSet FOLLOW_rule__MessageEntry__Group__2_in_rule__MessageEntry__Group__12367 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_rule__MessageEntry__Group_1__0_in_rule__MessageEntry__Group__1__Impl2394 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group__2__Impl_in_rule__MessageEntry__Group__22425 = new BitSet(new long[]{0x0000000040100000L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group__3_in_rule__MessageEntry__Group__22428 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__MessageEntry__Group__2__Impl2456 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group__3__Impl_in_rule__MessageEntry__Group__32487 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Alternatives_3_in_rule__MessageEntry__Group__3__Impl2514 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_1__0__Impl_in_rule__MessageEntry__Group_1__02552 = new BitSet(new long[]{0x00000000000F0000L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_1__1_in_rule__MessageEntry__Group_1__02555 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_27_in_rule__MessageEntry__Group_1__0__Impl2583 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_1__1__Impl_in_rule__MessageEntry__Group_1__12614 = new BitSet(new long[]{0x0000000030000000L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_1__2_in_rule__MessageEntry__Group_1__12617 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__ParamListAssignment_1_1_in_rule__MessageEntry__Group_1__1__Impl2644 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_1__2__Impl_in_rule__MessageEntry__Group_1__22674 = new BitSet(new long[]{0x0000000030000000L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_1__3_in_rule__MessageEntry__Group_1__22677 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_1_2__0_in_rule__MessageEntry__Group_1__2__Impl2704 = new BitSet(new long[]{0x0000000020000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_1__3__Impl_in_rule__MessageEntry__Group_1__32735 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_rule__MessageEntry__Group_1__3__Impl2763 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_1_2__0__Impl_in_rule__MessageEntry__Group_1_2__02802 = new BitSet(new long[]{0x00000000000F0000L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_1_2__1_in_rule__MessageEntry__Group_1_2__02805 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__MessageEntry__Group_1_2__0__Impl2833 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_1_2__1__Impl_in_rule__MessageEntry__Group_1_2__12864 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__ParamListAssignment_1_2_1_in_rule__MessageEntry__Group_1_2__1__Impl2891 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_3_0__0__Impl_in_rule__MessageEntry__Group_3_0__02925 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_3_0__1_in_rule__MessageEntry__Group_3_0__02928 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_20_in_rule__MessageEntry__Group_3_0__0__Impl2956 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_3_0__1__Impl_in_rule__MessageEntry__Group_3_0__12987 = new BitSet(new long[]{0x0000000020200000L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_3_0__2_in_rule__MessageEntry__Group_3_0__12990 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__MessageListAssignment_3_0_1_in_rule__MessageEntry__Group_3_0__1__Impl3017 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_3_0__2__Impl_in_rule__MessageEntry__Group_3_0__23047 = new BitSet(new long[]{0x0000000020200000L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_3_0__3_in_rule__MessageEntry__Group_3_0__23050 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_3_0_2__0_in_rule__MessageEntry__Group_3_0__2__Impl3077 = new BitSet(new long[]{0x0000000020000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_3_0__3__Impl_in_rule__MessageEntry__Group_3_0__33108 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_21_in_rule__MessageEntry__Group_3_0__3__Impl3136 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_3_0_2__0__Impl_in_rule__MessageEntry__Group_3_0_2__03175 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_3_0_2__1_in_rule__MessageEntry__Group_3_0_2__03178 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_29_in_rule__MessageEntry__Group_3_0_2__0__Impl3206 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_3_0_2__1__Impl_in_rule__MessageEntry__Group_3_0_2__13237 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__MessageListAssignment_3_0_2_1_in_rule__MessageEntry__Group_3_0_2__1__Impl3264 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_3_1__0__Impl_in_rule__MessageEntry__Group_3_1__03298 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_3_1__1_in_rule__MessageEntry__Group_3_1__03301 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rule__MessageEntry__Group_3_1__0__Impl3329 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_3_1__1__Impl_in_rule__MessageEntry__Group_3_1__13360 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_3_1__2_in_rule__MessageEntry__Group_3_1__13363 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__EntryRefAssignment_3_1_1_in_rule__MessageEntry__Group_3_1__1__Impl3390 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageEntry__Group_3_1__2__Impl_in_rule__MessageEntry__Group_3_1__23420 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rule__MessageEntry__Group_3_1__2__Impl3448 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageParam__Group__0__Impl_in_rule__MessageParam__Group__03485 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__MessageParam__Group__1_in_rule__MessageParam__Group__03488 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageParam__PredefinedAssignment_0_in_rule__MessageParam__Group__0__Impl3515 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageParam__Group__1__Impl_in_rule__MessageParam__Group__13545 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__MessageParam__VarAssignment_1_in_rule__MessageParam__Group__1__Impl3572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Message__Group__0__Impl_in_rule__Message__Group__03606 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_rule__Message__Group__1_in_rule__Message__Group__03609 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Message__NameAssignment_0_in_rule__Message__Group__0__Impl3636 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Message__Group__1__Impl_in_rule__Message__Group__13666 = new BitSet(new long[]{0x0000000000000060L});
-    public static final BitSet FOLLOW_rule__Message__Group__2_in_rule__Message__Group__13669 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_rule__Message__Group__1__Impl3697 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Message__Group__2__Impl_in_rule__Message__Group__23728 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__Message__MessageAssignment_2_in_rule__Message__Group__2__Impl3755 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RichString__Group_1__0__Impl_in_rule__RichString__Group_1__03791 = new BitSet(new long[]{0x0000000000000190L});
-    public static final BitSet FOLLOW_rule__RichString__Group_1__1_in_rule__RichString__Group_1__03794 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RichString__ExpressionsAssignment_1_0_in_rule__RichString__Group_1__0__Impl3821 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RichString__Group_1__1__Impl_in_rule__RichString__Group_1__13851 = new BitSet(new long[]{0x0000000000000190L});
-    public static final BitSet FOLLOW_rule__RichString__Group_1__2_in_rule__RichString__Group_1__13854 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RichString__ExpressionsAssignment_1_1_in_rule__RichString__Group_1__1__Impl3881 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RichString__Group_1__2__Impl_in_rule__RichString__Group_1__23912 = new BitSet(new long[]{0x0000000000000190L});
-    public static final BitSet FOLLOW_rule__RichString__Group_1__3_in_rule__RichString__Group_1__23915 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RichString__Group_1_2__0_in_rule__RichString__Group_1__2__Impl3942 = new BitSet(new long[]{0x0000000000000102L});
-    public static final BitSet FOLLOW_rule__RichString__Group_1__3__Impl_in_rule__RichString__Group_1__33973 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RichString__ExpressionsAssignment_1_3_in_rule__RichString__Group_1__3__Impl4000 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RichString__Group_1_2__0__Impl_in_rule__RichString__Group_1_2__04038 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__RichString__Group_1_2__1_in_rule__RichString__Group_1_2__04041 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RichString__ExpressionsAssignment_1_2_0_in_rule__RichString__Group_1_2__0__Impl4068 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RichString__Group_1_2__1__Impl_in_rule__RichString__Group_1_2__14098 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RichString__ExpressionsAssignment_1_2_1_in_rule__RichString__Group_1_2__1__Impl4125 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RichVarPart__Group__0__Impl_in_rule__RichVarPart__Group__04160 = new BitSet(new long[]{0x0000000000000200L});
-    public static final BitSet FOLLOW_rule__RichVarPart__Group__1_in_rule__RichVarPart__Group__04163 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RichVarPart__KeyAssignment_0_in_rule__RichVarPart__Group__0__Impl4190 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RichVarPart__Group__1__Impl_in_rule__RichVarPart__Group__14220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RichVarPart__Group_1__0_in_rule__RichVarPart__Group__1__Impl4247 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RichVarPart__Group_1__0__Impl_in_rule__RichVarPart__Group_1__04282 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__RichVarPart__Group_1__1_in_rule__RichVarPart__Group_1__04285 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RichVarPart__FormatAssignment_1_0_in_rule__RichVarPart__Group_1__0__Impl4312 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RichVarPart__Group_1__1__Impl_in_rule__RichVarPart__Group_1__14342 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__RichVarPart__FormatterClassAssignment_1_1_in_rule__RichVarPart__Group_1__1__Impl4369 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__04404 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__04407 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__QualifiedName__Group__0__Impl4434 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__14463 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0_in_rule__QualifiedName__Group__1__Impl4490 = new BitSet(new long[]{0x0000000100000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0__Impl_in_rule__QualifiedName__Group_1__04525 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__1_in_rule__QualifiedName__Group_1__04528 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rule__QualifiedName__Group_1__0__Impl4557 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__1__Impl_in_rule__QualifiedName__Group_1__14589 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_rule__QualifiedName__Group_1__1__Impl4616 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePackageDeclaration_in_rule__NLS__PackageAssignment_04654 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNLSBundle_in_rule__NLS__BundleListAssignment_24685 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__PackageDeclaration__NameAssignment_14716 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__NLSBundle__NameAssignment_14747 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__NLSBundle__LangAssignment_34778 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleNLSFormatter_in_rule__NLSBundle__FormatterListAssignment_54809 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessageEntry_in_rule__NLSBundle__MessageEntryListAssignment_64840 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__NLSFormatter__NameAssignment_14871 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__NLSFormatter__ClassRefAssignment_24902 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__MessageEntry__NameAssignment_04933 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessageParam_in_rule__MessageEntry__ParamListAssignment_1_14964 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessageParam_in_rule__MessageEntry__ParamListAssignment_1_2_14995 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessage_in_rule__MessageEntry__MessageListAssignment_3_0_15026 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessage_in_rule__MessageEntry__MessageListAssignment_3_0_2_15057 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__MessageEntry__EntryRefAssignment_3_1_15092 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePredefinedTypes_in_rule__MessageParam__PredefinedAssignment_05127 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__MessageParam__VarAssignment_15158 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__Message__NameAssignment_05189 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRichString_in_rule__Message__MessageAssignment_25220 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRichStringLiteral_in_rule__RichString__ExpressionsAssignment_05251 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRichStringLiteralStart_in_rule__RichString__ExpressionsAssignment_1_05282 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRichVarPart_in_rule__RichString__ExpressionsAssignment_1_15313 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRichStringLiteralInbetween_in_rule__RichString__ExpressionsAssignment_1_2_05344 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRichVarPart_in_rule__RichString__ExpressionsAssignment_1_2_15375 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRichStringLiteralEnd_in_rule__RichString__ExpressionsAssignment_1_35406 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_RICH_TEXT_in_rule__RichStringLiteral__ValueAssignment5437 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_RICH_TEXT_START_in_rule__RichStringLiteralStart__ValueAssignment5468 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_RICH_TEXT_END_in_rule__RichStringLiteralEnd__ValueAssignment5499 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_RICH_TEXT_INBETWEEN_in_rule__RichStringLiteralInbetween__ValueAssignment5530 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_rule__RichVarPart__KeyAssignment_05561 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_STRING_in_rule__RichVarPart__FormatAssignment_1_05592 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__RichVarPart__FormatterClassAssignment_1_15627 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group__2__Impl_in_rule__MessageEntry__Group__22425 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Alternatives_2_in_rule__MessageEntry__Group__2__Impl2452 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_1__0__Impl_in_rule__MessageEntry__Group_1__02488 = new BitSet(new long[]{0x00000000000F0000L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_1__1_in_rule__MessageEntry__Group_1__02491 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_26_in_rule__MessageEntry__Group_1__0__Impl2519 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_1__1__Impl_in_rule__MessageEntry__Group_1__12550 = new BitSet(new long[]{0x0000000018000000L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_1__2_in_rule__MessageEntry__Group_1__12553 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__ParamListAssignment_1_1_in_rule__MessageEntry__Group_1__1__Impl2580 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_1__2__Impl_in_rule__MessageEntry__Group_1__22610 = new BitSet(new long[]{0x0000000018000000L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_1__3_in_rule__MessageEntry__Group_1__22613 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_1_2__0_in_rule__MessageEntry__Group_1__2__Impl2640 = new BitSet(new long[]{0x0000000010000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_1__3__Impl_in_rule__MessageEntry__Group_1__32671 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_27_in_rule__MessageEntry__Group_1__3__Impl2699 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_1_2__0__Impl_in_rule__MessageEntry__Group_1_2__02738 = new BitSet(new long[]{0x00000000000F0000L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_1_2__1_in_rule__MessageEntry__Group_1_2__02741 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_28_in_rule__MessageEntry__Group_1_2__0__Impl2769 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_1_2__1__Impl_in_rule__MessageEntry__Group_1_2__12800 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__ParamListAssignment_1_2_1_in_rule__MessageEntry__Group_1_2__1__Impl2827 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_2_0__0__Impl_in_rule__MessageEntry__Group_2_0__02861 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_2_0__1_in_rule__MessageEntry__Group_2_0__02864 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_20_in_rule__MessageEntry__Group_2_0__0__Impl2892 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_2_0__1__Impl_in_rule__MessageEntry__Group_2_0__12923 = new BitSet(new long[]{0x0000000010200000L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_2_0__2_in_rule__MessageEntry__Group_2_0__12926 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__MessageListAssignment_2_0_1_in_rule__MessageEntry__Group_2_0__1__Impl2953 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_2_0__2__Impl_in_rule__MessageEntry__Group_2_0__22983 = new BitSet(new long[]{0x0000000010200000L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_2_0__3_in_rule__MessageEntry__Group_2_0__22986 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_2_0_2__0_in_rule__MessageEntry__Group_2_0__2__Impl3013 = new BitSet(new long[]{0x0000000010000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_2_0__3__Impl_in_rule__MessageEntry__Group_2_0__33044 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_21_in_rule__MessageEntry__Group_2_0__3__Impl3072 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_2_0_2__0__Impl_in_rule__MessageEntry__Group_2_0_2__03111 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_2_0_2__1_in_rule__MessageEntry__Group_2_0_2__03114 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_28_in_rule__MessageEntry__Group_2_0_2__0__Impl3142 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_2_0_2__1__Impl_in_rule__MessageEntry__Group_2_0_2__13173 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__MessageListAssignment_2_0_2_1_in_rule__MessageEntry__Group_2_0_2__1__Impl3200 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_2_1__0__Impl_in_rule__MessageEntry__Group_2_1__03234 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_2_1__1_in_rule__MessageEntry__Group_2_1__03237 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_29_in_rule__MessageEntry__Group_2_1__0__Impl3265 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_2_1__1__Impl_in_rule__MessageEntry__Group_2_1__13296 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_2_1__2_in_rule__MessageEntry__Group_2_1__13299 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__EntryRefAssignment_2_1_1_in_rule__MessageEntry__Group_2_1__1__Impl3326 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageEntry__Group_2_1__2__Impl_in_rule__MessageEntry__Group_2_1__23356 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_30_in_rule__MessageEntry__Group_2_1__2__Impl3384 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageParam__Group__0__Impl_in_rule__MessageParam__Group__03421 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__MessageParam__Group__1_in_rule__MessageParam__Group__03424 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageParam__PredefinedAssignment_0_in_rule__MessageParam__Group__0__Impl3451 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageParam__Group__1__Impl_in_rule__MessageParam__Group__13481 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__MessageParam__VarAssignment_1_in_rule__MessageParam__Group__1__Impl3508 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Message__Group__0__Impl_in_rule__Message__Group__03542 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_rule__Message__Group__1_in_rule__Message__Group__03545 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Message__NameAssignment_0_in_rule__Message__Group__0__Impl3572 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Message__Group__1__Impl_in_rule__Message__Group__13602 = new BitSet(new long[]{0x0000000000000060L});
+    public static final BitSet FOLLOW_rule__Message__Group__2_in_rule__Message__Group__13605 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_31_in_rule__Message__Group__1__Impl3633 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Message__Group__2__Impl_in_rule__Message__Group__23664 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__Message__MessageAssignment_2_in_rule__Message__Group__2__Impl3691 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RichString__Group_1__0__Impl_in_rule__RichString__Group_1__03727 = new BitSet(new long[]{0x0000000000000190L});
+    public static final BitSet FOLLOW_rule__RichString__Group_1__1_in_rule__RichString__Group_1__03730 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RichString__ExpressionsAssignment_1_0_in_rule__RichString__Group_1__0__Impl3757 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RichString__Group_1__1__Impl_in_rule__RichString__Group_1__13787 = new BitSet(new long[]{0x0000000000000190L});
+    public static final BitSet FOLLOW_rule__RichString__Group_1__2_in_rule__RichString__Group_1__13790 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RichString__ExpressionsAssignment_1_1_in_rule__RichString__Group_1__1__Impl3817 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RichString__Group_1__2__Impl_in_rule__RichString__Group_1__23848 = new BitSet(new long[]{0x0000000000000190L});
+    public static final BitSet FOLLOW_rule__RichString__Group_1__3_in_rule__RichString__Group_1__23851 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RichString__Group_1_2__0_in_rule__RichString__Group_1__2__Impl3878 = new BitSet(new long[]{0x0000000000000102L});
+    public static final BitSet FOLLOW_rule__RichString__Group_1__3__Impl_in_rule__RichString__Group_1__33909 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RichString__ExpressionsAssignment_1_3_in_rule__RichString__Group_1__3__Impl3936 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RichString__Group_1_2__0__Impl_in_rule__RichString__Group_1_2__03974 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__RichString__Group_1_2__1_in_rule__RichString__Group_1_2__03977 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RichString__ExpressionsAssignment_1_2_0_in_rule__RichString__Group_1_2__0__Impl4004 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RichString__Group_1_2__1__Impl_in_rule__RichString__Group_1_2__14034 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RichString__ExpressionsAssignment_1_2_1_in_rule__RichString__Group_1_2__1__Impl4061 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RichVarPart__Group__0__Impl_in_rule__RichVarPart__Group__04096 = new BitSet(new long[]{0x0000000000000200L});
+    public static final BitSet FOLLOW_rule__RichVarPart__Group__1_in_rule__RichVarPart__Group__04099 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RichVarPart__KeyAssignment_0_in_rule__RichVarPart__Group__0__Impl4126 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RichVarPart__Group__1__Impl_in_rule__RichVarPart__Group__14156 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RichVarPart__Group_1__0_in_rule__RichVarPart__Group__1__Impl4183 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RichVarPart__Group_1__0__Impl_in_rule__RichVarPart__Group_1__04218 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__RichVarPart__Group_1__1_in_rule__RichVarPart__Group_1__04221 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RichVarPart__FormatAssignment_1_0_in_rule__RichVarPart__Group_1__0__Impl4248 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RichVarPart__Group_1__1__Impl_in_rule__RichVarPart__Group_1__14278 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__RichVarPart__FormatterClassAssignment_1_1_in_rule__RichVarPart__Group_1__1__Impl4305 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__QualifiedName__Group__0__Impl_in_rule__QualifiedName__Group__04340 = new BitSet(new long[]{0x0000000100000000L});
+    public static final BitSet FOLLOW_rule__QualifiedName__Group__1_in_rule__QualifiedName__Group__04343 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_rule__QualifiedName__Group__0__Impl4370 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__QualifiedName__Group__1__Impl_in_rule__QualifiedName__Group__14399 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0_in_rule__QualifiedName__Group__1__Impl4426 = new BitSet(new long[]{0x0000000100000002L});
+    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__0__Impl_in_rule__QualifiedName__Group_1__04461 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__1_in_rule__QualifiedName__Group_1__04464 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_32_in_rule__QualifiedName__Group_1__0__Impl4493 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rule__QualifiedName__Group_1__1__Impl_in_rule__QualifiedName__Group_1__14525 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_rule__QualifiedName__Group_1__1__Impl4552 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rulePackageDeclaration_in_rule__NLS__PackageAssignment_04590 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleNLSBundle_in_rule__NLS__BundleListAssignment_24621 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__PackageDeclaration__NameAssignment_14652 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_rule__NLSBundle__NameAssignment_14683 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_rule__NLSBundle__LangAssignment_34714 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleNLSFormatter_in_rule__NLSBundle__FormatterListAssignment_54745 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleMessageEntry_in_rule__NLSBundle__MessageEntryListAssignment_64776 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_rule__NLSFormatter__NameAssignment_14807 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__NLSFormatter__ClassRefAssignment_24838 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_rule__MessageEntry__NameAssignment_04869 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleMessageParam_in_rule__MessageEntry__ParamListAssignment_1_14900 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleMessageParam_in_rule__MessageEntry__ParamListAssignment_1_2_14931 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleMessage_in_rule__MessageEntry__MessageListAssignment_2_0_14962 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleMessage_in_rule__MessageEntry__MessageListAssignment_2_0_2_14993 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__MessageEntry__EntryRefAssignment_2_1_15028 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rulePredefinedTypes_in_rule__MessageParam__PredefinedAssignment_05063 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_rule__MessageParam__VarAssignment_15094 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_rule__Message__NameAssignment_05125 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRichString_in_rule__Message__MessageAssignment_25156 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRichStringLiteral_in_rule__RichString__ExpressionsAssignment_05187 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRichStringLiteralStart_in_rule__RichString__ExpressionsAssignment_1_05218 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRichVarPart_in_rule__RichString__ExpressionsAssignment_1_15249 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRichStringLiteralInbetween_in_rule__RichString__ExpressionsAssignment_1_2_05280 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRichVarPart_in_rule__RichString__ExpressionsAssignment_1_2_15311 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRichStringLiteralEnd_in_rule__RichString__ExpressionsAssignment_1_35342 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_RICH_TEXT_in_rule__RichStringLiteral__ValueAssignment5373 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_RICH_TEXT_START_in_rule__RichStringLiteralStart__ValueAssignment5404 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_RICH_TEXT_END_in_rule__RichStringLiteralEnd__ValueAssignment5435 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_RICH_TEXT_INBETWEEN_in_rule__RichStringLiteralInbetween__ValueAssignment5466 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_rule__RichVarPart__KeyAssignment_05497 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_STRING_in_rule__RichVarPart__FormatAssignment_1_05528 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_rule__RichVarPart__FormatterClassAssignment_1_15563 = new BitSet(new long[]{0x0000000000000002L});
 
 }
\ No newline at end of file
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/NLSDsl.xtextbin b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/NLSDsl.xtextbin
index 11d534b1c..7cef60540 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/NLSDsl.xtextbin
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/NLSDsl.xtextbin
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g
index 2f37d659a..b77045132 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g
@@ -422,62 +422,58 @@ ruleMessageEntry returns [EObject current=null]
     {
     	newLeafNode(otherlv_5, grammarAccess.getMessageEntryAccess().getRightParenthesisKeyword_1_3());
     }
-)?	otherlv_6=':' 
+)?((	otherlv_6='{' 
     {
-    	newLeafNode(otherlv_6, grammarAccess.getMessageEntryAccess().getColonKeyword_2());
-    }
-((	otherlv_7='{' 
-    {
-    	newLeafNode(otherlv_7, grammarAccess.getMessageEntryAccess().getLeftCurlyBracketKeyword_3_0_0());
+    	newLeafNode(otherlv_6, grammarAccess.getMessageEntryAccess().getLeftCurlyBracketKeyword_2_0_0());
     }
 (
 (
 		{ 
-	        newCompositeNode(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_3_0_1_0()); 
+	        newCompositeNode(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_2_0_1_0()); 
 	    }
-		lv_messageList_8_0=ruleMessage		{
+		lv_messageList_7_0=ruleMessage		{
 	        if ($current==null) {
 	            $current = createModelElementForParent(grammarAccess.getMessageEntryRule());
 	        }
        		add(
        			$current, 
        			"messageList",
-        		lv_messageList_8_0, 
+        		lv_messageList_7_0, 
         		"Message");
 	        afterParserOrEnumRuleCall();
 	    }
 
 )
-)(	otherlv_9=',' 
+)(	otherlv_8=',' 
     {
-    	newLeafNode(otherlv_9, grammarAccess.getMessageEntryAccess().getCommaKeyword_3_0_2_0());
+    	newLeafNode(otherlv_8, grammarAccess.getMessageEntryAccess().getCommaKeyword_2_0_2_0());
     }
 (
 (
 		{ 
-	        newCompositeNode(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_3_0_2_1_0()); 
+	        newCompositeNode(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_2_0_2_1_0()); 
 	    }
-		lv_messageList_10_0=ruleMessage		{
+		lv_messageList_9_0=ruleMessage		{
 	        if ($current==null) {
 	            $current = createModelElementForParent(grammarAccess.getMessageEntryRule());
 	        }
        		add(
        			$current, 
        			"messageList",
-        		lv_messageList_10_0, 
+        		lv_messageList_9_0, 
         		"Message");
 	        afterParserOrEnumRuleCall();
 	    }
 
 )
-))*	otherlv_11='}' 
+))*	otherlv_10='}' 
     {
-    	newLeafNode(otherlv_11, grammarAccess.getMessageEntryAccess().getRightCurlyBracketKeyword_3_0_3());
+    	newLeafNode(otherlv_10, grammarAccess.getMessageEntryAccess().getRightCurlyBracketKeyword_2_0_3());
     }
 )
-    |(	otherlv_12='[' 
+    |(	otherlv_11='[' 
     {
-    	newLeafNode(otherlv_12, grammarAccess.getMessageEntryAccess().getLeftSquareBracketKeyword_3_1_0());
+    	newLeafNode(otherlv_11, grammarAccess.getMessageEntryAccess().getLeftSquareBracketKeyword_2_1_0());
     }
 (
 (
@@ -487,16 +483,16 @@ ruleMessageEntry returns [EObject current=null]
 	        }
         }
 		{ 
-	        newCompositeNode(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryCrossReference_3_1_1_0()); 
+	        newCompositeNode(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryCrossReference_2_1_1_0()); 
 	    }
 		ruleQualifiedName		{ 
 	        afterParserOrEnumRuleCall();
 	    }
 
 )
-)	otherlv_14=']' 
+)	otherlv_13=']' 
     {
-    	newLeafNode(otherlv_14, grammarAccess.getMessageEntryAccess().getRightSquareBracketKeyword_3_1_2());
+    	newLeafNode(otherlv_13, grammarAccess.getMessageEntryAccess().getRightSquareBracketKeyword_2_1_2());
     }
 )))
 ;
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.tokens b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.tokens
index 355bffe2f..4aea1504a 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.tokens
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.tokens
@@ -2,13 +2,13 @@
 ')'=24
 ','=23
 '.'=28
-':'=25
+':'=27
 'ANY'=29
 'DATE'=31
 'NUMBER'=30
 'TEMPORAL'=32
-'['=26
-']'=27
+'['=25
+']'=26
 'bundle'=19
 'default'=20
 'formatter'=21
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDslLexer.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDslLexer.java
index 3b9112e9d..96fd0439a 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDslLexer.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDslLexer.java
@@ -245,10 +245,10 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:20:7: ( ':' )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:20:9: ':'
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:20:7: ( '[' )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:20:9: '['
             {
-            match(':'); 
+            match('['); 
 
             }
 
@@ -265,10 +265,10 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:21:7: ( '[' )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:21:9: '['
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:21:7: ( ']' )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:21:9: ']'
             {
-            match('['); 
+            match(']'); 
 
             }
 
@@ -285,10 +285,10 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:22:7: ( ']' )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:22:9: ']'
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:22:7: ( ':' )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:22:9: ':'
             {
-            match(']'); 
+            match(':'); 
 
             }
 
@@ -409,12 +409,12 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_RICH_TEXT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:16: ( '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:18: '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1090:16: ( '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1090:18: '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF )
             {
             match("'''"); 
 
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:27: ( RULE_IN_RICH_STRING )*
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1090:27: ( RULE_IN_RICH_STRING )*
             loop1:
             do {
                 int alt1=2;
@@ -445,7 +445,7 @@ public class InternalNLSDslLexer extends Lexer {
 
                 switch (alt1) {
             	case 1 :
-            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:27: RULE_IN_RICH_STRING
+            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1090:27: RULE_IN_RICH_STRING
             	    {
             	    mRULE_IN_RICH_STRING(); 
 
@@ -457,7 +457,7 @@ public class InternalNLSDslLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:48: ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1090:48: ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -480,7 +480,7 @@ public class InternalNLSDslLexer extends Lexer {
                 alt4=2;}
             switch (alt4) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:49: '\\'\\'\\''
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1090:49: '\\'\\'\\''
                     {
                     match("'''"); 
 
@@ -488,9 +488,9 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:58: ( '\\'' ( '\\'' )? )? EOF
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1090:58: ( '\\'' ( '\\'' )? )? EOF
                     {
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:58: ( '\\'' ( '\\'' )? )?
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1090:58: ( '\\'' ( '\\'' )? )?
                     int alt3=2;
                     int LA3_0 = input.LA(1);
 
@@ -499,10 +499,10 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     switch (alt3) {
                         case 1 :
-                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:59: '\\'' ( '\\'' )?
+                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1090:59: '\\'' ( '\\'' )?
                             {
                             match('\''); 
-                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:64: ( '\\'' )?
+                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1090:64: ( '\\'' )?
                             int alt2=2;
                             int LA2_0 = input.LA(1);
 
@@ -511,7 +511,7 @@ public class InternalNLSDslLexer extends Lexer {
                             }
                             switch (alt2) {
                                 case 1 :
-                                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:64: '\\''
+                                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1090:64: '\\''
                                     {
                                     match('\''); 
 
@@ -549,12 +549,12 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_RICH_TEXT_START;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:22: ( '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB' )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:24: '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB'
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1092:22: ( '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB' )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1092:24: '\\'\\'\\'' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB'
             {
             match("'''"); 
 
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:33: ( RULE_IN_RICH_STRING )*
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1092:33: ( RULE_IN_RICH_STRING )*
             loop5:
             do {
                 int alt5=2;
@@ -585,7 +585,7 @@ public class InternalNLSDslLexer extends Lexer {
 
                 switch (alt5) {
             	case 1 :
-            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:33: RULE_IN_RICH_STRING
+            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1092:33: RULE_IN_RICH_STRING
             	    {
             	    mRULE_IN_RICH_STRING(); 
 
@@ -597,7 +597,7 @@ public class InternalNLSDslLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:54: ( '\\'' ( '\\'' )? )?
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1092:54: ( '\\'' ( '\\'' )? )?
             int alt7=2;
             int LA7_0 = input.LA(1);
 
@@ -606,10 +606,10 @@ public class InternalNLSDslLexer extends Lexer {
             }
             switch (alt7) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:55: '\\'' ( '\\'' )?
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1092:55: '\\'' ( '\\'' )?
                     {
                     match('\''); 
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:60: ( '\\'' )?
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1092:60: ( '\\'' )?
                     int alt6=2;
                     int LA6_0 = input.LA(1);
 
@@ -618,7 +618,7 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     switch (alt6) {
                         case 1 :
-                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:60: '\\''
+                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1092:60: '\\''
                             {
                             match('\''); 
 
@@ -650,11 +650,11 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_RICH_TEXT_END;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:20: ( '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:22: '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:20: ( '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:22: '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF )
             {
             match('\u00BB'); 
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:31: ( RULE_IN_RICH_STRING )*
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:31: ( RULE_IN_RICH_STRING )*
             loop8:
             do {
                 int alt8=2;
@@ -685,7 +685,7 @@ public class InternalNLSDslLexer extends Lexer {
 
                 switch (alt8) {
             	case 1 :
-            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:31: RULE_IN_RICH_STRING
+            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:31: RULE_IN_RICH_STRING
             	    {
             	    mRULE_IN_RICH_STRING(); 
 
@@ -697,7 +697,7 @@ public class InternalNLSDslLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:52: ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:52: ( '\\'\\'\\'' | ( '\\'' ( '\\'' )? )? EOF )
             int alt11=2;
             int LA11_0 = input.LA(1);
 
@@ -720,7 +720,7 @@ public class InternalNLSDslLexer extends Lexer {
                 alt11=2;}
             switch (alt11) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:53: '\\'\\'\\''
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:53: '\\'\\'\\''
                     {
                     match("'''"); 
 
@@ -728,9 +728,9 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:62: ( '\\'' ( '\\'' )? )? EOF
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:62: ( '\\'' ( '\\'' )? )? EOF
                     {
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:62: ( '\\'' ( '\\'' )? )?
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:62: ( '\\'' ( '\\'' )? )?
                     int alt10=2;
                     int LA10_0 = input.LA(1);
 
@@ -739,10 +739,10 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     switch (alt10) {
                         case 1 :
-                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:63: '\\'' ( '\\'' )?
+                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:63: '\\'' ( '\\'' )?
                             {
                             match('\''); 
-                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:68: ( '\\'' )?
+                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:68: ( '\\'' )?
                             int alt9=2;
                             int LA9_0 = input.LA(1);
 
@@ -751,7 +751,7 @@ public class InternalNLSDslLexer extends Lexer {
                             }
                             switch (alt9) {
                                 case 1 :
-                                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:68: '\\''
+                                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1094:68: '\\''
                                     {
                                     match('\''); 
 
@@ -789,11 +789,11 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_RICH_TEXT_INBETWEEN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:26: ( '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB' )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:28: '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB'
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:26: ( '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB' )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:28: '\\u00BB' ( RULE_IN_RICH_STRING )* ( '\\'' ( '\\'' )? )? '\\u00AB'
             {
             match('\u00BB'); 
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:37: ( RULE_IN_RICH_STRING )*
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:37: ( RULE_IN_RICH_STRING )*
             loop12:
             do {
                 int alt12=2;
@@ -824,7 +824,7 @@ public class InternalNLSDslLexer extends Lexer {
 
                 switch (alt12) {
             	case 1 :
-            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:37: RULE_IN_RICH_STRING
+            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:37: RULE_IN_RICH_STRING
             	    {
             	    mRULE_IN_RICH_STRING(); 
 
@@ -836,7 +836,7 @@ public class InternalNLSDslLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:58: ( '\\'' ( '\\'' )? )?
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:58: ( '\\'' ( '\\'' )? )?
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -845,10 +845,10 @@ public class InternalNLSDslLexer extends Lexer {
             }
             switch (alt14) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:59: '\\'' ( '\\'' )?
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:59: '\\'' ( '\\'' )?
                     {
                     match('\''); 
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:64: ( '\\'' )?
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:64: ( '\\'' )?
                     int alt13=2;
                     int LA13_0 = input.LA(1);
 
@@ -857,7 +857,7 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     switch (alt13) {
                         case 1 :
-                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:64: '\\''
+                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1096:64: '\\''
                             {
                             match('\''); 
 
@@ -887,10 +887,10 @@ public class InternalNLSDslLexer extends Lexer {
     // $ANTLR start "RULE_IN_RICH_STRING"
     public final void mRULE_IN_RICH_STRING() throws RecognitionException {
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:30: ( ( '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | ~ ( ( '\\u00AB' | '\\'' ) ) ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:32: ( '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | ~ ( ( '\\u00AB' | '\\'' ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:30: ( ( '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | ~ ( ( '\\u00AB' | '\\'' ) ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:32: ( '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | ~ ( ( '\\u00AB' | '\\'' ) ) )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:32: ( '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | ~ ( ( '\\u00AB' | '\\'' ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:32: ( '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | '\\'' ~ ( ( '\\u00AB' | '\\'' ) ) | ~ ( ( '\\u00AB' | '\\'' ) ) )
             int alt15=3;
             int LA15_0 = input.LA(1);
 
@@ -921,7 +921,7 @@ public class InternalNLSDslLexer extends Lexer {
             }
             switch (alt15) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:33: '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:33: '\\'\\'' ~ ( ( '\\u00AB' | '\\'' ) )
                     {
                     match("''"); 
 
@@ -938,7 +938,7 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:59: '\\'' ~ ( ( '\\u00AB' | '\\'' ) )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:59: '\\'' ~ ( ( '\\u00AB' | '\\'' ) )
                     {
                     match('\''); 
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='\u00AA')||(input.LA(1)>='\u00AC' && input.LA(1)<='\uFFFF') ) {
@@ -954,7 +954,7 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:83: ~ ( ( '\\u00AB' | '\\'' ) )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1098:83: ~ ( ( '\\u00AB' | '\\'' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='\u00AA')||(input.LA(1)>='\u00AC' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -985,10 +985,10 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:11: ( '^' )?
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:11: ( '^' )?
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -997,7 +997,7 @@ public class InternalNLSDslLexer extends Lexer {
             }
             switch (alt16) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:11: '^'
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:11: '^'
                     {
                     match('^'); 
 
@@ -1015,7 +1015,7 @@ public class InternalNLSDslLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1100:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop17:
             do {
                 int alt17=2;
@@ -1064,10 +1064,10 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:10: ( ( '0' .. '9' )+ )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:12: ( '0' .. '9' )+
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:10: ( ( '0' .. '9' )+ )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:12: ( '0' .. '9' )+
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:12: ( '0' .. '9' )+
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:12: ( '0' .. '9' )+
             int cnt18=0;
             loop18:
             do {
@@ -1081,7 +1081,7 @@ public class InternalNLSDslLexer extends Lexer {
 
                 switch (alt18) {
             	case 1 :
-            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:13: '0' .. '9'
+            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1102:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1113,10 +1113,10 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt21=2;
             int LA21_0 = input.LA(1);
 
@@ -1134,10 +1134,10 @@ public class InternalNLSDslLexer extends Lexer {
             }
             switch (alt21) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop19:
                     do {
                         int alt19=3;
@@ -1153,7 +1153,7 @@ public class InternalNLSDslLexer extends Lexer {
 
                         switch (alt19) {
                     	case 1 :
-                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:21: '\\\\' .
+                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1161,7 +1161,7 @@ public class InternalNLSDslLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1186,10 +1186,10 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop20:
                     do {
                         int alt20=3;
@@ -1205,7 +1205,7 @@ public class InternalNLSDslLexer extends Lexer {
 
                         switch (alt20) {
                     	case 1 :
-                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:54: '\\\\' .
+                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1213,7 +1213,7 @@ public class InternalNLSDslLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1104:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1256,12 +1256,12 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1110:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1110:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1110:24: ( options {greedy=false; } : . )*
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:24: ( options {greedy=false; } : . )*
             loop22:
             do {
                 int alt22=2;
@@ -1286,7 +1286,7 @@ public class InternalNLSDslLexer extends Lexer {
 
                 switch (alt22) {
             	case 1 :
-            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1110:52: .
+            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1106:52: .
             	    {
             	    matchAny(); 
 
@@ -1316,12 +1316,12 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1112:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1112:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1112:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop23:
             do {
                 int alt23=2;
@@ -1334,7 +1334,7 @@ public class InternalNLSDslLexer extends Lexer {
 
                 switch (alt23) {
             	case 1 :
-            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1112:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -1354,7 +1354,7 @@ public class InternalNLSDslLexer extends Lexer {
                 }
             } while (true);
 
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1112:40: ( ( '\\r' )? '\\n' )?
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:40: ( ( '\\r' )? '\\n' )?
             int alt25=2;
             int LA25_0 = input.LA(1);
 
@@ -1363,9 +1363,9 @@ public class InternalNLSDslLexer extends Lexer {
             }
             switch (alt25) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1112:41: ( '\\r' )? '\\n'
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:41: ( '\\r' )? '\\n'
                     {
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1112:41: ( '\\r' )?
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:41: ( '\\r' )?
                     int alt24=2;
                     int LA24_0 = input.LA(1);
 
@@ -1374,7 +1374,7 @@ public class InternalNLSDslLexer extends Lexer {
                     }
                     switch (alt24) {
                         case 1 :
-                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1112:41: '\\r'
+                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1108:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1406,10 +1406,10 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1114:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1114:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1110:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1110:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1114:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1110:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt26=0;
             loop26:
             do {
@@ -1463,8 +1463,8 @@ public class InternalNLSDslLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1116:16: ( . )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1116:18: .
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1112:16: ( . )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1112:18: .
             {
             matchAny(); 
 
@@ -1699,7 +1699,7 @@ public class InternalNLSDslLexer extends Lexer {
     static final String DFA27_specialS =
         "\1\3\21\uffff\1\6\1\7\3\uffff\1\5\27\uffff\1\1\1\16\16\uffff\1\12\1\0\1\15\10\uffff\1\2\1\13\2\uffff\1\14\7\uffff\1\4\1\11\6\uffff\1\10\15\uffff}>";
     static final String[] DFA27_transitionS = {
-            "\11\32\2\31\2\32\1\31\22\32\1\31\1\32\1\27\4\32\1\22\1\7\1\11\2\32\1\10\1\32\1\15\1\30\12\26\1\12\6\32\1\16\2\25\1\20\11\25\1\17\5\25\1\21\6\25\1\13\1\32\1\14\1\24\1\25\1\32\1\25\1\4\1\25\1\5\1\25\1\6\11\25\1\3\12\25\1\1\1\32\1\2\75\32\1\23\uff44\32",
+            "\11\32\2\31\2\32\1\31\22\32\1\31\1\32\1\27\4\32\1\22\1\7\1\11\2\32\1\10\1\32\1\15\1\30\12\26\1\14\6\32\1\16\2\25\1\20\11\25\1\17\5\25\1\21\6\25\1\12\1\32\1\13\1\24\1\25\1\32\1\25\1\4\1\25\1\5\1\25\1\6\11\25\1\3\12\25\1\1\1\32\1\2\75\32\1\23\uff44\32",
             "",
             "",
             "\1\35",
@@ -1907,11 +1907,11 @@ public class InternalNLSDslLexer extends Lexer {
 
                         else if ( (LA27_0==')') ) {s = 9;}
 
-                        else if ( (LA27_0==':') ) {s = 10;}
+                        else if ( (LA27_0=='[') ) {s = 10;}
 
-                        else if ( (LA27_0=='[') ) {s = 11;}
+                        else if ( (LA27_0==']') ) {s = 11;}
 
-                        else if ( (LA27_0==']') ) {s = 12;}
+                        else if ( (LA27_0==':') ) {s = 12;}
 
                         else if ( (LA27_0=='.') ) {s = 13;}
 
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDslParser.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDslParser.java
index b74ddba04..6901457ea 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDslParser.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDslParser.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
 @SuppressWarnings("all")
 public class InternalNLSDslParser extends AbstractInternalAntlrParser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_RICH_TEXT", "RULE_RICH_TEXT_START", "RULE_RICH_TEXT_END", "RULE_RICH_TEXT_INBETWEEN", "RULE_STRING", "RULE_IN_RICH_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'{'", "'}'", "'package'", "'bundle'", "'default'", "'formatter'", "'('", "','", "')'", "':'", "'['", "']'", "'.'", "'ANY'", "'NUMBER'", "'DATE'", "'TEMPORAL'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_RICH_TEXT", "RULE_RICH_TEXT_START", "RULE_RICH_TEXT_END", "RULE_RICH_TEXT_INBETWEEN", "RULE_STRING", "RULE_IN_RICH_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'{'", "'}'", "'package'", "'bundle'", "'default'", "'formatter'", "'('", "','", "')'", "'['", "']'", "':'", "'.'", "'ANY'", "'NUMBER'", "'DATE'", "'TEMPORAL'"
     };
     public static final int RULE_STRING=9;
     public static final int RULE_SL_COMMENT=13;
@@ -891,7 +891,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleMessageEntry"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:355:1: ruleMessageEntry returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '(' ( (lv_paramList_2_0= ruleMessageParam ) ) (otherlv_3= ',' ( (lv_paramList_4_0= ruleMessageParam ) ) )* otherlv_5= ')' )? otherlv_6= ':' ( (otherlv_7= '{' ( (lv_messageList_8_0= ruleMessage ) ) (otherlv_9= ',' ( (lv_messageList_10_0= ruleMessage ) ) )* otherlv_11= '}' ) | (otherlv_12= '[' ( ( ruleQualifiedName ) ) otherlv_14= ']' ) ) ) ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:355:1: ruleMessageEntry returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '(' ( (lv_paramList_2_0= ruleMessageParam ) ) (otherlv_3= ',' ( (lv_paramList_4_0= ruleMessageParam ) ) )* otherlv_5= ')' )? ( (otherlv_6= '{' ( (lv_messageList_7_0= ruleMessage ) ) (otherlv_8= ',' ( (lv_messageList_9_0= ruleMessage ) ) )* otherlv_10= '}' ) | (otherlv_11= '[' ( ( ruleQualifiedName ) ) otherlv_13= ']' ) ) ) ;
     public final EObject ruleMessageEntry() throws RecognitionException {
         EObject current = null;
 
@@ -900,28 +900,27 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
         Token otherlv_3=null;
         Token otherlv_5=null;
         Token otherlv_6=null;
-        Token otherlv_7=null;
-        Token otherlv_9=null;
+        Token otherlv_8=null;
+        Token otherlv_10=null;
         Token otherlv_11=null;
-        Token otherlv_12=null;
-        Token otherlv_14=null;
+        Token otherlv_13=null;
         EObject lv_paramList_2_0 = null;
 
         EObject lv_paramList_4_0 = null;
 
-        EObject lv_messageList_8_0 = null;
+        EObject lv_messageList_7_0 = null;
 
-        EObject lv_messageList_10_0 = null;
+        EObject lv_messageList_9_0 = null;
 
 
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:358:28: ( ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '(' ( (lv_paramList_2_0= ruleMessageParam ) ) (otherlv_3= ',' ( (lv_paramList_4_0= ruleMessageParam ) ) )* otherlv_5= ')' )? otherlv_6= ':' ( (otherlv_7= '{' ( (lv_messageList_8_0= ruleMessage ) ) (otherlv_9= ',' ( (lv_messageList_10_0= ruleMessage ) ) )* otherlv_11= '}' ) | (otherlv_12= '[' ( ( ruleQualifiedName ) ) otherlv_14= ']' ) ) ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:359:1: ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '(' ( (lv_paramList_2_0= ruleMessageParam ) ) (otherlv_3= ',' ( (lv_paramList_4_0= ruleMessageParam ) ) )* otherlv_5= ')' )? otherlv_6= ':' ( (otherlv_7= '{' ( (lv_messageList_8_0= ruleMessage ) ) (otherlv_9= ',' ( (lv_messageList_10_0= ruleMessage ) ) )* otherlv_11= '}' ) | (otherlv_12= '[' ( ( ruleQualifiedName ) ) otherlv_14= ']' ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:358:28: ( ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '(' ( (lv_paramList_2_0= ruleMessageParam ) ) (otherlv_3= ',' ( (lv_paramList_4_0= ruleMessageParam ) ) )* otherlv_5= ')' )? ( (otherlv_6= '{' ( (lv_messageList_7_0= ruleMessage ) ) (otherlv_8= ',' ( (lv_messageList_9_0= ruleMessage ) ) )* otherlv_10= '}' ) | (otherlv_11= '[' ( ( ruleQualifiedName ) ) otherlv_13= ']' ) ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:359:1: ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '(' ( (lv_paramList_2_0= ruleMessageParam ) ) (otherlv_3= ',' ( (lv_paramList_4_0= ruleMessageParam ) ) )* otherlv_5= ')' )? ( (otherlv_6= '{' ( (lv_messageList_7_0= ruleMessage ) ) (otherlv_8= ',' ( (lv_messageList_9_0= ruleMessage ) ) )* otherlv_10= '}' ) | (otherlv_11= '[' ( ( ruleQualifiedName ) ) otherlv_13= ']' ) ) )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:359:1: ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '(' ( (lv_paramList_2_0= ruleMessageParam ) ) (otherlv_3= ',' ( (lv_paramList_4_0= ruleMessageParam ) ) )* otherlv_5= ')' )? otherlv_6= ':' ( (otherlv_7= '{' ( (lv_messageList_8_0= ruleMessage ) ) (otherlv_9= ',' ( (lv_messageList_10_0= ruleMessage ) ) )* otherlv_11= '}' ) | (otherlv_12= '[' ( ( ruleQualifiedName ) ) otherlv_14= ']' ) ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:359:2: ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '(' ( (lv_paramList_2_0= ruleMessageParam ) ) (otherlv_3= ',' ( (lv_paramList_4_0= ruleMessageParam ) ) )* otherlv_5= ')' )? otherlv_6= ':' ( (otherlv_7= '{' ( (lv_messageList_8_0= ruleMessage ) ) (otherlv_9= ',' ( (lv_messageList_10_0= ruleMessage ) ) )* otherlv_11= '}' ) | (otherlv_12= '[' ( ( ruleQualifiedName ) ) otherlv_14= ']' ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:359:1: ( ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '(' ( (lv_paramList_2_0= ruleMessageParam ) ) (otherlv_3= ',' ( (lv_paramList_4_0= ruleMessageParam ) ) )* otherlv_5= ')' )? ( (otherlv_6= '{' ( (lv_messageList_7_0= ruleMessage ) ) (otherlv_8= ',' ( (lv_messageList_9_0= ruleMessage ) ) )* otherlv_10= '}' ) | (otherlv_11= '[' ( ( ruleQualifiedName ) ) otherlv_13= ']' ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:359:2: ( (lv_name_0_0= RULE_ID ) ) (otherlv_1= '(' ( (lv_paramList_2_0= ruleMessageParam ) ) (otherlv_3= ',' ( (lv_paramList_4_0= ruleMessageParam ) ) )* otherlv_5= ')' )? ( (otherlv_6= '{' ( (lv_messageList_7_0= ruleMessage ) ) (otherlv_8= ',' ( (lv_messageList_9_0= ruleMessage ) ) )* otherlv_10= '}' ) | (otherlv_11= '[' ( ( ruleQualifiedName ) ) otherlv_13= ']' ) )
             {
             // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:359:2: ( (lv_name_0_0= RULE_ID ) )
             // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:360:1: (lv_name_0_0= RULE_ID )
@@ -1082,20 +1081,14 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_6=(Token)match(input,25,FOLLOW_25_in_ruleMessageEntry804); if (state.failed) return current;
-            if ( state.backtracking==0 ) {
-
-                  	newLeafNode(otherlv_6, grammarAccess.getMessageEntryAccess().getColonKeyword_2());
-                  
-            }
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:429:1: ( (otherlv_7= '{' ( (lv_messageList_8_0= ruleMessage ) ) (otherlv_9= ',' ( (lv_messageList_10_0= ruleMessage ) ) )* otherlv_11= '}' ) | (otherlv_12= '[' ( ( ruleQualifiedName ) ) otherlv_14= ']' ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:425:3: ( (otherlv_6= '{' ( (lv_messageList_7_0= ruleMessage ) ) (otherlv_8= ',' ( (lv_messageList_9_0= ruleMessage ) ) )* otherlv_10= '}' ) | (otherlv_11= '[' ( ( ruleQualifiedName ) ) otherlv_13= ']' ) )
             int alt8=2;
             int LA8_0 = input.LA(1);
 
             if ( (LA8_0==16) ) {
                 alt8=1;
             }
-            else if ( (LA8_0==26) ) {
+            else if ( (LA8_0==25) ) {
                 alt8=2;
             }
             else {
@@ -1107,30 +1100,30 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
             }
             switch (alt8) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:429:2: (otherlv_7= '{' ( (lv_messageList_8_0= ruleMessage ) ) (otherlv_9= ',' ( (lv_messageList_10_0= ruleMessage ) ) )* otherlv_11= '}' )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:425:4: (otherlv_6= '{' ( (lv_messageList_7_0= ruleMessage ) ) (otherlv_8= ',' ( (lv_messageList_9_0= ruleMessage ) ) )* otherlv_10= '}' )
                     {
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:429:2: (otherlv_7= '{' ( (lv_messageList_8_0= ruleMessage ) ) (otherlv_9= ',' ( (lv_messageList_10_0= ruleMessage ) ) )* otherlv_11= '}' )
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:429:4: otherlv_7= '{' ( (lv_messageList_8_0= ruleMessage ) ) (otherlv_9= ',' ( (lv_messageList_10_0= ruleMessage ) ) )* otherlv_11= '}'
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:425:4: (otherlv_6= '{' ( (lv_messageList_7_0= ruleMessage ) ) (otherlv_8= ',' ( (lv_messageList_9_0= ruleMessage ) ) )* otherlv_10= '}' )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:425:6: otherlv_6= '{' ( (lv_messageList_7_0= ruleMessage ) ) (otherlv_8= ',' ( (lv_messageList_9_0= ruleMessage ) ) )* otherlv_10= '}'
                     {
-                    otherlv_7=(Token)match(input,16,FOLLOW_16_in_ruleMessageEntry818); if (state.failed) return current;
+                    otherlv_6=(Token)match(input,16,FOLLOW_16_in_ruleMessageEntry806); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                          	newLeafNode(otherlv_7, grammarAccess.getMessageEntryAccess().getLeftCurlyBracketKeyword_3_0_0());
+                          	newLeafNode(otherlv_6, grammarAccess.getMessageEntryAccess().getLeftCurlyBracketKeyword_2_0_0());
                           
                     }
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:433:1: ( (lv_messageList_8_0= ruleMessage ) )
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:434:1: (lv_messageList_8_0= ruleMessage )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:429:1: ( (lv_messageList_7_0= ruleMessage ) )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:430:1: (lv_messageList_7_0= ruleMessage )
                     {
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:434:1: (lv_messageList_8_0= ruleMessage )
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:435:3: lv_messageList_8_0= ruleMessage
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:430:1: (lv_messageList_7_0= ruleMessage )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:431:3: lv_messageList_7_0= ruleMessage
                     {
                     if ( state.backtracking==0 ) {
                        
-                      	        newCompositeNode(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_3_0_1_0()); 
+                      	        newCompositeNode(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_2_0_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleMessage_in_ruleMessageEntry839);
-                    lv_messageList_8_0=ruleMessage();
+                    pushFollow(FOLLOW_ruleMessage_in_ruleMessageEntry827);
+                    lv_messageList_7_0=ruleMessage();
 
                     state._fsp--;
                     if (state.failed) return current;
@@ -1142,7 +1135,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
                              		add(
                              			current, 
                              			"messageList",
-                              		lv_messageList_8_0, 
+                              		lv_messageList_7_0, 
                               		"Message");
                       	        afterParserOrEnumRuleCall();
                       	    
@@ -1153,7 +1146,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:451:2: (otherlv_9= ',' ( (lv_messageList_10_0= ruleMessage ) ) )*
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:447:2: (otherlv_8= ',' ( (lv_messageList_9_0= ruleMessage ) ) )*
                     loop7:
                     do {
                         int alt7=2;
@@ -1166,27 +1159,27 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
                         switch (alt7) {
                     	case 1 :
-                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:451:4: otherlv_9= ',' ( (lv_messageList_10_0= ruleMessage ) )
+                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:447:4: otherlv_8= ',' ( (lv_messageList_9_0= ruleMessage ) )
                     	    {
-                    	    otherlv_9=(Token)match(input,23,FOLLOW_23_in_ruleMessageEntry852); if (state.failed) return current;
+                    	    otherlv_8=(Token)match(input,23,FOLLOW_23_in_ruleMessageEntry840); if (state.failed) return current;
                     	    if ( state.backtracking==0 ) {
 
-                    	          	newLeafNode(otherlv_9, grammarAccess.getMessageEntryAccess().getCommaKeyword_3_0_2_0());
+                    	          	newLeafNode(otherlv_8, grammarAccess.getMessageEntryAccess().getCommaKeyword_2_0_2_0());
                     	          
                     	    }
-                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:455:1: ( (lv_messageList_10_0= ruleMessage ) )
-                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:456:1: (lv_messageList_10_0= ruleMessage )
+                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:451:1: ( (lv_messageList_9_0= ruleMessage ) )
+                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:452:1: (lv_messageList_9_0= ruleMessage )
                     	    {
-                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:456:1: (lv_messageList_10_0= ruleMessage )
-                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:457:3: lv_messageList_10_0= ruleMessage
+                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:452:1: (lv_messageList_9_0= ruleMessage )
+                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:453:3: lv_messageList_9_0= ruleMessage
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
-                    	      	        newCompositeNode(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_3_0_2_1_0()); 
+                    	      	        newCompositeNode(grammarAccess.getMessageEntryAccess().getMessageListMessageParserRuleCall_2_0_2_1_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleMessage_in_ruleMessageEntry873);
-                    	    lv_messageList_10_0=ruleMessage();
+                    	    pushFollow(FOLLOW_ruleMessage_in_ruleMessageEntry861);
+                    	    lv_messageList_9_0=ruleMessage();
 
                     	    state._fsp--;
                     	    if (state.failed) return current;
@@ -1198,7 +1191,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
                     	             		add(
                     	             			current, 
                     	             			"messageList",
-                    	              		lv_messageList_10_0, 
+                    	              		lv_messageList_9_0, 
                     	              		"Message");
                     	      	        afterParserOrEnumRuleCall();
                     	      	    
@@ -1218,10 +1211,10 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
                         }
                     } while (true);
 
-                    otherlv_11=(Token)match(input,17,FOLLOW_17_in_ruleMessageEntry887); if (state.failed) return current;
+                    otherlv_10=(Token)match(input,17,FOLLOW_17_in_ruleMessageEntry875); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                          	newLeafNode(otherlv_11, grammarAccess.getMessageEntryAccess().getRightCurlyBracketKeyword_3_0_3());
+                          	newLeafNode(otherlv_10, grammarAccess.getMessageEntryAccess().getRightCurlyBracketKeyword_2_0_3());
                           
                     }
 
@@ -1231,22 +1224,22 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:478:6: (otherlv_12= '[' ( ( ruleQualifiedName ) ) otherlv_14= ']' )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:474:6: (otherlv_11= '[' ( ( ruleQualifiedName ) ) otherlv_13= ']' )
                     {
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:478:6: (otherlv_12= '[' ( ( ruleQualifiedName ) ) otherlv_14= ']' )
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:478:8: otherlv_12= '[' ( ( ruleQualifiedName ) ) otherlv_14= ']'
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:474:6: (otherlv_11= '[' ( ( ruleQualifiedName ) ) otherlv_13= ']' )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:474:8: otherlv_11= '[' ( ( ruleQualifiedName ) ) otherlv_13= ']'
                     {
-                    otherlv_12=(Token)match(input,26,FOLLOW_26_in_ruleMessageEntry907); if (state.failed) return current;
+                    otherlv_11=(Token)match(input,25,FOLLOW_25_in_ruleMessageEntry895); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                          	newLeafNode(otherlv_12, grammarAccess.getMessageEntryAccess().getLeftSquareBracketKeyword_3_1_0());
+                          	newLeafNode(otherlv_11, grammarAccess.getMessageEntryAccess().getLeftSquareBracketKeyword_2_1_0());
                           
                     }
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:482:1: ( ( ruleQualifiedName ) )
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:483:1: ( ruleQualifiedName )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:478:1: ( ( ruleQualifiedName ) )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:479:1: ( ruleQualifiedName )
                     {
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:483:1: ( ruleQualifiedName )
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:484:3: ruleQualifiedName
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:479:1: ( ruleQualifiedName )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:480:3: ruleQualifiedName
                     {
                     if ( state.backtracking==0 ) {
 
@@ -1257,10 +1250,10 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
                     }
                     if ( state.backtracking==0 ) {
                        
-                      	        newCompositeNode(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryCrossReference_3_1_1_0()); 
+                      	        newCompositeNode(grammarAccess.getMessageEntryAccess().getEntryRefMessageEntryCrossReference_2_1_1_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleQualifiedName_in_ruleMessageEntry930);
+                    pushFollow(FOLLOW_ruleQualifiedName_in_ruleMessageEntry918);
                     ruleQualifiedName();
 
                     state._fsp--;
@@ -1276,10 +1269,10 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_14=(Token)match(input,27,FOLLOW_27_in_ruleMessageEntry942); if (state.failed) return current;
+                    otherlv_13=(Token)match(input,26,FOLLOW_26_in_ruleMessageEntry930); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
-                          	newLeafNode(otherlv_14, grammarAccess.getMessageEntryAccess().getRightSquareBracketKeyword_3_1_2());
+                          	newLeafNode(otherlv_13, grammarAccess.getMessageEntryAccess().getRightSquareBracketKeyword_2_1_2());
                           
                     }
 
@@ -1314,7 +1307,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleMessageParam"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:509:1: entryRuleMessageParam returns [EObject current=null] : iv_ruleMessageParam= ruleMessageParam EOF ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:505:1: entryRuleMessageParam returns [EObject current=null] : iv_ruleMessageParam= ruleMessageParam EOF ;
     public final EObject entryRuleMessageParam() throws RecognitionException {
         EObject current = null;
 
@@ -1322,13 +1315,13 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:510:2: (iv_ruleMessageParam= ruleMessageParam EOF )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:511:2: iv_ruleMessageParam= ruleMessageParam EOF
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:506:2: (iv_ruleMessageParam= ruleMessageParam EOF )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:507:2: iv_ruleMessageParam= ruleMessageParam EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getMessageParamRule()); 
             }
-            pushFollow(FOLLOW_ruleMessageParam_in_entryRuleMessageParam980);
+            pushFollow(FOLLOW_ruleMessageParam_in_entryRuleMessageParam968);
             iv_ruleMessageParam=ruleMessageParam();
 
             state._fsp--;
@@ -1336,7 +1329,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
             if ( state.backtracking==0 ) {
                current =iv_ruleMessageParam; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMessageParam990); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleMessageParam978); if (state.failed) return current;
 
             }
 
@@ -1354,7 +1347,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleMessageParam"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:518:1: ruleMessageParam returns [EObject current=null] : ( ( (lv_predefined_0_0= rulePredefinedTypes ) ) ( (lv_var_1_0= RULE_ID ) ) ) ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:514:1: ruleMessageParam returns [EObject current=null] : ( ( (lv_predefined_0_0= rulePredefinedTypes ) ) ( (lv_var_1_0= RULE_ID ) ) ) ;
     public final EObject ruleMessageParam() throws RecognitionException {
         EObject current = null;
 
@@ -1365,24 +1358,24 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:521:28: ( ( ( (lv_predefined_0_0= rulePredefinedTypes ) ) ( (lv_var_1_0= RULE_ID ) ) ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:522:1: ( ( (lv_predefined_0_0= rulePredefinedTypes ) ) ( (lv_var_1_0= RULE_ID ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:517:28: ( ( ( (lv_predefined_0_0= rulePredefinedTypes ) ) ( (lv_var_1_0= RULE_ID ) ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:518:1: ( ( (lv_predefined_0_0= rulePredefinedTypes ) ) ( (lv_var_1_0= RULE_ID ) ) )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:522:1: ( ( (lv_predefined_0_0= rulePredefinedTypes ) ) ( (lv_var_1_0= RULE_ID ) ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:522:2: ( (lv_predefined_0_0= rulePredefinedTypes ) ) ( (lv_var_1_0= RULE_ID ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:518:1: ( ( (lv_predefined_0_0= rulePredefinedTypes ) ) ( (lv_var_1_0= RULE_ID ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:518:2: ( (lv_predefined_0_0= rulePredefinedTypes ) ) ( (lv_var_1_0= RULE_ID ) )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:522:2: ( (lv_predefined_0_0= rulePredefinedTypes ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:523:1: (lv_predefined_0_0= rulePredefinedTypes )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:518:2: ( (lv_predefined_0_0= rulePredefinedTypes ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:519:1: (lv_predefined_0_0= rulePredefinedTypes )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:523:1: (lv_predefined_0_0= rulePredefinedTypes )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:524:3: lv_predefined_0_0= rulePredefinedTypes
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:519:1: (lv_predefined_0_0= rulePredefinedTypes )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:520:3: lv_predefined_0_0= rulePredefinedTypes
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getMessageParamAccess().getPredefinedPredefinedTypesEnumRuleCall_0_0()); 
               	    
             }
-            pushFollow(FOLLOW_rulePredefinedTypes_in_ruleMessageParam1036);
+            pushFollow(FOLLOW_rulePredefinedTypes_in_ruleMessageParam1024);
             lv_predefined_0_0=rulePredefinedTypes();
 
             state._fsp--;
@@ -1406,13 +1399,13 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:540:2: ( (lv_var_1_0= RULE_ID ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:541:1: (lv_var_1_0= RULE_ID )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:536:2: ( (lv_var_1_0= RULE_ID ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:537:1: (lv_var_1_0= RULE_ID )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:541:1: (lv_var_1_0= RULE_ID )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:542:3: lv_var_1_0= RULE_ID
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:537:1: (lv_var_1_0= RULE_ID )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:538:3: lv_var_1_0= RULE_ID
             {
-            lv_var_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleMessageParam1053); if (state.failed) return current;
+            lv_var_1_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleMessageParam1041); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_var_1_0, grammarAccess.getMessageParamAccess().getVarIDTerminalRuleCall_1_0()); 
@@ -1459,7 +1452,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleMessage"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:566:1: entryRuleMessage returns [EObject current=null] : iv_ruleMessage= ruleMessage EOF ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:562:1: entryRuleMessage returns [EObject current=null] : iv_ruleMessage= ruleMessage EOF ;
     public final EObject entryRuleMessage() throws RecognitionException {
         EObject current = null;
 
@@ -1467,13 +1460,13 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:567:2: (iv_ruleMessage= ruleMessage EOF )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:568:2: iv_ruleMessage= ruleMessage EOF
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:563:2: (iv_ruleMessage= ruleMessage EOF )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:564:2: iv_ruleMessage= ruleMessage EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getMessageRule()); 
             }
-            pushFollow(FOLLOW_ruleMessage_in_entryRuleMessage1094);
+            pushFollow(FOLLOW_ruleMessage_in_entryRuleMessage1082);
             iv_ruleMessage=ruleMessage();
 
             state._fsp--;
@@ -1481,7 +1474,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
             if ( state.backtracking==0 ) {
                current =iv_ruleMessage; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleMessage1104); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleMessage1092); if (state.failed) return current;
 
             }
 
@@ -1499,7 +1492,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleMessage"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:575:1: ruleMessage returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_message_2_0= ruleRichString ) ) ) ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:571:1: ruleMessage returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_message_2_0= ruleRichString ) ) ) ;
     public final EObject ruleMessage() throws RecognitionException {
         EObject current = null;
 
@@ -1511,19 +1504,19 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:578:28: ( ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_message_2_0= ruleRichString ) ) ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:579:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_message_2_0= ruleRichString ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:574:28: ( ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_message_2_0= ruleRichString ) ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:575:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_message_2_0= ruleRichString ) ) )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:579:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_message_2_0= ruleRichString ) ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:579:2: ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_message_2_0= ruleRichString ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:575:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_message_2_0= ruleRichString ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:575:2: ( (lv_name_0_0= RULE_ID ) ) otherlv_1= ':' ( (lv_message_2_0= ruleRichString ) )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:579:2: ( (lv_name_0_0= RULE_ID ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:580:1: (lv_name_0_0= RULE_ID )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:575:2: ( (lv_name_0_0= RULE_ID ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:576:1: (lv_name_0_0= RULE_ID )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:580:1: (lv_name_0_0= RULE_ID )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:581:3: lv_name_0_0= RULE_ID
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:576:1: (lv_name_0_0= RULE_ID )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:577:3: lv_name_0_0= RULE_ID
             {
-            lv_name_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleMessage1146); if (state.failed) return current;
+            lv_name_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleMessage1134); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_name_0_0, grammarAccess.getMessageAccess().getNameIDTerminalRuleCall_0_0()); 
@@ -1547,24 +1540,24 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,25,FOLLOW_25_in_ruleMessage1163); if (state.failed) return current;
+            otherlv_1=(Token)match(input,27,FOLLOW_27_in_ruleMessage1151); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
                   	newLeafNode(otherlv_1, grammarAccess.getMessageAccess().getColonKeyword_1());
                   
             }
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:601:1: ( (lv_message_2_0= ruleRichString ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:602:1: (lv_message_2_0= ruleRichString )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:597:1: ( (lv_message_2_0= ruleRichString ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:598:1: (lv_message_2_0= ruleRichString )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:602:1: (lv_message_2_0= ruleRichString )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:603:3: lv_message_2_0= ruleRichString
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:598:1: (lv_message_2_0= ruleRichString )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:599:3: lv_message_2_0= ruleRichString
             {
             if ( state.backtracking==0 ) {
                
               	        newCompositeNode(grammarAccess.getMessageAccess().getMessageRichStringParserRuleCall_2_0()); 
               	    
             }
-            pushFollow(FOLLOW_ruleRichString_in_ruleMessage1184);
+            pushFollow(FOLLOW_ruleRichString_in_ruleMessage1172);
             lv_message_2_0=ruleRichString();
 
             state._fsp--;
@@ -1611,7 +1604,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRichString"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:627:1: entryRuleRichString returns [EObject current=null] : iv_ruleRichString= ruleRichString EOF ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:623:1: entryRuleRichString returns [EObject current=null] : iv_ruleRichString= ruleRichString EOF ;
     public final EObject entryRuleRichString() throws RecognitionException {
         EObject current = null;
 
@@ -1619,13 +1612,13 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:628:2: (iv_ruleRichString= ruleRichString EOF )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:629:2: iv_ruleRichString= ruleRichString EOF
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:624:2: (iv_ruleRichString= ruleRichString EOF )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:625:2: iv_ruleRichString= ruleRichString EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getRichStringRule()); 
             }
-            pushFollow(FOLLOW_ruleRichString_in_entryRuleRichString1220);
+            pushFollow(FOLLOW_ruleRichString_in_entryRuleRichString1208);
             iv_ruleRichString=ruleRichString();
 
             state._fsp--;
@@ -1633,7 +1626,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
             if ( state.backtracking==0 ) {
                current =iv_ruleRichString; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRichString1230); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleRichString1218); if (state.failed) return current;
 
             }
 
@@ -1651,7 +1644,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRichString"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:636:1: ruleRichString returns [EObject current=null] : ( ( (lv_expressions_0_0= ruleRichStringLiteral ) ) | ( ( (lv_expressions_1_0= ruleRichStringLiteralStart ) ) ( (lv_expressions_2_0= ruleRichVarPart ) )? ( ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) ) ( (lv_expressions_4_0= ruleRichVarPart ) )? )* ( (lv_expressions_5_0= ruleRichStringLiteralEnd ) ) ) ) ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:632:1: ruleRichString returns [EObject current=null] : ( ( (lv_expressions_0_0= ruleRichStringLiteral ) ) | ( ( (lv_expressions_1_0= ruleRichStringLiteralStart ) ) ( (lv_expressions_2_0= ruleRichVarPart ) )? ( ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) ) ( (lv_expressions_4_0= ruleRichVarPart ) )? )* ( (lv_expressions_5_0= ruleRichStringLiteralEnd ) ) ) ) ;
     public final EObject ruleRichString() throws RecognitionException {
         EObject current = null;
 
@@ -1671,10 +1664,10 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:639:28: ( ( ( (lv_expressions_0_0= ruleRichStringLiteral ) ) | ( ( (lv_expressions_1_0= ruleRichStringLiteralStart ) ) ( (lv_expressions_2_0= ruleRichVarPart ) )? ( ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) ) ( (lv_expressions_4_0= ruleRichVarPart ) )? )* ( (lv_expressions_5_0= ruleRichStringLiteralEnd ) ) ) ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:640:1: ( ( (lv_expressions_0_0= ruleRichStringLiteral ) ) | ( ( (lv_expressions_1_0= ruleRichStringLiteralStart ) ) ( (lv_expressions_2_0= ruleRichVarPart ) )? ( ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) ) ( (lv_expressions_4_0= ruleRichVarPart ) )? )* ( (lv_expressions_5_0= ruleRichStringLiteralEnd ) ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:635:28: ( ( ( (lv_expressions_0_0= ruleRichStringLiteral ) ) | ( ( (lv_expressions_1_0= ruleRichStringLiteralStart ) ) ( (lv_expressions_2_0= ruleRichVarPart ) )? ( ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) ) ( (lv_expressions_4_0= ruleRichVarPart ) )? )* ( (lv_expressions_5_0= ruleRichStringLiteralEnd ) ) ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:636:1: ( ( (lv_expressions_0_0= ruleRichStringLiteral ) ) | ( ( (lv_expressions_1_0= ruleRichStringLiteralStart ) ) ( (lv_expressions_2_0= ruleRichVarPart ) )? ( ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) ) ( (lv_expressions_4_0= ruleRichVarPart ) )? )* ( (lv_expressions_5_0= ruleRichStringLiteralEnd ) ) ) )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:640:1: ( ( (lv_expressions_0_0= ruleRichStringLiteral ) ) | ( ( (lv_expressions_1_0= ruleRichStringLiteralStart ) ) ( (lv_expressions_2_0= ruleRichVarPart ) )? ( ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) ) ( (lv_expressions_4_0= ruleRichVarPart ) )? )* ( (lv_expressions_5_0= ruleRichStringLiteralEnd ) ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:636:1: ( ( (lv_expressions_0_0= ruleRichStringLiteral ) ) | ( ( (lv_expressions_1_0= ruleRichStringLiteralStart ) ) ( (lv_expressions_2_0= ruleRichVarPart ) )? ( ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) ) ( (lv_expressions_4_0= ruleRichVarPart ) )? )* ( (lv_expressions_5_0= ruleRichStringLiteralEnd ) ) ) )
             int alt12=2;
             int LA12_0 = input.LA(1);
 
@@ -1693,20 +1686,20 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
             }
             switch (alt12) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:640:2: ( (lv_expressions_0_0= ruleRichStringLiteral ) )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:636:2: ( (lv_expressions_0_0= ruleRichStringLiteral ) )
                     {
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:640:2: ( (lv_expressions_0_0= ruleRichStringLiteral ) )
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:641:1: (lv_expressions_0_0= ruleRichStringLiteral )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:636:2: ( (lv_expressions_0_0= ruleRichStringLiteral ) )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:637:1: (lv_expressions_0_0= ruleRichStringLiteral )
                     {
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:641:1: (lv_expressions_0_0= ruleRichStringLiteral )
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:642:3: lv_expressions_0_0= ruleRichStringLiteral
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:637:1: (lv_expressions_0_0= ruleRichStringLiteral )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:638:3: lv_expressions_0_0= ruleRichStringLiteral
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getRichStringAccess().getExpressionsRichStringLiteralParserRuleCall_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleRichStringLiteral_in_ruleRichString1276);
+                    pushFollow(FOLLOW_ruleRichStringLiteral_in_ruleRichString1264);
                     lv_expressions_0_0=ruleRichStringLiteral();
 
                     state._fsp--;
@@ -1734,23 +1727,23 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:659:6: ( ( (lv_expressions_1_0= ruleRichStringLiteralStart ) ) ( (lv_expressions_2_0= ruleRichVarPart ) )? ( ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) ) ( (lv_expressions_4_0= ruleRichVarPart ) )? )* ( (lv_expressions_5_0= ruleRichStringLiteralEnd ) ) )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:655:6: ( ( (lv_expressions_1_0= ruleRichStringLiteralStart ) ) ( (lv_expressions_2_0= ruleRichVarPart ) )? ( ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) ) ( (lv_expressions_4_0= ruleRichVarPart ) )? )* ( (lv_expressions_5_0= ruleRichStringLiteralEnd ) ) )
                     {
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:659:6: ( ( (lv_expressions_1_0= ruleRichStringLiteralStart ) ) ( (lv_expressions_2_0= ruleRichVarPart ) )? ( ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) ) ( (lv_expressions_4_0= ruleRichVarPart ) )? )* ( (lv_expressions_5_0= ruleRichStringLiteralEnd ) ) )
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:659:7: ( (lv_expressions_1_0= ruleRichStringLiteralStart ) ) ( (lv_expressions_2_0= ruleRichVarPart ) )? ( ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) ) ( (lv_expressions_4_0= ruleRichVarPart ) )? )* ( (lv_expressions_5_0= ruleRichStringLiteralEnd ) )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:655:6: ( ( (lv_expressions_1_0= ruleRichStringLiteralStart ) ) ( (lv_expressions_2_0= ruleRichVarPart ) )? ( ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) ) ( (lv_expressions_4_0= ruleRichVarPart ) )? )* ( (lv_expressions_5_0= ruleRichStringLiteralEnd ) ) )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:655:7: ( (lv_expressions_1_0= ruleRichStringLiteralStart ) ) ( (lv_expressions_2_0= ruleRichVarPart ) )? ( ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) ) ( (lv_expressions_4_0= ruleRichVarPart ) )? )* ( (lv_expressions_5_0= ruleRichStringLiteralEnd ) )
                     {
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:659:7: ( (lv_expressions_1_0= ruleRichStringLiteralStart ) )
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:660:1: (lv_expressions_1_0= ruleRichStringLiteralStart )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:655:7: ( (lv_expressions_1_0= ruleRichStringLiteralStart ) )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:656:1: (lv_expressions_1_0= ruleRichStringLiteralStart )
                     {
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:660:1: (lv_expressions_1_0= ruleRichStringLiteralStart )
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:661:3: lv_expressions_1_0= ruleRichStringLiteralStart
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:656:1: (lv_expressions_1_0= ruleRichStringLiteralStart )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:657:3: lv_expressions_1_0= ruleRichStringLiteralStart
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getRichStringAccess().getExpressionsRichStringLiteralStartParserRuleCall_1_0_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleRichStringLiteralStart_in_ruleRichString1304);
+                    pushFollow(FOLLOW_ruleRichStringLiteralStart_in_ruleRichString1292);
                     lv_expressions_1_0=ruleRichStringLiteralStart();
 
                     state._fsp--;
@@ -1774,7 +1767,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:677:2: ( (lv_expressions_2_0= ruleRichVarPart ) )?
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:673:2: ( (lv_expressions_2_0= ruleRichVarPart ) )?
                     int alt9=2;
                     int LA9_0 = input.LA(1);
 
@@ -1783,17 +1776,17 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt9) {
                         case 1 :
-                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:678:1: (lv_expressions_2_0= ruleRichVarPart )
+                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:674:1: (lv_expressions_2_0= ruleRichVarPart )
                             {
-                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:678:1: (lv_expressions_2_0= ruleRichVarPart )
-                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:679:3: lv_expressions_2_0= ruleRichVarPart
+                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:674:1: (lv_expressions_2_0= ruleRichVarPart )
+                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:675:3: lv_expressions_2_0= ruleRichVarPart
                             {
                             if ( state.backtracking==0 ) {
                                
                               	        newCompositeNode(grammarAccess.getRichStringAccess().getExpressionsRichVarPartParserRuleCall_1_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleRichVarPart_in_ruleRichString1325);
+                            pushFollow(FOLLOW_ruleRichVarPart_in_ruleRichString1313);
                             lv_expressions_2_0=ruleRichVarPart();
 
                             state._fsp--;
@@ -1820,7 +1813,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:695:3: ( ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) ) ( (lv_expressions_4_0= ruleRichVarPart ) )? )*
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:691:3: ( ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) ) ( (lv_expressions_4_0= ruleRichVarPart ) )? )*
                     loop11:
                     do {
                         int alt11=2;
@@ -1833,20 +1826,20 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
                         switch (alt11) {
                     	case 1 :
-                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:695:4: ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) ) ( (lv_expressions_4_0= ruleRichVarPart ) )?
+                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:691:4: ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) ) ( (lv_expressions_4_0= ruleRichVarPart ) )?
                     	    {
-                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:695:4: ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) )
-                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:696:1: (lv_expressions_3_0= ruleRichStringLiteralInbetween )
+                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:691:4: ( (lv_expressions_3_0= ruleRichStringLiteralInbetween ) )
+                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:692:1: (lv_expressions_3_0= ruleRichStringLiteralInbetween )
                     	    {
-                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:696:1: (lv_expressions_3_0= ruleRichStringLiteralInbetween )
-                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:697:3: lv_expressions_3_0= ruleRichStringLiteralInbetween
+                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:692:1: (lv_expressions_3_0= ruleRichStringLiteralInbetween )
+                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:693:3: lv_expressions_3_0= ruleRichStringLiteralInbetween
                     	    {
                     	    if ( state.backtracking==0 ) {
                     	       
                     	      	        newCompositeNode(grammarAccess.getRichStringAccess().getExpressionsRichStringLiteralInbetweenParserRuleCall_1_2_0_0()); 
                     	      	    
                     	    }
-                    	    pushFollow(FOLLOW_ruleRichStringLiteralInbetween_in_ruleRichString1348);
+                    	    pushFollow(FOLLOW_ruleRichStringLiteralInbetween_in_ruleRichString1336);
                     	    lv_expressions_3_0=ruleRichStringLiteralInbetween();
 
                     	    state._fsp--;
@@ -1870,7 +1863,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
                     	    }
 
-                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:713:2: ( (lv_expressions_4_0= ruleRichVarPart ) )?
+                    	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:709:2: ( (lv_expressions_4_0= ruleRichVarPart ) )?
                     	    int alt10=2;
                     	    int LA10_0 = input.LA(1);
 
@@ -1879,17 +1872,17 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
                     	    }
                     	    switch (alt10) {
                     	        case 1 :
-                    	            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:714:1: (lv_expressions_4_0= ruleRichVarPart )
+                    	            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:710:1: (lv_expressions_4_0= ruleRichVarPart )
                     	            {
-                    	            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:714:1: (lv_expressions_4_0= ruleRichVarPart )
-                    	            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:715:3: lv_expressions_4_0= ruleRichVarPart
+                    	            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:710:1: (lv_expressions_4_0= ruleRichVarPart )
+                    	            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:711:3: lv_expressions_4_0= ruleRichVarPart
                     	            {
                     	            if ( state.backtracking==0 ) {
                     	               
                     	              	        newCompositeNode(grammarAccess.getRichStringAccess().getExpressionsRichVarPartParserRuleCall_1_2_1_0()); 
                     	              	    
                     	            }
-                    	            pushFollow(FOLLOW_ruleRichVarPart_in_ruleRichString1369);
+                    	            pushFollow(FOLLOW_ruleRichVarPart_in_ruleRichString1357);
                     	            lv_expressions_4_0=ruleRichVarPart();
 
                     	            state._fsp--;
@@ -1925,18 +1918,18 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
                         }
                     } while (true);
 
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:731:5: ( (lv_expressions_5_0= ruleRichStringLiteralEnd ) )
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:732:1: (lv_expressions_5_0= ruleRichStringLiteralEnd )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:727:5: ( (lv_expressions_5_0= ruleRichStringLiteralEnd ) )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:728:1: (lv_expressions_5_0= ruleRichStringLiteralEnd )
                     {
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:732:1: (lv_expressions_5_0= ruleRichStringLiteralEnd )
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:733:3: lv_expressions_5_0= ruleRichStringLiteralEnd
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:728:1: (lv_expressions_5_0= ruleRichStringLiteralEnd )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:729:3: lv_expressions_5_0= ruleRichStringLiteralEnd
                     {
                     if ( state.backtracking==0 ) {
                        
                       	        newCompositeNode(grammarAccess.getRichStringAccess().getExpressionsRichStringLiteralEndParserRuleCall_1_3_0()); 
                       	    
                     }
-                    pushFollow(FOLLOW_ruleRichStringLiteralEnd_in_ruleRichString1393);
+                    pushFollow(FOLLOW_ruleRichStringLiteralEnd_in_ruleRichString1381);
                     lv_expressions_5_0=ruleRichStringLiteralEnd();
 
                     state._fsp--;
@@ -1989,7 +1982,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRichStringLiteral"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:757:1: entryRuleRichStringLiteral returns [EObject current=null] : iv_ruleRichStringLiteral= ruleRichStringLiteral EOF ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:753:1: entryRuleRichStringLiteral returns [EObject current=null] : iv_ruleRichStringLiteral= ruleRichStringLiteral EOF ;
     public final EObject entryRuleRichStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1997,13 +1990,13 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:758:2: (iv_ruleRichStringLiteral= ruleRichStringLiteral EOF )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:759:2: iv_ruleRichStringLiteral= ruleRichStringLiteral EOF
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:754:2: (iv_ruleRichStringLiteral= ruleRichStringLiteral EOF )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:755:2: iv_ruleRichStringLiteral= ruleRichStringLiteral EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getRichStringLiteralRule()); 
             }
-            pushFollow(FOLLOW_ruleRichStringLiteral_in_entryRuleRichStringLiteral1430);
+            pushFollow(FOLLOW_ruleRichStringLiteral_in_entryRuleRichStringLiteral1418);
             iv_ruleRichStringLiteral=ruleRichStringLiteral();
 
             state._fsp--;
@@ -2011,7 +2004,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
             if ( state.backtracking==0 ) {
                current =iv_ruleRichStringLiteral; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRichStringLiteral1440); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleRichStringLiteral1428); if (state.failed) return current;
 
             }
 
@@ -2029,7 +2022,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRichStringLiteral"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:766:1: ruleRichStringLiteral returns [EObject current=null] : ( (lv_value_0_0= RULE_RICH_TEXT ) ) ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:762:1: ruleRichStringLiteral returns [EObject current=null] : ( (lv_value_0_0= RULE_RICH_TEXT ) ) ;
     public final EObject ruleRichStringLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2038,16 +2031,16 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:769:28: ( ( (lv_value_0_0= RULE_RICH_TEXT ) ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:770:1: ( (lv_value_0_0= RULE_RICH_TEXT ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:765:28: ( ( (lv_value_0_0= RULE_RICH_TEXT ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:766:1: ( (lv_value_0_0= RULE_RICH_TEXT ) )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:770:1: ( (lv_value_0_0= RULE_RICH_TEXT ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:771:1: (lv_value_0_0= RULE_RICH_TEXT )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:766:1: ( (lv_value_0_0= RULE_RICH_TEXT ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:767:1: (lv_value_0_0= RULE_RICH_TEXT )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:771:1: (lv_value_0_0= RULE_RICH_TEXT )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:772:3: lv_value_0_0= RULE_RICH_TEXT
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:767:1: (lv_value_0_0= RULE_RICH_TEXT )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:768:3: lv_value_0_0= RULE_RICH_TEXT
             {
-            lv_value_0_0=(Token)match(input,RULE_RICH_TEXT,FOLLOW_RULE_RICH_TEXT_in_ruleRichStringLiteral1481); if (state.failed) return current;
+            lv_value_0_0=(Token)match(input,RULE_RICH_TEXT,FOLLOW_RULE_RICH_TEXT_in_ruleRichStringLiteral1469); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_value_0_0, grammarAccess.getRichStringLiteralAccess().getValueRICH_TEXTTerminalRuleCall_0()); 
@@ -2091,7 +2084,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRichStringLiteralStart"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:796:1: entryRuleRichStringLiteralStart returns [EObject current=null] : iv_ruleRichStringLiteralStart= ruleRichStringLiteralStart EOF ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:792:1: entryRuleRichStringLiteralStart returns [EObject current=null] : iv_ruleRichStringLiteralStart= ruleRichStringLiteralStart EOF ;
     public final EObject entryRuleRichStringLiteralStart() throws RecognitionException {
         EObject current = null;
 
@@ -2099,13 +2092,13 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:797:2: (iv_ruleRichStringLiteralStart= ruleRichStringLiteralStart EOF )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:798:2: iv_ruleRichStringLiteralStart= ruleRichStringLiteralStart EOF
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:793:2: (iv_ruleRichStringLiteralStart= ruleRichStringLiteralStart EOF )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:794:2: iv_ruleRichStringLiteralStart= ruleRichStringLiteralStart EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getRichStringLiteralStartRule()); 
             }
-            pushFollow(FOLLOW_ruleRichStringLiteralStart_in_entryRuleRichStringLiteralStart1521);
+            pushFollow(FOLLOW_ruleRichStringLiteralStart_in_entryRuleRichStringLiteralStart1509);
             iv_ruleRichStringLiteralStart=ruleRichStringLiteralStart();
 
             state._fsp--;
@@ -2113,7 +2106,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
             if ( state.backtracking==0 ) {
                current =iv_ruleRichStringLiteralStart; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRichStringLiteralStart1531); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleRichStringLiteralStart1519); if (state.failed) return current;
 
             }
 
@@ -2131,7 +2124,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRichStringLiteralStart"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:805:1: ruleRichStringLiteralStart returns [EObject current=null] : ( (lv_value_0_0= RULE_RICH_TEXT_START ) ) ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:801:1: ruleRichStringLiteralStart returns [EObject current=null] : ( (lv_value_0_0= RULE_RICH_TEXT_START ) ) ;
     public final EObject ruleRichStringLiteralStart() throws RecognitionException {
         EObject current = null;
 
@@ -2140,16 +2133,16 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:808:28: ( ( (lv_value_0_0= RULE_RICH_TEXT_START ) ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:809:1: ( (lv_value_0_0= RULE_RICH_TEXT_START ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:804:28: ( ( (lv_value_0_0= RULE_RICH_TEXT_START ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:805:1: ( (lv_value_0_0= RULE_RICH_TEXT_START ) )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:809:1: ( (lv_value_0_0= RULE_RICH_TEXT_START ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:810:1: (lv_value_0_0= RULE_RICH_TEXT_START )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:805:1: ( (lv_value_0_0= RULE_RICH_TEXT_START ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:806:1: (lv_value_0_0= RULE_RICH_TEXT_START )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:810:1: (lv_value_0_0= RULE_RICH_TEXT_START )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:811:3: lv_value_0_0= RULE_RICH_TEXT_START
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:806:1: (lv_value_0_0= RULE_RICH_TEXT_START )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:807:3: lv_value_0_0= RULE_RICH_TEXT_START
             {
-            lv_value_0_0=(Token)match(input,RULE_RICH_TEXT_START,FOLLOW_RULE_RICH_TEXT_START_in_ruleRichStringLiteralStart1572); if (state.failed) return current;
+            lv_value_0_0=(Token)match(input,RULE_RICH_TEXT_START,FOLLOW_RULE_RICH_TEXT_START_in_ruleRichStringLiteralStart1560); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_value_0_0, grammarAccess.getRichStringLiteralStartAccess().getValueRICH_TEXT_STARTTerminalRuleCall_0()); 
@@ -2193,7 +2186,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRichStringLiteralEnd"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:835:1: entryRuleRichStringLiteralEnd returns [EObject current=null] : iv_ruleRichStringLiteralEnd= ruleRichStringLiteralEnd EOF ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:831:1: entryRuleRichStringLiteralEnd returns [EObject current=null] : iv_ruleRichStringLiteralEnd= ruleRichStringLiteralEnd EOF ;
     public final EObject entryRuleRichStringLiteralEnd() throws RecognitionException {
         EObject current = null;
 
@@ -2201,13 +2194,13 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:836:2: (iv_ruleRichStringLiteralEnd= ruleRichStringLiteralEnd EOF )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:837:2: iv_ruleRichStringLiteralEnd= ruleRichStringLiteralEnd EOF
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:832:2: (iv_ruleRichStringLiteralEnd= ruleRichStringLiteralEnd EOF )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:833:2: iv_ruleRichStringLiteralEnd= ruleRichStringLiteralEnd EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getRichStringLiteralEndRule()); 
             }
-            pushFollow(FOLLOW_ruleRichStringLiteralEnd_in_entryRuleRichStringLiteralEnd1612);
+            pushFollow(FOLLOW_ruleRichStringLiteralEnd_in_entryRuleRichStringLiteralEnd1600);
             iv_ruleRichStringLiteralEnd=ruleRichStringLiteralEnd();
 
             state._fsp--;
@@ -2215,7 +2208,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
             if ( state.backtracking==0 ) {
                current =iv_ruleRichStringLiteralEnd; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRichStringLiteralEnd1622); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleRichStringLiteralEnd1610); if (state.failed) return current;
 
             }
 
@@ -2233,7 +2226,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRichStringLiteralEnd"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:844:1: ruleRichStringLiteralEnd returns [EObject current=null] : ( (lv_value_0_0= RULE_RICH_TEXT_END ) ) ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:840:1: ruleRichStringLiteralEnd returns [EObject current=null] : ( (lv_value_0_0= RULE_RICH_TEXT_END ) ) ;
     public final EObject ruleRichStringLiteralEnd() throws RecognitionException {
         EObject current = null;
 
@@ -2242,16 +2235,16 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:847:28: ( ( (lv_value_0_0= RULE_RICH_TEXT_END ) ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:848:1: ( (lv_value_0_0= RULE_RICH_TEXT_END ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:843:28: ( ( (lv_value_0_0= RULE_RICH_TEXT_END ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:844:1: ( (lv_value_0_0= RULE_RICH_TEXT_END ) )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:848:1: ( (lv_value_0_0= RULE_RICH_TEXT_END ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:849:1: (lv_value_0_0= RULE_RICH_TEXT_END )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:844:1: ( (lv_value_0_0= RULE_RICH_TEXT_END ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:845:1: (lv_value_0_0= RULE_RICH_TEXT_END )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:849:1: (lv_value_0_0= RULE_RICH_TEXT_END )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:850:3: lv_value_0_0= RULE_RICH_TEXT_END
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:845:1: (lv_value_0_0= RULE_RICH_TEXT_END )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:846:3: lv_value_0_0= RULE_RICH_TEXT_END
             {
-            lv_value_0_0=(Token)match(input,RULE_RICH_TEXT_END,FOLLOW_RULE_RICH_TEXT_END_in_ruleRichStringLiteralEnd1663); if (state.failed) return current;
+            lv_value_0_0=(Token)match(input,RULE_RICH_TEXT_END,FOLLOW_RULE_RICH_TEXT_END_in_ruleRichStringLiteralEnd1651); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_value_0_0, grammarAccess.getRichStringLiteralEndAccess().getValueRICH_TEXT_ENDTerminalRuleCall_0()); 
@@ -2295,7 +2288,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRichStringLiteralInbetween"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:874:1: entryRuleRichStringLiteralInbetween returns [EObject current=null] : iv_ruleRichStringLiteralInbetween= ruleRichStringLiteralInbetween EOF ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:870:1: entryRuleRichStringLiteralInbetween returns [EObject current=null] : iv_ruleRichStringLiteralInbetween= ruleRichStringLiteralInbetween EOF ;
     public final EObject entryRuleRichStringLiteralInbetween() throws RecognitionException {
         EObject current = null;
 
@@ -2303,13 +2296,13 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:875:2: (iv_ruleRichStringLiteralInbetween= ruleRichStringLiteralInbetween EOF )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:876:2: iv_ruleRichStringLiteralInbetween= ruleRichStringLiteralInbetween EOF
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:871:2: (iv_ruleRichStringLiteralInbetween= ruleRichStringLiteralInbetween EOF )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:872:2: iv_ruleRichStringLiteralInbetween= ruleRichStringLiteralInbetween EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getRichStringLiteralInbetweenRule()); 
             }
-            pushFollow(FOLLOW_ruleRichStringLiteralInbetween_in_entryRuleRichStringLiteralInbetween1703);
+            pushFollow(FOLLOW_ruleRichStringLiteralInbetween_in_entryRuleRichStringLiteralInbetween1691);
             iv_ruleRichStringLiteralInbetween=ruleRichStringLiteralInbetween();
 
             state._fsp--;
@@ -2317,7 +2310,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
             if ( state.backtracking==0 ) {
                current =iv_ruleRichStringLiteralInbetween; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRichStringLiteralInbetween1713); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleRichStringLiteralInbetween1701); if (state.failed) return current;
 
             }
 
@@ -2335,7 +2328,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRichStringLiteralInbetween"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:883:1: ruleRichStringLiteralInbetween returns [EObject current=null] : ( (lv_value_0_0= RULE_RICH_TEXT_INBETWEEN ) ) ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:879:1: ruleRichStringLiteralInbetween returns [EObject current=null] : ( (lv_value_0_0= RULE_RICH_TEXT_INBETWEEN ) ) ;
     public final EObject ruleRichStringLiteralInbetween() throws RecognitionException {
         EObject current = null;
 
@@ -2344,16 +2337,16 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:886:28: ( ( (lv_value_0_0= RULE_RICH_TEXT_INBETWEEN ) ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:887:1: ( (lv_value_0_0= RULE_RICH_TEXT_INBETWEEN ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:882:28: ( ( (lv_value_0_0= RULE_RICH_TEXT_INBETWEEN ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:883:1: ( (lv_value_0_0= RULE_RICH_TEXT_INBETWEEN ) )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:887:1: ( (lv_value_0_0= RULE_RICH_TEXT_INBETWEEN ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:888:1: (lv_value_0_0= RULE_RICH_TEXT_INBETWEEN )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:883:1: ( (lv_value_0_0= RULE_RICH_TEXT_INBETWEEN ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:884:1: (lv_value_0_0= RULE_RICH_TEXT_INBETWEEN )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:888:1: (lv_value_0_0= RULE_RICH_TEXT_INBETWEEN )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:889:3: lv_value_0_0= RULE_RICH_TEXT_INBETWEEN
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:884:1: (lv_value_0_0= RULE_RICH_TEXT_INBETWEEN )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:885:3: lv_value_0_0= RULE_RICH_TEXT_INBETWEEN
             {
-            lv_value_0_0=(Token)match(input,RULE_RICH_TEXT_INBETWEEN,FOLLOW_RULE_RICH_TEXT_INBETWEEN_in_ruleRichStringLiteralInbetween1754); if (state.failed) return current;
+            lv_value_0_0=(Token)match(input,RULE_RICH_TEXT_INBETWEEN,FOLLOW_RULE_RICH_TEXT_INBETWEEN_in_ruleRichStringLiteralInbetween1742); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_value_0_0, grammarAccess.getRichStringLiteralInbetweenAccess().getValueRICH_TEXT_INBETWEENTerminalRuleCall_0()); 
@@ -2397,7 +2390,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRichVarPart"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:913:1: entryRuleRichVarPart returns [EObject current=null] : iv_ruleRichVarPart= ruleRichVarPart EOF ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:909:1: entryRuleRichVarPart returns [EObject current=null] : iv_ruleRichVarPart= ruleRichVarPart EOF ;
     public final EObject entryRuleRichVarPart() throws RecognitionException {
         EObject current = null;
 
@@ -2405,13 +2398,13 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:914:2: (iv_ruleRichVarPart= ruleRichVarPart EOF )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:915:2: iv_ruleRichVarPart= ruleRichVarPart EOF
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:910:2: (iv_ruleRichVarPart= ruleRichVarPart EOF )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:911:2: iv_ruleRichVarPart= ruleRichVarPart EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getRichVarPartRule()); 
             }
-            pushFollow(FOLLOW_ruleRichVarPart_in_entryRuleRichVarPart1794);
+            pushFollow(FOLLOW_ruleRichVarPart_in_entryRuleRichVarPart1782);
             iv_ruleRichVarPart=ruleRichVarPart();
 
             state._fsp--;
@@ -2419,7 +2412,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
             if ( state.backtracking==0 ) {
                current =iv_ruleRichVarPart; 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleRichVarPart1804); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleRichVarPart1792); if (state.failed) return current;
 
             }
 
@@ -2437,7 +2430,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRichVarPart"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:922:1: ruleRichVarPart returns [EObject current=null] : ( ( (lv_key_0_0= RULE_ID ) ) ( ( (lv_format_1_0= RULE_STRING ) ) ( ( ruleQualifiedName ) )? )? ) ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:918:1: ruleRichVarPart returns [EObject current=null] : ( ( (lv_key_0_0= RULE_ID ) ) ( ( (lv_format_1_0= RULE_STRING ) ) ( ( ruleQualifiedName ) )? )? ) ;
     public final EObject ruleRichVarPart() throws RecognitionException {
         EObject current = null;
 
@@ -2447,19 +2440,19 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:925:28: ( ( ( (lv_key_0_0= RULE_ID ) ) ( ( (lv_format_1_0= RULE_STRING ) ) ( ( ruleQualifiedName ) )? )? ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:926:1: ( ( (lv_key_0_0= RULE_ID ) ) ( ( (lv_format_1_0= RULE_STRING ) ) ( ( ruleQualifiedName ) )? )? )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:921:28: ( ( ( (lv_key_0_0= RULE_ID ) ) ( ( (lv_format_1_0= RULE_STRING ) ) ( ( ruleQualifiedName ) )? )? ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:922:1: ( ( (lv_key_0_0= RULE_ID ) ) ( ( (lv_format_1_0= RULE_STRING ) ) ( ( ruleQualifiedName ) )? )? )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:926:1: ( ( (lv_key_0_0= RULE_ID ) ) ( ( (lv_format_1_0= RULE_STRING ) ) ( ( ruleQualifiedName ) )? )? )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:926:2: ( (lv_key_0_0= RULE_ID ) ) ( ( (lv_format_1_0= RULE_STRING ) ) ( ( ruleQualifiedName ) )? )?
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:922:1: ( ( (lv_key_0_0= RULE_ID ) ) ( ( (lv_format_1_0= RULE_STRING ) ) ( ( ruleQualifiedName ) )? )? )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:922:2: ( (lv_key_0_0= RULE_ID ) ) ( ( (lv_format_1_0= RULE_STRING ) ) ( ( ruleQualifiedName ) )? )?
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:926:2: ( (lv_key_0_0= RULE_ID ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:927:1: (lv_key_0_0= RULE_ID )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:922:2: ( (lv_key_0_0= RULE_ID ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:923:1: (lv_key_0_0= RULE_ID )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:927:1: (lv_key_0_0= RULE_ID )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:928:3: lv_key_0_0= RULE_ID
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:923:1: (lv_key_0_0= RULE_ID )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:924:3: lv_key_0_0= RULE_ID
             {
-            lv_key_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRichVarPart1846); if (state.failed) return current;
+            lv_key_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRichVarPart1834); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               			newLeafNode(lv_key_0_0, grammarAccess.getRichVarPartAccess().getKeyIDTerminalRuleCall_0_0()); 
@@ -2483,7 +2476,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
             }
 
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:944:2: ( ( (lv_format_1_0= RULE_STRING ) ) ( ( ruleQualifiedName ) )? )?
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:940:2: ( ( (lv_format_1_0= RULE_STRING ) ) ( ( ruleQualifiedName ) )? )?
             int alt14=2;
             int LA14_0 = input.LA(1);
 
@@ -2492,15 +2485,15 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
             }
             switch (alt14) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:944:3: ( (lv_format_1_0= RULE_STRING ) ) ( ( ruleQualifiedName ) )?
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:940:3: ( (lv_format_1_0= RULE_STRING ) ) ( ( ruleQualifiedName ) )?
                     {
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:944:3: ( (lv_format_1_0= RULE_STRING ) )
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:945:1: (lv_format_1_0= RULE_STRING )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:940:3: ( (lv_format_1_0= RULE_STRING ) )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:941:1: (lv_format_1_0= RULE_STRING )
                     {
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:945:1: (lv_format_1_0= RULE_STRING )
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:946:3: lv_format_1_0= RULE_STRING
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:941:1: (lv_format_1_0= RULE_STRING )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:942:3: lv_format_1_0= RULE_STRING
                     {
-                    lv_format_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleRichVarPart1869); if (state.failed) return current;
+                    lv_format_1_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleRichVarPart1857); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                       			newLeafNode(lv_format_1_0, grammarAccess.getRichVarPartAccess().getFormatSTRINGTerminalRuleCall_1_0_0()); 
@@ -2524,7 +2517,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:962:2: ( ( ruleQualifiedName ) )?
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:958:2: ( ( ruleQualifiedName ) )?
                     int alt13=2;
                     int LA13_0 = input.LA(1);
 
@@ -2533,10 +2526,10 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt13) {
                         case 1 :
-                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:963:1: ( ruleQualifiedName )
+                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:959:1: ( ruleQualifiedName )
                             {
-                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:963:1: ( ruleQualifiedName )
-                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:964:3: ruleQualifiedName
+                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:959:1: ( ruleQualifiedName )
+                            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:960:3: ruleQualifiedName
                             {
                             if ( state.backtracking==0 ) {
 
@@ -2550,7 +2543,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
                               	        newCompositeNode(grammarAccess.getRichVarPartAccess().getFormatterClassNLSFormatterCrossReference_1_1_0()); 
                               	    
                             }
-                            pushFollow(FOLLOW_ruleQualifiedName_in_ruleRichVarPart1897);
+                            pushFollow(FOLLOW_ruleQualifiedName_in_ruleRichVarPart1885);
                             ruleQualifiedName();
 
                             state._fsp--;
@@ -2598,7 +2591,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleValidID"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:985:1: entryRuleValidID returns [String current=null] : iv_ruleValidID= ruleValidID EOF ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:981:1: entryRuleValidID returns [String current=null] : iv_ruleValidID= ruleValidID EOF ;
     public final String entryRuleValidID() throws RecognitionException {
         String current = null;
 
@@ -2606,13 +2599,13 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:986:2: (iv_ruleValidID= ruleValidID EOF )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:987:2: iv_ruleValidID= ruleValidID EOF
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:982:2: (iv_ruleValidID= ruleValidID EOF )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:983:2: iv_ruleValidID= ruleValidID EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getValidIDRule()); 
             }
-            pushFollow(FOLLOW_ruleValidID_in_entryRuleValidID1937);
+            pushFollow(FOLLOW_ruleValidID_in_entryRuleValidID1925);
             iv_ruleValidID=ruleValidID();
 
             state._fsp--;
@@ -2620,7 +2613,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
             if ( state.backtracking==0 ) {
                current =iv_ruleValidID.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleValidID1948); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleValidID1936); if (state.failed) return current;
 
             }
 
@@ -2638,7 +2631,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleValidID"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:994:1: ruleValidID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:990:1: ruleValidID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= RULE_ID ;
     public final AntlrDatatypeRuleToken ruleValidID() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -2647,10 +2640,10 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:997:28: (this_ID_0= RULE_ID )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:998:5: this_ID_0= RULE_ID
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:993:28: (this_ID_0= RULE_ID )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:994:5: this_ID_0= RULE_ID
             {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleValidID1987); if (state.failed) return current;
+            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleValidID1975); if (state.failed) return current;
             if ( state.backtracking==0 ) {
 
               		current.merge(this_ID_0);
@@ -2681,7 +2674,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleQualifiedName"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1013:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1009:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
     public final String entryRuleQualifiedName() throws RecognitionException {
         String current = null;
 
@@ -2689,13 +2682,13 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1014:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1015:2: iv_ruleQualifiedName= ruleQualifiedName EOF
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1010:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1011:2: iv_ruleQualifiedName= ruleQualifiedName EOF
             {
             if ( state.backtracking==0 ) {
                newCompositeNode(grammarAccess.getQualifiedNameRule()); 
             }
-            pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2032);
+            pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2020);
             iv_ruleQualifiedName=ruleQualifiedName();
 
             state._fsp--;
@@ -2703,7 +2696,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
             if ( state.backtracking==0 ) {
                current =iv_ruleQualifiedName.getText(); 
             }
-            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName2043); if (state.failed) return current;
+            match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName2031); if (state.failed) return current;
 
             }
 
@@ -2721,7 +2714,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1022:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1018:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -2734,18 +2727,18 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
          enterRule(); 
             
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1025:28: ( (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1026:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1021:28: ( (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1022:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1026:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1027:5: this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1022:1: (this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )* )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1023:5: this_ValidID_0= ruleValidID ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
             {
             if ( state.backtracking==0 ) {
                
                       newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_0()); 
                   
             }
-            pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName2090);
+            pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName2078);
             this_ValidID_0=ruleValidID();
 
             state._fsp--;
@@ -2760,7 +2753,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
                       afterParserOrEnumRuleCall();
                   
             }
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1037:1: ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1033:1: ( ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID )*
             loop15:
             do {
                 int alt15=2;
@@ -2773,12 +2766,12 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
                 switch (alt15) {
             	case 1 :
-            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1037:2: ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID
+            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1033:2: ( ( '.' )=>kw= '.' ) this_ValidID_2= ruleValidID
             	    {
-            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1037:2: ( ( '.' )=>kw= '.' )
-            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1037:3: ( '.' )=>kw= '.'
+            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1033:2: ( ( '.' )=>kw= '.' )
+            	    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1033:3: ( '.' )=>kw= '.'
             	    {
-            	    kw=(Token)match(input,28,FOLLOW_28_in_ruleQualifiedName2118); if (state.failed) return current;
+            	    kw=(Token)match(input,28,FOLLOW_28_in_ruleQualifiedName2106); if (state.failed) return current;
             	    if ( state.backtracking==0 ) {
 
             	              current.merge(kw);
@@ -2793,7 +2786,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
             	              newCompositeNode(grammarAccess.getQualifiedNameAccess().getValidIDParserRuleCall_1_1()); 
             	          
             	    }
-            	    pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName2141);
+            	    pushFollow(FOLLOW_ruleValidID_in_ruleQualifiedName2129);
             	    this_ValidID_2=ruleValidID();
 
             	    state._fsp--;
@@ -2840,7 +2833,7 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePredefinedTypes"
-    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1064:1: rulePredefinedTypes returns [Enumerator current=null] : ( (enumLiteral_0= 'ANY' ) | (enumLiteral_1= 'NUMBER' ) | (enumLiteral_2= 'DATE' ) | (enumLiteral_3= 'TEMPORAL' ) ) ;
+    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1060:1: rulePredefinedTypes returns [Enumerator current=null] : ( (enumLiteral_0= 'ANY' ) | (enumLiteral_1= 'NUMBER' ) | (enumLiteral_2= 'DATE' ) | (enumLiteral_3= 'TEMPORAL' ) ) ;
     public final Enumerator rulePredefinedTypes() throws RecognitionException {
         Enumerator current = null;
 
@@ -2851,10 +2844,10 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
          enterRule(); 
         try {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1066:28: ( ( (enumLiteral_0= 'ANY' ) | (enumLiteral_1= 'NUMBER' ) | (enumLiteral_2= 'DATE' ) | (enumLiteral_3= 'TEMPORAL' ) ) )
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1067:1: ( (enumLiteral_0= 'ANY' ) | (enumLiteral_1= 'NUMBER' ) | (enumLiteral_2= 'DATE' ) | (enumLiteral_3= 'TEMPORAL' ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1062:28: ( ( (enumLiteral_0= 'ANY' ) | (enumLiteral_1= 'NUMBER' ) | (enumLiteral_2= 'DATE' ) | (enumLiteral_3= 'TEMPORAL' ) ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1063:1: ( (enumLiteral_0= 'ANY' ) | (enumLiteral_1= 'NUMBER' ) | (enumLiteral_2= 'DATE' ) | (enumLiteral_3= 'TEMPORAL' ) )
             {
-            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1067:1: ( (enumLiteral_0= 'ANY' ) | (enumLiteral_1= 'NUMBER' ) | (enumLiteral_2= 'DATE' ) | (enumLiteral_3= 'TEMPORAL' ) )
+            // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1063:1: ( (enumLiteral_0= 'ANY' ) | (enumLiteral_1= 'NUMBER' ) | (enumLiteral_2= 'DATE' ) | (enumLiteral_3= 'TEMPORAL' ) )
             int alt16=4;
             switch ( input.LA(1) ) {
             case 29:
@@ -2887,12 +2880,12 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
             switch (alt16) {
                 case 1 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1067:2: (enumLiteral_0= 'ANY' )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1063:2: (enumLiteral_0= 'ANY' )
                     {
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1067:2: (enumLiteral_0= 'ANY' )
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1067:4: enumLiteral_0= 'ANY'
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1063:2: (enumLiteral_0= 'ANY' )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1063:4: enumLiteral_0= 'ANY'
                     {
-                    enumLiteral_0=(Token)match(input,29,FOLLOW_29_in_rulePredefinedTypes2202); if (state.failed) return current;
+                    enumLiteral_0=(Token)match(input,29,FOLLOW_29_in_rulePredefinedTypes2190); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getPredefinedTypesAccess().getANYEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
@@ -2906,12 +2899,12 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1073:6: (enumLiteral_1= 'NUMBER' )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1069:6: (enumLiteral_1= 'NUMBER' )
                     {
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1073:6: (enumLiteral_1= 'NUMBER' )
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1073:8: enumLiteral_1= 'NUMBER'
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1069:6: (enumLiteral_1= 'NUMBER' )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1069:8: enumLiteral_1= 'NUMBER'
                     {
-                    enumLiteral_1=(Token)match(input,30,FOLLOW_30_in_rulePredefinedTypes2219); if (state.failed) return current;
+                    enumLiteral_1=(Token)match(input,30,FOLLOW_30_in_rulePredefinedTypes2207); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getPredefinedTypesAccess().getNUMBEREnumLiteralDeclaration_1().getEnumLiteral().getInstance();
@@ -2925,12 +2918,12 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1079:6: (enumLiteral_2= 'DATE' )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1075:6: (enumLiteral_2= 'DATE' )
                     {
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1079:6: (enumLiteral_2= 'DATE' )
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1079:8: enumLiteral_2= 'DATE'
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1075:6: (enumLiteral_2= 'DATE' )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1075:8: enumLiteral_2= 'DATE'
                     {
-                    enumLiteral_2=(Token)match(input,31,FOLLOW_31_in_rulePredefinedTypes2236); if (state.failed) return current;
+                    enumLiteral_2=(Token)match(input,31,FOLLOW_31_in_rulePredefinedTypes2224); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getPredefinedTypesAccess().getDATEEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
@@ -2944,12 +2937,12 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1085:6: (enumLiteral_3= 'TEMPORAL' )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1081:6: (enumLiteral_3= 'TEMPORAL' )
                     {
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1085:6: (enumLiteral_3= 'TEMPORAL' )
-                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1085:8: enumLiteral_3= 'TEMPORAL'
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1081:6: (enumLiteral_3= 'TEMPORAL' )
+                    // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1081:8: enumLiteral_3= 'TEMPORAL'
                     {
-                    enumLiteral_3=(Token)match(input,32,FOLLOW_32_in_rulePredefinedTypes2253); if (state.failed) return current;
+                    enumLiteral_3=(Token)match(input,32,FOLLOW_32_in_rulePredefinedTypes2241); if (state.failed) return current;
                     if ( state.backtracking==0 ) {
 
                               current = grammarAccess.getPredefinedTypesAccess().getTEMPORALEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
@@ -2985,10 +2978,10 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
 
     // $ANTLR start synpred1_InternalNLSDsl
     public final void synpred1_InternalNLSDsl_fragment() throws RecognitionException {   
-        // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1037:3: ( '.' )
-        // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1038:2: '.'
+        // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1033:3: ( '.' )
+        // ../org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/parser/antlr/internal/InternalNLSDsl.g:1034:2: '.'
         {
-        match(input,28,FOLLOW_28_in_synpred1_InternalNLSDsl2109); if (state.failed) return ;
+        match(input,28,FOLLOW_28_in_synpred1_InternalNLSDsl2097); if (state.failed) return ;
 
         }
     }
@@ -3041,67 +3034,66 @@ public class InternalNLSDslParser extends AbstractInternalAntlrParser {
     public static final BitSet FOLLOW_ruleQualifiedName_in_ruleNLSFormatter615 = new BitSet(new long[]{0x0000000000000002L});
     public static final BitSet FOLLOW_ruleMessageEntry_in_entryRuleMessageEntry651 = new BitSet(new long[]{0x0000000000000000L});
     public static final BitSet FOLLOW_EOF_in_entryRuleMessageEntry661 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleMessageEntry703 = new BitSet(new long[]{0x0000000002400000L});
+    public static final BitSet FOLLOW_RULE_ID_in_ruleMessageEntry703 = new BitSet(new long[]{0x0000000002410000L});
     public static final BitSet FOLLOW_22_in_ruleMessageEntry721 = new BitSet(new long[]{0x00000001E0000000L});
     public static final BitSet FOLLOW_ruleMessageParam_in_ruleMessageEntry742 = new BitSet(new long[]{0x0000000001800000L});
     public static final BitSet FOLLOW_23_in_ruleMessageEntry755 = new BitSet(new long[]{0x00000001E0000000L});
     public static final BitSet FOLLOW_ruleMessageParam_in_ruleMessageEntry776 = new BitSet(new long[]{0x0000000001800000L});
-    public static final BitSet FOLLOW_24_in_ruleMessageEntry790 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleMessageEntry804 = new BitSet(new long[]{0x0000000004010000L});
-    public static final BitSet FOLLOW_16_in_ruleMessageEntry818 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleMessage_in_ruleMessageEntry839 = new BitSet(new long[]{0x0000000000820000L});
-    public static final BitSet FOLLOW_23_in_ruleMessageEntry852 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleMessage_in_ruleMessageEntry873 = new BitSet(new long[]{0x0000000000820000L});
-    public static final BitSet FOLLOW_17_in_ruleMessageEntry887 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_26_in_ruleMessageEntry907 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleMessageEntry930 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_27_in_ruleMessageEntry942 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessageParam_in_entryRuleMessageParam980 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMessageParam990 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_rulePredefinedTypes_in_ruleMessageParam1036 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleMessageParam1053 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleMessage_in_entryRuleMessage1094 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleMessage1104 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleMessage1146 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_25_in_ruleMessage1163 = new BitSet(new long[]{0x0000000000000060L});
-    public static final BitSet FOLLOW_ruleRichString_in_ruleMessage1184 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRichString_in_entryRuleRichString1220 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRichString1230 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRichStringLiteral_in_ruleRichString1276 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRichStringLiteralStart_in_ruleRichString1304 = new BitSet(new long[]{0x0000000000000190L});
-    public static final BitSet FOLLOW_ruleRichVarPart_in_ruleRichString1325 = new BitSet(new long[]{0x0000000000000190L});
-    public static final BitSet FOLLOW_ruleRichStringLiteralInbetween_in_ruleRichString1348 = new BitSet(new long[]{0x0000000000000190L});
-    public static final BitSet FOLLOW_ruleRichVarPart_in_ruleRichString1369 = new BitSet(new long[]{0x0000000000000190L});
-    public static final BitSet FOLLOW_ruleRichStringLiteralEnd_in_ruleRichString1393 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRichStringLiteral_in_entryRuleRichStringLiteral1430 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRichStringLiteral1440 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_RICH_TEXT_in_ruleRichStringLiteral1481 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRichStringLiteralStart_in_entryRuleRichStringLiteralStart1521 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRichStringLiteralStart1531 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_RICH_TEXT_START_in_ruleRichStringLiteralStart1572 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRichStringLiteralEnd_in_entryRuleRichStringLiteralEnd1612 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRichStringLiteralEnd1622 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_RICH_TEXT_END_in_ruleRichStringLiteralEnd1663 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRichStringLiteralInbetween_in_entryRuleRichStringLiteralInbetween1703 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRichStringLiteralInbetween1713 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_RICH_TEXT_INBETWEEN_in_ruleRichStringLiteralInbetween1754 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleRichVarPart_in_entryRuleRichVarPart1794 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleRichVarPart1804 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleRichVarPart1846 = new BitSet(new long[]{0x0000000000000202L});
-    public static final BitSet FOLLOW_RULE_STRING_in_ruleRichVarPart1869 = new BitSet(new long[]{0x0000000000000012L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleRichVarPart1897 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_entryRuleValidID1937 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleValidID1948 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_RULE_ID_in_ruleValidID1987 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2032 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName2043 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName2090 = new BitSet(new long[]{0x0000000010000002L});
-    public static final BitSet FOLLOW_28_in_ruleQualifiedName2118 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName2141 = new BitSet(new long[]{0x0000000010000002L});
-    public static final BitSet FOLLOW_29_in_rulePredefinedTypes2202 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_30_in_rulePredefinedTypes2219 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_31_in_rulePredefinedTypes2236 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_32_in_rulePredefinedTypes2253 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_28_in_synpred1_InternalNLSDsl2109 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_24_in_ruleMessageEntry790 = new BitSet(new long[]{0x0000000002010000L});
+    public static final BitSet FOLLOW_16_in_ruleMessageEntry806 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleMessage_in_ruleMessageEntry827 = new BitSet(new long[]{0x0000000000820000L});
+    public static final BitSet FOLLOW_23_in_ruleMessageEntry840 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleMessage_in_ruleMessageEntry861 = new BitSet(new long[]{0x0000000000820000L});
+    public static final BitSet FOLLOW_17_in_ruleMessageEntry875 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_25_in_ruleMessageEntry895 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleMessageEntry918 = new BitSet(new long[]{0x0000000004000000L});
+    public static final BitSet FOLLOW_26_in_ruleMessageEntry930 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleMessageParam_in_entryRuleMessageParam968 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleMessageParam978 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_rulePredefinedTypes_in_ruleMessageParam1024 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_RULE_ID_in_ruleMessageParam1041 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleMessage_in_entryRuleMessage1082 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleMessage1092 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_ruleMessage1134 = new BitSet(new long[]{0x0000000008000000L});
+    public static final BitSet FOLLOW_27_in_ruleMessage1151 = new BitSet(new long[]{0x0000000000000060L});
+    public static final BitSet FOLLOW_ruleRichString_in_ruleMessage1172 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRichString_in_entryRuleRichString1208 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleRichString1218 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRichStringLiteral_in_ruleRichString1264 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRichStringLiteralStart_in_ruleRichString1292 = new BitSet(new long[]{0x0000000000000190L});
+    public static final BitSet FOLLOW_ruleRichVarPart_in_ruleRichString1313 = new BitSet(new long[]{0x0000000000000190L});
+    public static final BitSet FOLLOW_ruleRichStringLiteralInbetween_in_ruleRichString1336 = new BitSet(new long[]{0x0000000000000190L});
+    public static final BitSet FOLLOW_ruleRichVarPart_in_ruleRichString1357 = new BitSet(new long[]{0x0000000000000190L});
+    public static final BitSet FOLLOW_ruleRichStringLiteralEnd_in_ruleRichString1381 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRichStringLiteral_in_entryRuleRichStringLiteral1418 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleRichStringLiteral1428 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_RICH_TEXT_in_ruleRichStringLiteral1469 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRichStringLiteralStart_in_entryRuleRichStringLiteralStart1509 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleRichStringLiteralStart1519 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_RICH_TEXT_START_in_ruleRichStringLiteralStart1560 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRichStringLiteralEnd_in_entryRuleRichStringLiteralEnd1600 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleRichStringLiteralEnd1610 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_RICH_TEXT_END_in_ruleRichStringLiteralEnd1651 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRichStringLiteralInbetween_in_entryRuleRichStringLiteralInbetween1691 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleRichStringLiteralInbetween1701 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_RICH_TEXT_INBETWEEN_in_ruleRichStringLiteralInbetween1742 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleRichVarPart_in_entryRuleRichVarPart1782 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleRichVarPart1792 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_ruleRichVarPart1834 = new BitSet(new long[]{0x0000000000000202L});
+    public static final BitSet FOLLOW_RULE_STRING_in_ruleRichVarPart1857 = new BitSet(new long[]{0x0000000000000012L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_ruleRichVarPart1885 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_entryRuleValidID1925 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleValidID1936 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_ruleValidID1975 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2020 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName2031 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName2078 = new BitSet(new long[]{0x0000000010000002L});
+    public static final BitSet FOLLOW_28_in_ruleQualifiedName2106 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_ruleValidID_in_ruleQualifiedName2129 = new BitSet(new long[]{0x0000000010000002L});
+    public static final BitSet FOLLOW_29_in_rulePredefinedTypes2190 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_30_in_rulePredefinedTypes2207 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_31_in_rulePredefinedTypes2224 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_32_in_rulePredefinedTypes2241 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_28_in_synpred1_InternalNLSDsl2097 = new BitSet(new long[]{0x0000000000000002L});
 
 }
\ No newline at end of file
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/services/NLSDslGrammarAccess.java b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/services/NLSDslGrammarAccess.java
index 34e86b7d0..277ce57f8 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/services/NLSDslGrammarAccess.java
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src-gen/org/eclipse/fx/ide/l10n/services/NLSDslGrammarAccess.java
@@ -184,30 +184,29 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder {
 		private final Assignment cParamListAssignment_1_2_1 = (Assignment)cGroup_1_2.eContents().get(1);
 		private final RuleCall cParamListMessageParamParserRuleCall_1_2_1_0 = (RuleCall)cParamListAssignment_1_2_1.eContents().get(0);
 		private final Keyword cRightParenthesisKeyword_1_3 = (Keyword)cGroup_1.eContents().get(3);
-		private final Keyword cColonKeyword_2 = (Keyword)cGroup.eContents().get(2);
-		private final Alternatives cAlternatives_3 = (Alternatives)cGroup.eContents().get(3);
-		private final Group cGroup_3_0 = (Group)cAlternatives_3.eContents().get(0);
-		private final Keyword cLeftCurlyBracketKeyword_3_0_0 = (Keyword)cGroup_3_0.eContents().get(0);
-		private final Assignment cMessageListAssignment_3_0_1 = (Assignment)cGroup_3_0.eContents().get(1);
-		private final RuleCall cMessageListMessageParserRuleCall_3_0_1_0 = (RuleCall)cMessageListAssignment_3_0_1.eContents().get(0);
-		private final Group cGroup_3_0_2 = (Group)cGroup_3_0.eContents().get(2);
-		private final Keyword cCommaKeyword_3_0_2_0 = (Keyword)cGroup_3_0_2.eContents().get(0);
-		private final Assignment cMessageListAssignment_3_0_2_1 = (Assignment)cGroup_3_0_2.eContents().get(1);
-		private final RuleCall cMessageListMessageParserRuleCall_3_0_2_1_0 = (RuleCall)cMessageListAssignment_3_0_2_1.eContents().get(0);
-		private final Keyword cRightCurlyBracketKeyword_3_0_3 = (Keyword)cGroup_3_0.eContents().get(3);
-		private final Group cGroup_3_1 = (Group)cAlternatives_3.eContents().get(1);
-		private final Keyword cLeftSquareBracketKeyword_3_1_0 = (Keyword)cGroup_3_1.eContents().get(0);
-		private final Assignment cEntryRefAssignment_3_1_1 = (Assignment)cGroup_3_1.eContents().get(1);
-		private final CrossReference cEntryRefMessageEntryCrossReference_3_1_1_0 = (CrossReference)cEntryRefAssignment_3_1_1.eContents().get(0);
-		private final RuleCall cEntryRefMessageEntryQualifiedNameParserRuleCall_3_1_1_0_1 = (RuleCall)cEntryRefMessageEntryCrossReference_3_1_1_0.eContents().get(1);
-		private final Keyword cRightSquareBracketKeyword_3_1_2 = (Keyword)cGroup_3_1.eContents().get(2);
+		private final Alternatives cAlternatives_2 = (Alternatives)cGroup.eContents().get(2);
+		private final Group cGroup_2_0 = (Group)cAlternatives_2.eContents().get(0);
+		private final Keyword cLeftCurlyBracketKeyword_2_0_0 = (Keyword)cGroup_2_0.eContents().get(0);
+		private final Assignment cMessageListAssignment_2_0_1 = (Assignment)cGroup_2_0.eContents().get(1);
+		private final RuleCall cMessageListMessageParserRuleCall_2_0_1_0 = (RuleCall)cMessageListAssignment_2_0_1.eContents().get(0);
+		private final Group cGroup_2_0_2 = (Group)cGroup_2_0.eContents().get(2);
+		private final Keyword cCommaKeyword_2_0_2_0 = (Keyword)cGroup_2_0_2.eContents().get(0);
+		private final Assignment cMessageListAssignment_2_0_2_1 = (Assignment)cGroup_2_0_2.eContents().get(1);
+		private final RuleCall cMessageListMessageParserRuleCall_2_0_2_1_0 = (RuleCall)cMessageListAssignment_2_0_2_1.eContents().get(0);
+		private final Keyword cRightCurlyBracketKeyword_2_0_3 = (Keyword)cGroup_2_0.eContents().get(3);
+		private final Group cGroup_2_1 = (Group)cAlternatives_2.eContents().get(1);
+		private final Keyword cLeftSquareBracketKeyword_2_1_0 = (Keyword)cGroup_2_1.eContents().get(0);
+		private final Assignment cEntryRefAssignment_2_1_1 = (Assignment)cGroup_2_1.eContents().get(1);
+		private final CrossReference cEntryRefMessageEntryCrossReference_2_1_1_0 = (CrossReference)cEntryRefAssignment_2_1_1.eContents().get(0);
+		private final RuleCall cEntryRefMessageEntryQualifiedNameParserRuleCall_2_1_1_0_1 = (RuleCall)cEntryRefMessageEntryCrossReference_2_1_1_0.eContents().get(1);
+		private final Keyword cRightSquareBracketKeyword_2_1_2 = (Keyword)cGroup_2_1.eContents().get(2);
 		
 		//MessageEntry:
-		//	name=ID ("(" paramList+=MessageParam ("," paramList+=MessageParam)* ")")? ":" ("{" messageList+=Message (","
+		//	name=ID ("(" paramList+=MessageParam ("," paramList+=MessageParam)* ")")? ("{" messageList+=Message (","
 		//	messageList+=Message)* "}" | "[" entryRef=[MessageEntry|QualifiedName] "]");
 		public ParserRule getRule() { return rule; }
 
-		//name=ID ("(" paramList+=MessageParam ("," paramList+=MessageParam)* ")")? ":" ("{" messageList+=Message (","
+		//name=ID ("(" paramList+=MessageParam ("," paramList+=MessageParam)* ")")? ("{" messageList+=Message (","
 		//messageList+=Message)* "}" | "[" entryRef=[MessageEntry|QualifiedName] "]")
 		public Group getGroup() { return cGroup; }
 
@@ -244,56 +243,53 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder {
 		//")"
 		public Keyword getRightParenthesisKeyword_1_3() { return cRightParenthesisKeyword_1_3; }
 
-		//":"
-		public Keyword getColonKeyword_2() { return cColonKeyword_2; }
-
 		//"{" messageList+=Message ("," messageList+=Message)* "}" | "[" entryRef=[MessageEntry|QualifiedName] "]"
-		public Alternatives getAlternatives_3() { return cAlternatives_3; }
+		public Alternatives getAlternatives_2() { return cAlternatives_2; }
 
 		//"{" messageList+=Message ("," messageList+=Message)* "}"
-		public Group getGroup_3_0() { return cGroup_3_0; }
+		public Group getGroup_2_0() { return cGroup_2_0; }
 
 		//"{"
-		public Keyword getLeftCurlyBracketKeyword_3_0_0() { return cLeftCurlyBracketKeyword_3_0_0; }
+		public Keyword getLeftCurlyBracketKeyword_2_0_0() { return cLeftCurlyBracketKeyword_2_0_0; }
 
 		//messageList+=Message
-		public Assignment getMessageListAssignment_3_0_1() { return cMessageListAssignment_3_0_1; }
+		public Assignment getMessageListAssignment_2_0_1() { return cMessageListAssignment_2_0_1; }
 
 		//Message
-		public RuleCall getMessageListMessageParserRuleCall_3_0_1_0() { return cMessageListMessageParserRuleCall_3_0_1_0; }
+		public RuleCall getMessageListMessageParserRuleCall_2_0_1_0() { return cMessageListMessageParserRuleCall_2_0_1_0; }
 
 		//("," messageList+=Message)*
-		public Group getGroup_3_0_2() { return cGroup_3_0_2; }
+		public Group getGroup_2_0_2() { return cGroup_2_0_2; }
 
 		//","
-		public Keyword getCommaKeyword_3_0_2_0() { return cCommaKeyword_3_0_2_0; }
+		public Keyword getCommaKeyword_2_0_2_0() { return cCommaKeyword_2_0_2_0; }
 
 		//messageList+=Message
-		public Assignment getMessageListAssignment_3_0_2_1() { return cMessageListAssignment_3_0_2_1; }
+		public Assignment getMessageListAssignment_2_0_2_1() { return cMessageListAssignment_2_0_2_1; }
 
 		//Message
-		public RuleCall getMessageListMessageParserRuleCall_3_0_2_1_0() { return cMessageListMessageParserRuleCall_3_0_2_1_0; }
+		public RuleCall getMessageListMessageParserRuleCall_2_0_2_1_0() { return cMessageListMessageParserRuleCall_2_0_2_1_0; }
 
 		//"}"
-		public Keyword getRightCurlyBracketKeyword_3_0_3() { return cRightCurlyBracketKeyword_3_0_3; }
+		public Keyword getRightCurlyBracketKeyword_2_0_3() { return cRightCurlyBracketKeyword_2_0_3; }
 
 		//"[" entryRef=[MessageEntry|QualifiedName] "]"
-		public Group getGroup_3_1() { return cGroup_3_1; }
+		public Group getGroup_2_1() { return cGroup_2_1; }
 
 		//"["
-		public Keyword getLeftSquareBracketKeyword_3_1_0() { return cLeftSquareBracketKeyword_3_1_0; }
+		public Keyword getLeftSquareBracketKeyword_2_1_0() { return cLeftSquareBracketKeyword_2_1_0; }
 
 		//entryRef=[MessageEntry|QualifiedName]
-		public Assignment getEntryRefAssignment_3_1_1() { return cEntryRefAssignment_3_1_1; }
+		public Assignment getEntryRefAssignment_2_1_1() { return cEntryRefAssignment_2_1_1; }
 
 		//[MessageEntry|QualifiedName]
-		public CrossReference getEntryRefMessageEntryCrossReference_3_1_1_0() { return cEntryRefMessageEntryCrossReference_3_1_1_0; }
+		public CrossReference getEntryRefMessageEntryCrossReference_2_1_1_0() { return cEntryRefMessageEntryCrossReference_2_1_1_0; }
 
 		//QualifiedName
-		public RuleCall getEntryRefMessageEntryQualifiedNameParserRuleCall_3_1_1_0_1() { return cEntryRefMessageEntryQualifiedNameParserRuleCall_3_1_1_0_1; }
+		public RuleCall getEntryRefMessageEntryQualifiedNameParserRuleCall_2_1_1_0_1() { return cEntryRefMessageEntryQualifiedNameParserRuleCall_2_1_1_0_1; }
 
 		//"]"
-		public Keyword getRightSquareBracketKeyword_3_1_2() { return cRightSquareBracketKeyword_3_1_2; }
+		public Keyword getRightSquareBracketKeyword_2_1_2() { return cRightSquareBracketKeyword_2_1_2; }
 	}
 
 	public class MessageParamElements extends AbstractParserRuleElementFinder {
@@ -742,7 +738,7 @@ public class NLSDslGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//MessageEntry:
-	//	name=ID ("(" paramList+=MessageParam ("," paramList+=MessageParam)* ")")? ":" ("{" messageList+=Message (","
+	//	name=ID ("(" paramList+=MessageParam ("," paramList+=MessageParam)* ")")? ("{" messageList+=Message (","
 	//	messageList+=Message)* "}" | "[" entryRef=[MessageEntry|QualifiedName] "]");
 	public MessageEntryElements getMessageEntryAccess() {
 		return pMessageEntry;
diff --git a/bundles/tooling/org.eclipse.fx.ide.l10n/src/org/eclipse/fx/ide/l10n/NLSDsl.xtext b/bundles/tooling/org.eclipse.fx.ide.l10n/src/org/eclipse/fx/ide/l10n/NLSDsl.xtext
index 1dc06a334..76ae2060b 100644
--- a/bundles/tooling/org.eclipse.fx.ide.l10n/src/org/eclipse/fx/ide/l10n/NLSDsl.xtext
+++ b/bundles/tooling/org.eclipse.fx.ide.l10n/src/org/eclipse/fx/ide/l10n/NLSDsl.xtext
@@ -24,7 +24,7 @@ NLSFormatter:
 ;
 
 MessageEntry:
-	name=ID ('(' paramList+=MessageParam ( ',' paramList+=MessageParam )* ')')? ':' ('{' messageList+=Message (',' messageList+=Message )* '}' | '['entryRef=[MessageEntry|QualifiedName] ']')
+	name=ID ('(' paramList+=MessageParam ( ',' paramList+=MessageParam )* ')')? ('{' messageList+=Message (',' messageList+=Message )* '}' | '['entryRef=[MessageEntry|QualifiedName] ']')
 ;
 
 MessageParam: