po/nb/gettext.edit.po in gettext-3.1.7 vs po/nb/gettext.edit.po in gettext-3.1.8

- old
+ new

@@ -35,40 +35,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:355 ../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:356 ../lib/gettext/tools/xgettext.rb:248 msgid "Specific options:" msgstr "Spesifikke alternativer:" -#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:363 +#: ../lib/gettext/tools/msgcat.rb:214 ../lib/gettext/tools/msgmerge.rb:364 #, fuzzy msgid "Write output to specified file" msgstr "skriv ut til spesifisert fil" #: ../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:368 ../lib/gettext/tools/msgmerge.rb:387 ../lib/gettext/tools/xgettext.rb:302 +#: ../lib/gettext/tools/msgcat.rb:220 ../lib/gettext/tools/msgcat.rb:237 ../lib/gettext/tools/msgmerge.rb:369 ../lib/gettext/tools/msgmerge.rb:388 ../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:375 ../lib/gettext/tools/msgmerge.rb:382 +#: ../lib/gettext/tools/msgcat.rb:225 ../lib/gettext/tools/msgcat.rb:230 ../lib/gettext/tools/msgmerge.rb:376 ../lib/gettext/tools/msgmerge.rb:383 msgid "Sort output by location" msgstr "" -#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:376 +#: ../lib/gettext/tools/msgcat.rb:231 ../lib/gettext/tools/msgmerge.rb:377 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:370 ../lib/gettext/tools/msgmerge.rb:377 +#: ../lib/gettext/tools/msgcat.rb:232 ../lib/gettext/tools/msgcat.rb:239 ../lib/gettext/tools/msgmerge.rb:371 ../lib/gettext/tools/msgmerge.rb:378 msgid "Just for GNU gettext's msgcat compatibility" msgstr "" -#: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:369 +#: ../lib/gettext/tools/msgcat.rb:238 ../lib/gettext/tools/msgmerge.rb:370 msgid "It is same as --sort-by-msgid" msgstr "" #: ../lib/gettext/tools/msgcat.rb:244 msgid "Remove location information" @@ -92,15 +92,15 @@ #: ../lib/gettext/tools/msgcat.rb:269 msgid "Remove all comments" msgstr "" -#: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:397 ../lib/gettext/tools/xgettext.rb:312 +#: ../lib/gettext/tools/msgcat.rb:274 ../lib/gettext/tools/msgmerge.rb:398 ../lib/gettext/tools/xgettext.rb:312 msgid "Set output page width" msgstr "" -#: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:403 ../lib/gettext/tools/xgettext.rb:318 +#: ../lib/gettext/tools/msgcat.rb:280 ../lib/gettext/tools/msgmerge.rb:404 ../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" @@ -108,11 +108,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:420 +#: ../lib/gettext/tools/msgcat.rb:301 ../lib/gettext/tools/msgmerge.rb:421 msgid "Don't output obsolete entries" msgstr "" #: ../lib/gettext/tools/msgcat.rb:306 msgid "Remove FIELD from header" @@ -173,11 +173,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:424 +#: ../lib/gettext/tools/msginit.rb:131 ../lib/gettext/tools/msgmerge.rb:425 msgid "Display this help and exit" msgstr "" #: ../lib/gettext/tools/msginit.rb:136 #, fuzzy @@ -208,35 +208,35 @@ #: ../lib/gettext/tools/msginit.rb:251 msgid "Please enter your email address" msgstr "" -#: ../lib/gettext/tools/msgmerge.rb:344 +#: ../lib/gettext/tools/msgmerge.rb:345 msgid "Usage: %s [OPTIONS] definition.po reference.pot" msgstr "" -#: ../lib/gettext/tools/msgmerge.rb:347 +#: ../lib/gettext/tools/msgmerge.rb:348 #, 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 "Slår sammen to po-filer av Uniforum-typen. def.po-filen er en eksisterendePO-fil med oversettelser. ref.po-filen er den sist opprettede PO-filen medoppdaterte kildereferanser. ref.pot er generelt opprettet av rgettext." -#: ../lib/gettext/tools/msgmerge.rb:358 +#: ../lib/gettext/tools/msgmerge.rb:359 msgid "Update definition.po" msgstr "" -#: ../lib/gettext/tools/msgmerge.rb:392 ../lib/gettext/tools/xgettext.rb:307 +#: ../lib/gettext/tools/msgmerge.rb:393 ../lib/gettext/tools/xgettext.rb:307 msgid "Preserve '#: FILENAME:LINE' lines" msgstr "" -#: ../lib/gettext/tools/msgmerge.rb:414 +#: ../lib/gettext/tools/msgmerge.rb:415 msgid "Disable fuzzy matching" msgstr "" -#: ../lib/gettext/tools/msgmerge.rb:415 +#: ../lib/gettext/tools/msgmerge.rb:416 msgid "(enable)" msgstr "" -#: ../lib/gettext/tools/msgmerge.rb:430 +#: ../lib/gettext/tools/msgmerge.rb:431 #, fuzzy msgid "Display version information and exit" msgstr "vis versjonsinformasjon og avslutt" #: ../lib/gettext/tools/parser/glade.rb:32