Fix generation of slotifier.pot.

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.

diff --git a/Makefile.am b/Makefile.am
index 891cc7543544eed22185a03bd16b9a9dca2be0f5..607865d27ca98ad39a59266f8b0b3b6f855055b6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,7 +98,8 @@ XGETTEXT_OPTS = -D $(builddir) -D $(srcdir) --from-code=utf-8 \
                 --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)

diff --git a/po/en.po b/po/en.po
index 36fecc3394448b5b0438e5b4e7b468ec6200cfdd..d4ff97d7e04fdadc7059b5f9bab46204b3d63916 100644 (file)
--- a/po/en.po
+++ b/po/en.po
@@ -4,85 +4,75 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: slotifier 0\n"
+"Project-Id-Version: slotifier 1.2\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"
 "Language-Team: \n"
+"Language: en\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
+#: lib/getopt.c:278
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' is ambiguous\n"
 msgstr ""
 
-#: lib/getopt.c:637 lib/getopt.c:642
+#: lib/getopt.c:284
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
 msgstr ""
 
-#: lib/getopt.c:685 lib/getopt.c:704
+#: lib/getopt.c:319
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: unrecognized option '%s%s'\n"
 msgstr ""
 
-#: lib/getopt.c:742 lib/getopt.c:745
+#: lib/getopt.c:345
 #, c-format
-msgid "%s: unrecognized option '--%s'\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr ""
 
-#: lib/getopt.c:753 lib/getopt.c:756
+#: lib/getopt.c:360
 #, c-format
-msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr ""
 
-#: lib/getopt.c:805 lib/getopt.c:808
+#: lib/getopt.c:621
 #, 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 ""
 
-#: lib/getopt.c:934 lib/getopt.c:950
+#: src/slotifier.c:75
 #, c-format
-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"
 msgstr ""
 
-#: lib/getopt.c:1013 lib/getopt.c:1031
+#: src/slotifier.c:77
 #, c-format
-msgid "%s: option '-W %s' requires an argument\n"
+msgid "Try %s --help for more information.\n"
 msgstr ""
 
-#: src/slotifier.c:76
+#: src/slotifier.c:92
 #, c-format
-msgid "Usage: %s [options] [-o filename] filename\n"
+msgid "  -%c, --%s=%s"
 msgstr ""
 
-#: src/slotifier.c:78
+#: src/slotifier.c:96
 #, c-format
-msgid "Try %s --help for more information.\n"
+msgid "  -%c, --%s"
 msgstr ""
 
-#: src/slotifier.c:87
+#: src/slotifier.c:146
 msgid ""
 "This is \"slotifier\": a tool to convert overlapping drill hits in Excellon\n"
 "drill files to G85 drill slots."
@@ -90,87 +80,91 @@ msgstr ""
 "This is “slotifier”: a tool to convert overlapping drill hits in Excellon\n"
 "drill files to G85 drill slots."
 
-#: src/slotifier.c:91
+#: src/slotifier.c:150
 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
+#: src/slotifier.c:167
 msgid "For more information, see the slotifier(1) man page."
 msgstr ""
 
-#: src/slotifier.c:148
+#. TRANSLATORS: Please add *another line* indicating where users should
+#. report translation bugs.
+#: src/slotifier.c:174
 #, c-format
-msgid "Report bugs to <%s>."
+msgid "Report bugs to <%s>.\n"
 msgstr ""
 
-#: 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 ""
 
-#: src/slotifier.c:238
+#: src/slotifier.c:287
 #, c-format
 msgid "%s: fatal error searching holes\n"
 msgstr ""
 
-#: src/slotifier.c:289
+#: src/slotifier.c:343
 #, 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"
 
-#: src/slotifier.c:306
+#: src/slotifier.c:360
 #, c-format
 msgid "%s: hole at (%.4f,%.4f) not merged\n"
 msgstr ""
 
-#: src/slotifier.c:327
+#: src/slotifier.c:409
 #, c-format
 msgid "%s: failed to build search tree\n"
 msgstr ""
 
-#: src/slotifier.c:395
+#: 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 ""
 
-#: src/slotifier.c:402
+#: src/slotifier.c:503
 #, c-format
 msgid "%s: error: excess command-line arguments\n"
 msgstr ""
 
-#: src/slotifier.c:420
+#: src/slotifier.c:521
 #, 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 ""