gettext.edit.po in gettext-3.1.5

- old
+ new

@@ -36,40 +36,40 @@
 
 #: ../lib/gettext/tools/msgcat.rb:209
 msgid "Concatenates and merges PO files."
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:211 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:333 ../lib/gettext/tools/xgettext.rb:248
+#: ../lib/gettext/tools/msgcat.rb:211 ../lib/gettext/tools/msgfmt.rb:86 ../lib/gettext/tools/msginit.rb:92 ../lib/gettext/tools/msgmerge.rb:355 ../lib/gettext/tools/xgettext.rb:248
 msgid "Specific options:"
 msgstr "Options spécifiques:"
 
-#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:341
+#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:363
 #, fuzzy
 msgid "Write output to specified file"
 msgstr "écrit la sortie dans le fichier spécifié"
 
 #: ../lib/gettext/tools/msgcat.rb:215
 msgid "(default: the standard output)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237 ../lib/gettext/tools/msgmerge.rb:346 ../lib/gettext/tools/msgmerge.rb:365 ../lib/gettext/tools/xgettext.rb:302
+#: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237 ../lib/gettext/tools/msgmerge.rb:368 ../lib/gettext/tools/msgmerge.rb:387 ../lib/gettext/tools/xgettext.rb:302
 msgid "Sort output by msgid"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:353 ../lib/gettext/tools/msgmerge.rb:360
+#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:375 ../lib/gettext/tools/msgmerge.rb:382
 msgid "Sort output by location"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:354
+#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:376
 msgid "It is same as --sort-by-location"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:348 ../lib/gettext/tools/msgmerge.rb:355
+#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:370 ../lib/gettext/tools/msgmerge.rb:377
 msgid "Just for GNU gettext's msgcat compatibility"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:347
+#: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:369
 msgid "It is same as --sort-by-msgid"
 msgstr ""
 
 #: ../lib/gettext/tools/msgcat.rb:244
 msgid "Remove location information"
@@ -93,15 +93,15 @@
 
 #: ../lib/gettext/tools/msgcat.rb:269
 msgid "Remove all comments"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:375 ../lib/gettext/tools/xgettext.rb:312
+#: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:397 ../lib/gettext/tools/xgettext.rb:312
 msgid "Set output page width"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:381 ../lib/gettext/tools/xgettext.rb:318
+#: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:403 ../lib/gettext/tools/xgettext.rb:318
 msgid "Break long message lines, longer than the output page width, into several lines"
 msgstr ""
 
 #: ../lib/gettext/tools/msgcat.rb:291
 msgid "Ignore fuzzy entries"
@@ -109,11 +109,11 @@
 
 #: ../lib/gettext/tools/msgcat.rb:296
 msgid "Don't report warning messages"
 msgstr ""
 
-#: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:398
+#: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:420
 msgid "Don't output obsolete entries"
 msgstr ""
 
 #: ../lib/gettext/tools/msgcat.rb:306
 msgid "Remove FIELD from header"
@@ -174,11 +174,11 @@
 
 #: ../lib/gettext/tools/msginit.rb:127
 msgid "Use EMAIL as translator email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:402
+#: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:424
 msgid "Display this help and exit"
 msgstr ""
 
 #: ../lib/gettext/tools/msginit.rb:136
 #, fuzzy
@@ -209,35 +209,35 @@
 
 #: ../lib/gettext/tools/msginit.rb:251
 msgid "Please enter your email address"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:322
+#: ../lib/gettext/tools/msgmerge.rb:344
 msgid "Usage: %s [OPTIONS] definition.po reference.pot"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:325
+#: ../lib/gettext/tools/msgmerge.rb:347
 #, fuzzy
 msgid "Merges two Uniforum style .po files together. The definition.po file is an existing PO file with translations. The reference.pot file is the last created PO file with up-to-date source references. The reference.pot is generally created by rxgettext."
 msgstr "Fusionne deux fichiers .po de style Uniforum.  Le fichier def.po est un fichier de traduction original.  Le fichier ref.pot est le dernier fichier de traduction créé avec les sources mise-à-jour.  ref.pot est en général généré par rgettext."
 
-#: ../lib/gettext/tools/msgmerge.rb:336
+#: ../lib/gettext/tools/msgmerge.rb:358
 msgid "Update definition.po"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:370 ../lib/gettext/tools/xgettext.rb:307
+#: ../lib/gettext/tools/msgmerge.rb:392 ../lib/gettext/tools/xgettext.rb:307
 msgid "Preserve '#: FILENAME:LINE' lines"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:392
+#: ../lib/gettext/tools/msgmerge.rb:414
 msgid "Disable fuzzy matching"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:393
+#: ../lib/gettext/tools/msgmerge.rb:415
 msgid "(enable)"
 msgstr ""
 
-#: ../lib/gettext/tools/msgmerge.rb:408
+#: ../lib/gettext/tools/msgmerge.rb:430
 #, fuzzy
 msgid "Display version information and exit"
 msgstr "affiche la version du programme et sort"
 
 #: ../lib/gettext/tools/parser/glade.rb:32