The new options generator uses additional keywords that need to be
supplied to xgettext when generating the pot file. Fix that up,
and sync the en.po file accordingly.
--add-comments=TRANSLATORS: --foreign-user \
--msgid-bugs-address=$(PACKAGE_BUGREPORT) \
--package-version=$(PACKAGE_VERSION) \
--add-comments=TRANSLATORS: --foreign-user \
--msgid-bugs-address=$(PACKAGE_BUGREPORT) \
--package-version=$(PACKAGE_VERSION) \
- --package-name=$(PACKAGE) --keyword=_
+ --package-name=$(PACKAGE) --keyword=_ \
+ --keyword=N_ --keyword=PN_:1c,2
po/$(PACKAGE).pot: $(SOURCES)
$(AM_V_at) $(MKDIR_P) $(@D)
po/$(PACKAGE).pot: $(SOURCES)
$(AM_V_at) $(MKDIR_P) $(@D)
-"Project-Id-Version: slotifier 0\n"
+"Project-Id-Version: slotifier 1.2\n"
"Report-Msgid-Bugs-To: nbowler@draconx.ca\n"
"Report-Msgid-Bugs-To: nbowler@draconx.ca\n"
-"POT-Creation-Date: 2018-12-20 15:42-0500\n"
-"PO-Revision-Date: 2018-12-20 15:52-0500\n"
+"POT-Creation-Date: 2021-04-26 22:42-0400\n"
+"PO-Revision-Date: 2021-04-26 22:44-0400\n"
+"Last-Translator: Nick Bowler <nbowler@draconx.ca>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.1.1\n"
-"Last-Translator: Nick Bowler <nbowler@draconx.ca>\n"
-"Language: en\n"
-
-#: lib/getopt.c:547 lib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr ""
+"X-Generator: Poedit 2.2.4\n"
-#: lib/getopt.c:624 lib/getopt.c:628
-msgid "%s: option '--%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' is ambiguous\n"
-#: lib/getopt.c:637 lib/getopt.c:642
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
-#: lib/getopt.c:685 lib/getopt.c:704
-msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: unrecognized option '%s%s'\n"
-#: lib/getopt.c:742 lib/getopt.c:745
-msgid "%s: unrecognized option '--%s'\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
-#: lib/getopt.c:753 lib/getopt.c:756
-msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: option '%s%s' requires an argument\n"
-#: lib/getopt.c:805 lib/getopt.c:808
#, c-format
msgid "%s: invalid option -- '%c'\n"
msgstr ""
#, c-format
msgid "%s: invalid option -- '%c'\n"
msgstr ""
-#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#: lib/getopt.c:636 lib/getopt.c:682
#, c-format
msgid "%s: option requires an argument -- '%c'\n"
msgstr ""
#, c-format
msgid "%s: option requires an argument -- '%c'\n"
msgstr ""
-#: lib/getopt.c:934 lib/getopt.c:950
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr ""
-
-#: lib/getopt.c:974 lib/getopt.c:992
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgid "Usage: %s [options] [-o filename] filename\n"
-#: lib/getopt.c:1013 lib/getopt.c:1031
-msgid "%s: option '-W %s' requires an argument\n"
+msgid "Try %s --help for more information.\n"
-msgid "Usage: %s [options] [-o filename] filename\n"
-msgid "Try %s --help for more information.\n"
msgid ""
"This is \"slotifier\": a tool to convert overlapping drill hits in Excellon\n"
"drill files to G85 drill slots."
msgid ""
"This is \"slotifier\": a tool to convert overlapping drill hits in Excellon\n"
"drill files to G85 drill slots."
"This is “slotifier”: a tool to convert overlapping drill hits in Excellon\n"
"drill files to G85 drill slots."
"This is “slotifier”: a tool to convert overlapping drill hits in Excellon\n"
"drill files to G85 drill slots."
msgid "Options:"
msgstr ""
msgid "Options:"
msgstr ""
-#: src/slotifier.c:98
-msgid "FILE"
-msgstr ""
-
-#: src/slotifier.c:101
-#, c-format
-msgid " -%c, --%s=%s"
-msgstr ""
-
-#: src/slotifier.c:104
-#, c-format
-msgid " -%c, --%s"
-msgstr ""
-
-#: src/slotifier.c:114
-msgid "Output to FILE, instead of standard output."
-msgstr ""
-
-#: src/slotifier.c:117
-msgid "Increase verbosity (can be specified more than once)."
-msgstr ""
-
-#: src/slotifier.c:120
-msgid "Print a version message and then exit."
-msgstr ""
-
-#: src/slotifier.c:123
-msgid "Print this message and then exit."
-msgstr ""
-
-#: src/slotifier.c:145
msgid "For more information, see the slotifier(1) man page."
msgstr ""
msgid "For more information, see the slotifier(1) man page."
msgstr ""
+#. TRANSLATORS: Please add *another line* indicating where users should
+#. report translation bugs.
+#: src/slotifier.c:174
-msgid "Report bugs to <%s>."
+msgid "Report bugs to <%s>.\n"
-#: src/slotifier.c:206 src/slotifier.c:211
+#: src/slotifier.c:259 src/slotifier.c:264 src/slotifier.c:419
#, c-format
msgid "%s: failed to allocate memory\n"
msgstr ""
#, c-format
msgid "%s: failed to allocate memory\n"
msgstr ""
#, c-format
msgid "%s: fatal error searching holes\n"
msgstr ""
#, c-format
msgid "%s: fatal error searching holes\n"
msgstr ""
#, c-format
msgid "%s: merged %zu hole into slot (%.4f,%.4f)-(%.4f,%.4f)\n"
msgid_plural "%s: merged %zu holes into slot (%.4f,%.4f)-(%.4f,%.4f)\n"
#, c-format
msgid "%s: merged %zu hole into slot (%.4f,%.4f)-(%.4f,%.4f)\n"
msgid_plural "%s: merged %zu holes into slot (%.4f,%.4f)-(%.4f,%.4f)\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s: merged %zu hole into slot (%.4f,%.4f)–(%.4f,%.4f)\n"
+msgstr[1] "%s: merged %zu holes into slot (%.4f,%.4f)–(%.4f,%.4f)\n"
#, c-format
msgid "%s: hole at (%.4f,%.4f) not merged\n"
msgstr ""
#, c-format
msgid "%s: hole at (%.4f,%.4f) not merged\n"
msgstr ""
#, c-format
msgid "%s: failed to build search tree\n"
msgstr ""
#, c-format
msgid "%s: failed to build search tree\n"
msgstr ""
+#: src/slotifier.c:438
+#, c-format
+msgid "%s: checking hole at (%.4f,%.4f) for overlaps\n"
+msgstr ""
+
+#: src/slotifier.c:496
#, c-format
msgid "%s: error: must specify a filename\n"
msgstr ""
#, c-format
msgid "%s: error: must specify a filename\n"
msgstr ""
#, c-format
msgid "%s: error: excess command-line arguments\n"
msgstr ""
#, c-format
msgid "%s: error: excess command-line arguments\n"
msgstr ""
#, c-format
msgid "%s: %s: error: not a drill file\n"
msgstr ""
#, c-format
msgid "%s: %s: error: not a drill file\n"
msgstr ""
+
+#: src/options.h:40
+msgctxt "output"
+msgid "FILE"
+msgstr ""
+
+#: src/options.h:44
+msgctxt "output"
+msgid "Write drill data to FILE instead of standard output."
+msgstr ""
+
+#: src/options.h:46
+msgctxt "verbose"
+msgid ""
+"Increase verbosity (can be specified multiple times for\n"
+"increased effect)."
+msgstr ""
+
+#: src/options.h:49
+msgctxt "version"
+msgid "Print a version message and then exit."
+msgstr ""
+
+#: src/options.h:51
+msgctxt "help"
+msgid "Print this message and then exit."
+msgstr ""