resx extraction: no entry for text == controlId

git-svn-id: https://svn.code.sf.net/p/gettextnet/code@32 cfd95cc2-f724-4227-9a96-9a83de4730d4

GNU.Gettext/GNU.Gettext.Xgettext/ExtractorCsharp.cs

@@ -215,6 +215,8 @@ namespace GNU.Gettext.Xgettext
 								controlId, inputFile));
 						continue;
 					}
+					if (controlId == msgid)
+						continue; // Text property was initialized by controlId and was not changed so this text is not usable in application
 					break;
 				case ExtractMode.MsgidPlural:
 					if (groups.Count < 3)
@@ -228,7 +230,7 @@ namespace GNU.Gettext.Xgettext
 					context = Unescape(groups[1].Value);
 					msgid = Unescape(groups[2].Value);
 					if (groups.Count == 4)
-					msgidPlural = Unescape(groups[3].Value);
+						msgidPlural = Unescape(groups[3].Value);
 					break;
 				}
 				MergeWithEntry(context, msgid, msgidPlural, inputFile, CalcLineNumber(text, match.Index));

GNU.Gettext/GNU.Gettext.Xgettext/Program.cs

@@ -222,7 +222,6 @@ namespace GNU.Gettext.Xgettext
             Console.WriteLine(
 				"   -f, --files-from=file                  Read the names of the input files from file\n" +
 				"                                          instead of getting them from the command line\n\n" +
-				"   -j, --join-existing                    Join with existing file instead of overwrite\n\n" +
             	"   -o file, --output=file                 Output PO template file name.\n" +
             	"                                          Using of '*.pot' file type is strongly recommended\n" +
             	"                                          \"{0}\" will be used if not specified\n\n" +
@@ -236,6 +235,7 @@ namespace GNU.Gettext.Xgettext
             	"                                          Default is '{2}'\n\n" +
             	"   --detect-code                          Try detects the unicode encoding.\n" +
             	"                                          If not detected '--from-code' or default '{2}' will be used\n\n" +
+				"   -j, --join-existing                    Join with existing file instead of overwrite\n\n" +
             	"   -v, --verbose                          Verbose output\n\n" +
             	"   -h, --help                             Display this help and exit",
 				(new Options()).OutFile,