Use portable format specifiers: Case %ld - *.po files.

Fix uses of plain "%ld" within *.po files:
- Replace "%ld" with "%<PRId64>".

src/po/af.po

@@ -77,8 +77,8 @@ msgstr "E84: Geen veranderde buffer gevind nie"
 msgid "E85: There is no listed buffer"
 msgstr "E85: Daar is geen gelyste buffer nie"
 
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Buffer %ld bestaan nie"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Buffer %<PRId64> bestaan nie"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Kan nie verby laaste buffer gaan nie"
@@ -86,8 +86,8 @@ msgstr "E87: Kan nie verby laaste buffer gaan nie"
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: Kan nie v<><76>r eerste buffer gaan nie"
 
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: Buffer %ld nog ongestoor sedert vorige wysiging (gebruik ! om te dwing)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: Buffer %<PRId64> nog ongestoor sedert vorige wysiging (gebruik ! om te dwing)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Kan nie laaste buffer uitlaai nie"
@@ -96,8 +96,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Waarskuwing: L<>erlys loop oor"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: buffer %ld kon nie gevind word nie"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: buffer %<PRId64> kon nie gevind word nie"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -108,8 +108,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Geen buffer wat by %s pas nie"
 
 #, c-format
-msgid "line %ld"
-msgstr "re<72>l %ld"
+msgid "line %<PRId64>"
+msgstr "re<72>l %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Buffer met hierdie naam bestaan alreeds"
@@ -134,12 +134,12 @@ msgid "1 line --%d%%--"
 msgstr "1 re<72>l --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld re<72>ls --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> re<72>ls --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "re<72>l %ld van %ld --%d%%-- kolom "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "re<72>l %<PRId64> van %<PRId64> --%d%%-- kolom "
 
 msgid "[No file]"
 msgstr "[Geen l<>er]"
@@ -189,12 +189,12 @@ msgid "Signs for %s:"
 msgstr "Tekens vir %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    re<72>l=%ld  id=%d  naam=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    re<72>l=%<PRId64>  id=%d  naam=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Kan nie meer as %ld buffers 'diff' nie"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Kan nie meer as %<PRId64> buffers 'diff' nie"
 
 msgid "E97: Cannot create diffs"
 msgstr "E97: Kan nie 'diffs' skep nie "
@@ -479,8 +479,8 @@ msgid "%s aborted"
 msgstr "%s gekanselleer"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s lewer #%ld op"
+msgid "%s returning #%<PRId64>"
+msgstr "%s lewer #%<PRId64> op"
 
 #, c-format
 msgid "%s returning \"%s\""
@@ -506,16 +506,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Ontfoutmodus begin nou.  Tik \"cont\" om te verlaat."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "re<72>l %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "re<72>l %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "cmd: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Inspeksiepunt in \"%s%s\" re<72>l %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Inspeksiepunt in \"%s%s\" re<72>l %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -525,8 +525,8 @@ msgid "No breakpoints defined"
 msgstr "Geen inspeksiepunte gedefinieer nie"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  re<72>l %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  re<72>l %<PRId64>"
 
 msgid "Save As"
 msgstr "Stoor As"
@@ -581,16 +581,16 @@ msgid "could not source \"%s\""
 msgstr "kon nie \"%s\" uitvoer nie"
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "re<72>l %ld: kon nie \"%s\" uitvoer nie"
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "re<72>l %<PRId64>: kon nie \"%s\" uitvoer nie"
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "besig om \"%s\" uit te voer"
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "re<72>l %ld: voer nou \"%s\" uit"
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "re<72>l %<PRId64>: voer nou \"%s\" uit"
 
 #, c-format
 msgid "finished sourcing %s"
@@ -699,12 +699,12 @@ msgid "1 line moved"
 msgstr "1 re<72>l geskuif"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld re<72>ls geskuif"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> re<72>ls geskuif"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld re<72>ls filtreer"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> re<72>ls filtreer"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filter* Outobevele mag nie die huidige buffer verander nie"
@@ -779,8 +779,8 @@ msgid "Overwrite existing file \"%.*s\"?"
 msgstr "Oorskryf bestaande l<>er \"%.*s\"?"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: Geen l<>ernaam vir buffer %ld nie"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: Geen l<>ernaam vir buffer %<PRId64> nie"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: L<>er nie gestoor nie: Stoor is afgeskakel deur die 'write' opsie"
@@ -820,15 +820,15 @@ msgid "1 substitution"
 msgstr "1 vervanging"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld vervangings"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> vervangings"
 
 msgid " on 1 line"
 msgstr " op 1 re<72>l"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " op %ld re<72>ls"
+msgid " on %<PRId64> lines"
+msgstr " op %<PRId64> re<72>ls"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: Kan nie :global rekursief doen nie "
@@ -909,8 +909,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Ongeldige buffernaam: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Ongeldige teken ID: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: Ongeldige teken ID: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (NIE GEVIND NIE)"
@@ -972,8 +972,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: Nog 1 l<>er om te bewerk"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: Nog %ld l<>ers om te bewerk"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: Nog %<PRId64> l<>ers om te bewerk"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: Bevel bestaan alreeds: gebruik ! om te herdefinieer"
@@ -1134,8 +1134,8 @@ msgstr "Uitsondering het klaar gemaak: %s"
 msgid "Exception discarded: %s"
 msgstr "Uitsondering weg gegooi: %s"
 
-msgid "%s, line %ld"
-msgstr "%s, re<72>l %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, re<72>l %<PRId64>"
 
 #. always scroll up, don't overwrite
 msgid "Exception caught: %s"
@@ -1316,8 +1316,8 @@ msgid "[CONVERSION ERROR]"
 msgstr "[OMSETTINGSFOUT]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[ONWETTIGE GREEP in re<72>l %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[ONWETTIGE GREEP in re<72>l %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[LEESFOUTE]"
@@ -1453,15 +1453,15 @@ msgid "1 line, "
 msgstr "1 re<72>l, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld re<72>ls, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> re<72>ls, "
 
 msgid "1 character"
 msgstr "1 karakter"
 
 #, c-format
-msgid "%ld characters"
-msgstr "%ld karakters"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> karakters"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -1814,19 +1814,19 @@ msgstr "Font0: %s\n"
 msgid "Font1: %s\n"
 msgstr "Font1: %s\n"
 
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "Font%ld wydte is nie twee keer d<>e van font0 nie\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "Font%<PRId64> wydte is nie twee keer d<>e van font0 nie\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "Font0 wydte: %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "Font0 wydte: %<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"Font1 wydte: %ld\n"
+"Font1 wydte: %<PRId64>\n"
 "\n"
 
 msgid "E256: Hangul automata ERROR"
@@ -1876,8 +1876,8 @@ msgstr "E564: %s is nie 'n gids of 'n geldige 'cscope' databasis nie"
 msgid "Added cscope database %s"
 msgstr "'cscope' databasis %s bygevoeg"
 
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: 'cscope' verbinding %ld kon nie gelees word nie"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: 'cscope' verbinding %<PRId64> kon nie gelees word nie"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: onbekende 'cscope' soektipe"
@@ -2985,12 +2985,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: Kon nie bewaar nie"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: 'ml_get': ongeldige 'lnum': %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: 'ml_get': ongeldige 'lnum': %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: 'ml_get': kan re<72>l %ld nie vind nie"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: 'ml_get': kan re<72>l %<PRId64> nie vind nie"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: wyser blok id verkeerd 3"
@@ -3008,8 +3008,8 @@ msgid "deleted block 1?"
 msgstr "verwyder blok 1?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Kan nie re<72>l %ld vind nie"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Kan nie re<72>l %<PRId64> vind nie"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: wyser blok id verkeerd"
@@ -3018,12 +3018,12 @@ msgid "pe_line_count is zero"
 msgstr "'pe_line_count' is nul"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: re<72>lnommer buite perke: %ld verby die einde"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: re<72>lnommer buite perke: %<PRId64> verby die einde"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: re<72>ltelling mag verkeerd wees in blok %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: re<72>ltelling mag verkeerd wees in blok %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "Stapel grootte verhoog"
@@ -3255,12 +3255,12 @@ msgid "1 line less"
 msgstr "1 re<72>l minder"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld meer re<72>ls"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> meer re<72>ls"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld minder re<72>ls"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> minder re<72>ls"
 
 msgid " (Interrupted)"
 msgstr " (Onderbreek)"
@@ -3296,8 +3296,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: R<>el word te lank"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Interne fout: 'lalloc(%ld, )'"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Interne fout: 'lalloc(%<PRId64>, )'"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -3378,8 +3378,8 @@ msgstr "E668: Verkeerde toegangsmodue vir NetBeans konneksie inligtingsl
 msgid "read from Netbeans socket"
 msgstr "lees vanaf Netbeans 'socket'"
 
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: NetBeans konneksie vir buffer %ld verloor"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: NetBeans konneksie vir buffer %<PRId64> verloor"
 
 msgid "Warning: terminal cannot highlight"
 msgstr "Waarskuwing: terminaal kan nie teks uitlig nie"
@@ -3415,23 +3415,23 @@ msgid "1 line %sed %d times"
 msgstr "1 re<72>l ge-%s %d keer"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld re<72>ls 1 keer ge-%s"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> re<72>ls 1 keer ge-%s"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld re<72>ls ge-%s %d keer"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> re<72>ls ge-%s %d keer"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld re<72>ls om in te keep..."
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> re<72>ls om in te keep..."
 
 msgid "1 line indented "
 msgstr "1 re<72>l ingekeep "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld re<72>ls ingekeep "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> re<72>ls ingekeep "
 
 #. must display the prompt
 msgid "cannot yank; delete anyway"
@@ -3440,19 +3440,19 @@ msgstr "kan nie pluk nie: verwyder in elk geval"
 msgid "1 line changed"
 msgstr "1 re<72>l verander"
 
-msgid "%ld lines changed"
-msgstr "%ld re<72>ls verander"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> re<72>ls verander"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "laat %ld re<72>ls gaan"
+msgid "freeing %<PRId64> lines"
+msgstr "laat %<PRId64> re<72>ls gaan"
 
 msgid "1 line yanked"
 msgstr "1 re<72>l gepluk"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld re<72>ls gepluk"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> re<72>ls gepluk"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3485,21 +3485,21 @@ msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Ongeldige registernaam: '%s'"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld Kolomme; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> Kolomme; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "%s%ld van %ld re<72>ls gekies; %ld van %ld Woorde; %ld van %ld Grepe"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "%s%<PRId64> van %<PRId64> re<72>ls gekies; %<PRId64> van %<PRId64> Woorde; %<PRId64> van %<PRId64> Grepe"
 
 # njj: Karakters kan meerdere grepe wees, sien ':h multibyte'
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Kol %s van %s; Re<52>l %ld van %ld; Woord %ld van %ld; Greep %ld van %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Kol %s van %s; Re<52>l %<PRId64> van %<PRId64>; Woord %<PRId64> van %<PRId64>; Greep %<PRId64> van %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld vir 'BOM')"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> vir 'BOM')"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Bladsy %N"
@@ -3666,8 +3666,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Benodig Amigados weergawe 2.04 of later\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Benodig %s weergawe %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Benodig %s weergawe %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Kan nie NIL: oopmaak nie\n"
@@ -3751,8 +3751,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Het dodelike sein gevang\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "Om die X-vertoonskerm oop te maak het %ld msek gevat"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "Om die X-vertoonskerm oop te maak het %<PRId64> msek gevat"
 
 msgid ""
 "\n"
@@ -4393,8 +4393,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Formaatfout in etiketl<74>er \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "Voor greep %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Voor greep %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -4457,8 +4457,8 @@ msgid "1 change"
 msgstr "1 verandering"
 
 #, c-format
-msgid "%ld changes"
-msgstr "%ld veranderinge"
+msgid "%<PRId64> changes"
+msgstr "%<PRId64> veranderinge"
 
 msgid "E439: undo list corrupt"
 msgstr "E439: herstellys korrup"
@@ -5175,8 +5175,8 @@ msgstr "E463: Omgewing is onder bewaking, kan nie verander nie"
 #~ msgid "1 line ~ed"
 #~ msgstr "1 re<72>l ge-~"
 
-#~ msgid "%ld lines ~ed"
-#~ msgstr "%ld re<72>ls ge-~"
+#~ msgid "%<PRId64> lines ~ed"
+#~ msgstr "%<PRId64> re<72>ls ge-~"
 
 #~ msgid " BLOCK"
 #~ msgstr " BLOK"
@@ -5202,14 +5202,14 @@ msgstr "E463: Omgewing is onder bewaking, kan nie verander nie"
 #~ msgid "Missing filename"
 #~ msgstr "Ontbrekende l<>ernaam"
 
-#~ msgid "Invalid line number: %ld"
-#~ msgstr "Ongeldige re<72>lnommer: %ld"
+#~ msgid "Invalid line number: %<PRId64>"
+#~ msgstr "Ongeldige re<72>lnommer: %<PRId64>"
 
 #~ msgid "Cannot use :normal from event handler"
 #~ msgstr "Kan ':normal' nie vanuit gebeurtenishanteerder gebruik nie"
 
-#~ msgid "%ldL, %ldC"
-#~ msgstr "%ldR, %ldK"
+#~ msgid "%<PRId64>L, %<PRId64>C"
+#~ msgstr "%<PRId64>R, %<PRId64>K"
 
 #~ msgid "VIM - Help on..."
 #~ msgstr "VIM - Hulp met.."
@@ -5350,8 +5350,8 @@ msgstr "E463: Omgewing is onder bewaking, kan nie verander nie"
 #~ msgid "Security error: new viminfo file is a symbolic link"
 #~ msgstr "Sekuriteitsfout: nuwe viminfo l<>er is a simboliese skakel"
 
-#~ msgid "line ~%ld: %s"
-#~ msgstr "re<72>l ~%ld: %s"
+#~ msgid "line ~%<PRId64>: %s"
+#~ msgstr "re<72>l ~%<PRId64>: %s"
 
 #~ msgid "makeef option not set"
 #~ msgstr "'makeef' opsie nie aan nie"

src/po/ca.po

@@ -61,8 +61,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: No hi ha cap buffer a la llista"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: El buffer %ld no existeix"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: El buffer %<PRId64> no existeix"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: No es pot anar m<>s enll<6C> de l'<27>ltim buffer"
@@ -71,8 +71,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: No es pot anar m<>s enll<6C> del primer buffer"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: No s'ha desat el buffer %ld (afegiu ! per confirmar)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: No s'ha desat el buffer %<PRId64> (afegiu ! per confirmar)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: No es pot alliberar l'<27>ltim buffer"
@@ -81,8 +81,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Atenci<63>: S'ha desbordat la llista de noms de fitxers"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: No s'ha trobat el buffer %ld"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: No s'ha trobat el buffer %<PRId64>"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -93,8 +93,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: No hi ha cap coincid<69>ncia per a %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "l<>nia %ld"
+msgid "line %<PRId64>"
+msgstr "l<>nia %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Ja existeix un buffer amb aquest nom"
@@ -119,12 +119,12 @@ msgid "1 line --%d%%--"
 msgstr "1 l<>nia --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld l<>nies --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> l<>nies --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "l<>nia %ld de %ld --%d%%-- col "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "l<>nia %<PRId64> de %<PRId64> --%d%%-- col "
 
 msgid "[No Name]"
 msgstr "[Sense nom]"
@@ -174,12 +174,12 @@ msgid "Signs for %s:"
 msgstr "Senyals per a %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    l<>nia=%ld  id=%d  nom=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    l<>nia=%<PRId64>  id=%d  nom=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: No es poden mostrar difer<65>ncies amb m<>s de %ld buffers"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: No es poden mostrar difer<65>ncies amb m<>s de %<PRId64> buffers"
 
 msgid "E97: Cannot create diffs"
 msgstr "E97: No s'han pogut mostrar les difer<65>ncies"
@@ -340,8 +340,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: Car<61>cters inesperats :let"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: <20>ndex de llista fora d'abast: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: <20>ndex de llista fora d'abast: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -692,8 +692,8 @@ msgid "%s aborted"
 msgstr "s'ha avortat %s"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s ha retornat #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s ha retornat #%<PRId64>"
 
 #, c-format
 msgid "%s returning %s"
@@ -725,16 +725,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Entrant en mode de depuraci<63>. Escriviu \"cont\" per a continuar."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "l<>nia %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "l<>nia %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "ordre: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Punt de ruptura a \"%s%s\" l<>nia %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Punt de ruptura a \"%s%s\" l<>nia %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -744,8 +744,8 @@ msgid "No breakpoints defined"
 msgstr "No s'han definit punts de ruptura"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  l<>nia %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  l<>nia %<PRId64>"
 
 msgid "E750: First use :profile start <fname>"
 msgstr "E750: Primer useu :profile start <nomfitxer>"
@@ -807,16 +807,16 @@ msgid "could not source \"%s\""
 msgstr "no s'ha pogut interpretar \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "l<>nia %ld: no s'ha pogut interpretar \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "l<>nia %<PRId64>: no s'ha pogut interpretar \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "interpretant \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "l<>nia %ld: interpretant \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "l<>nia %<PRId64>: interpretant \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -879,12 +879,12 @@ msgid "1 line moved"
 msgstr "1 l<>nia despla<6C>ada"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld l<>nies despla<6C>ades"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> l<>nies despla<6C>ades"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld l<>nies filtrades"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> l<>nies filtrades"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: Les auto-ordres *Filter* no poden canviar el buffer actual"
@@ -965,8 +965,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: El fitxer d'intercanvi existeix: %s (:silent! per a confirmar)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: No hi ha nom de fitxer per al buffer %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: No hi ha nom de fitxer per al buffer %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: No s'ha escrit el fitxer: L'opci<63> 'write' ho impedeix"
@@ -1011,19 +1011,19 @@ msgid "1 substitution"
 msgstr "1 substituci<63>"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld coincid<69>ncies"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> coincid<69>ncies"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld substitucions"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> substitucions"
 
 msgid " on 1 line"
 msgstr " en 1 l<>nia"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " en %ld l<>nies"
+msgid " on %<PRId64> lines"
+msgstr " en %<PRId64> l<>nies"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: No es pot executar una ordre global de forma recursiva"
@@ -1106,8 +1106,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: El nom del buffer no <20>s v<>lid: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: L'ID del senyal no <20>s v<>lida: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: L'ID del senyal no <20>s v<>lida: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (NO TROBAT)"
@@ -1170,8 +1170,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: Queda 1 fitxer per editar"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: Queden %ld fitxers per editar"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: Queden %<PRId64> fitxers per editar"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: L'ordre ja existeix: afegiu ! per substituir-la"
@@ -1359,8 +1359,8 @@ msgid "Exception discarded: %s"
 msgstr "Exepci<63> descartada: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, l<>nia %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, l<>nia %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1562,12 +1562,12 @@ msgid "[crypted]"
 msgstr "[xifrat]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[ERROR DE CONVERSI<53> a la l<>nia %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[ERROR DE CONVERSI<53> a la l<>nia %<PRId64>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[OCTET IL<49>LEGAL a la l<>nia %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[OCTET IL<49>LEGAL a la l<>nia %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[ERRORS DE LECTURA]"
@@ -1710,15 +1710,15 @@ msgid "1 line, "
 msgstr "1 l<>nia, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld l<>nies, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> l<>nies, "
 
 msgid "1 character"
 msgstr "1 car<61>cter"
 
 #, c-format
-msgid "%ld characters"
-msgstr "%ld car<61>cters"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> car<61>cters"
 
 # <20>no final de l<>nia<69>  eac
 msgid "[noeol]"
@@ -2133,19 +2133,19 @@ msgid "Font1: %s\n"
 msgstr "Fosa1: %s\n"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "L'amplada de la fosa%ld no <20>s el doble que la de la fosa0\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "L'amplada de la fosa%<PRId64> no <20>s el doble que la de la fosa0\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "Amplada de de la Fosa0: %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "Amplada de de la Fosa0: %<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"Amplada de la Fosa1: %ld\n"
+"Amplada de la Fosa1: %<PRId64>\n"
 "\n"
 
 msgid "Invalid font specification"
@@ -2322,8 +2322,8 @@ msgid "Added cscope database %s"
 msgstr "S'ha afegit la base de dades cscope %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: Error en llegir la connexi<78> cscope %ld"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: Error en llegir la connexi<78> cscope %<PRId64>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: Tipus de cerca cscope desconeguda"
@@ -3475,12 +3475,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: La preservaci<63> ha fallat"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: lnum no v<>lid: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: lnum no v<>lid: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: no s'ha trobat la l<>nia %ld"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: no s'ha trobat la l<>nia %<PRId64>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: Punter a la id d'un bloc incorrecte 3"
@@ -3498,8 +3498,8 @@ msgid "deleted block 1?"
 msgstr "s'ha eliminat el bloc 1?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: No s'ha trobat la l<>nia %ld"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: No s'ha trobat la l<>nia %<PRId64>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: Punter a la id d'un bloc incorrecte"
@@ -3508,12 +3508,12 @@ msgid "pe_line_count is zero"
 msgstr "po_line_count <20>s zero"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: Nombre de l<>nia fora d'abast: %ld passat el final"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: Nombre de l<>nia fora d'abast: %<PRId64> passat el final"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: Comptador de l<>nia incorrecte al bloc %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: Comptador de l<>nia incorrecte al bloc %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "La mida de la pila s'incrementa"
@@ -3701,8 +3701,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Premeu ENTRAR o introdu<64>u una ordre per a continuar"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s l<>nia %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s l<>nia %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- M<>s --"
@@ -3768,12 +3768,12 @@ msgid "1 line less"
 msgstr "1 l<>nia menys"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld l<>nies m<>s"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> l<>nies m<>s"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld l<>nies menys"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> l<>nies menys"
 
 msgid " (Interrupted)"
 msgstr " (Interromput)"
@@ -3812,8 +3812,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: La l<>nia s'est<73> tornant massa llarga"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Error intern: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Error intern: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -3882,8 +3882,8 @@ msgid "read from Netbeans socket"
 msgstr "lectura d'un socket Netbeans"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: S'ha perdut la connexi<78> NetBeans per al buffer %ld"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: S'ha perdut la connexi<78> NetBeans per al buffer %<PRId64>"
 
 msgid "E505: "
 msgstr "E505:"
@@ -3928,23 +3928,23 @@ msgid "1 line %sed %d times"
 msgstr "1 l<>nia %sada %d vegades"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld l<>nies %sades 1 vegada"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> l<>nies %sades 1 vegada"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld l<>nies %sades %d vegades"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> l<>nies %sades %d vegades"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld l<>nies a sagnar... "
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> l<>nies a sagnar... "
 
 msgid "1 line indented "
 msgstr "1 l<>nia sagnada "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld l<>nies sagnades "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> l<>nies sagnades "
 
 msgid "E748: No previously used register"
 msgstr "E748: No hi ha cap registre usat amb anterioritat"
@@ -3957,12 +3957,12 @@ msgid "1 line changed"
 msgstr "1 l<>nia canviada"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld l<>nies canviades"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> l<>nies canviades"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "alliberant %ld l<>nies"
+msgid "freeing %<PRId64> lines"
+msgstr "alliberant %<PRId64> l<>nies"
 
 msgid "block of 1 line yanked"
 msgstr "bloc d'1 l<>nia copiat"
@@ -3971,12 +3971,12 @@ msgid "1 line yanked"
 msgstr "1 l<>nia copiada"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "bloc de %ld l<>nies copiat"
+msgid "block of %<PRId64> lines yanked"
+msgstr "bloc de %<PRId64> l<>nies copiat"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld l<>nies copiades"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> l<>nies copiades"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4006,28 +4006,28 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: El tipus de registre %d <20>s desconegut"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld Cols; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> Cols; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Selecci<63> %s%ld de %ld L<>nies; %ld de %ld Paraules; %ld de %ld Octets"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Selecci<63> %s%<PRId64> de %<PRId64> L<>nies; %<PRId64> de %<PRId64> Paraules; %<PRId64> de %<PRId64> Octets"
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld Bytes"
-msgstr "Selecci<63> %s%ld de %ld L<>nies; %ld de %ld Paraules; %ld de %ld Car<61>cters; %ld de %ld Octets"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
+msgstr "Selecci<63> %s%<PRId64> de %<PRId64> L<>nies; %<PRId64> de %<PRId64> Paraules; %<PRId64> de %<PRId64> Car<61>cters; %<PRId64> de %<PRId64> Octets"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Col %s de %s; L<>nia %ld de %ld; Paraula %ld de %ld; Octet %ld de %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Col %s de %s; L<>nia %<PRId64> de %<PRId64>; Paraula %<PRId64> de %<PRId64>; Octet %<PRId64> de %<PRId64>"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of %ld"
-msgstr "Col %s de %s; L<>nia %ld de %ld; Paraula %ld de %ld; Car<61>cter %ld de %ld; Octet %ld de %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Col %s de %s; L<>nia %<PRId64> de %<PRId64>; Paraula %<PRId64> de %<PRId64>; Car<61>cter %<PRId64> de %<PRId64>; Octet %<PRId64> de %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld per la BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> per la BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=P<>gina %N"
@@ -4193,8 +4193,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Es requereix Amigados versi<73> 2.04 o posterior\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Es requereix %s versi<73> %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Es requereix %s versi<73> %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "No s'ha pogut obrir NIL:\n"
@@ -4278,8 +4278,8 @@ msgstr "Vim: S'ha rebut un senyal letal\n"
 
 # display
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "S'ha trigat %ld mseg en obrir el display X"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "S'ha trigat %<PRId64> mseg en obrir el display X"
 
 msgid ""
 "\n"
@@ -4934,8 +4934,8 @@ msgid "Performing soundfolding..."
 msgstr "Efectuant expansi<73> per similitud fon<6F>tica..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "Nombre de paraules despr<70>s de l'expansi<73> per similitud fon<6F>tica: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "Nombre de paraules despr<70>s de l'expansi<73> per similitud fon<6F>tica: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -4970,8 +4970,8 @@ msgid "Done!"
 msgstr "Fet!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' no t<> %ld entrades"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' no t<> %<PRId64> entrades"
 
 #, c-format
 msgid "Word removed from %s"
@@ -4988,8 +4988,8 @@ msgid "Sorry, no suggestions"
 msgstr "Cap suggeriment"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Ll<4C>stima, nom<6F>s %ld suggeriments"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "Ll<4C>stima, nom<6F>s %<PRId64> suggeriments"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5292,8 +5292,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Error de format en el fitxer d'etiquetes \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "Abans de l'octet %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Abans de l'octet %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5357,8 +5357,8 @@ msgid "Already at newest change"
 msgstr "Ja sou en el canvi m<>s recent"
 
 #, c-format
-msgid "Undo number %ld not found"
-msgstr "L<>nia de desfer n<>mero %ld no trobada"
+msgid "Undo number %<PRId64> not found"
+msgstr "L<>nia de desfer n<>mero %<PRId64> no trobada"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: els nombres de l<>nia no s<>n correctes"
@@ -5382,8 +5382,8 @@ msgid "changes"
 msgstr "canvis"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "abans"
@@ -5398,8 +5398,8 @@ msgid "number changes  time"
 msgstr "n<>mero canvis   hora"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "fa %ld segons"
+msgid "%<PRId64> seconds ago"
+msgstr "fa %<PRId64> segons"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin no est<73> perm<72>s despr<70>s de undo"

src/po/cs.cp1250.po

@@ -60,8 +60,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: Seznam buffer<65> je pr<70>zdn<64>"
 
 #, c-format
-msgid "E86: Cannot go to buffer %ld"
-msgstr "E86: Nelze p<>esko<6B>it na buffer %ld"
+msgid "E86: Cannot go to buffer %<PRId64>"
+msgstr "E86: Nelze p<>esko<6B>it na buffer %<PRId64>"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Za posledn<64> buffer nelze p<>esko<6B>it"
@@ -70,8 +70,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: P<>ed prvn<76> buffer nelze p<>esko<6B>it"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (use ! to override)"
-msgstr "E89: Zm<5A>ny v bufferu %ld nebyly ulo<6C>eny (! pro vynucen<65>)"
+msgid "E89: No write since last change for buffer %<PRId64> (use ! to override)"
+msgstr "E89: Zm<5A>ny v bufferu %<PRId64> nebyly ulo<6C>eny (! pro vynucen<65>)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Posledn<64> buffer nelze deaktivovat"
@@ -80,8 +80,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Varov<6F>n<EFBFBD>: p<>ete<74>en<65> seznamu s n<>zvy soubor<6F>"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Buffer %ld nenalezen"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: Buffer %<PRId64> nenalezen"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -92,8 +92,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Vzoru %s nevyhovuje <20><>dn<64> buffer"
 
 #, c-format
-msgid "line %ld"
-msgstr "<22><>dek %ld"
+msgid "line %<PRId64>"
+msgstr "<22><>dek %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Buffer tohoto jm<6A>na ji<6A> existuje"
@@ -116,11 +116,11 @@ msgstr "[Pouze pro
 msgid "1 line --%d%%--"
 msgstr "<22><>dk<64>: --%d%%--"
 
-msgid "%ld lines --%d%%--"
-msgstr "<22><>dk<64>: %ld --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "<22><>dk<64>: %<PRId64> --%d%%--"
 
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "<22><>dek %ld/%ld --%d%%-- sloupec"
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "<22><>dek %<PRId64>/%<PRId64> --%d%%-- sloupec"
 
 msgid "[No file]"
 msgstr "[<5B><>dn<64> soubor]"
@@ -169,12 +169,12 @@ msgid "Signs for %s:"
 msgstr "Znaky pro %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    <20><>dek=%ld id=%d jm<6A>no=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    <20><>dek=%<PRId64> id=%d jm<6A>no=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Nelze p<>ekro<72>it maxim<69>ln<6C> po<70>et %ld diff buffer<65>"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Nelze p<>ekro<72>it maxim<69>ln<6C> po<70>et %<PRId64> diff buffer<65>"
 
 msgid "E97: Cannot create diffs"
 msgstr "E97: Nelze vytvo<76>it diffy"
@@ -446,8 +446,8 @@ msgid "E133: :return not inside a function"
 msgstr "E133: :return mimo funkci"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "dokon<6F>eno prov<6F>d<EFBFBD>n<EFBFBD> %s. N<>vratov<6F> hodnota #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "dokon<6F>eno prov<6F>d<EFBFBD>n<EFBFBD> %s. N<>vratov<6F> hodnota #%<PRId64>"
 
 #, c-format
 msgid "%s returning \"%s\""
@@ -471,12 +471,12 @@ msgid "1 line moved"
 msgstr "po<70>et p<>esunut<75>ch <20><>dk<64>: 1"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "Po<50>et p<>esunut<75>ch <20><>dk<64>: %ld"
+msgid "%<PRId64> lines moved"
+msgstr "Po<50>et p<>esunut<75>ch <20><>dk<64>: %<PRId64>"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "Po<50>et filtrovan<61>ch <20><>dk<64>: %ld"
+msgid "%<PRId64> lines filtered"
+msgstr "Po<50>et filtrovan<61>ch <20><>dk<64>: %<PRId64>"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: Automatick<63> p<><70>kazy *Filter* nesm<73> m<>nit aktu<74>ln<6C> buffer"
@@ -552,8 +552,8 @@ msgid "Overwrite existing file \"%.*s\"?"
 msgstr "P<>epsat soubor \"%.*s\"?"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: <20><>dn<64> n<>zev souboru pro buffer %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: <20><>dn<64> n<>zev souboru pro buffer %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: Soubor nebyl ulo<6C>en: Ukl<6B>d<EFBFBD>n<EFBFBD> je zak<61>z<EFBFBD>no volbou 'write'"
@@ -593,15 +593,15 @@ msgid "1 substitution"
 msgstr "1 nahrazen<65>"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld nahrazen<65>"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> nahrazen<65>"
 
 msgid " on 1 line"
 msgstr " na jednom <20><>dku"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " na %ld <20><>dc<64>ch"
+msgid " on %<PRId64> lines"
+msgstr " na %<PRId64> <20><>dc<64>ch"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global nelze volat rekurzivn<76>"
@@ -672,8 +672,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: chybn<62> jm<6A>no bufferu: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Chybn<62> ID volby: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: Chybn<62> ID volby: %<PRId64>"
 
 msgid "[Deleted]"
 msgstr "[Vymaz<61>no]"
@@ -682,16 +682,16 @@ msgid "Entering Debug mode.  Type \"cont\" to leave."
 msgstr "Spou<6F>t<EFBFBD>m lad<61>c<EFBFBD> re<72>im. Pro ukon<6F>en<65> napi<70>te \"cont\"."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "<22><>dek %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "<22><>dek %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "p<><70>kaz: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Bod p<>eru<72>en<65> v \"%s%s\" na <20><>dku %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Bod p<>eru<72>en<65> v \"%s%s\" na <20><>dku %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -701,8 +701,8 @@ msgid "No breakpoints defined"
 msgstr "Nebyly definov<6F>nu <20><>dn<64> body p<>eru<72>en<65>"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  <20><>dek %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  <20><>dek %<PRId64>"
 
 #, c-format
 msgid "Save changes to \"%.*s\"?"
@@ -752,16 +752,16 @@ msgid "could not source \"%s\""
 msgstr "nelze interpretovat \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "<22><>dek %ld: nelze interpretovat \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "<22><>dek %<PRId64>: nelze interpretovat \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "interpretuji \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "<22><>dek %ld: interpretuji %s"
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "<22><>dek %<PRId64>: interpretuji %s"
 
 #, c-format
 msgid "finished sourcing %s"
@@ -873,8 +873,8 @@ msgid "%d more files to edit.  Quit anyway?"
 msgstr "Je<4A>t<EFBFBD> zb<7A>vaj<61> soubory k editaci (%d). Chcete p<>esto ukon<6F>it editor?"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: Je<4A>t<EFBFBD> zb<7A>vaj<61> soubory k editaci (%ld)."
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: Je<4A>t<EFBFBD> zb<7A>vaj<61> soubory k editaci (%<PRId64>)."
 
 msgid "E174: Command already exists: use ! to redefine"
 msgstr "E174: P<><50>kaz ji<6A> existuje: pou<6F>ijte ! pro p<>edefinov<6F>n<EFBFBD>"
@@ -1262,15 +1262,15 @@ msgid "1 line, "
 msgstr "1 <20><>dek, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld <20><>dk<64>, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> <20><>dk<64>, "
 
 msgid "1 character"
 msgstr "1 znak"
 
 #, c-format
-msgid "%ld characters"
-msgstr "%ld znak<61>, "
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> znak<61>, "
 
 msgid "[noeol]"
 msgstr "[<5B><>dn<64> eol]"
@@ -1630,15 +1630,15 @@ msgid "Font%d width is not twice that of font0\n"
 msgstr "<22><><EFBFBD>ka p<>sma%d nen<65> dvojn<6A>soblem <20><><EFBFBD>ky p<>sma0\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "<22><><EFBFBD>ka p<>sma0: %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "<22><><EFBFBD>ka p<>sma0: %<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"<22><><EFBFBD>ka p<>sma1: %ld\n"
+"<22><><EFBFBD>ka p<>sma1: %<PRId64>\n"
 "\n"
 
 #, c-format
@@ -2764,12 +2764,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: Uchov<6F>n<EFBFBD> se nezda<64>ilo"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: chybn<62> <20><>slo <20><>dku: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: chybn<62> <20><>slo <20><>dku: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: nelze nal<61>zt <20><>dek %ld"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: nelze nal<61>zt <20><>dek %<PRId64>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: chybn<62> id ukazatele na blok 3"
@@ -2787,8 +2787,8 @@ msgid "deleted block 1?"
 msgstr "smaz<61>n blok 1?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Nelze nal<61>zt <20><>dek %ld"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Nelze nal<61>zt <20><>dek %<PRId64>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: chybn<62> id ukazatele na blok"
@@ -2797,12 +2797,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count m<> nulovou hodnotu"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: po<70>et <20><>dk<64> mimo rozsah: %ld > celkov<6F> po<70>et <20><>dk<64>"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: po<70>et <20><>dk<64> mimo rozsah: %<PRId64> > celkov<6F> po<70>et <20><>dk<64>"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: chybn<62> po<70>et <20><>dk<64> v bloku %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: chybn<62> po<70>et <20><>dk<64> v bloku %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "N<>r<EFBFBD>st velikosti z<>sobn<62>ku"
@@ -3039,12 +3039,12 @@ msgid "1 line less"
 msgstr "po<70>et smazan<61>ch <20><>dk<64>: 1"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "po<70>et nov<6F>ch <20><>dk<64>: %ld"
+msgid "%<PRId64> more lines"
+msgstr "po<70>et nov<6F>ch <20><>dk<64>: %<PRId64>"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "po<70>et smazan<61>ch <20><>dk<64>: %ld"
+msgid "%<PRId64> fewer lines"
+msgstr "po<70>et smazan<61>ch <20><>dk<64>: %<PRId64>"
 
 msgid " (Interrupted)"
 msgstr "(P<>eru<72>eno)"
@@ -3080,8 +3080,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: <20><>dek se st<73>v<EFBFBD> p<><70>li<6C> dlouh<75>m"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Vnit<69>n<EFBFBD> chyba: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Vnit<69>n<EFBFBD> chyba: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -3163,23 +3163,23 @@ msgid "1 line %sed %d times"
 msgstr "Po<50>et <20><>dk<64> posunut<75>ch pomoc<6F> %s %d-kr<6B>t : 1"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "Po<50>et <20><>dk<64>: %ld (posunut<75>ch jednou pomoc<6F> %s)"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "Po<50>et <20><>dk<64>: %<PRId64> (posunut<75>ch jednou pomoc<6F> %s)"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "Po<50>et <20><>dk<64>: %ld (posunut<75>ch pomoc<6F> %s %d-kr<6B>t)"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "Po<50>et <20><>dk<64>: %<PRId64> (posunut<75>ch pomoc<6F> %s %d-kr<6B>t)"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "po<70>et <20><>dk<64> k odsazen<65>: %ld"
+msgid "%<PRId64> lines to indent... "
+msgstr "po<70>et <20><>dk<64> k odsazen<65>: %<PRId64>"
 
 msgid "1 line indented "
 msgstr "po<70>et <20><>dk<64> k odsazen<65>: 1"
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "po<70>et odsazen<65>ch <20><>dk<64>: %ld"
+msgid "%<PRId64> lines indented "
+msgstr "po<70>et odsazen<65>ch <20><>dk<64>: %<PRId64>"
 
 #. must display the prompt
 msgid "cannot yank; delete anyway"
@@ -3189,19 +3189,19 @@ msgid "1 line changed"
 msgstr "po<70>et <20><>dek se zm<7A>n<EFBFBD>nou velikost<73> p<>smen: 1"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "po<70>et <20><>dek se zm<7A>n<EFBFBD>nou velikost<73> p<>smen: %ld"
+msgid "%<PRId64> lines changed"
+msgstr "po<70>et <20><>dek se zm<7A>n<EFBFBD>nou velikost<73> p<>smen: %<PRId64>"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "po<70>et uvol<6F>ovan<61>ch <20><>dk<64>: %ld"
+msgid "freeing %<PRId64> lines"
+msgstr "po<70>et uvol<6F>ovan<61>ch <20><>dk<64>: %<PRId64>"
 
 msgid "1 line yanked"
 msgstr "po<70>et zkop<6F>rovan<61>ch <20><>dk<64>: 1"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "po<70>et zkop<6F>rovan<61>ch <20><>dk<64>: %ld"
+msgid "%<PRId64> lines yanked"
+msgstr "po<70>et zkop<6F>rovan<61>ch <20><>dk<64>: %<PRId64>"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3234,20 +3234,20 @@ msgid "E354: Invalid register name: '%s'"
 msgstr "E354: '%s' nen<65> p<><70>pustn<74> jm<6A>no registru"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "<22><>dk<64>: %ld;"
+msgid "%<PRId64> Cols; "
+msgstr "<22><>dk<64>: %<PRId64>;"
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Vybr<62>no %s%ld z %ld <20><>dk<64>; %ld z %ld slov; %ld z %ld Byt<79>"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Vybr<62>no %s%<PRId64> z %<PRId64> <20><>dk<64>; %<PRId64> z %<PRId64> slov; %<PRId64> z %<PRId64> Byt<79>"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Sloupec %s z %s; <20><>dek %ld z %ld; Slovo %ld z %ld; Byte %ld z %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Sloupec %s z %s; <20><>dek %<PRId64> z %<PRId64>; Slovo %<PRId64> z %<PRId64>; Byte %<PRId64> z %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld pro BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> pro BOM)"
 
 msgid "Thanks for flying Vim"
 msgstr "D<>kuji za pou<6F>it<69> Vim"
@@ -3416,8 +3416,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Vy<56>aduje Amigados verze 2.04 nebo vy<76><79><EFBFBD>\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Vy<56>aduje %s verze %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Vy<56>aduje %s verze %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Nelze otev<65><76>t NIL:\n"
@@ -3507,8 +3507,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Zachycen smrteln<6C> sign<67>l\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "Doba otev<65>r<EFBFBD>n<EFBFBD> X displeje (v ms): %ld"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "Doba otev<65>r<EFBFBD>n<EFBFBD> X displeje (v ms): %<PRId64>"
 
 msgid ""
 "\n"
@@ -4045,8 +4045,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Chyba form<72>tu v souboru tag<61> \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "P<>ed bajtem %ld"
+msgid "Before byte %<PRId64>"
+msgstr "P<>ed bajtem %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -4109,8 +4109,8 @@ msgid "1 change"
 msgstr "po<70>et zm<7A>n: 1"
 
 #, c-format
-msgid "%ld changes"
-msgstr "po<70>et zm<7A>n: %ld"
+msgid "%<PRId64> changes"
+msgstr "po<70>et zm<7A>n: %<PRId64>"
 
 msgid "E439: undo list corrupt"
 msgstr "E439: z<>znam o zm<7A>n<EFBFBD>ch po<70>kozen"

src/po/cs.po

@@ -60,8 +60,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: Seznam buffer<65> je pr<70>zdn<64>"
 
 #, c-format
-msgid "E86: Cannot go to buffer %ld"
-msgstr "E86: Nelze p<>esko<6B>it na buffer %ld"
+msgid "E86: Cannot go to buffer %<PRId64>"
+msgstr "E86: Nelze p<>esko<6B>it na buffer %<PRId64>"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Za posledn<64> buffer nelze p<>esko<6B>it"
@@ -70,8 +70,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: P<>ed prvn<76> buffer nelze p<>esko<6B>it"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (use ! to override)"
-msgstr "E89: Zm<5A>ny v bufferu %ld nebyly ulo<6C>eny (! pro vynucen<65>)"
+msgid "E89: No write since last change for buffer %<PRId64> (use ! to override)"
+msgstr "E89: Zm<5A>ny v bufferu %<PRId64> nebyly ulo<6C>eny (! pro vynucen<65>)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Posledn<64> buffer nelze deaktivovat"
@@ -80,8 +80,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Varov<6F>n<EFBFBD>: p<>ete<74>en<65> seznamu s n<>zvy soubor<6F>"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Buffer %ld nenalezen"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: Buffer %<PRId64> nenalezen"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -92,8 +92,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Vzoru %s nevyhovuje <20><>dn<64> buffer"
 
 #, c-format
-msgid "line %ld"
-msgstr "<22><>dek %ld"
+msgid "line %<PRId64>"
+msgstr "<22><>dek %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Buffer tohoto jm<6A>na ji<6A> existuje"
@@ -116,11 +116,11 @@ msgstr "[Pouze pro
 msgid "1 line --%d%%--"
 msgstr "<22><>dk<64>: --%d%%--"
 
-msgid "%ld lines --%d%%--"
-msgstr "<22><>dk<64>: %ld --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "<22><>dk<64>: %<PRId64> --%d%%--"
 
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "<22><>dek %ld/%ld --%d%%-- sloupec"
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "<22><>dek %<PRId64>/%<PRId64> --%d%%-- sloupec"
 
 msgid "[No file]"
 msgstr "[<5B><>dn<64> soubor]"
@@ -169,12 +169,12 @@ msgid "Signs for %s:"
 msgstr "Znaky pro %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    <20><>dek=%ld id=%d jm<6A>no=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    <20><>dek=%<PRId64> id=%d jm<6A>no=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Nelze p<>ekro<72>it maxim<69>ln<6C> po<70>et %ld diff buffer<65>"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Nelze p<>ekro<72>it maxim<69>ln<6C> po<70>et %<PRId64> diff buffer<65>"
 
 msgid "E97: Cannot create diffs"
 msgstr "E97: Nelze vytvo<76>it diffy"
@@ -446,8 +446,8 @@ msgid "E133: :return not inside a function"
 msgstr "E133: :return mimo funkci"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "dokon<6F>eno prov<6F>d<EFBFBD>n<EFBFBD> %s. N<>vratov<6F> hodnota #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "dokon<6F>eno prov<6F>d<EFBFBD>n<EFBFBD> %s. N<>vratov<6F> hodnota #%<PRId64>"
 
 #, c-format
 msgid "%s returning \"%s\""
@@ -471,12 +471,12 @@ msgid "1 line moved"
 msgstr "po<70>et p<>esunut<75>ch <20><>dk<64>: 1"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "Po<50>et p<>esunut<75>ch <20><>dk<64>: %ld"
+msgid "%<PRId64> lines moved"
+msgstr "Po<50>et p<>esunut<75>ch <20><>dk<64>: %<PRId64>"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "Po<50>et filtrovan<61>ch <20><>dk<64>: %ld"
+msgid "%<PRId64> lines filtered"
+msgstr "Po<50>et filtrovan<61>ch <20><>dk<64>: %<PRId64>"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: Automatick<63> p<><70>kazy *Filter* nesm<73> m<>nit aktu<74>ln<6C> buffer"
@@ -552,8 +552,8 @@ msgid "Overwrite existing file \"%.*s\"?"
 msgstr "P<>epsat soubor \"%.*s\"?"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: <20><>dn<64> n<>zev souboru pro buffer %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: <20><>dn<64> n<>zev souboru pro buffer %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: Soubor nebyl ulo<6C>en: Ukl<6B>d<EFBFBD>n<EFBFBD> je zak<61>z<EFBFBD>no volbou 'write'"
@@ -593,15 +593,15 @@ msgid "1 substitution"
 msgstr "1 nahrazen<65>"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld nahrazen<65>"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> nahrazen<65>"
 
 msgid " on 1 line"
 msgstr " na jednom <20><>dku"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " na %ld <20><>dc<64>ch"
+msgid " on %<PRId64> lines"
+msgstr " na %<PRId64> <20><>dc<64>ch"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global nelze volat rekurzivn<76>"
@@ -672,8 +672,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: chybn<62> jm<6A>no bufferu: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Chybn<62> ID volby: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: Chybn<62> ID volby: %<PRId64>"
 
 msgid "[Deleted]"
 msgstr "[Vymaz<61>no]"
@@ -682,16 +682,16 @@ msgid "Entering Debug mode.  Type \"cont\" to leave."
 msgstr "Spou<6F>t<EFBFBD>m lad<61>c<EFBFBD> re<72>im. Pro ukon<6F>en<65> napi<70>te \"cont\"."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "<22><>dek %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "<22><>dek %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "p<><70>kaz: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Bod p<>eru<72>en<65> v \"%s%s\" na <20><>dku %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Bod p<>eru<72>en<65> v \"%s%s\" na <20><>dku %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -701,8 +701,8 @@ msgid "No breakpoints defined"
 msgstr "Nebyly definov<6F>nu <20><>dn<64> body p<>eru<72>en<65>"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  <20><>dek %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  <20><>dek %<PRId64>"
 
 #, c-format
 msgid "Save changes to \"%.*s\"?"
@@ -752,16 +752,16 @@ msgid "could not source \"%s\""
 msgstr "nelze interpretovat \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "<22><>dek %ld: nelze interpretovat \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "<22><>dek %<PRId64>: nelze interpretovat \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "interpretuji \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "<22><>dek %ld: interpretuji %s"
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "<22><>dek %<PRId64>: interpretuji %s"
 
 #, c-format
 msgid "finished sourcing %s"
@@ -873,8 +873,8 @@ msgid "%d more files to edit.  Quit anyway?"
 msgstr "Je<4A>t<EFBFBD> zb<7A>vaj<61> soubory k editaci (%d). Chcete p<>esto ukon<6F>it editor?"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: Je<4A>t<EFBFBD> zb<7A>vaj<61> soubory k editaci (%ld)."
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: Je<4A>t<EFBFBD> zb<7A>vaj<61> soubory k editaci (%<PRId64>)."
 
 msgid "E174: Command already exists: use ! to redefine"
 msgstr "E174: P<><50>kaz ji<6A> existuje: pou<6F>ijte ! pro p<>edefinov<6F>n<EFBFBD>"
@@ -1262,15 +1262,15 @@ msgid "1 line, "
 msgstr "1 <20><>dek, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld <20><>dk<64>, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> <20><>dk<64>, "
 
 msgid "1 character"
 msgstr "1 znak"
 
 #, c-format
-msgid "%ld characters"
-msgstr "%ld znak<61>, "
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> znak<61>, "
 
 msgid "[noeol]"
 msgstr "[<5B><>dn<64> eol]"
@@ -1630,15 +1630,15 @@ msgid "Font%d width is not twice that of font0\n"
 msgstr "<22><><EFBFBD>ka p<>sma%d nen<65> dvojn<6A>soblem <20><><EFBFBD>ky p<>sma0\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "<22><><EFBFBD>ka p<>sma0: %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "<22><><EFBFBD>ka p<>sma0: %<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"<22><><EFBFBD>ka p<>sma1: %ld\n"
+"<22><><EFBFBD>ka p<>sma1: %<PRId64>\n"
 "\n"
 
 #, c-format
@@ -2764,12 +2764,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: Uchov<6F>n<EFBFBD> se nezda<64>ilo"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: chybn<62> <20><>slo <20><>dku: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: chybn<62> <20><>slo <20><>dku: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: nelze nal<61>zt <20><>dek %ld"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: nelze nal<61>zt <20><>dek %<PRId64>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: chybn<62> id ukazatele na blok 3"
@@ -2787,8 +2787,8 @@ msgid "deleted block 1?"
 msgstr "smaz<61>n blok 1?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Nelze nal<61>zt <20><>dek %ld"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Nelze nal<61>zt <20><>dek %<PRId64>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: chybn<62> id ukazatele na blok"
@@ -2797,12 +2797,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count m<> nulovou hodnotu"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: po<70>et <20><>dk<64> mimo rozsah: %ld > celkov<6F> po<70>et <20><>dk<64>"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: po<70>et <20><>dk<64> mimo rozsah: %<PRId64> > celkov<6F> po<70>et <20><>dk<64>"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: chybn<62> po<70>et <20><>dk<64> v bloku %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: chybn<62> po<70>et <20><>dk<64> v bloku %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "N<>r<EFBFBD>st velikosti z<>sobn<62>ku"
@@ -3039,12 +3039,12 @@ msgid "1 line less"
 msgstr "po<70>et smazan<61>ch <20><>dk<64>: 1"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "po<70>et nov<6F>ch <20><>dk<64>: %ld"
+msgid "%<PRId64> more lines"
+msgstr "po<70>et nov<6F>ch <20><>dk<64>: %<PRId64>"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "po<70>et smazan<61>ch <20><>dk<64>: %ld"
+msgid "%<PRId64> fewer lines"
+msgstr "po<70>et smazan<61>ch <20><>dk<64>: %<PRId64>"
 
 msgid " (Interrupted)"
 msgstr "(P<>eru<72>eno)"
@@ -3080,8 +3080,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: <20><>dek se st<73>v<EFBFBD> p<><70>li<6C> dlouh<75>m"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Vnit<69>n<EFBFBD> chyba: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Vnit<69>n<EFBFBD> chyba: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -3163,23 +3163,23 @@ msgid "1 line %sed %d times"
 msgstr "Po<50>et <20><>dk<64> posunut<75>ch pomoc<6F> %s %d-kr<6B>t : 1"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "Po<50>et <20><>dk<64>: %ld (posunut<75>ch jednou pomoc<6F> %s)"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "Po<50>et <20><>dk<64>: %<PRId64> (posunut<75>ch jednou pomoc<6F> %s)"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "Po<50>et <20><>dk<64>: %ld (posunut<75>ch pomoc<6F> %s %d-kr<6B>t)"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "Po<50>et <20><>dk<64>: %<PRId64> (posunut<75>ch pomoc<6F> %s %d-kr<6B>t)"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "po<70>et <20><>dk<64> k odsazen<65>: %ld"
+msgid "%<PRId64> lines to indent... "
+msgstr "po<70>et <20><>dk<64> k odsazen<65>: %<PRId64>"
 
 msgid "1 line indented "
 msgstr "po<70>et <20><>dk<64> k odsazen<65>: 1"
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "po<70>et odsazen<65>ch <20><>dk<64>: %ld"
+msgid "%<PRId64> lines indented "
+msgstr "po<70>et odsazen<65>ch <20><>dk<64>: %<PRId64>"
 
 #. must display the prompt
 msgid "cannot yank; delete anyway"
@@ -3189,19 +3189,19 @@ msgid "1 line changed"
 msgstr "po<70>et <20><>dek se zm<7A>n<EFBFBD>nou velikost<73> p<>smen: 1"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "po<70>et <20><>dek se zm<7A>n<EFBFBD>nou velikost<73> p<>smen: %ld"
+msgid "%<PRId64> lines changed"
+msgstr "po<70>et <20><>dek se zm<7A>n<EFBFBD>nou velikost<73> p<>smen: %<PRId64>"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "po<70>et uvol<6F>ovan<61>ch <20><>dk<64>: %ld"
+msgid "freeing %<PRId64> lines"
+msgstr "po<70>et uvol<6F>ovan<61>ch <20><>dk<64>: %<PRId64>"
 
 msgid "1 line yanked"
 msgstr "po<70>et zkop<6F>rovan<61>ch <20><>dk<64>: 1"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "po<70>et zkop<6F>rovan<61>ch <20><>dk<64>: %ld"
+msgid "%<PRId64> lines yanked"
+msgstr "po<70>et zkop<6F>rovan<61>ch <20><>dk<64>: %<PRId64>"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3234,20 +3234,20 @@ msgid "E354: Invalid register name: '%s'"
 msgstr "E354: '%s' nen<65> p<><70>pustn<74> jm<6A>no registru"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "<22><>dk<64>: %ld;"
+msgid "%<PRId64> Cols; "
+msgstr "<22><>dk<64>: %<PRId64>;"
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Vybr<62>no %s%ld z %ld <20><>dk<64>; %ld z %ld slov; %ld z %ld Byt<79>"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Vybr<62>no %s%<PRId64> z %<PRId64> <20><>dk<64>; %<PRId64> z %<PRId64> slov; %<PRId64> z %<PRId64> Byt<79>"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Sloupec %s z %s; <20><>dek %ld z %ld; Slovo %ld z %ld; Byte %ld z %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Sloupec %s z %s; <20><>dek %<PRId64> z %<PRId64>; Slovo %<PRId64> z %<PRId64>; Byte %<PRId64> z %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld pro BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> pro BOM)"
 
 msgid "Thanks for flying Vim"
 msgstr "D<>kuji za pou<6F>it<69> Vim"
@@ -3416,8 +3416,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Vy<56>aduje Amigados verze 2.04 nebo vy<76><79><EFBFBD>\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Vy<56>aduje %s verze %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Vy<56>aduje %s verze %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Nelze otev<65><76>t NIL:\n"
@@ -3507,8 +3507,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Zachycen smrteln<6C> sign<67>l\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "Doba otev<65>r<EFBFBD>n<EFBFBD> X displeje (v ms): %ld"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "Doba otev<65>r<EFBFBD>n<EFBFBD> X displeje (v ms): %<PRId64>"
 
 msgid ""
 "\n"
@@ -4045,8 +4045,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Chyba form<72>tu v souboru tag<61> \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "P<>ed bajtem %ld"
+msgid "Before byte %<PRId64>"
+msgstr "P<>ed bajtem %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -4109,8 +4109,8 @@ msgid "1 change"
 msgstr "po<70>et zm<7A>n: 1"
 
 #, c-format
-msgid "%ld changes"
-msgstr "po<70>et zm<7A>n: %ld"
+msgid "%<PRId64> changes"
+msgstr "po<70>et zm<7A>n: %<PRId64>"
 
 msgid "E439: undo list corrupt"
 msgstr "E439: z<>znam o zm<7A>n<EFBFBD>ch po<70>kozen"

src/po/de.po

@@ -62,8 +62,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: Es gibt keine angezeigten Puffer"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Puffer %ld existiert nicht"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Puffer %<PRId64> existiert nicht"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Kann nicht <20>ber den letzten Puffer hinaus gehen"
@@ -72,8 +72,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: Kann nicht vor den ersten Puffer gehen"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: Puffer %ld nicht gesichert seit der letzten <20>nderung (erzwinge mit !)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: Puffer %<PRId64> nicht gesichert seit der letzten <20>nderung (erzwinge mit !)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Kann letzten Puffer nicht ausladen"
@@ -82,8 +82,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Achtung: <20>berlauf der Liste der Dateinamen"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Kein Puffer %ld gefunden"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: Kein Puffer %<PRId64> gefunden"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -94,8 +94,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Kein <20>bereinstimmender Puffer f<>r %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "Zeile %ld"
+msgid "line %<PRId64>"
+msgstr "Zeile %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Ein Puffer mit diesem Namen existiert bereits"
@@ -120,12 +120,12 @@ msgid "1 line --%d%%--"
 msgstr "1 Zeile --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld Zeilen --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> Zeilen --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "Zeile %ld von %ld --%d%%-- Spalte "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "Zeile %<PRId64> von %<PRId64> --%d%%-- Spalte "
 
 msgid "[No Name]"
 msgstr "[Unbenannt]"
@@ -175,12 +175,12 @@ msgid "Signs for %s:"
 msgstr "Zeichen f<>r %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    Zeile=%ld  id=%d  Name=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    Zeile=%<PRId64>  id=%d  Name=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Keine Differenz f<>r mehr als %ld Puffer"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Keine Differenz f<>r mehr als %<PRId64> Puffer"
 
 msgid "E97: Cannot create diffs"
 msgstr "E97: Kann keine Differenz erstellen"
@@ -318,8 +318,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: Unerwartete Zeichen in :let"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: Index der Liste au<61>erhalb des zul<75>ssigen Bereichs: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: Index der Liste au<61>erhalb des zul<75>ssigen Bereichs: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -648,8 +648,8 @@ msgid "%s aborted"
 msgstr "%s abgebrochen"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s lieferte #%ld zur<75>ck"
+msgid "%s returning #%<PRId64>"
+msgstr "%s lieferte #%<PRId64> zur<75>ck"
 
 #, c-format
 msgid "%s returning %s"
@@ -696,12 +696,12 @@ msgid "1 line moved"
 msgstr "1 Zeile verschoben"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld Zeilen verschoben"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> Zeilen verschoben"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld Zeilen gefiltert"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> Zeilen gefiltert"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filter*-Autokommandos d<>rfen den aktuellen Puffer nicht <20>ndern"
@@ -783,8 +783,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Auslagerungsdatei existiert bereits: %s (mit :silent! erzwingen)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: Kein Dateiname f<>r Puffer %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: Kein Dateiname f<>r Puffer %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: Datei wurde nicht geschrieben: Schreiben ist durch die Option 'write' ausgeschaltet"
@@ -827,19 +827,19 @@ msgid "1 substitution"
 msgstr "eine Ersetzung"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld Treffer"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> Treffer"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld Ersetzungen"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> Ersetzungen"
 
 msgid " on 1 line"
 msgstr " auf einer Zeile"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " auf %ld Zeilen"
+msgid " on %<PRId64> lines"
+msgstr " auf %<PRId64> Zeilen"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: Kann :global nicht rekursiv ausf<73>hren"
@@ -922,8 +922,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: ung<6E>ltige Puffernummer: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Ung<6E>ltige Zeichen-ID: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: Ung<6E>ltige Zeichen-ID: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (NICHT GEFUNDEN)"
@@ -938,16 +938,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Debug-Modus. Geben Sie \"cont\" zum Fortsetzen ein."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "Zeile %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "Zeile %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "Befehl: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Haltepunkt in \"%s%s\" Zeile %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Haltepunkt in \"%s%s\" Zeile %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -957,8 +957,8 @@ msgid "No breakpoints defined"
 msgstr "Keine Haltepunkte definiert"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  Zeile %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  Zeile %<PRId64>"
 
 msgid "E750: First use :profile start <fname>"
 msgstr "E750: Erste Verwendung von :profile startet <fname>"
@@ -1014,16 +1014,16 @@ msgid "could not source \"%s\""
 msgstr "\"%s\" konnte nicht gelesen werden"
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "Zeile %ld: \"%s\" konnte nicht gelesen werden"
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "Zeile %<PRId64>: \"%s\" konnte nicht gelesen werden"
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "lese \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "Zeile %ld: lese \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "Zeile %<PRId64>: lese \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1113,8 +1113,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: Eine weitere Datei zum Editieren"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: %ld weitere Dateien zum Editieren"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: %<PRId64> weitere Dateien zum Editieren"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: Befehl existiert bereits: ! zum Ersetzen hinzuf<75>gen"
@@ -1288,8 +1288,8 @@ msgid "Exception discarded: %s"
 msgstr "Ausnahme verworfen: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, Zeile %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, Zeile %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1481,12 +1481,12 @@ msgid "[crypted]"
 msgstr "[verschl<68>sselt]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "UMWANDLUNGSFEHLER in Zeile %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "UMWANDLUNGSFEHLER in Zeile %<PRId64>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[UNZUL<55>SSIGES BYTE in Zeile %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[UNZUL<55>SSIGES BYTE in Zeile %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[LESE-FEHLER]"
@@ -1625,15 +1625,15 @@ msgid "1 line, "
 msgstr "eine Zeile, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld Zeilen, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> Zeilen, "
 
 msgid "1 character"
 msgstr "ein Zeichen"
 
 #, c-format
-msgid "%ld characters"
-msgstr "%ld Zeichen"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> Zeichen"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2035,19 +2035,19 @@ msgid "Font1: %s\n"
 msgstr "Schriftart 1: %s\n"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "Die Breite der Schriftart %ld ist nicht doppelt so gro<72> wie die der Schriftart 0\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "Die Breite der Schriftart %<PRId64> ist nicht doppelt so gro<72> wie die der Schriftart 0\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "Schriftart 0 Breite: %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "Schriftart 0 Breite: %<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"Schriftart 1 Breite: %ld\n"
+"Schriftart 1 Breite: %<PRId64>\n"
 "\n"
 
 msgid "Invalid font specification"
@@ -2224,8 +2224,8 @@ msgid "Added cscope database %s"
 msgstr "csope Datenbank %s hinzugef<65>gt"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: Fehler beim Lesen aus der cscope Verbindung %ld"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: Fehler beim Lesen aus der cscope Verbindung %<PRId64>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: Unbekannter cscope Suchtyp"
@@ -3363,12 +3363,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: Absicherung fehlgeschlagen"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: unzul<75>ssige lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: unzul<75>ssige lnum: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: kann Zeile %ld nicht finden"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: kann Zeile %<PRId64> nicht finden"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: Zeiger Block id falsch 3"
@@ -3386,8 +3386,8 @@ msgid "deleted block 1?"
 msgstr "Block 1 gel<65>scht?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Kann Zeile %ld nicht finden"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Kann Zeile %<PRId64> nicht finden"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: Zeiger Block id ist falsch"
@@ -3396,12 +3396,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count ist Null"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: Zeilennummer nicht im zul<75>ssigen Bereich: %ld nach dem Ende"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: Zeilennummer nicht im zul<75>ssigen Bereich: %<PRId64> nach dem Ende"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: Zeilen Z<>hler falsch in Block %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: Zeilen Z<>hler falsch in Block %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "Stapel Gr<47><72>e w<>chst"
@@ -3581,8 +3581,8 @@ msgid "Hit ENTER or type command to continue"
 msgstr "Dr<44>cken Sie die EINGABETASTE oder geben Sie einen Befehl ein"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s Zeile %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s Zeile %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- Mehr --"
@@ -3645,12 +3645,12 @@ msgid "1 line less"
 msgstr "eine Zeile weniger"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld Zeilen mehr"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> Zeilen mehr"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld Zeilen weniger"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> Zeilen weniger"
 
 msgid " (Interrupted)"
 msgstr " (Unterbrochen)"
@@ -3688,8 +3688,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: Zeile wird zu lang"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Interner Fehler: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Interner Fehler: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -3762,8 +3762,8 @@ msgid "read from Netbeans socket"
 msgstr "gelesen vom NetBeans Socket"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: Verbindung zu NetBeans f<>r Puffer %ld verloren"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: Verbindung zu NetBeans f<>r Puffer %<PRId64> verloren"
 
 msgid "E505: "
 msgstr "E505: "
@@ -3808,23 +3808,23 @@ msgid "1 line %sed %d times"
 msgstr "eine Zeile %s %d Mal"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld Zeilen %s ein Mal"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> Zeilen %s ein Mal"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld Zeilen %s %d Mal"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> Zeilen %s %d Mal"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld Zeilen zum Einr<6E>cken... "
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> Zeilen zum Einr<6E>cken... "
 
 msgid "1 line indented "
 msgstr "eine Zeile einger<65>ckt... "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld Zeilen einger<65>ckt... "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> Zeilen einger<65>ckt... "
 
 msgid "E748: No previously used register"
 msgstr "E748: Kein bereits verwendetes Register"
@@ -3837,12 +3837,12 @@ msgid "1 line changed"
 msgstr "eine Zeile ge<67>ndert"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld Zeilen ge<67>ndert"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> Zeilen ge<67>ndert"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "gebe %ld Zeilen frei"
+msgid "freeing %<PRId64> lines"
+msgstr "gebe %<PRId64> Zeilen frei"
 
 msgid "block of 1 line yanked"
 msgstr "Block von einer Zeile kopiert"
@@ -3851,12 +3851,12 @@ msgid "1 line yanked"
 msgstr "eine Zeile kopiert"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "Block von %ld Zeilen kopiert"
+msgid "block of %<PRId64> lines yanked"
+msgstr "Block von %<PRId64> Zeilen kopiert"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld Zeilen kopiert"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> Zeilen kopiert"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3885,36 +3885,36 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: Unbekannter Register Typ %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld Spalten; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> Spalten; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "%s%ld von %ld Zeilen; %ld von %ld W<>rtern; %ld von %ld Bytes"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "%s%<PRId64> von %<PRId64> Zeilen; %<PRId64> von %<PRId64> W<>rtern; %<PRId64> von %<PRId64> Bytes"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
 msgstr ""
-"%s%ld von %ld Zeilen; %ld von %ld W<>rtern; %ld von %ld Zeichen; %ld von %ld "
+"%s%<PRId64> von %<PRId64> Zeilen; %<PRId64> von %<PRId64> W<>rtern; %<PRId64> von %<PRId64> Zeichen; %<PRId64> von %<PRId64> "
 "Bytes"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Sp %s von %s; Zeile %ld von %ld; Wort %ld von %ld; Byte %ld von %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Sp %s von %s; Zeile %<PRId64> von %<PRId64>; Wort %<PRId64> von %<PRId64>; Byte %<PRId64> von %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"Sp %s von %s; Zeile %ld von %ld; Wort %ld von %ld; Zeichen %ld von %ld; Byte %ld von "
-"%ld"
+"Sp %s von %s; Zeile %<PRId64> von %<PRId64>; Wort %<PRId64> von %<PRId64>; Zeichen %<PRId64> von %<PRId64>; Byte %<PRId64> von "
+"%<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld f<>r BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> f<>r BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Seite %N"
@@ -4080,8 +4080,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Brauche Amigados Version 2.04 oder neuere\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Ben<65>tige %s Version %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Ben<65>tige %s Version %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Kann NIL nicht <20>ffnen:\n"
@@ -4165,8 +4165,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Erhielt t<>dliches Signal\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "<22>ffnen des X-Displays dauerte %ld msec"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "<22>ffnen des X-Displays dauerte %<PRId64> msec"
 
 msgid ""
 "\n"
@@ -4806,8 +4806,8 @@ msgid "Performing soundfolding..."
 msgstr "F<>hre 'Soundfolding' durch..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "Anzahl der W<>rter nach 'Soundfolding': %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "Anzahl der W<>rter nach 'Soundfolding': %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -4842,8 +4842,8 @@ msgid "Done!"
 msgstr "Fertig!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' hat nicht %ld Eintr<74>ge"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' hat nicht %<PRId64> Eintr<74>ge"
 
 #, c-format
 msgid "Word removed from %s"
@@ -4860,8 +4860,8 @@ msgid "Sorry, no suggestions"
 msgstr "Leider keine Vorschl<68>ge"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Leider nur %ld Vorschl<68>ge"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "Leider nur %<PRId64> Vorschl<68>ge"
 
 #. avoid more prompt
 #, c-format
@@ -5160,8 +5160,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Format Fehler in Tag-Datei \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "Vor byte %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Vor byte %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5223,8 +5223,8 @@ msgid "Already at newest change"
 msgstr "Bereits bei der j<>ngsten <20>nderung"
 
 #, c-format
-msgid "Undo number %ld not found"
-msgstr "Nummer %ld zur Wiederherstellung nicht gefunden"
+msgid "Undo number %<PRId64> not found"
+msgstr "Nummer %<PRId64> zur Wiederherstellung nicht gefunden"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: Zeilennummer falsch"
@@ -5248,8 +5248,8 @@ msgid "changes"
 msgstr "<22>nderungen"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "vor"
@@ -5975,8 +5975,8 @@ msgstr "Die L
 msgid "Edits the selected file(s) with Vim"
 msgstr "Editiert die ausgew<65>hlte(n) Datei(en) mit Vim"
 
-msgid "%ld seconds ago"
-msgstr "vor %ld Sekunden"
+msgid "%<PRId64> seconds ago"
+msgstr "vor %<PRId64> Sekunden"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: 'undojoin' ist nicht erlaubt nach 'undo'"

src/po/en_GB.po

@@ -26,8 +26,8 @@ msgstr ""
 "Content-Transfer-Encoding: 7bit\n"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Cannot diff more than %ld buffers"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Cannot diff more than %<PRId64> buffers"
 
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
 msgstr "E101: More than two buffers in diff mode, do not know which one to use"

src/po/eo.po

@@ -101,8 +101,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: Estas neniu listigita bufro"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: La bufro %ld ne ekzistas"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: La bufro %<PRId64> ne ekzistas"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Ne eblas iri preter la lastan bufron"
@@ -111,9 +111,9 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: Ne eblas iri antaŭ la unuan bufron"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
 msgstr ""
-"E89: Neniu skribo de post la lasta ŝanĝo de la bufro %ld (aldonu ! por "
+"E89: Neniu skribo de post la lasta ŝanĝo de la bufro %<PRId64> (aldonu ! por "
 "transpasi)"
 
 msgid "E90: Cannot unload last buffer"
@@ -123,8 +123,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Averto: Listo de dosiernomoj troas"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Bufro %ld ne trovita"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: Bufro %<PRId64> ne trovita"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -135,8 +135,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Neniu bufro kongruas kun %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "linio %ld"
+msgid "line %<PRId64>"
+msgstr "linio %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Bufro kun tiu nomo jam ekzistas"
@@ -161,12 +161,12 @@ msgid "1 line --%d%%--"
 msgstr "1 linio --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld linioj --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> linioj --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "linio %ld de %ld --%d%%-- kol "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "linio %<PRId64> de %<PRId64> --%d%%-- kol "
 
 msgid "[No Name]"
 msgstr "[Neniu nomo]"
@@ -213,12 +213,12 @@ msgid "Signs for %s:"
 msgstr "Emfazaj simbolaĵoj de %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    linio=%ld  id=%d  nomo=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    linio=%<PRId64>  id=%d  nomo=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Ne eblas dosierdiferenci pli ol %ld bufrojn"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Ne eblas dosierdiferenci pli ol %<PRId64> bufrojn"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: Ne eblas legi aŭ skribi provizorajn dosierojn"
@@ -377,8 +377,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: Neatenditaj signoj en \":let\""
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: indekso de listo ekster limoj: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: indekso de listo ekster limoj: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -790,8 +790,8 @@ msgid "%s aborted"
 msgstr "%s ĉesigita"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s liveras #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s liveras #%<PRId64>"
 
 #, c-format
 msgid "%s returning %s"
@@ -840,12 +840,12 @@ msgid "1 line moved"
 msgstr "1 linio movita"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld linioj movitaj"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> linioj movitaj"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld linioj filtritaj"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> linioj filtritaj"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filtraj* Aŭtokomandoj ne rajtas ŝanĝi aktualan bufron"
@@ -929,8 +929,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Permutodosiero .swp ekzistas: %s (:silent! por transpasi)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: Neniu dosiernomo de bufro %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: Neniu dosiernomo de bufro %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: Dosiero ne skribita: Skribo malŝaltita per la opcio 'write'"
@@ -987,19 +987,19 @@ msgid "1 substitution"
 msgstr "1 anstataŭigo"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld kongruoj"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> kongruoj"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld anstataŭigoj"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> anstataŭigoj"
 
 msgid " on 1 line"
 msgstr " en 1 linio"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " en %ld linioj"
+msgid " on %<PRId64> lines"
+msgstr " en %<PRId64> linioj"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: Ne eblas fari \":global\" rekursie"
@@ -1087,8 +1087,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Nevalida nomo de bufro: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Nevalida identigilo de simbolo: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: Nevalida identigilo de simbolo: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr "  (NETROVITA)"
@@ -1103,16 +1103,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Eniras sencimigan reĝimon.  Tajpu \"cont\" por daŭrigi."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "linio %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "linio %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "kmd: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Kontrolpunkto en \"%s%s\" linio %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Kontrolpunkto en \"%s%s\" linio %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -1122,8 +1122,8 @@ msgid "No breakpoints defined"
 msgstr "Neniu kontrolpunkto estas difinita"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  linio %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  linio %<PRId64>"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Uzu unue \":profile start {dosiernomo}\""
@@ -1179,16 +1179,16 @@ msgid "could not source \"%s\""
 msgstr "ne eblis ruli \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "linio %ld: ne eblis ruli \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "linio %<PRId64>: ne eblis ruli \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "rulas \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "linio %ld: rulas \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "linio %<PRId64>: rulas \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1277,8 +1277,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: 1 plia redaktenda dosiero"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: %ld pliaj redaktendaj dosieroj"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: %<PRId64> pliaj redaktendaj dosieroj"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: La komando jam ekzistas: aldonu ! por anstataŭigi ĝin"
@@ -1478,8 +1478,8 @@ msgid "Exception discarded: %s"
 msgstr "Escepto ne konservita: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, linio %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, linio %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1686,12 +1686,12 @@ msgid "[crypted]"
 msgstr "[ĉifrita]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[ERARO DE KONVERTO en linio %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[ERARO DE KONVERTO en linio %<PRId64>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[NEVALIDA BAJTO en linio %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[NEVALIDA BAJTO en linio %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[ERAROJ DE LEGADO]"
@@ -1774,10 +1774,10 @@ msgstr "E513: skriberaro, konverto fiaskis (igu 'fenc' malplena por transpasi)"
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: skriberaro, konverto fiaskis en linio %ld (igu 'fenc' malplena  por "
+"E513: skriberaro, konverto fiaskis en linio %<PRId64> (igu 'fenc' malplena  por "
 "transpasi)"
 
 msgid "E514: write error (file system full?)"
@@ -1787,8 +1787,8 @@ msgid " CONVERSION ERROR"
 msgstr " ERARO DE KONVERTO"
 
 #, c-format
-msgid " in line %ld;"
-msgstr " en linio %ld;"
+msgid " in line %<PRId64>;"
+msgstr " en linio %<PRId64>;"
 
 msgid "[Device]"
 msgstr "[Aparatdosiero]"
@@ -1849,8 +1849,8 @@ msgid "1 line, "
 msgstr "1 linio, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld linioj, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> linioj, "
 
 msgid "1 character"
 msgstr "1 signo"
@@ -1861,8 +1861,8 @@ msgstr "%<PRId64> signoj"
 
 #. Explicit typecast avoids warning on Mac OS X 10.6
 #, c-format
-msgid "%ld characters"
-msgstr "%ld signoj"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> signoj"
 
 msgid "[noeol]"
 msgstr "[sen EOL]"
@@ -2280,19 +2280,19 @@ msgid "Font1: %s\n"
 msgstr "Font1: %s\n"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "Font%ld ne estas duoble pli larĝa ol font0\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "Font%<PRId64> ne estas duoble pli larĝa ol font0\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "Larĝo de font0: %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "Larĝo de font0: %<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"Larĝo de Font1: %ld\n"
+"Larĝo de Font1: %<PRId64>\n"
 "\n"
 
 msgid "Invalid font specification"
@@ -2470,8 +2470,8 @@ msgid "Added cscope database %s"
 msgstr "Aldonis datumbazon de cscope %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: eraro dum legado de konekto de cscope %ld"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: eraro dum legado de konekto de cscope %<PRId64>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: nekonata tipo de serĉo de cscope"
@@ -3699,12 +3699,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: Konservo fiaskis"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: nevalida lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: nevalida lnum: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: ne eblas trovi linion %ld"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: ne eblas trovi linion %<PRId64>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: nevalida referenco de bloko id 3"
@@ -3722,8 +3722,8 @@ msgid "deleted block 1?"
 msgstr "ĉu forviŝita bloko 1?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Ne eblas trovi linion %ld"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Ne eblas trovi linion %<PRId64>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: nevalida referenco de bloko id"
@@ -3732,12 +3732,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count estas nul"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: numero de linio ekster limoj: %ld preter la fino"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: numero de linio ekster limoj: %<PRId64> preter la fino"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: nevalida nombro de linioj en bloko %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: nevalida nombro de linioj en bloko %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "Stako pligrandiĝas"
@@ -3923,8 +3923,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Premu ENEN-KLAVON aŭ tajpu komandon por daŭrigi"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s linio %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s linio %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- Pli --"
@@ -3996,12 +3996,12 @@ msgid "1 line less"
 msgstr "1 malplia linio"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld pliaj linioj"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> pliaj linioj"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld malpliaj linioj"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> malpliaj linioj"
 
 msgid " (Interrupted)"
 msgstr " (Interrompita)"
@@ -4040,8 +4040,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: Linio iĝas tro longa"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Interna eraro: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Interna eraro: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4117,8 +4117,8 @@ msgid "read from Netbeans socket"
 msgstr "lego el kontaktoskatolo de Netbeans"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: Konekto de NetBeans perdita por bufro %ld"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: Konekto de NetBeans perdita por bufro %<PRId64>"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: netbeans ne estas subtenata kun tiu grafika interfaco"
@@ -4170,23 +4170,23 @@ msgid "1 line %sed %d times"
 msgstr "1 linio %sita %d foje"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld linio %sita 1 foje"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> linio %sita 1 foje"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld linioj %sitaj %d foje"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> linioj %sitaj %d foje"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld krommarĝenendaj linioj... "
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> krommarĝenendaj linioj... "
 
 msgid "1 line indented "
 msgstr "1 linio krommarĝenita "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld linioj krommarĝenitaj "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> linioj krommarĝenitaj "
 
 msgid "E748: No previously used register"
 msgstr "E748: Neniu reĝistro antaŭe uzata"
@@ -4199,12 +4199,12 @@ msgid "1 line changed"
 msgstr "1 linio ŝanĝita"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld linioj ŝanĝitaj"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> linioj ŝanĝitaj"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "malokupas %ld liniojn"
+msgid "freeing %<PRId64> lines"
+msgstr "malokupas %<PRId64> liniojn"
 
 msgid "block of 1 line yanked"
 msgstr "bloko de 1 linio kopiita"
@@ -4213,12 +4213,12 @@ msgid "1 line yanked"
 msgstr "1 linio kopiita"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "bloko de %ld linioj kopiita"
+msgid "block of %<PRId64> lines yanked"
+msgstr "bloko de %<PRId64> linioj kopiita"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld linioj kopiitaj"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> linioj kopiitaj"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4247,36 +4247,36 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: Nekonata tipo de reĝistro %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld Kolumnoj; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> Kolumnoj; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Apartigis %s%ld de %ld Linioj; %ld de %ld Vortoj; %ld de %ld Bajtoj"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Apartigis %s%<PRId64> de %<PRId64> Linioj; %<PRId64> de %<PRId64> Vortoj; %<PRId64> de %<PRId64> Bajtoj"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
 msgstr ""
-"Apartigis %s%ld de %ld Linioj; %ld de %ld Vortoj; %ld de %ld Signoj; %ld de "
-"%ld Bajtoj"
+"Apartigis %s%<PRId64> de %<PRId64> Linioj; %<PRId64> de %<PRId64> Vortoj; %<PRId64> de %<PRId64> Signoj; %<PRId64> de "
+"%<PRId64> Bajtoj"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Kol %s de %s; Linio %ld de %ld; Vorto %ld de %ld; Bajto %ld de %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Kol %s de %s; Linio %<PRId64> de %<PRId64>; Vorto %<PRId64> de %<PRId64>; Bajto %<PRId64> de %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"Kol %s de %s; Linio %ld de %ld; Vorto %ld de %ld; Signo %ld de %ld; Bajto "
-"%ld de %ld"
+"Kol %s de %s; Linio %<PRId64> de %<PRId64>; Vorto %<PRId64> de %<PRId64>; Signo %<PRId64> de %<PRId64>; Bajto "
+"%<PRId64> de %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld por BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> por BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Folio %N"
@@ -4458,8 +4458,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Bezonas version 2.04 de Amigados aŭ pli novan\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Bezonas %s-on versio %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Bezonas %s-on versio %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Ne eblas malfermi NIL:\n"
@@ -4541,8 +4541,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Kaptis mortigantan signalon\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "Malfermo de vidigo X daŭris %ld msek"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "Malfermo de vidigo X daŭris %<PRId64> msek"
 
 msgid ""
 "\n"
@@ -5314,8 +5314,8 @@ msgid "Performing soundfolding..."
 msgstr "Fonetika analizado..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "Nombro de vortoj post fonetika analizado: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "Nombro de vortoj post fonetika analizado: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -5350,8 +5350,8 @@ msgid "Done!"
 msgstr "Farita!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' ne havas %ld rikordojn"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' ne havas %<PRId64> rikordojn"
 
 #, c-format
 msgid "Word removed from %s"
@@ -5368,8 +5368,8 @@ msgid "Sorry, no suggestions"
 msgstr "Bedaŭrinde ne estas sugestoj"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Bedaŭrinde estas nur %ld sugestoj"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "Bedaŭrinde estas nur %<PRId64> sugestoj"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5682,8 +5682,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Eraro de formato en etikeda dosiero \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "Antaŭ bajto %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Antaŭ bajto %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5827,8 +5827,8 @@ msgid "Already at newest change"
 msgstr "Jam al la plej nova ŝanĝo"
 
 #, c-format
-msgid "E830: Undo number %ld not found"
-msgstr "E830: Malfara numero %ld netrovita"
+msgid "E830: Undo number %<PRId64> not found"
+msgstr "E830: Malfara numero %<PRId64> netrovita"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: nevalidaj numeroj de linioj"
@@ -5852,8 +5852,8 @@ msgid "changes"
 msgstr "ŝanĝoj"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "antaŭ"
@@ -5868,8 +5868,8 @@ msgid "number changes  when               saved"
 msgstr "numero ŝanĝoj   tempo              konservita"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "antaŭ %ld sekundoj"
+msgid "%<PRId64> seconds ago"
+msgstr "antaŭ %<PRId64> sekundoj"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin estas nepermesebla post malfaro"

src/po/es.po

@@ -78,8 +78,8 @@ msgstr "E85: No hay búfers en la lista"
 
 #: buffer.c:1016
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: El búfer %ld no existe"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: El búfer %<PRId64> no existe"
 
 #: buffer.c:1019
 msgid "E87: Cannot go beyond last buffer"
@@ -91,9 +91,9 @@ msgstr "E88: No se pudo regresar antes del primer búfer"
 
 #: buffer.c:1063
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
 msgstr ""
-"E89: No se guardó el archivo desde el último cambio del búfer %ld (añada \"!"
+"E89: No se guardó el archivo desde el último cambio del búfer %<PRId64> (añada \"!"
 "\" para forzar)"
 
 #: buffer.c:1080
@@ -106,8 +106,8 @@ msgstr "W14: Advertencia: La lista de nombres de archivos es muy larga"
 
 #: buffer.c:1850 quickfix.c:3632
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: No se encontró el búfer %ld"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: No se encontró el búfer %<PRId64>"
 
 #: buffer.c:2125
 #, c-format
@@ -121,8 +121,8 @@ msgstr "E94: No hay un búfer que coincida con %s"
 
 #: buffer.c:2579
 #, c-format
-msgid "line %ld"
-msgstr "línea %ld"
+msgid "line %<PRId64>"
+msgstr "línea %<PRId64>"
 
 #: buffer.c:2666
 msgid "E95: Buffer with this name already exists"
@@ -155,13 +155,13 @@ msgstr "1 línea --%d%%--"
 
 #: buffer.c:3032
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld líneas --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> líneas --%d%%--"
 
 #: buffer.c:3039
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "línea %ld de %ld --%d%%-- col "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "línea %<PRId64> de %<PRId64> --%d%%-- col "
 
 #: buffer.c:3160 buffer.c:5126 memline.c:1727
 msgid "[No Name]"
@@ -229,13 +229,13 @@ msgstr "Signos para %s:"
 
 #: buffer.c:5455
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    línea=%ld id=%d nombre=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    línea=%<PRId64> id=%d nombre=%s"
 
 #: diff.c:141
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: No se puede usar \"diff\" con más de %ld búfers"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: No se puede usar \"diff\" con más de %<PRId64> búfers"
 
 #: diff.c:777
 msgid "E810: Cannot read or write temp files"
@@ -441,8 +441,8 @@ msgstr "E18: Caracteres inesperados en :let"
 
 #: eval.c:97
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: índice de lista fuera de rango: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: índice de lista fuera de rango: %<PRId64>"
 
 #: eval.c:98
 #, c-format
@@ -939,8 +939,8 @@ msgstr "Abortada la ejecución de %s"
 
 #: eval.c:21337
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s devuelve #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s devuelve #%<PRId64>"
 
 #: eval.c:21353
 #, c-format
@@ -1003,13 +1003,13 @@ msgstr "1 línea movida"
 
 #: ex_cmds.c:810
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld líneas movidas"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> líneas movidas"
 
 #: ex_cmds.c:1305
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld líneas filtradas"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> líneas filtradas"
 
 #: ex_cmds.c:1329
 msgid "E135: *Filter* Autocommands must not change current buffer"
@@ -1120,8 +1120,8 @@ msgstr ""
 
 #: ex_cmds.c:2901
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: No existe un nombre de archivo para el búfer %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: No existe un nombre de archivo para el búfer %<PRId64>"
 
 #: ex_cmds.c:2940
 msgid "E142: File not written: Writing is disabled by 'write' option"
@@ -1194,13 +1194,13 @@ msgstr "Una (1) sustitución"
 
 #: ex_cmds.c:5174
 #, c-format
-msgid "%ld matches"
-msgstr "%ld coincidencias"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> coincidencias"
 
 #: ex_cmds.c:5174
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld sustituciones"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> sustituciones"
 
 #: ex_cmds.c:5179
 msgid " on 1 line"
@@ -1208,8 +1208,8 @@ msgstr " en una (1) línea"
 
 #: ex_cmds.c:5182
 #, c-format
-msgid " on %ld lines"
-msgstr " en %ld líneas"
+msgid " on %<PRId64> lines"
+msgstr " en %<PRId64> líneas"
 
 #: ex_cmds.c:5229
 msgid "E147: Cannot do :global recursive"
@@ -1314,8 +1314,8 @@ msgstr "E158: El nombre del búfer no es válido: %s"
 
 #: ex_cmds.c:6926
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: La identificación del signo no es válida: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: La identificación del signo no es válida: %<PRId64>"
 
 #: ex_cmds.c:6996
 msgid " (NOT FOUND)"
@@ -1335,8 +1335,8 @@ msgstr "Iniciando modo de depuración. Escriba \"cont\" para continuar."
 
 #: ex_cmds2.c:142 ex_docmd.c:1081
 #, c-format
-msgid "line %ld: %s"
-msgstr "línea %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "línea %<PRId64>: %s"
 
 #: ex_cmds2.c:144
 #, c-format
@@ -1345,8 +1345,8 @@ msgstr "cmd: %s"
 
 #: ex_cmds2.c:344
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "\"Breakpoint\" en \"%s%s\" línea %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "\"Breakpoint\" en \"%s%s\" línea %<PRId64>"
 
 #: ex_cmds2.c:656
 #, c-format
@@ -1359,8 +1359,8 @@ msgstr "No se han definido \"breakpoints\""
 
 #: ex_cmds2.c:697
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  línea %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  línea %<PRId64>"
 
 #: ex_cmds2.c:1095
 msgid "E750: First use :profile start <fname>"
@@ -1434,8 +1434,8 @@ msgstr "No pude ejecutar %s"
 
 #: ex_cmds2.c:2934
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "línea %ld: no se pudo ejecutar %s"
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "línea %<PRId64>: no se pudo ejecutar %s"
 
 #: ex_cmds2.c:2950
 #, c-format
@@ -1444,8 +1444,8 @@ msgstr "ejecutando %s"
 
 #: ex_cmds2.c:2952
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "línea %ld: ejecutando %s"
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "línea %<PRId64>: ejecutando %s"
 
 #: ex_cmds2.c:3143
 #, c-format
@@ -1566,8 +1566,8 @@ msgstr "E173: Un (1) archivo más para editar"
 
 #: ex_docmd.c:5048
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: Hay %ld archivos en edición"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: Hay %<PRId64> archivos en edición"
 
 #: ex_docmd.c:5142
 msgid "E174: Command already exists: add ! to replace it"
@@ -1822,8 +1822,8 @@ msgstr "Excepción descartada: %s"
 
 #: ex_eval.c:635 ex_eval.c:687
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, en la línea %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, en la línea %<PRId64>"
 
 # always scroll up, don't overwrite
 #. always scroll up, don't overwrite
@@ -2096,13 +2096,13 @@ msgstr "[cifrado]"
 
 #: fileio.c:2432
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[ERROR DE CONVERSIÓN en línea %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[ERROR DE CONVERSIÓN en línea %<PRId64>]"
 
 #: fileio.c:2438
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[BYTE ILEGAL en la línea %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[BYTE ILEGAL en la línea %<PRId64>]"
 
 #: fileio.c:2445
 msgid "[READ ERRORS]"
@@ -2226,10 +2226,10 @@ msgstr ""
 #: fileio.c:4501
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: Error de escritura, la conversión falló en la línea %ld(vacíe 'fenc' "
+"E513: Error de escritura, la conversión falló en la línea %<PRId64>(vacíe 'fenc' "
 "para forzar)"
 
 #: fileio.c:4510
@@ -2242,8 +2242,8 @@ msgstr " ERROR DE CONVERSIÓN"
 
 #: fileio.c:4583
 #, c-format
-msgid " in line %ld;"
-msgstr "en la línea %ld"
+msgid " in line %<PRId64>;"
+msgstr "en la línea %<PRId64>"
 
 #: fileio.c:4600
 msgid "[Device]"
@@ -2323,8 +2323,8 @@ msgstr "1 línea, "
 
 #: fileio.c:4975
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld líneas, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> líneas, "
 
 #: fileio.c:4978
 msgid "1 character"
@@ -2332,8 +2332,8 @@ msgstr "1 carácter"
 
 #: fileio.c:4980
 #, c-format
-msgid "%ld characters"
-msgstr "%ld caracteres"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> caracteres"
 
 #: fileio.c:4990 netbeans.c:3637
 msgid "[noeol]"
@@ -2886,23 +2886,23 @@ msgstr "Tipo de letra de impresión 1: %s\n"
 
 #: gui_x11.c:2204
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
 msgstr ""
-"La anchura del tipo de letra de impresión %ld no es el doble de la \n"
+"La anchura del tipo de letra de impresión %<PRId64> no es el doble de la \n"
 "de la tipografía de impresión 0\n"
 
 #: gui_x11.c:2205
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "Anchura del tipo de letra de impresión 0: %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "Anchura del tipo de letra de impresión 0: %<PRId64>\n"
 
 #: gui_x11.c:2206
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"Anchura del tipo de letra de impresión 1: %ld\n"
+"Anchura del tipo de letra de impresión 1: %<PRId64>\n"
 "\n"
 
 #: gui_xmdlg.c:690 gui_xmdlg.c:809
@@ -3135,8 +3135,8 @@ msgstr "Se ha añadido la base de datos \"cscope\" %s"
 
 #: if_cscope.c:695
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: Error al leer la conexión %ld con \"cscope\""
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: Error al leer la conexión %<PRId64> con \"cscope\""
 
 #: if_cscope.c:802
 msgid "E561: unknown cscope search type"
@@ -4761,13 +4761,13 @@ msgstr "E314: Falló la preservación del archivo"
 
 #: memline.c:2103
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: \"ml_get\": número de línea no válido: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: \"ml_get\": número de línea no válido: %<PRId64>"
 
 #: memline.c:2138
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: \"ml_get\": no se pudo encontrar la línea %ld"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: \"ml_get\": no se pudo encontrar la línea %<PRId64>"
 
 #: memline.c:2552
 msgid "E317: pointer block id wrong 3"
@@ -4791,8 +4791,8 @@ msgstr "¿bloque 1 suprimido?"
 
 #: memline.c:3101
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: No se pudo encontrar la línea %ld"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: No se pudo encontrar la línea %<PRId64>"
 
 #: memline.c:3347
 msgid "E317: pointer block id wrong"
@@ -4804,13 +4804,13 @@ msgstr "\"pe_line_count\" es cero"
 
 #: memline.c:3392
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: número de línea fuera de rango: %ld más allá del final"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: número de línea fuera de rango: %<PRId64> más allá del final"
 
 #: memline.c:3396
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: recuento de líneas erróneo en el bloque %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: recuento de líneas erróneo en el bloque %<PRId64>"
 
 #: memline.c:3445
 msgid "Stack size increases"
@@ -5045,8 +5045,8 @@ msgstr "Pulse INTRO o escriba una orden para continuar"
 
 #: message.c:2139
 #, c-format
-msgid "%s line %ld"
-msgstr "%s, en la línea %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s, en la línea %<PRId64>"
 
 #: message.c:2839
 msgid "-- More --"
@@ -5134,13 +5134,13 @@ msgstr "1 línea menos"
 
 #: misc1.c:3330
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld líneas más"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> líneas más"
 
 #: misc1.c:3332
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld líneas menos"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> líneas menos"
 
 #: misc1.c:3335
 msgid " (Interrupted)"
@@ -5189,8 +5189,8 @@ msgstr "E340: La línea se está haciendo demasiado larga"
 
 #: misc2.c:839
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Error interno: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Error interno: lalloc(%<PRId64>, )"
 
 #: misc2.c:953
 #, c-format
@@ -5284,8 +5284,8 @@ msgstr "leído del socket NetBeans"
 
 #: netbeans.c:1872
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: Se perdió la conexión NetBeans para el búfer %ld"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: Se perdió la conexión NetBeans para el búfer %<PRId64>"
 
 #: netbeans.c:3692
 msgid "E505: "
@@ -5343,18 +5343,18 @@ msgstr "1 línea %sed %d veces"
 
 #: ops.c:300
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld líneas %sed 1 vez"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> líneas %sed 1 vez"
 
 #: ops.c:303
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld líneas %sed %d veces"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> líneas %sed %d veces"
 
 #: ops.c:691
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld líneas por sangrar..."
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> líneas por sangrar..."
 
 #: ops.c:742
 msgid "1 line indented "
@@ -5362,8 +5362,8 @@ msgstr "1 línea sangrada"
 
 #: ops.c:744
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld líneas sangradas"
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> líneas sangradas"
 
 #: ops.c:1170
 msgid "E748: No previously used register"
@@ -5381,13 +5381,13 @@ msgstr "1 línea cambiada"
 
 #: ops.c:2333
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld líneas cambiadas"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> líneas cambiadas"
 
 #: ops.c:2788
 #, c-format
-msgid "freeing %ld lines"
-msgstr "liberando %ld líneas"
+msgid "freeing %<PRId64> lines"
+msgstr "liberando %<PRId64> líneas"
 
 #: ops.c:3073
 msgid "block of 1 line yanked"
@@ -5399,13 +5399,13 @@ msgstr "1 línea copiada"
 
 #: ops.c:3080
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "bloque de %ld líneas copiadas"
+msgid "block of %<PRId64> lines yanked"
+msgstr "bloque de %<PRId64> líneas copiadas"
 
 #: ops.c:3083
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld líneas copiadas"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> líneas copiadas"
 
 #: ops.c:3378
 #, c-format
@@ -5442,42 +5442,42 @@ msgstr "E574: Registro desconocido de tipo %d"
 
 #: ops.c:6435
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld Cols; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> Cols; "
 
 #: ops.c:6444
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
 msgstr ""
-"Selección %s%ld de %ld Líneas; %ld de %ld Palabras; %ld de %ld Caracteres"
+"Selección %s%<PRId64> de %<PRId64> Líneas; %<PRId64> de %<PRId64> Palabras; %<PRId64> de %<PRId64> Caracteres"
 
 #: ops.c:6451
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
 msgstr ""
-"Selección %s%ld de %ld Líneas; %ld de %ld Palabras; %ld de %ld Caracteres; %"
-"ld de %ld Bytes"
+"Selección %s%<PRId64> de %<PRId64> Líneas; %<PRId64> de %<PRId64> Palabras; %<PRId64> de %<PRId64> Caracteres; %"
+"ld de %<PRId64> Bytes"
 
 #: ops.c:6470
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Col %s de %s; Línea %ld de %ld; Palabra %ld de %ld; Byte %ld de %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Col %s de %s; Línea %<PRId64> de %<PRId64>; Palabra %<PRId64> de %<PRId64>; Byte %<PRId64> de %<PRId64>"
 
 #: ops.c:6478
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"Col %s de %s; Línea %ld de %ld; Palabra %ld de %ld; Carácter %ld de %ld Byte "
-"%ld de %ld"
+"Col %s de %s; Línea %<PRId64> de %<PRId64>; Palabra %<PRId64> de %<PRId64>; Carácter %<PRId64> de %<PRId64> Byte "
+"%<PRId64> de %<PRId64>"
 
 #: ops.c:6490
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld para BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> para BOM)"
 
 #: option.c:1953
 msgid "%<%f%h%m%=Page %N"
@@ -5700,8 +5700,8 @@ msgstr "Necesito Amigados 2.04 o una versión posterior\n"
 
 #: os_amiga.c:346
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Necesito %s versión %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Necesito %s versión %<PRId64>\n"
 
 #: os_amiga.c:419
 msgid "Cannot open NIL:\n"
@@ -5812,8 +5812,8 @@ msgstr "Vim: Capté una señal mortal\n"
 
 #: os_unix.c:1412
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "Abrir la pantalla X tomó %ld mseg"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "Abrir la pantalla X tomó %<PRId64> mseg"
 
 #: os_unix.c:1439
 msgid ""
@@ -6683,8 +6683,8 @@ msgstr "Ejecutando compresión fonética"
 
 #: spell.c:8754
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "Número de palabras después de la compresión fonética: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "Número de palabras después de la compresión fonética: %<PRId64>"
 
 #: spell.c:8879
 #, c-format
@@ -6730,8 +6730,8 @@ msgstr "¡Listo!"
 
 #: spell.c:9543
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' no tiene entradas %ld"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' no tiene entradas %<PRId64>"
 
 #: spell.c:9588
 #, c-format
@@ -6754,8 +6754,8 @@ msgstr "Lo siento, no hay sugerencias"
 
 #: spell.c:10325
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Lo siento, solo hay %ld sugerencias"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "Lo siento, solo hay %<PRId64> sugerencias"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -7141,8 +7141,8 @@ msgstr "E431: Error de formato en el archivo de etiquetas \"%s\""
 
 #: tag.c:2392
 #, c-format
-msgid "Before byte %ld"
-msgstr "Adelante del byte %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Adelante del byte %<PRId64>"
 
 #: tag.c:2425
 #, c-format
@@ -7234,8 +7234,8 @@ msgstr "Este es el cambio más nuevo"
 
 #: undo.c:930
 #, c-format
-msgid "Undo number %ld not found"
-msgstr "No se encontró el número de \"deshacer\" %ld"
+msgid "Undo number %<PRId64> not found"
+msgstr "No se encontró el número de \"deshacer\" %<PRId64>"
 
 #: undo.c:1100
 msgid "E438: u_undo: line numbers wrong"
@@ -7267,8 +7267,8 @@ msgstr "cambios"
 
 #: undo.c:1375
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 #: undo.c:1378
 msgid "before"
@@ -7288,8 +7288,8 @@ msgstr "el número modifica el tiempo"
 
 #: undo.c:1525
 #, c-format
-msgid "%ld seconds ago"
-msgstr "hace %ld segundos"
+msgid "%<PRId64> seconds ago"
+msgstr "hace %<PRId64> segundos"
 
 #: undo.c:1541
 msgid "E790: undojoin is not allowed after undo"

src/po/fi.po

@@ -91,8 +91,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: Luetteloitua puskuria ei ole"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Puskuria %ld ei ole"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Puskuria %<PRId64> ei ole"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Viimeisen puskurin ohi ei voi edet<65>"
@@ -101,9 +101,9 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: Ensimm<6D>isen puskurin ohi ei voi edet<65>"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
 msgstr ""
-"E89: Puskurin %ld muutoksia ei ole tallennettu (lis<69><73> komentoon ! "
+"E89: Puskurin %<PRId64> muutoksia ei ole tallennettu (lis<69><73> komentoon ! "
 "ohittaaksesi)"
 
 msgid "E90: Cannot unload last buffer"
@@ -113,8 +113,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Varoitus: Tiedostonimiluettelon ylivuoto"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Puskuria %ld ei l<>ydy"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: Puskuria %<PRId64> ei l<>ydy"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -125,8 +125,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: %s ei t<>sm<73><6D> yhteenk<6E><6B>n puskuriin"
 
 #, c-format
-msgid "line %ld"
-msgstr "rivi %ld"
+msgid "line %<PRId64>"
+msgstr "rivi %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Samanniminen puskuri on jo olemassa"
@@ -151,12 +151,12 @@ msgid "1 line --%d%%--"
 msgstr "1 rivi --%d %%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld rivi<76> --%d %%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> rivi<76> --%d %%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "rivi %ld/%ld --%d %%-- sarake "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "rivi %<PRId64>/%<PRId64> --%d %%-- sarake "
 
 msgid "[No Name]"
 msgstr "[Nimet<65>n]"
@@ -205,12 +205,12 @@ msgid "Signs for %s:"
 msgstr "Merkit kohteelle %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    rivi=%ld  id=%d  nimi=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    rivi=%<PRId64>  id=%d  nimi=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Ei voi diffata enemp<6D><70> kuin %ld puskuria"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Ei voi diffata enemp<6D><70> kuin %<PRId64> puskuria"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: Ei voi lukea tai kirjoittaa v<>liaikaistiedostoja"
@@ -362,8 +362,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: Odottamattomia merkkej<65> komennossa :let"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: Indeksi %ld luettelon rajojen ulkopuolella"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: Indeksi %<PRId64> luettelon rajojen ulkopuolella"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -747,8 +747,8 @@ msgid "%s aborted"
 msgstr "%s keskeytettiin"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s palaa kohdassa #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s palaa kohdassa #%<PRId64>"
 
 #, c-format
 msgid "%s returning %s"
@@ -782,16 +782,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Siirryt<79><74>n vianetsint<6E>tilaan, kirjoita cont jatkaaksesi."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "rivi %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "rivi %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "kmnt: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Katkaisukohta %s%s rivill<6C> %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Katkaisukohta %s%s rivill<6C> %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -801,8 +801,8 @@ msgid "No breakpoints defined"
 msgstr "Ei katkaisukohtia"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  rivi %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  rivi %<PRId64>"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Aloita k<>skyll<6C> :profile start {fname}"
@@ -861,16 +861,16 @@ msgid "could not source \"%s\""
 msgstr "ei voitu ladata %s"
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "rivi %ld: ei voitu ladata %s"
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "rivi %<PRId64>: ei voitu ladata %s"
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "ladataan %s"
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "rivi %ld: ladataan %s"
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "rivi %<PRId64>: ladataan %s"
 
 #, c-format
 msgid "finished sourcing %s"
@@ -928,12 +928,12 @@ msgid "1 line moved"
 msgstr "1 rivi siirretty"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld rivi<76> siirretty"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> rivi<76> siirretty"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld rivi<76> suodatettu"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> rivi<76> suodatettu"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filter*-autocommand ei voi vaihtaa puskuria"
@@ -1016,8 +1016,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Swap-tiedosto on jo olemassa: %s (komento :silent! ohittaa)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: Ei tiedostonime<6D> puskurille %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: Ei tiedostonime<6D> puskurille %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr ""
@@ -1075,19 +1075,19 @@ msgid "1 substitution"
 msgstr "1 korvaus"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld t<>sm<73>yst<73>"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> t<>sm<73>yst<73>"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld korvausta"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> korvausta"
 
 msgid " on 1 line"
 msgstr " 1 rivill<6C>"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " %ld rivill<6C>"
+msgid " on %<PRId64> lines"
+msgstr " %<PRId64> rivill<6C>"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :globalia ei voi suorittaa rekursiivisesti"
@@ -1170,8 +1170,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Virheellinen puskurin nimi: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Virheellinen merkin tunnus: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: Virheellinen merkin tunnus: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (EI L<>YTYNYT)"
@@ -1233,8 +1233,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: viel<65> 1 tiedosto muokattavana"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: viel<65> %ld tiedostoa muokattavana"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: viel<65> %<PRId64> tiedostoa muokattavana"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: Komento on jo olemassa, k<>yt<79> !:<3A> korvataksesi"
@@ -1420,8 +1420,8 @@ msgid "Exception discarded: %s"
 msgstr "Poikkeus poistettu: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, rivi %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, rivi %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1627,12 +1627,12 @@ msgid "[crypted]"
 msgstr "[salattu]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[MUUNNOSVIRHE rivill<6C> %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[MUUNNOSVIRHE rivill<6C> %<PRId64>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[VIRHEELLINEN OKTETTI rivill<6C> %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[VIRHEELLINEN OKTETTI rivill<6C> %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[LUKUVIRHEIT<49>]"
@@ -1725,9 +1725,9 @@ msgstr "E513: kirjoitusvirhe, muunnos ep
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
 "override)"
-msgstr "E513: kirjoitusvirhe, muunnos ep<65>onnistui rivill<6C> %ld"
+msgstr "E513: kirjoitusvirhe, muunnos ep<65>onnistui rivill<6C> %<PRId64>"
 "(tyhj<68><6A> fenc ohittaaksesi)"
 
 msgid "E514: write error (file system full?)"
@@ -1737,8 +1737,8 @@ msgid " CONVERSION ERROR"
 msgstr " MUUNNOSVIRHE"
 
 #, c-format
-msgid " in line %ld;"
-msgstr " rivill<6C> %ld"
+msgid " in line %<PRId64>;"
+msgstr " rivill<6C> %<PRId64>"
 
 msgid "[Device]"
 msgstr "[Laite]"
@@ -1799,8 +1799,8 @@ msgid "1 line, "
 msgstr "1 rivi, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld rivi<76>, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> rivi<76>, "
 
 msgid "1 character"
 msgstr "1 merkki"
@@ -1811,8 +1811,8 @@ msgstr "%<PRId64> merkki
 
 #. Explicit typecast avoids warning on Mac OS X 10.6
 #, c-format
-msgid "%ld characters"
-msgstr "%ld merkki<6B>"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> merkki<6B>"
 
 # ei rivinvaihtoja
 msgid "[noeol]"
@@ -2227,19 +2227,19 @@ msgid "Font1: %s\n"
 msgstr "Fontti1: %s\n"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "Fontti%ld:n leveys ei ole kaksi kertaa fontti0:n\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "Fontti%<PRId64>:n leveys ei ole kaksi kertaa fontti0:n\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "Fontti0:n leveys: %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "Fontti0:n leveys: %<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"Fontti1:n leveys: %ld\n"
+"Fontti1:n leveys: %<PRId64>\n"
 "\n"
 
 msgid "Invalid font specification"
@@ -2416,8 +2416,8 @@ msgid "Added cscope database %s"
 msgstr "Lis<69>tty cscope-tietokanta %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: Virhe luettaessa cscope-yhteytt<74> %ld"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: Virhe luettaessa cscope-yhteytt<74> %<PRId64>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: tuntematon cscope-hakutyyppi"
@@ -3638,12 +3638,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: S<>ilytt<74>minen ep<65>onnistui"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: virheellinen lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: virheellinen lnum: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: rivi<76> %ld ei l<>ydy"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: rivi<76> %<PRId64> ei l<>ydy"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: osoitinlohkon tunnus v<><76>r<EFBFBD> 3"
@@ -3661,8 +3661,8 @@ msgid "deleted block 1?"
 msgstr "poistettu lohko 1?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Rivi<76> %ld ei l<>ydy"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Rivi<76> %<PRId64> ei l<>ydy"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: osoitinlohkon tunnus v<><76>r<EFBFBD>"
@@ -3671,12 +3671,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count on nolla"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: rivinumero arvoalueen ulkopuoleta: %ld on loppua suurempi"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: rivinumero arvoalueen ulkopuoleta: %<PRId64> on loppua suurempi"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: rivim<69><6D>r<EFBFBD> v<><76>rin lohkossa %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: rivim<69><6D>r<EFBFBD> v<><76>rin lohkossa %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "Pinon koko kasvaa"
@@ -3864,8 +3864,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Paina enteri<72> tai kirjoita komento aloittaaksesi "
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s rivi %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s rivi %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- Lis<69><73> --"
@@ -3934,12 +3934,12 @@ msgid "1 line less"
 msgstr "1 rivi v<>hemm<6D>n"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld rivi<76> lis<69><73>"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> rivi<76> lis<69><73>"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld rivi<76> v<>hemm<6D>n"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> rivi<76> v<>hemm<6D>n"
 
 msgid " (Interrupted)"
 msgstr " (Keskeytetty)"
@@ -3978,8 +3978,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: Rivist<73> tulee liian pitk<74>"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Sis<69>inen virhe: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Sis<69>inen virhe: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4051,8 +4051,8 @@ msgid "read from Netbeans socket"
 msgstr "luettu Netbeans-soketista"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: NetBeans-yhteys katkesi puskurille %ld"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: NetBeans-yhteys katkesi puskurille %<PRId64>"
 
 msgid "E511: netbeans already connected"
 msgstr "E511: netbeans on yhdistetty jo"
@@ -4099,23 +4099,23 @@ msgid "1 line %sed %d times"
 msgstr "1 rivi<76> %s %d kertaa"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld rivi<76> %s kerran"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> rivi<76> %s kerran"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld rivi<76> %s %d kertaa"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> rivi<76> %s %d kertaa"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld rivi<76> sisennett<74>v<EFBFBD>n<EFBFBD>..."
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> rivi<76> sisennett<74>v<EFBFBD>n<EFBFBD>..."
 
 msgid "1 line indented "
 msgstr "1 rivi sisennetty "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld rivi<76> sisennetty "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> rivi<76> sisennetty "
 
 msgid "E748: No previously used register"
 msgstr "E748: Ei aiemmin k<>ytettyj<79> rekisterej<65>"
@@ -4128,12 +4128,12 @@ msgid "1 line changed"
 msgstr "1 rivi muuttui"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld rivi<76> muuttui"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> rivi<76> muuttui"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "vapautetaan %ld rivi<76>"
+msgid "freeing %<PRId64> lines"
+msgstr "vapautetaan %<PRId64> rivi<76>"
 
 msgid "block of 1 line yanked"
 msgstr "1 rivin lohko kopioitu"
@@ -4142,12 +4142,12 @@ msgid "1 line yanked"
 msgstr "1 rivi kopioitu"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "lohko %ld rivilt<6C> kopioitu"
+msgid "block of %<PRId64> lines yanked"
+msgstr "lohko %<PRId64> rivilt<6C> kopioitu"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld rivi<76> kopioitu"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> rivi<76> kopioitu"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4176,33 +4176,33 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: Tuntematon rekisterityyppi %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld saraketta, "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> saraketta, "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Valittu %s%ld/%ld rivi<76>, %ld/%ld sanaa, %ld/%ld tavua"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Valittu %s%<PRId64>/%<PRId64> rivi<76>, %<PRId64>/%<PRId64> sanaa, %<PRId64>/%<PRId64> tavua"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
-msgstr "Valittu %s%ld/%ld rivi<76>, %ld/%ld sanaa, %ld/%ld merkki<6B>, %ld/%ld tavua"
+msgstr "Valittu %s%<PRId64>/%<PRId64> rivi<76>, %<PRId64>/%<PRId64> sanaa, %<PRId64>/%<PRId64> merkki<6B>, %<PRId64>/%<PRId64> tavua"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Sarake %s/%s, Rivi %ld/%ld, sana %ld/%ld, tavu %ld/%ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Sarake %s/%s, Rivi %<PRId64>/%<PRId64>, sana %<PRId64>/%<PRId64>, tavu %<PRId64>/%<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
-msgstr "Sarake %s/%s, rivi %ld/%ld, sana %ld/%ld, merkki %ld/%ld, tavu %ld/%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
+msgstr "Sarake %s/%s, rivi %<PRId64>/%<PRId64>, sana %<PRId64>/%<PRId64>, merkki %<PRId64>/%<PRId64>, tavu %<PRId64>/%<PRId64>"
 
 # Unicode Byte Order Mark
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld BOMista)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> BOMista)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Sivu %N"
@@ -4381,8 +4381,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Amigados 2.04 tai uudempi tarvitaan\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Tarvitaan %s versio %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Tarvitaan %s versio %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Ei voi avata NILi<4C>:\n"
@@ -4464,8 +4464,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Tappava signaali\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "X-n<>yt<79>n avaus vei %ld millisekuntia"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "X-n<>yt<79>n avaus vei %<PRId64> millisekuntia"
 
 msgid ""
 "\n"
@@ -5154,8 +5154,8 @@ msgid "Performing soundfolding..."
 msgstr "<22><>nt<6E>myksen mukaan yhdistell<6C><6C>n..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "Sanoja <20><>nt<6E>mysyhdistelyn j<>lkeen: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "Sanoja <20><>nt<6E>mysyhdistelyn j<>lkeen: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -5190,8 +5190,8 @@ msgid "Done!"
 msgstr "Valmista."
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: spellfile ei sis<69>ll<6C> %ld kohtaa"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: spellfile ei sis<69>ll<6C> %<PRId64> kohtaa"
 
 #, c-format
 msgid "Word removed from %s"
@@ -5208,8 +5208,8 @@ msgid "Sorry, no suggestions"
 msgstr "Sori, ei ehdotuksia"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Sori, vain %ld ehdotusta"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "Sori, vain %<PRId64> ehdotusta"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5506,8 +5506,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Muotovirh t<>gitiedostossa %s"
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "Ennen tavua %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Ennen tavua %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5655,8 +5655,8 @@ msgid "Already at newest change"
 msgstr "Nuorimmassa muutoksessa"
 
 #, c-format
-msgid "E830: Undo number %ld not found"
-msgstr "E830: Kumouslukua %ld ei l<>ydy"
+msgid "E830: Undo number %<PRId64> not found"
+msgstr "E830: Kumouslukua %<PRId64> ei l<>ydy"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: v<><76>r<EFBFBD>t rivinumerot"
@@ -5681,8 +5681,8 @@ msgstr "muutosta"
 
 # eka %s yl<79>puolelta, toka %s alapuolelta, kolmas %s aika
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s, %s #%ld %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s, %s #%<PRId64> %s"
 
 msgid "before"
 msgstr "ennen muutosta"
@@ -5697,8 +5697,8 @@ msgid "number changes  time            saved"
 msgstr "muutoksia       aika            tallennettu"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld sekuntia sitten"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> sekuntia sitten"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin ei toimi undon j<>lkeen"

src/po/fr.po

@@ -99,8 +99,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: Aucun tampon n'est list<73>"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Le tampon %ld n'existe pas"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Le tampon %<PRId64> n'existe pas"
 
 # AB - Je ne suis pas s<>r que l'on puisse obtenir ce message.
 msgid "E87: Cannot go beyond last buffer"
@@ -111,9 +111,9 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: Impossible d'aller avant le premier tampon"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
 msgstr ""
-"E89: Le tampon %ld n'a pas <20>t<EFBFBD> enregistr<74> (ajoutez ! pour passer outre)"
+"E89: Le tampon %<PRId64> n'a pas <20>t<EFBFBD> enregistr<74> (ajoutez ! pour passer outre)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Impossible de d<>charger le dernier tampon"
@@ -124,8 +124,8 @@ msgstr "W14: Alerte : La liste des noms de fichier d
 # AB - Vu le code source, la version fran<61>aise est meilleure que la
 #      version anglaise. Ce message est similaire au message E86.
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Le tampon %ld n'existe pas"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: Le tampon %<PRId64> n'existe pas"
 
 # AB - Il faut respecter l'esprit plus que la lettre.
 #, c-format
@@ -137,8 +137,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Aucun tampon ne correspond <20> %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "ligne %ld"
+msgid "line %<PRId64>"
+msgstr "ligne %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Un tampon porte d<>j<EFBFBD> ce nom"
@@ -166,14 +166,14 @@ msgid "1 line --%d%%--"
 msgstr "1 ligne --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld lignes --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> lignes --%d%%--"
 
 # AB - Faut-il remplacer "sur" par "de" ?
 # DB - Mon avis : oui.
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "ligne %ld sur %ld --%d%%-- col "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "ligne %<PRId64> sur %<PRId64> --%d%%-- col "
 
 # DB - Je trouvais [Aucun fichier] (VO : [No file]) plus naturel
 #      lors du lancement de Vim en mode graphique (ce message
@@ -227,16 +227,16 @@ msgid "Signs for %s:"
 msgstr "Symboles dans %s :"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    ligne=%ld  id=%d  nom=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    ligne=%<PRId64>  id=%d  nom=%s"
 
 # AB - Je n'ai pas trouv<75> de traduction satisfaisante au verbe "diff". Comme
 #      Vim fait en pratique appel au programme "diff" pour evaluer les
 #      diff<66>rences entre fichiers, "to diff" a <20>t<EFBFBD> traduit par "utiliser diff"
 #      et d'autres expressions appropri<72>es.
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Impossible d'utiliser diff sur plus de %ld tampons"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Impossible d'utiliser diff sur plus de %<PRId64> tampons"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: Impossible de lire ou <20>crire des fichiers temporaires"
@@ -430,8 +430,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: Caract<63>res inattendus avant '='"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: index de Liste hors limites : %ld au-del<65> de la fin"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: index de Liste hors limites : %<PRId64> au-del<65> de la fin"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -877,8 +877,8 @@ msgstr "%s annul
 
 # AB - Ce texte fait partie d'un message de d<>bogage.
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s a retourn<72> #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s a retourn<72> #%<PRId64>"
 
 # AB - Ce texte fait partie d'un message de d<>bogage.
 #, c-format
@@ -934,12 +934,12 @@ msgid "1 line moved"
 msgstr "1 ligne d<>plac<61>e"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld lignes d<>plac<61>es"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> lignes d<>plac<61>es"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld lignes filtr<74>es"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> lignes filtr<74>es"
 
 # AB - J'ai volontairement omis l'ast<73>risque initiale car je pense que le
 #      motif "Filter*" d<>crit plus clairement les quatre autocommandes li<6C>es
@@ -1064,8 +1064,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Le fichier d'<27>change %s existe d<>j<EFBFBD> (:silent! pour passer outre)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: Pas de nom de fichier pour le tampon %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: Pas de nom de fichier pour le tampon %<PRId64>"
 
 # AB - Il faut respecter l'esprit plus que la lettre.
 msgid "E142: File not written: Writing is disabled by 'write' option"
@@ -1137,19 +1137,19 @@ msgid "1 substitution"
 msgstr "1 substitution"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld correspondances"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> correspondances"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld substitutions"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> substitutions"
 
 msgid " on 1 line"
 msgstr " sur 1 ligne"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " sur %ld lignes"
+msgid " on %<PRId64> lines"
+msgstr " sur %<PRId64> lignes"
 
 # AB - Il faut respecter l'esprit plus que la lettre.
 # AB - Ce message devrait contenir une r<>f<EFBFBD>rence <20> :vglobal.
@@ -1264,8 +1264,8 @@ msgstr "E158: Le tampon %s est introuvable"
 # AB - Vu le code source, la version fran<61>aise est meilleure que la
 #      version anglaise.
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Le symbole %ld est introuvable"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: Le symbole %<PRId64> est introuvable"
 
 msgid " (NOT FOUND)"
 msgstr "  (INTROUVABLE)"
@@ -1282,16 +1282,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Mode d<>bogage activ<69>. Tapez \"cont\" pour continuer."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "ligne %ld : %s"
+msgid "line %<PRId64>: %s"
+msgstr "ligne %<PRId64> : %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "cmde : %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Point d'arr<72>t dans %s%s ligne %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Point d'arr<72>t dans %s%s ligne %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -1303,8 +1303,8 @@ msgstr "Aucun point d'arr
 # AB - Le deuxi<78>me %s est remplac<61> par "func" ou "file" sans que l'on puisse
 #      traduire ces mots.
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  ligne %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  ligne %<PRId64>"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Utilisez d'abord \":profile start {nomfichier}\""
@@ -1365,16 +1365,16 @@ msgid "could not source \"%s\""
 msgstr "impossible de sourcer \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "ligne %ld : impossible de sourcer \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "ligne %<PRId64> : impossible de sourcer \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "sourcement \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "ligne %ld : sourcement de \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "ligne %<PRId64> : sourcement de \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1465,8 +1465,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: encore 1 fichier <20> <20>diter"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: encore %ld fichiers <20> <20>diter"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: encore %<PRId64> fichiers <20> <20>diter"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: La commande existe d<>j<EFBFBD> : ajoutez ! pour la red<65>finir"
@@ -1661,8 +1661,8 @@ msgid "Exception discarded: %s"
 msgstr "Exception <20>limin<69>e : %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, ligne %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, ligne %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1878,12 +1878,12 @@ msgid "[crypted]"
 msgstr "[chiffr<66>]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[ERREUR DE CONVERSION <20> la ligne %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[ERREUR DE CONVERSION <20> la ligne %<PRId64>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[OCTET INVALIDE <20> la ligne %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[OCTET INVALIDE <20> la ligne %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[ERREURS DE LECTURE]"
@@ -1973,10 +1973,10 @@ msgstr ""
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: Erreur d'<27>criture, <20>chec de conversion <20> la ligne %ld (videz 'fenc' "
+"E513: Erreur d'<27>criture, <20>chec de conversion <20> la ligne %<PRId64> (videz 'fenc' "
 "pour passer outre)"
 
 msgid "E514: write error (file system full?)"
@@ -1986,8 +1986,8 @@ msgid " CONVERSION ERROR"
 msgstr " ERREUR DE CONVERSION"
 
 #, c-format
-msgid " in line %ld;"
-msgstr " <20> la ligne %ld"
+msgid " in line %<PRId64>;"
+msgstr " <20> la ligne %<PRId64>"
 
 msgid "[Device]"
 msgstr "[P<>riph.]"
@@ -2051,8 +2051,8 @@ msgid "1 line, "
 msgstr "1 ligne, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld lignes, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> lignes, "
 
 msgid "1 character"
 msgstr "1 caract<63>re"
@@ -2063,8 +2063,8 @@ msgstr "%<PRId64> caract
 
 #. Explicit typecast avoids warning on Mac OS X 10.6
 #, c-format
-msgid "%ld characters"
-msgstr "%ld caract<63>res"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> caract<63>res"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2502,19 +2502,19 @@ msgid "Font1: %s\n"
 msgstr "Font1: %s\n"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "La largeur de Font%ld n'est pas le double de celle de Font0\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "La largeur de Font%<PRId64> n'est pas le double de celle de Font0\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "Largeur de Font0 : %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "Largeur de Font0 : %<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"Largeur de Font1 : %ld\n"
+"Largeur de Font1 : %<PRId64>\n"
 "\n"
 
 # DB - todo : Pas certain de mon coup, ici...
@@ -2697,8 +2697,8 @@ msgid "Added cscope database %s"
 msgstr "Base de donn<6E>es cscope %s ajout<75>e"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: erreur lors de la lecture de la connexion cscope %ld"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: erreur lors de la lecture de la connexion cscope %<PRId64>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: type de recherche cscope inconnu"
@@ -3938,12 +3938,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: <20>chec de la pr<70>servation"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get : num<75>ro de ligne invalide : %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get : num<75>ro de ligne invalide : %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get : ligne %ld introuvable"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get : ligne %<PRId64> introuvable"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: mauvais id de pointeur de bloc 3"
@@ -3961,8 +3961,8 @@ msgid "deleted block 1?"
 msgstr "bloc 1 effac<61> ?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Ligne %ld introuvable"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Ligne %<PRId64> introuvable"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: mauvais id de pointeur de bloc"
@@ -3971,12 +3971,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count vaut z<>ro"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: num<75>ro de ligne hors limites : %ld au-del<65> de la fin"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: num<75>ro de ligne hors limites : %<PRId64> au-del<65> de la fin"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: nombre de lignes erron<6F> dans le bloc %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: nombre de lignes erron<6F> dans le bloc %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "La taille de la pile s'accro<72>t"
@@ -4163,8 +4163,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Appuyez sur ENTR<54>E ou tapez une commande pour continuer"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s, ligne %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s, ligne %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- Plus --"
@@ -4236,12 +4236,12 @@ msgid "1 line less"
 msgstr "1 ligne en moins"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld lignes en plus"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> lignes en plus"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld lignes en moins"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> lignes en moins"
 
 msgid " (Interrupted)"
 msgstr " (Interrompu)"
@@ -4279,8 +4279,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: La ligne devient trop longue"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Erreur interne : lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Erreur interne : lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4358,8 +4358,8 @@ msgid "read from Netbeans socket"
 msgstr "read sur la socket Netbeans"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: Connexion NetBeans perdue pour le tampon %ld"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: Connexion NetBeans perdue pour le tampon %<PRId64>"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: netbeans n'est pas support<72> avec cette interface graphique"
@@ -4411,23 +4411,23 @@ msgid "1 line %sed %d times"
 msgstr "1 ligne %s<>e %d fois"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld lignes %s<>es 1 fois"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> lignes %s<>es 1 fois"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld lignes %s<>es %d fois"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> lignes %s<>es %d fois"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld lignes <20> indenter... "
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> lignes <20> indenter... "
 
 msgid "1 line indented "
 msgstr "1 ligne indent<6E>e "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld lignes indent<6E>es "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> lignes indent<6E>es "
 
 msgid "E748: No previously used register"
 msgstr "E748: Aucun registre n'a <20>t<EFBFBD> pr<70>c<EFBFBD>demment utilis<69>"
@@ -4441,12 +4441,12 @@ msgid "1 line changed"
 msgstr "1 ligne modifi<66>e"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld lignes modifi<66>es"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> lignes modifi<66>es"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "lib<69>ration de %ld lignes"
+msgid "freeing %<PRId64> lines"
+msgstr "lib<69>ration de %<PRId64> lignes"
 
 msgid "block of 1 line yanked"
 msgstr "bloc de 1 ligne copi<70>"
@@ -4455,12 +4455,12 @@ msgid "1 line yanked"
 msgstr "1 ligne copi<70>e"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "bloc de %ld lignes copi<70>"
+msgid "block of %<PRId64> lines yanked"
+msgstr "bloc de %<PRId64> lignes copi<70>"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld lignes copi<70>es"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> lignes copi<70>es"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4489,38 +4489,38 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: Type de registre %d inconnu"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld Colonnes ; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> Colonnes ; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
 msgstr ""
-"%s%ld sur %ld Lignes ; %ld sur %ld Mots ; %ld sur %ld Octets s<>lectionn<6E>s"
+"%s%<PRId64> sur %<PRId64> Lignes ; %<PRId64> sur %<PRId64> Mots ; %<PRId64> sur %<PRId64> Octets s<>lectionn<6E>s"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
 msgstr ""
-"%s%ld sur %ld Lignes ; %ld sur %ld Mots ; %ld sur %ld Caract<63>res ; %ld sur "
-"%ld octets s<>lectionn<6E>s"
+"%s%<PRId64> sur %<PRId64> Lignes ; %<PRId64> sur %<PRId64> Mots ; %<PRId64> sur %<PRId64> Caract<63>res ; %<PRId64> sur "
+"%<PRId64> octets s<>lectionn<6E>s"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
 msgstr ""
-"Colonne %s sur %s ; Ligne %ld sur %ld ; Mot %ld sur %ld ; Octet %ld sur %ld"
+"Colonne %s sur %s ; Ligne %<PRId64> sur %<PRId64> ; Mot %<PRId64> sur %<PRId64> ; Octet %<PRId64> sur %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"Colonne %s sur %s ; Ligne %ld sur %ld ; Mot %ld sur %ld ; Caract<63>re %ld sur "
-"%ld ; Octet %ld sur %ld"
+"Colonne %s sur %s ; Ligne %<PRId64> sur %<PRId64> ; Mot %<PRId64> sur %<PRId64> ; Caract<63>re %<PRId64> sur "
+"%<PRId64> ; Octet %<PRId64> sur %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld pour le BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> pour le BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Page %N"
@@ -4705,8 +4705,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Amigados version 2.04 ou ult<6C>rieure est n<>cessaire\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "%s version %ld est n<>cessaire\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "%s version %<PRId64> est n<>cessaire\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Impossible d'ouvrir NIL :\n"
@@ -4789,8 +4789,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim : Signal mortel intercept<70>\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "L'ouverture du display X a pris %ld ms"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "L'ouverture du display X a pris %<PRId64> ms"
 
 msgid ""
 "\n"
@@ -5566,8 +5566,8 @@ msgid "Performing soundfolding..."
 msgstr "Analyse phon<6F>tique en cours..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "Nombre de mots apr<70>s l'analyse phon<6F>tique : %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "Nombre de mots apr<70>s l'analyse phon<6F>tique : %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -5603,8 +5603,8 @@ msgstr "Termin
 
 # DB - todo : perfectible.
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' n'a pas %ld entr<74>es"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' n'a pas %<PRId64> entr<74>es"
 
 #, c-format
 msgid "Word removed from %s"
@@ -5622,8 +5622,8 @@ msgid "Sorry, no suggestions"
 msgstr "D<>sol<6F>, aucune suggestion"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "D<>sol<6F>, seulement %ld suggestions"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "D<>sol<6F>, seulement %<PRId64> suggestions"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5941,8 +5941,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Erreur de format dans le fichier de marqueurs \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "Avant l'octet %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Avant l'octet %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -6093,8 +6093,8 @@ msgid "Already at newest change"
 msgstr "D<>j<EFBFBD> <20> la modification la plus r<>cente"
 
 #, c-format
-msgid "E830: Undo number %ld not found"
-msgstr "E830: Annulation n<> %ld introuvable"
+msgid "E830: Undo number %<PRId64> not found"
+msgstr "E830: Annulation n<> %<PRId64> introuvable"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo : num<75>ros de ligne erron<6F>s"
@@ -6118,8 +6118,8 @@ msgid "changes"
 msgstr "modifications"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s ; %s #%ld ; %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s ; %s #%<PRId64> ; %s"
 
 msgid "before"
 msgstr "avant"
@@ -6135,8 +6135,8 @@ msgid "number changes  when               saved"
 msgstr "num<75>ro modif.   instant            enregistr<74>"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "il y a %ld secondes"
+msgid "%<PRId64> seconds ago"
+msgstr "il y a %<PRId64> secondes"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin n'est pas autoris<69> apr<70>s une annulation"

src/po/ga.po

@@ -58,8 +58,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: N<>l aon mhaol<6F>n liostaithe ann"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: N<>l a leith<74>id de mhaol<6F>n %ld"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: N<>l a leith<74>id de mhaol<6F>n %<PRId64>"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: N<> f<>idir a dhul thar an maol<6F>n deireanach"
@@ -68,9 +68,9 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: N<> f<>idir a dhul roimh an ch<63>ad mhaol<6F>n"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
 msgstr ""
-"E89: Athra<72>odh maol<6F>n %ld ach nach bhfuil s<> s<>bh<62>ilte <20> shin (cuir ! leis "
+"E89: Athra<72>odh maol<6F>n %<PRId64> ach nach bhfuil s<> s<>bh<62>ilte <20> shin (cuir ! leis "
 "an ord<72> chun s<>r<EFBFBD>)"
 
 msgid "E90: Cannot unload last buffer"
@@ -80,8 +80,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Rabhadh: Liosta ainmneacha comhaid thar maoil"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Maol<6F>n %ld gan aimsi<73>"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: Maol<6F>n %<PRId64> gan aimsi<73>"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -92,8 +92,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: N<>l aon mhaol<6F>n comhoiri<72>naithe le %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "l<>ne %ld:"
+msgid "line %<PRId64>"
+msgstr "l<>ne %<PRId64>:"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: T<> maol<6F>n ann leis an ainm seo cheana"
@@ -118,12 +118,12 @@ msgid "1 line --%d%%--"
 msgstr "1 l<>ne --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld l<>ne --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> l<>ne --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "l<>ne %ld de %ld --%d%%-- col "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "l<>ne %<PRId64> de %<PRId64> --%d%%-- col "
 
 msgid "[No Name]"
 msgstr "[Gan Ainm]"
@@ -176,12 +176,12 @@ msgid "Signs for %s:"
 msgstr "Comhartha<68> do %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    l<>ne=%ld  id=%d  ainm=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    l<>ne=%<PRId64>  id=%d  ainm=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: N<> f<>idir diff a dh<64>anamh ar n<>os m<> n<> %ld maol<6F>n"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: N<> f<>idir diff a dh<64>anamh ar n<>os m<> n<> %<PRId64> maol<6F>n"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: N<> f<>idir comhaid shealadacha a l<>amh n<> a scr<63>obh"
@@ -335,8 +335,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: Carachtair gan choinne i :let"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: inn<6E>acs liosta as raon: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: inn<6E>acs liosta as raon: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -720,8 +720,8 @@ msgid "%s aborted"
 msgstr "%s tobscortha"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s ag aisfhilleadh #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s ag aisfhilleadh #%<PRId64>"
 
 #, c-format
 msgid "%s returning %s"
@@ -771,12 +771,12 @@ msgid "1 line moved"
 msgstr "Bogadh l<>ne amh<6D>in"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "Bogadh %ld l<>ne"
+msgid "%<PRId64> lines moved"
+msgstr "Bogadh %<PRId64> l<>ne"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "Scagadh %ld l<>ne"
+msgid "%<PRId64> lines filtered"
+msgstr "Scagadh %<PRId64> l<>ne"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr ""
@@ -864,8 +864,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: T<> comhad babht<68>la ann cheana: %s (<28>s<EFBFBD>id :silent! chun s<>r<EFBFBD>)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: N<>l aon ainm ar mhaol<6F>n %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: N<>l aon ainm ar mhaol<6F>n %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: N<>or scr<63>obhadh an comhad: d<>chumasaithe leis an rogha 'write'"
@@ -923,19 +923,19 @@ msgid "1 substitution"
 msgstr "1 ionada<64>ocht"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld rud comhoiri<72>nach"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> rud comhoiri<72>nach"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld ionada<64>ocht"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> ionada<64>ocht"
 
 msgid " on 1 line"
 msgstr " ar l<>ne amh<6D>in"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " ar %ld l<>ne"
+msgid " on %<PRId64> lines"
+msgstr " ar %<PRId64> l<>ne"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: N<> cheada<64>tear :global go hathch<63>rsach"
@@ -1019,8 +1019,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Ainm maol<6F>in neamhbhail<69>: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: ID neamhbhail<69> comhartha: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: ID neamhbhail<69> comhartha: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (AR IARRAIDH)"
@@ -1035,16 +1035,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "M<>d d<>fhabhtaithe <20> thos<6F>.  Cl<43>scr<63>obh \"cont\" chun lean<61>int."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "l<>ne %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "l<>ne %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "ord<72>: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Brisphointe i \"%s%s\" l<>ne %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Brisphointe i \"%s%s\" l<>ne %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -1054,8 +1054,8 @@ msgid "No breakpoints defined"
 msgstr "N<>l aon bhrisphointe socraithe"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  l<>ne %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  l<>ne %<PRId64>"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: <20>s<EFBFBD>id \":profile start {ainm}\" ar dt<64>s"
@@ -1111,16 +1111,16 @@ msgid "could not source \"%s\""
 msgstr "n<>orbh fh<66>idir \"%s\" a l<>amh"
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "l<>ne %ld: n<>orbh fh<66>idir \"%s\" a fhoinsi<73>"
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "l<>ne %<PRId64>: n<>orbh fh<66>idir \"%s\" a fhoinsi<73>"
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "\"%s\" <20> fhoinsi<73>"
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "l<>ne %ld: \"%s\" <20> fhoinsi<73>"
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "l<>ne %<PRId64>: \"%s\" <20> fhoinsi<73>"
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1211,8 +1211,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: 1 chomhad le heagr<67> f<>s"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: %ld comhad le cur in eagar"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: %<PRId64> comhad le cur in eagar"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: T<> an t-ord<72> ann cheana: cuir ! leis chun s<>r<EFBFBD>"
@@ -1401,8 +1401,8 @@ msgid "Exception discarded: %s"
 msgstr "Eisceacht curtha i leataobh: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, l<>ne %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, l<>ne %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1610,12 +1610,12 @@ msgid "[crypted]"
 msgstr "[criptithe]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[EARR<52>ID TIONTAITHE i l<>ne %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[EARR<52>ID TIONTAITHE i l<>ne %<PRId64>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[BEART NEAMHCHEADAITHE i l<>ne %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[BEART NEAMHCHEADAITHE i l<>ne %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[EARR<52>ID<49> L<>IMH]"
@@ -1701,10 +1701,10 @@ msgstr ""
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: earr<72>id le linn scr<63>ofa, theip ar thiont<6E> ar l<>ne %ld (<28>s<EFBFBD>id 'fenc' folamh le "
+"E513: earr<72>id le linn scr<63>ofa, theip ar thiont<6E> ar l<>ne %<PRId64> (<28>s<EFBFBD>id 'fenc' folamh le "
 "s<>r<EFBFBD>)"
 
 msgid "E514: write error (file system full?)"
@@ -1714,8 +1714,8 @@ msgid " CONVERSION ERROR"
 msgstr " EARR<52>ID TIONTAITHE"
 
 #, c-format
-msgid " in line %ld;"
-msgstr " ar l<>ne %ld;"
+msgid " in line %<PRId64>;"
+msgstr " ar l<>ne %<PRId64>;"
 
 msgid "[Device]"
 msgstr "[Gl<47>as]"
@@ -1776,15 +1776,15 @@ msgid "1 line, "
 msgstr "1 l<>ne, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld l<>ne, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> l<>ne, "
 
 msgid "1 character"
 msgstr "1 carachtar"
 
 #, c-format
-msgid "%ld characters"
-msgstr "%ld carachtar"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> carachtar"
 
 msgid "[noeol]"
 msgstr "[ganEOL]"
@@ -2202,19 +2202,19 @@ msgid "Font1: %s\n"
 msgstr "Cl<43>1: %s\n"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "N<>l Cl<43>%ld n<>os leithne faoi dh<64> n<> cl<63>0\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "N<>l Cl<43>%<PRId64> n<>os leithne faoi dh<64> n<> cl<63>0\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "Leithead Cl<43>0: %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "Leithead Cl<43>0: %<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"Leithead Cl<43>1: %ld\n"
+"Leithead Cl<43>1: %<PRId64>\n"
 "\n"
 
 msgid "Invalid font specification"
@@ -2392,8 +2392,8 @@ msgid "Added cscope database %s"
 msgstr "Bunachar sonra<72> nua cscope: %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: earr<72>id agus an nasc cscope %ld <20> l<>amh"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: earr<72>id agus an nasc cscope %<PRId64> <20> l<>amh"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: cine<6E>l anaithnid cuardaigh cscope"
@@ -3636,12 +3636,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: Theip ar chaomhn<68>"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: lnum neamhbhail<69>: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: lnum neamhbhail<69>: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: l<>ne %ld gan aimsi<73>"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: l<>ne %<PRId64> gan aimsi<73>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: aitheantas m<>cheart ar an mbloc pointeora 3"
@@ -3659,8 +3659,8 @@ msgid "deleted block 1?"
 msgstr "bloc a haon scriosta?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: L<>ne %ld gan aimsi<73>"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: L<>ne %<PRId64> gan aimsi<73>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: aitheantas m<>cheart ar an mbloc pointeora"
@@ -3669,12 +3669,12 @@ msgid "pe_line_count is zero"
 msgstr "is 0 pe_line_count\""
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: l<>ne-uimhir as raon: %ld thar dheireadh"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: l<>ne-uimhir as raon: %<PRId64> thar dheireadh"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: l<>on m<>cheart na l<>nte i mbloc %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: l<>on m<>cheart na l<>nte i mbloc %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "M<>ada<64>onn an chruach"
@@ -3866,8 +3866,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Br<42>igh ENTER n<> iontr<74>il ord<72> le lean<61>int"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s l<>ne %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s l<>ne %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- Tuilleadh --"
@@ -3938,12 +3938,12 @@ msgid "1 line less"
 msgstr "1 l<>ne n<>os l<>"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld l<>ne eile"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> l<>ne eile"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld l<>ne n<>os l<>"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> l<>ne n<>os l<>"
 
 msgid " (Interrupted)"
 msgstr " (Idirbhriste)"
@@ -3982,8 +3982,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: T<> an l<>ne ag <20>ir<69> r<>fhada"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Earr<72>id inmhe<68>nach: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Earr<72>id inmhe<68>nach: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4055,8 +4055,8 @@ msgid "read from Netbeans socket"
 msgstr "l<>adh <20> shoic<69>ad Netbeans"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: Cailleadh nasc NetBeans le haghaidh maol<6F>in %ld"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: Cailleadh nasc NetBeans le haghaidh maol<6F>in %<PRId64>"
 
 msgid "E505: "
 msgstr "E505: "
@@ -4103,24 +4103,24 @@ msgstr "1 l
 
 # ouch - English -ed ?
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld l<>ne %sed uair amh<6D>in"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> l<>ne %sed uair amh<6D>in"
 
 # ouch - English -ed ?
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld l<>ne %sed %d uair"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> l<>ne %sed %d uair"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld l<>ne le heang<6E>... "
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> l<>ne le heang<6E>... "
 
 msgid "1 line indented "
 msgstr "eanga<67>odh l<>ne amh<6D>in "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld l<>ne eangaithe "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> l<>ne eangaithe "
 
 msgid "E748: No previously used register"
 msgstr "E748: N<>l aon tabhall <20>s<EFBFBD>idte roimhe seo"
@@ -4133,12 +4133,12 @@ msgid "1 line changed"
 msgstr "athra<72>odh l<>ne amh<6D>in"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "athra<72>odh %ld l<>ne"
+msgid "%<PRId64> lines changed"
+msgstr "athra<72>odh %<PRId64> l<>ne"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "%ld l<>ne <20> saoradh"
+msgid "freeing %<PRId64> lines"
+msgstr "%<PRId64> l<>ne <20> saoradh"
 
 msgid "block of 1 line yanked"
 msgstr "sracadh bloc de l<>ne amh<6D>in"
@@ -4147,12 +4147,12 @@ msgid "1 line yanked"
 msgstr "sracadh l<>ne amh<6D>in"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "sracadh bloc de %ld l<>ne"
+msgid "block of %<PRId64> lines yanked"
+msgstr "sracadh bloc de %<PRId64> l<>ne"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld l<>ne sractha"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> l<>ne sractha"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4182,36 +4182,36 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: Cine<6E>l anaithnid tabhaill %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld Col<6F>n; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> Col<6F>n; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Roghna<6E>odh %s%ld as %ld L<>ne; %ld as %ld Focal; %ld as %ld Beart"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Roghna<6E>odh %s%<PRId64> as %<PRId64> L<>ne; %<PRId64> as %<PRId64> Focal; %<PRId64> as %<PRId64> Beart"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
 msgstr ""
-"Roghna<6E>odh %s%ld as %ld L<>ne; %ld as %ld Focal; %ld as %ld Carachtar; %ld as "
-"%ld Beart"
+"Roghna<6E>odh %s%<PRId64> as %<PRId64> L<>ne; %<PRId64> as %<PRId64> Focal; %<PRId64> as %<PRId64> Carachtar; %<PRId64> as "
+"%<PRId64> Beart"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Col %s as %s; L<>ne %ld as %ld; Focal %ld as %ld; Beart %ld as %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Col %s as %s; L<>ne %<PRId64> as %<PRId64>; Focal %<PRId64> as %<PRId64>; Beart %<PRId64> as %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"Col %s as %s; L<>ne %ld as %ld; Focal %ld as %ld; Carachtar %ld as %ld; Beart "
-"%ld as %ld"
+"Col %s as %s; L<>ne %<PRId64> as %<PRId64>; Focal %<PRId64> as %<PRId64>; Carachtar %<PRId64> as %<PRId64>; Beart "
+"%<PRId64> as %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld do BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> do BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Leathanach %N"
@@ -4388,8 +4388,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "T<> g<> le Amigados leagan 2.04 n<> n<>os d<>ana<6E>\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "T<> g<> le %s, leagan %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "T<> g<> le %s, leagan %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "N<> f<>idir NIL a oscailt:\n"
@@ -4473,8 +4473,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Fuarthas comhartha marfach\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "Th<54>g %ld ms chun an sc<73>ile<6C>n X a oscailt"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "Th<54>g %<PRId64> ms chun an sc<73>ile<6C>n X a oscailt"
 
 msgid ""
 "\n"
@@ -5161,8 +5161,8 @@ msgid "Performing soundfolding..."
 msgstr "Fuaimfhilleadh..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "L<>on na bhfocal tar <20>is fuaimfhillte: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "L<>on na bhfocal tar <20>is fuaimfhillte: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -5197,8 +5197,8 @@ msgid "Done!"
 msgstr "Cr<43>ochnaithe!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: n<>l %ld iontr<74>il i 'spellfile'"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: n<>l %<PRId64> iontr<74>il i 'spellfile'"
 
 #, c-format
 msgid "Word removed from %s"
@@ -5215,8 +5215,8 @@ msgid "Sorry, no suggestions"
 msgstr "T<> br<62>n orm, n<>l aon mholadh ann"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "T<> br<62>n orm, n<>l ach %ld moladh ann"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "T<> br<62>n orm, n<>l ach %<PRId64> moladh ann"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5517,8 +5517,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Earr<72>id fhorm<72>ide i gcomhad clibeanna \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "Roimh bheart %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Roimh bheart %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5587,8 +5587,8 @@ msgid "Already at newest change"
 msgstr "Ag an athr<68> is nua<75> cheana"
 
 #, c-format
-msgid "Undo number %ld not found"
-msgstr "N<>or aims<6D>odh ceal<61> uimhir a %ld"
+msgid "Undo number %<PRId64> not found"
+msgstr "N<>or aims<6D>odh ceal<61> uimhir a %<PRId64>"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: l<>ne-uimhreacha m<>chearta"
@@ -5612,8 +5612,8 @@ msgid "changes"
 msgstr "athr<68>"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "roimh"
@@ -5629,8 +5629,8 @@ msgid "number changes  time"
 msgstr "uimhir athruithe  am"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld soicind <20> shin"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> soicind <20> shin"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: n<> cheada<64>tear \"undojoin\" tar <20>is \"undo\""
@@ -6454,8 +6454,8 @@ msgstr "Buaileadh an BUN le linn an chuardaigh, ag lean
 #~ msgstr ""
 #~ "N<> m<>r do charachtar a <20>s<EFBFBD>idtear ar SLASH a bheith ASCII; i %s l<>ne %d: %s"
 
-#~ msgid "%ld changes"
-#~ msgstr "%ld athr<68>"
+#~ msgid "%<PRId64> changes"
+#~ msgstr "%<PRId64> athr<68>"
 
 #~ msgid "with KDE GUI."
 #~ msgstr "le GUI KDE."

src/po/it.po

@@ -92,8 +92,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: Non c'<27> alcun buffer elencato"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Non esiste il buffer %ld"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Non esiste il buffer %<PRId64>"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Non posso oltrepassare l'ultimo buffer"
@@ -102,9 +102,9 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: Non posso andare prima del primo buffer"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
 msgstr ""
-"E89: Buffer %ld non salvato dopo modifica (aggiungi ! per eseguire comunque)"
+"E89: Buffer %<PRId64> non salvato dopo modifica (aggiungi ! per eseguire comunque)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Non riesco a scaricare l'ultimo buffer"
@@ -113,8 +113,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Attenzione: Superato limite della lista dei nomi di file"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Buffer %ld non trovato"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: Buffer %<PRId64> non trovato"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -125,8 +125,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Nessun buffer corrispondente a %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "linea %ld"
+msgid "line %<PRId64>"
+msgstr "linea %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: C'<27> gi<67> un buffer con questo nome"
@@ -152,11 +152,11 @@ msgstr "[in sola lettura]"
 msgid "1 line --%d%%--"
 msgstr "1 linea --%d%%--"
 
-msgid "%ld lines --%d%%--"
-msgstr "%ld linee --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> linee --%d%%--"
 
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "linea %ld di %ld --%d%%-- col "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "linea %<PRId64> di %<PRId64> --%d%%-- col "
 
 msgid "[No Name]"
 msgstr "[Senza nome]"
@@ -202,12 +202,12 @@ msgid "Signs for %s:"
 msgstr "Segni per %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    linea=%ld id=%d, nome=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    linea=%<PRId64> id=%d, nome=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Non supporto differenze fra pi<70> di %ld buffer"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Non supporto differenze fra pi<70> di %<PRId64> buffer"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: Non riesco a leggere o scrivere file temporanei"
@@ -365,8 +365,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: Caratteri non previsti in :let"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: indice lista fuori intervallo: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: indice lista fuori intervallo: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -782,8 +782,8 @@ msgid "%s aborted"
 msgstr "%s non completata"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s ritorno #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s ritorno #%<PRId64>"
 
 #, c-format
 msgid "%s returning %s"
@@ -832,12 +832,12 @@ msgid "1 line moved"
 msgstr "1 linea mossa"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld linee mosse"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> linee mosse"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld linee filtrate"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> linee filtrate"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filter* Gli autocomandi non devono modificare il buffer in uso"
@@ -921,8 +921,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: File swap esistente: %s (:silent! per sovrascriverlo)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: Manca nome file per il buffer %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: Manca nome file per il buffer %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: File non scritto: Scrittura inibita da opzione 'write'"
@@ -980,19 +980,19 @@ msgid "1 substitution"
 msgstr "1 sostituzione"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld corrisp."
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> corrisp."
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld sostituzioni"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> sostituzioni"
 
 msgid " on 1 line"
 msgstr " in 1 linea"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " in %ld linee"
+msgid " on %<PRId64> lines"
+msgstr " in %<PRId64> linee"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global non pu<70> essere usato ricorsivamente"
@@ -1078,8 +1078,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Nome buffer non valido: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: ID 'sign' non valido: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: ID 'sign' non valido: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (NON TROVATO)"
@@ -1094,16 +1094,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Entro modalit<69> Debug.  Batti \"cont\" per continuare."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "linea %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "linea %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "com: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Pausa in \"%s%s\" linea %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Pausa in \"%s%s\" linea %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -1113,8 +1113,8 @@ msgid "No breakpoints defined"
 msgstr "Nessun 'breakpoint' definito"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s linea %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s linea %<PRId64>"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Usare prima \":profile start {fname}\""
@@ -1172,16 +1172,16 @@ msgid "could not source \"%s\""
 msgstr "non riesco ad eseguire \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "linea %ld: non riesco ad eseguire \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "linea %<PRId64>: non riesco ad eseguire \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "eseguo \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "linea %ld: eseguo \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "linea %<PRId64>: eseguo \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1270,8 +1270,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: ancora 1 file da elaborare"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: ancora %ld file da elaborare"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: ancora %<PRId64> file da elaborare"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: Il comando esiste gi<67>: aggiungi ! per sostituirlo"
@@ -1472,8 +1472,8 @@ msgid "Exception discarded: %s"
 msgstr "Eccezione scartata: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, linea %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, linea %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1677,12 +1677,12 @@ msgid "[crypted]"
 msgstr "[cifrato]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[ERRORE DI CONVERSIONE alla linea %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[ERRORE DI CONVERSIONE alla linea %<PRId64>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[BYTE NON VALIDO alla linea %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[BYTE NON VALIDO alla linea %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[ERRORI IN LETTURA]"
@@ -1777,10 +1777,10 @@ msgstr ""
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: errore in scrittura, conversione fallita alla linea %ld (rendere "
+"E513: errore in scrittura, conversione fallita alla linea %<PRId64> (rendere "
 "'fenc' nullo per eseguire comunque)"
 
 msgid "E514: write error (file system full?)"
@@ -1790,8 +1790,8 @@ msgid " CONVERSION ERROR"
 msgstr " ERRORE DI CONVERSIONE"
 
 #, c-format
-msgid " in line %ld;"
-msgstr " alla linea %ld;"
+msgid " in line %<PRId64>;"
+msgstr " alla linea %<PRId64>;"
 
 msgid "[Device]"
 msgstr "[Dispositivo]"
@@ -1852,8 +1852,8 @@ msgid "1 line, "
 msgstr "1 linea, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld linee,"
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> linee,"
 
 msgid "1 character"
 msgstr "1 carattere"
@@ -1864,8 +1864,8 @@ msgstr "%<PRId64> caratteri"
 
 #. Explicit typecast avoids warning on Mac OS X 10.6
 #, c-format
-msgid "%ld characters"
-msgstr "%ld caratteri"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> caratteri"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2280,16 +2280,16 @@ msgid "Font1: %s"
 msgstr "Font1: %s"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0"
-msgstr "La larghezza di font%ld non <20> doppia di quella di font0"
+msgid "Font%<PRId64> width is not twice that of font0"
+msgstr "La larghezza di font%<PRId64> non <20> doppia di quella di font0"
 
 #, c-format
-msgid "Font0 width: %ld"
-msgstr "Larghezza di Font0: %ld"
+msgid "Font0 width: %<PRId64>"
+msgstr "Larghezza di Font0: %<PRId64>"
 
 #, c-format
-msgid "Font1 width: %ld"
-msgstr "Larghezza di Font1: %ld"
+msgid "Font1 width: %<PRId64>"
+msgstr "Larghezza di Font1: %<PRId64>"
 
 msgid "Invalid font specification"
 msgstr "Specifica di font non valida"
@@ -2464,8 +2464,8 @@ msgid "Added cscope database %s"
 msgstr "Aggiunto database cscope %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: errore leggendo connessione cscope %ld"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: errore leggendo connessione cscope %<PRId64>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: tipo di ricerca cscope sconosciuta"
@@ -3680,12 +3680,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: Preservazione fallita"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: numero linea non valido: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: numero linea non valido: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: non riesco a trovare la linea %ld"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: non riesco a trovare la linea %<PRId64>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: ID blocco puntatori errato 3"
@@ -3703,8 +3703,8 @@ msgid "deleted block 1?"
 msgstr "cancellato blocco 1?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Non riesco a trovare la linea %ld"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Non riesco a trovare la linea %<PRId64>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: ID blocco puntatori errato"
@@ -3713,12 +3713,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count a zero"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: numero linea non ammissibile: %ld dopo la fine"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: numero linea non ammissibile: %<PRId64> dopo la fine"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: contatore linee errato nel blocco %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: contatore linee errato nel blocco %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "Dimensione stack aumentata"
@@ -3904,8 +3904,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Premi INVIO o un comando per proseguire"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s linea %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s linea %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- Ancora --"
@@ -3975,12 +3975,12 @@ msgid "1 line less"
 msgstr "1 linea in meno"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld linee in pi<70>"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> linee in pi<70>"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld linee in meno"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> linee in meno"
 
 msgid " (Interrupted)"
 msgstr " (Interrotto)"
@@ -4018,8 +4018,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: La linea sta diventando troppo lunga"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Errore interno: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Errore interno: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4095,8 +4095,8 @@ msgid "read from Netbeans socket"
 msgstr "lettura da socket Netbeans"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: Connessione NetBeans persa per il buffer %ld"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: Connessione NetBeans persa per il buffer %<PRId64>"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: netbeans non <20> supportato con questa GUI"
@@ -4147,23 +4147,23 @@ msgid "1 line %sed %d times"
 msgstr "1 linea %sa %d volte"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld linee %se 1 volta"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> linee %se 1 volta"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld linee %se %d volte"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> linee %se %d volte"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld linee da rientrare... "
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> linee da rientrare... "
 
 msgid "1 line indented "
 msgstr "1 linea rientrata "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld linee rientrate "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> linee rientrate "
 
 msgid "E748: No previously used register"
 msgstr "E748: Nessun registro usato in precedenza"
@@ -4176,12 +4176,12 @@ msgid "1 line changed"
 msgstr "1 linea cambiata"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld linee cambiate"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> linee cambiate"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "libero %ld linee"
+msgid "freeing %<PRId64> lines"
+msgstr "libero %<PRId64> linee"
 
 msgid "block of 1 line yanked"
 msgstr "blocco di 1 linea messo in registro"
@@ -4190,12 +4190,12 @@ msgid "1 line yanked"
 msgstr "1 linea messa in registro"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "blocco di %ld linee messo in registro"
+msgid "block of %<PRId64> lines yanked"
+msgstr "blocco di %<PRId64> linee messo in registro"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld linee messe in registro"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> linee messe in registro"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4224,36 +4224,36 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: Tipo di registro sconosciuto: %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld Col.; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> Col.; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Selezionate %s%ld di %ld Linee; %ld di %ld Parole; %ld di %ld Caratt."
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Selezionate %s%<PRId64> di %<PRId64> Linee; %<PRId64> di %<PRId64> Parole; %<PRId64> di %<PRId64> Caratt."
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
 msgstr ""
-"Selezionate %s%ld di %ld Linee; %ld di %ld Parole; %ld di %ld Caratt.; %ld "
-"di %ld Byte"
+"Selezionate %s%<PRId64> di %<PRId64> Linee; %<PRId64> di %<PRId64> Parole; %<PRId64> di %<PRId64> Caratt.; %<PRId64> "
+"di %<PRId64> Byte"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Col. %s di %s; Linea %ld di %ld; Parola %ld di %ld; Caratt. %ld di %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Col. %s di %s; Linea %<PRId64> di %<PRId64>; Parola %<PRId64> di %<PRId64>; Caratt. %<PRId64> di %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"Col. %s di %s; Linea %ld di %ld; Parola %ld di %ld; Caratt. %ld di %ld; Byte "
-"%ld di %ld"
+"Col. %s di %s; Linea %<PRId64> di %<PRId64>; Parola %<PRId64> di %<PRId64>; Caratt. %<PRId64> di %<PRId64>; Byte "
+"%<PRId64> di %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld per BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> per BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Pagina %N"
@@ -4435,8 +4435,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Serve Amigados versione 2.04 o successiva\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Serve %s versione %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Serve %s versione %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Non riesco ad aprire NIL:\n"
@@ -4517,8 +4517,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Intercettato segnale fatale\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "Attivazione visualizzazione X ha richiesto %ld msec"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "Attivazione visualizzazione X ha richiesto %<PRId64> msec"
 
 msgid ""
 "\n"
@@ -5269,8 +5269,8 @@ msgid "Performing soundfolding..."
 msgstr "Eseguo soundfolding..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "Numero di parole dopo soundfolding: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "Numero di parole dopo soundfolding: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -5305,8 +5305,8 @@ msgid "Done!"
 msgstr "Fatto!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' non ha %ld elementi"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' non ha %<PRId64> elementi"
 
 #, c-format
 msgid "Word removed from %s"
@@ -5323,8 +5323,8 @@ msgid "Sorry, no suggestions"
 msgstr "Spiacente, nessun suggerimento"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Spiacente, solo %ld suggerimenti"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "Spiacente, solo %<PRId64> suggerimenti"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5642,8 +5642,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Errore di formato nel tag file \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "Prima del byte %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Prima del byte %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5787,8 +5787,8 @@ msgid "Already at newest change"
 msgstr "Questa <20> gi<67> l'ultima modifica"
 
 #, c-format
-msgid "E830: Undo number %ld not found"
-msgstr "E830: Undo numero %ld non trovato"
+msgid "E830: Undo number %<PRId64> not found"
+msgstr "E830: Undo numero %<PRId64> non trovato"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: numeri linee errati"
@@ -5812,8 +5812,8 @@ msgid "changes"
 msgstr "modifiche"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "prima"
@@ -5828,8 +5828,8 @@ msgid "number changes  when               saved"
 msgstr "numero modif.   quando             salv."
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld secondi fa"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> secondi fa"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin non <20> consentito dopo undo"

src/po/ja.euc-jp.po

@@ -91,8 +91,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: <20>ꥹ<EFBFBD><EAA5B9>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Хåե<C3A5><D5A5>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: <20>Хåե<C3A5> %ld <20>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: <20>Хåե<C3A5> %<PRId64> <20>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: <20>Ǹ<EFBFBD><C7B8>ΥХåե<C3A5><D5A5><EFBFBD><EFBFBD>ۤ<EFBFBD><DBA4>ư<EFBFBD>ư<EFBFBD>ϤǤ<CFA4><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -101,8 +101,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: <20>ǽ<EFBFBD><C7BD>ΥХåե<C3A5><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ؤϰ<D8A4>ư<EFBFBD>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: <20>Хåե<C3A5> %ld <20><><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD><C2B8><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD> (! <20><><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD>˴<EFBFBD>)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: <20>Хåե<C3A5> %<PRId64> <20><><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD><C2B8><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD> (! <20><><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD>˴<EFBFBD>)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: <20>Ǹ<EFBFBD><C7B8>ΥХåե<C3A5><D5A5>ϲ<EFBFBD><CFB2><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -111,8 +111,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: <20>ٹ<EFBFBD>: <20>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>̾<EFBFBD>Υꥹ<CEA5>Ȥ<EFBFBD>Ĺ<EFBFBD>᤮<EFBFBD>ޤ<EFBFBD>"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: <20>Хåե<C3A5> %ld <20><><EFBFBD><EFBFBD><EFBFBD>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: <20>Хåե<C3A5> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -123,8 +123,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: %s <20>˳<EFBFBD><CBB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Хåե<C3A5><D5A5>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4><EFBFBD>"
 
 #, c-format
-msgid "line %ld"
-msgstr "<22><> %ld"
+msgid "line %<PRId64>"
+msgstr "<22><> %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: <20><><EFBFBD><EFBFBD>̾<EFBFBD><CCBE><EFBFBD>ΥХåե<C3A5><D5A5>ϴ<EFBFBD><CFB4>ˤ<EFBFBD><CBA4><EFBFBD><EFBFBD>ޤ<EFBFBD>"
@@ -152,12 +152,12 @@ msgid "1 line --%d%%--"
 msgstr "1 <20><> --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld <20><> --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> <20><> --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "<22><> %ld (<28><><EFBFBD><EFBFBD> %ld) --%d%%-- col "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "<22><> %<PRId64> (<28><><EFBFBD><EFBFBD> %<PRId64>) --%d%%-- col "
 
 msgid "[No Name]"
 msgstr "[̵̾]"
@@ -203,12 +203,12 @@ msgid "Signs for %s:"
 msgstr "%s <20>Υ<EFBFBD><CEA5><EFBFBD><EFBFBD><EFBFBD>:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    <20><>=%ld  <20><><EFBFBD>̻<EFBFBD>=%d  ̾<><CCBE>=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    <20><>=%<PRId64>  <20><><EFBFBD>̻<EFBFBD>=%d  ̾<><CCBE>=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: %ld <20>ʾ<EFBFBD><CABE>ΥХåե<C3A5><D5A5><EFBFBD>diff<66>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: %<PRId64> <20>ʾ<EFBFBD><CABE>ΥХåե<C3A5><D5A5><EFBFBD>diff<66>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: <20><><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɹ<EFBFBD><C9B9>⤷<EFBFBD><E2A4B7><EFBFBD>Ͻ<EFBFBD><CFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -367,8 +367,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: ͽ<><CDBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʸ<EFBFBD><CAB8><EFBFBD><EFBFBD> :let <20>ˤ<EFBFBD><CBA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: <20>ꥹ<EFBFBD>ȤΥ<C8A4><CEA5><EFBFBD><EFBFBD>ǥå<C7A5><C3A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϰϳ<CFB0><CFB3>Ǥ<EFBFBD>: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: <20>ꥹ<EFBFBD>ȤΥ<C8A4><CEA5><EFBFBD><EFBFBD>ǥå<C7A5><C3A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϰϳ<CFB0><CFB3>Ǥ<EFBFBD>: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -782,8 +782,8 @@ msgid "%s aborted"
 msgstr "%s <20><><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s <20><> #%ld <20><><EFBFBD>֤<EFBFBD><D6A4>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "%s returning #%<PRId64>"
+msgstr "%s <20><> #%<PRId64> <20><><EFBFBD>֤<EFBFBD><D6A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
 msgid "%s returning %s"
@@ -832,12 +832,12 @@ msgid "1 line moved"
 msgstr "1 <20>Ԥ<EFBFBD><D4A4><EFBFBD>ư<EFBFBD><C6B0><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld <20>Ԥ<EFBFBD><D4A4><EFBFBD>ư<EFBFBD><C6B0><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> <20>Ԥ<EFBFBD><D4A4><EFBFBD>ư<EFBFBD><C6B0><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld <20>Ԥ<EFBFBD><D4A4>ե<EFBFBD><D5A5>륿<EFBFBD><EBA5BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> <20>Ԥ<EFBFBD><D4A4>ե<EFBFBD><D5A5>륿<EFBFBD><EBA5BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *<2A>ե<EFBFBD><D5A5>륿* autocommand<6E>ϸ<EFBFBD><CFB8>ߤΥХåե<C3A5><D5A5><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD>ƤϤ<C6A4><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -921,8 +921,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: <20><><EFBFBD><EFBFBD><EFBFBD>åץե<D7A5><D5A5><EFBFBD><EFBFBD>뤬¸<EBA4AC>ߤ<EFBFBD><DFA4>ޤ<EFBFBD>: %s (:silent! <20><><EFBFBD>ɲäǾ<C3A4><C7BE><EFBFBD>)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: <20>Хåե<C3A5> %ld <20>ˤ<EFBFBD>̾<EFBFBD><CCBE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: <20>Хåե<C3A5> %<PRId64> <20>ˤ<EFBFBD>̾<EFBFBD><CCBE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: <20>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¸<EFBFBD><C2B8><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD><EFBFBD>Ǥ<EFBFBD><C7A4><EFBFBD>: 'write' <20><><EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ˤ<EFBFBD><CBA4><EFBFBD>̵<EFBFBD><CCB5><EFBFBD>Ǥ<EFBFBD>"
@@ -979,19 +979,19 @@ msgid "1 substitution"
 msgstr "1 <20>ս<EFBFBD><D5BD>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld <20>ս곺<D5BD><EAB3BA><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> <20>ս곺<D5BD><EAB3BA><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld <20>ս<EFBFBD><D5BD>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> <20>ս<EFBFBD><D5BD>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 msgid " on 1 line"
 msgstr " (<28><> 1 <20><><EFBFBD><EFBFBD>)"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " (<28><> %ld <20><><EFBFBD><EFBFBD>)"
+msgid " on %<PRId64> lines"
+msgstr " (<28><> %<PRId64> <20><><EFBFBD><EFBFBD>)"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global <20><><EFBFBD>Ƶ<EFBFBD>Ū<EFBFBD>ˤϻȤ<CFBB><C8A4>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -1078,8 +1078,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: ̵<><CCB5><EFBFBD>ʥХåե<C3A5>̾<EFBFBD>Ǥ<EFBFBD>: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: ̵<><CCB5><EFBFBD><EFBFBD>sign<67><6E><EFBFBD>̻ҤǤ<D2A4>: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: ̵<><CCB5><EFBFBD><EFBFBD>sign<67><6E><EFBFBD>̻ҤǤ<D2A4>: %<PRId64>"
 
 # Added at 27-Jan-2004.
 msgid " (NOT FOUND)"
@@ -1095,16 +1095,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "<22>ǥХå<D0A5><C3A5>⡼<EFBFBD>ɤ<EFBFBD><C9A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>. ³<><C2B3><EFBFBD><EFBFBD><EFBFBD>ˤ<EFBFBD> \"cont\" <20><><EFBFBD><EFBFBD><EFBFBD>Ϥ<EFBFBD><CFA4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "<22><> %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "<22><> %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "<22><><EFBFBD>ޥ<EFBFBD><DEA5><EFBFBD>: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "<22>֥졼<D6A5><ECA1BC><EFBFBD>ݥ<EFBFBD><DDA5><EFBFBD><EFBFBD><EFBFBD> \"%s%s\" <20><> %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "<22>֥졼<D6A5><ECA1BC><EFBFBD>ݥ<EFBFBD><DDA5><EFBFBD><EFBFBD><EFBFBD> \"%s%s\" <20><> %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -1114,8 +1114,8 @@ msgid "No breakpoints defined"
 msgstr "<22>֥졼<D6A5><ECA1BC><EFBFBD>ݥ<EFBFBD><DDA5><EFBFBD><EFBFBD>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  <20><> %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  <20><> %<PRId64>"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \":profile start {fname}\" <20><><EFBFBD>¹Ԥ<C2B9><D4A4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -1171,16 +1171,16 @@ msgid "could not source \"%s\""
 msgstr "\"%s\" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "<22><> %ld: \"%s\" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "<22><> %<PRId64>: \"%s\" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "\"%s\" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "<22><> %ld: %s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "<22><> %<PRId64>: %s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1269,8 +1269,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: <20>Խ<EFBFBD><D4BD><EFBFBD><EFBFBD>٤<EFBFBD><D9A4>ե<EFBFBD><D5A5><EFBFBD><EFBFBD>뤬 1 <20>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD>"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: <20>Խ<EFBFBD><D4BD><EFBFBD><EFBFBD>٤<EFBFBD><D9A4>ե<EFBFBD><D5A5><EFBFBD><EFBFBD>뤬<EFBFBD><EBA4AC><EFBFBD><EFBFBD> %ld <20>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD>"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: <20>Խ<EFBFBD><D4BD><EFBFBD><EFBFBD>٤<EFBFBD><D9A4>ե<EFBFBD><D5A5><EFBFBD><EFBFBD>뤬<EFBFBD><EBA4AC><EFBFBD><EFBFBD> %<PRId64> <20>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD>"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: <20><><EFBFBD>ޥ<EFBFBD><DEA5>ɤ<EFBFBD><C9A4><EFBFBD><EFBFBD>ˤ<EFBFBD><CBA4><EFBFBD><EFBFBD>ޤ<EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ˤ<EFBFBD> ! <20><><EFBFBD>ɲä<C9B2><C3A4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -1464,8 +1464,8 @@ msgid "Exception discarded: %s"
 msgstr "<22>㳰<EFBFBD><E3B3B0><EFBFBD>˴<EFBFBD><CBB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, <20><> %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, <20><> %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1669,12 +1669,12 @@ msgid "[crypted]"
 msgstr "[<5B>Ź沽]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[%ld <20><><EFBFBD>ܤ<EFBFBD><DCA4>Ѵ<EFBFBD><D1B4><EFBFBD><EFBFBD>顼]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[%<PRId64> <20><><EFBFBD>ܤ<EFBFBD><DCA4>Ѵ<EFBFBD><D1B4><EFBFBD><EFBFBD>顼]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[%ld <20><><EFBFBD>ܤ<EFBFBD><DCA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʥХ<CAA5><D0A5><EFBFBD>]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[%<PRId64> <20><><EFBFBD>ܤ<EFBFBD><DCA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʥХ<CAA5><D0A5><EFBFBD>]"
 
 msgid "[READ ERRORS]"
 msgstr "[<5B>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD>顼]"
@@ -1758,10 +1758,10 @@ msgstr "E513:
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: <20><><EFBFBD><EFBFBD><EFBFBD>ߥ<EFBFBD><DFA5>顼, <20>Ѵ<EFBFBD><D1B4><EFBFBD><EFBFBD><EFBFBD>, <20>Կ<EFBFBD> %ld (<28><><EFBFBD>񤹤<EFBFBD><F1A4B9A4>ˤ<EFBFBD> 'fenc' <20><><EFBFBD><EFBFBD><EFBFBD>ˤ<EFBFBD><CBA4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD>"
+"E513: <20><><EFBFBD><EFBFBD><EFBFBD>ߥ<EFBFBD><DFA5>顼, <20>Ѵ<EFBFBD><D1B4><EFBFBD><EFBFBD><EFBFBD>, <20>Կ<EFBFBD> %<PRId64> (<28><><EFBFBD>񤹤<EFBFBD><F1A4B9A4>ˤ<EFBFBD> 'fenc' <20><><EFBFBD><EFBFBD><EFBFBD>ˤ<EFBFBD><CBA4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD>"
 "<22><>)"
 
 msgid "E514: write error (file system full?)"
@@ -1771,8 +1771,8 @@ msgid " CONVERSION ERROR"
 msgstr " <20>Ѵ<EFBFBD><D1B4><EFBFBD><EFBFBD>顼"
 
 #, c-format
-msgid " in line %ld;"
-msgstr "<22><> %ld;"
+msgid " in line %<PRId64>;"
+msgstr "<22><> %<PRId64>;"
 
 msgid "[Device]"
 msgstr "[<5B>ǥХ<C7A5><D0A5><EFBFBD>]"
@@ -1833,8 +1833,8 @@ msgid "1 line, "
 msgstr "1 <20><>, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld <20><>, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> <20><>, "
 
 msgid "1 character"
 msgstr "1 ʸ<><CAB8>"
@@ -1845,8 +1845,8 @@ msgstr "%<PRId64> ʸ
 
 #. Explicit typecast avoids warning on Mac OS X 10.6
 #, c-format
-msgid "%ld characters"
-msgstr "%ld ʸ<><CAB8>"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> ʸ<><CAB8>"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2258,16 +2258,16 @@ msgid "Font1: %s"
 msgstr "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>1: %s"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0"
-msgstr "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>%ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><30>2<EFBFBD>ܤǤϤ<C7A4><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "Font%<PRId64> width is not twice that of font0"
+msgstr "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>%<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><30>2<EFBFBD>ܤǤϤ<C7A4><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "Font0 width: %ld"
-msgstr "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><30><EFBFBD><EFBFBD>: %ld"
+msgid "Font0 width: %<PRId64>"
+msgstr "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><30><EFBFBD><EFBFBD>: %<PRId64>"
 
 #, c-format
-msgid "Font1 width: %ld"
-msgstr "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>1<EFBFBD><31><EFBFBD><EFBFBD>: %ld"
+msgid "Font1 width: %<PRId64>"
+msgstr "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>1<EFBFBD><31><EFBFBD><EFBFBD>: %<PRId64>"
 
 msgid "Invalid font specification"
 msgstr "̵<><CCB5><EFBFBD>ʥե<CAA5><D5A5><EFBFBD><EFBFBD>Ȼ<EFBFBD><C8BB><EFBFBD><EFBFBD>Ǥ<EFBFBD>"
@@ -2444,8 +2444,8 @@ msgid "Added cscope database %s"
 msgstr "cscope<70>ǡ<EFBFBD><C7A1><EFBFBD><EFBFBD>١<EFBFBD><D9A1><EFBFBD> %s <20><><EFBFBD>ɲ<EFBFBD>"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: cscope<70><65><EFBFBD><EFBFBD>³ %ld <20><><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Υ<EFBFBD><CEA5>顼<EFBFBD>Ǥ<EFBFBD>"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: cscope<70><65><EFBFBD><EFBFBD>³ %<PRId64> <20><><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Υ<EFBFBD><CEA5>顼<EFBFBD>Ǥ<EFBFBD>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: ̤<>Τ<EFBFBD>cscope<70><65><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD>"
@@ -3661,12 +3661,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: <20>ݻ<EFBFBD><DDBB>˼<EFBFBD><CBBC>Ԥ<EFBFBD><D4A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: ̵<><CCB5><EFBFBD><EFBFBD>lnum<75>Ǥ<EFBFBD>: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: ̵<><CCB5><EFBFBD><EFBFBD>lnum<75>Ǥ<EFBFBD>: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: <20><> %ld <20>򸫤Ĥ<F2B8ABA4><C4A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: <20><> %<PRId64> <20>򸫤Ĥ<F2B8ABA4><C4A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: <20>ݥ<EFBFBD><DDA5>󥿥֥<F3A5BFA5><D6A5>å<EFBFBD><C3A5><EFBFBD>ID<49><44><EFBFBD>ְ<EFBFBD><D6B0>äƤ<C3A4><C6A4>ޤ<EFBFBD> 3"
@@ -3684,8 +3684,8 @@ msgid "deleted block 1?"
 msgstr "<22>֥<EFBFBD><D6A5>å<EFBFBD> 1 <20>Ͼä<CFBE><C3A4>줿?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: <20><> %ld <20><><EFBFBD><EFBFBD><EFBFBD>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: <20><> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: <20>ݥ<EFBFBD><DDA5>󥿥֥<F3A5BFA5><D6A5>å<EFBFBD><C3A5><EFBFBD>ID<49><44><EFBFBD>ְ<EFBFBD><D6B0>äƤ<C3A4><C6A4>ޤ<EFBFBD>"
@@ -3694,12 +3694,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǥ<EFBFBD>"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: <20><><EFBFBD>ֹ椬<D6B9>ϰϳ<CFB0><CFB3>Ǥ<EFBFBD>: %ld Ķ<><C4B6><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: <20><><EFBFBD>ֹ椬<D6B9>ϰϳ<CFB0><CFB3>Ǥ<EFBFBD>: %<PRId64> Ķ<><C4B6><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: <20>֥<EFBFBD><D6A5>å<EFBFBD> %ld <20>ιԥ<CEB9><D4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȥ<EFBFBD><C8A4>ְ<EFBFBD><D6B0>äƤ<C3A4><C6A4>ޤ<EFBFBD>"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: <20>֥<EFBFBD><D6A5>å<EFBFBD> %<PRId64> <20>ιԥ<CEB9><D4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȥ<EFBFBD><C8A4>ְ<EFBFBD><D6B0>äƤ<C3A4><C6A4>ޤ<EFBFBD>"
 
 msgid "Stack size increases"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>å<EFBFBD><C3A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>"
@@ -3883,8 +3883,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "³<><C2B3><EFBFBD><EFBFBD><EFBFBD>ˤ<EFBFBD>ENTER<45>򲡤<EFBFBD><F2B2A1A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޥ<EFBFBD><DEA5>ɤ<EFBFBD><C9A4><EFBFBD><EFBFBD>Ϥ<EFBFBD><CFA4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s <20><> %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s <20><> %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- <20><>³ --"
@@ -3954,12 +3954,12 @@ msgid "1 line less"
 msgstr "1 <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld <20><> <20>ɲä<C9B2><C3A4>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> <20><> <20>ɲä<C9B2><C3A4>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 msgid " (Interrupted)"
 msgstr " (<28><><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4>ޤ<EFBFBD><DEA4><EFBFBD>)"
@@ -3997,8 +3997,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: <20>Ԥ<EFBFBD>Ĺ<EFBFBD><C4B9><EFBFBD>ʤ<EFBFBD><CAA4>᤮<EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>顼: lalloc(%ld,)"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>顼: lalloc(%<PRId64>,)"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4074,8 +4074,8 @@ msgid "read from Netbeans socket"
 msgstr "Netbeans <20>Υ<EFBFBD><CEA5><EFBFBD><EFBFBD>åȤ<C3A5><C8A4>ɹ<EFBFBD><C9B9><EFBFBD>"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: <20>Хåե<C3A5> %ld <20><> NetBeans <20><>³<EFBFBD><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: <20>Хåե<C3A5> %<PRId64> <20><> NetBeans <20><>³<EFBFBD><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: NetBeans<6E>Ϥ<EFBFBD><CFA4><EFBFBD>GUI<55>ˤ<EFBFBD><CBA4>б<EFBFBD><D0B1><EFBFBD><EFBFBD>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -4126,23 +4126,23 @@ msgid "1 line %sed %d times"
 msgstr "1 <20>Ԥ<EFBFBD> %s <20><> %d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld <20>Ԥ<EFBFBD> %s <20><> 1 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> <20>Ԥ<EFBFBD> %s <20><> 1 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld <20>Ԥ<EFBFBD> %s <20><> %d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> <20>Ԥ<EFBFBD> %s <20><> %d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld <20>Ԥ<EFBFBD><D4A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǥ<EFBFBD><C7A5>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>ޤ<EFBFBD>... "
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> <20>Ԥ<EFBFBD><D4A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǥ<EFBFBD><C7A5>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD>ޤ<EFBFBD>... "
 
 msgid "1 line indented "
 msgstr "1 <20>Ԥ򥤥<D4A4><F2A5A4A5>ǥ<EFBFBD><C7A5>Ȥ<EFBFBD><C8A4>ޤ<EFBFBD><DEA4><EFBFBD> "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld <20>Ԥ򥤥<D4A4><F2A5A4A5>ǥ<EFBFBD><C7A5>Ȥ<EFBFBD><C8A4>ޤ<EFBFBD><DEA4><EFBFBD> "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> <20>Ԥ򥤥<D4A4><F2A5A4A5>ǥ<EFBFBD><C7A5>Ȥ<EFBFBD><C8A4>ޤ<EFBFBD><DEA4><EFBFBD> "
 
 msgid "E748: No previously used register"
 msgstr "E748: <20>ޤ<EFBFBD><DEA4>쥸<EFBFBD><ECA5B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ѥ<EFBFBD><D1A4>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -4155,12 +4155,12 @@ msgid "1 line changed"
 msgstr "1 <20>Ԥ<EFBFBD><D4A4>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld <20>Ԥ<EFBFBD><D4A4>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> <20>Ԥ<EFBFBD><D4A4>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "%ld <20>Ԥ<EFBFBD><D4A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "freeing %<PRId64> lines"
+msgstr "%<PRId64> <20>Ԥ<EFBFBD><D4A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "block of 1 line yanked"
 msgstr "1 <20>ԤΥ֥<CEA5><D6A5>å<EFBFBD><C3A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>󥯤<EFBFBD><F3A5AFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
@@ -4169,12 +4169,12 @@ msgid "1 line yanked"
 msgstr "1 <20>Ԥ<EFBFBD><D4A4><EFBFBD><EFBFBD>󥯤<EFBFBD><F3A5AFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "%ld <20>ԤΥ֥<CEA5><D6A5>å<EFBFBD><C3A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>󥯤<EFBFBD><F3A5AFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "block of %<PRId64> lines yanked"
+msgstr "%<PRId64> <20>ԤΥ֥<CEA5><D6A5>å<EFBFBD><C3A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>󥯤<EFBFBD><F3A5AFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld <20>Ԥ<EFBFBD><D4A4><EFBFBD><EFBFBD>󥯤<EFBFBD><F3A5AFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> <20>Ԥ<EFBFBD><D4A4><EFBFBD><EFBFBD>󥯤<EFBFBD><F3A5AFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4203,33 +4203,33 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: ̤<>ΤΥ쥸<CEA5><ECA5B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d <20>Ǥ<EFBFBD>"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld <20><>; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> <20><>; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "<22><><EFBFBD><EFBFBD> %s%ld / %ld <20><>; %ld / %ld ñ<><C3B1>; %ld / %ld <20>Х<EFBFBD><D0A5><EFBFBD>"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "<22><><EFBFBD><EFBFBD> %s%<PRId64> / %<PRId64> <20><>; %<PRId64> / %<PRId64> ñ<><C3B1>; %<PRId64> / %<PRId64> <20>Х<EFBFBD><D0A5><EFBFBD>"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
-msgstr "<22><><EFBFBD><EFBFBD> %s%ld / %ld <20><>; %ld / %ld ñ<><C3B1>; %ld / %ld ʸ<><CAB8>; %ld / %ld <20>Х<EFBFBD><D0A5><EFBFBD>"
+msgstr "<22><><EFBFBD><EFBFBD> %s%<PRId64> / %<PRId64> <20><>; %<PRId64> / %<PRId64> ñ<><C3B1>; %<PRId64> / %<PRId64> ʸ<><CAB8>; %<PRId64> / %<PRId64> <20>Х<EFBFBD><D0A5><EFBFBD>"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "<22><> %s / %s; <20><> %ld of %ld; ñ<><C3B1> %ld / %ld; <20>Х<EFBFBD><D0A5><EFBFBD> %ld / %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "<22><> %s / %s; <20><> %<PRId64> of %<PRId64>; ñ<><C3B1> %<PRId64> / %<PRId64>; <20>Х<EFBFBD><D0A5><EFBFBD> %<PRId64> / %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"<22><> %s / %s; <20><> %ld / %ld; ñ<><C3B1> %ld / %ld; ʸ<><CAB8> %ld / %ld; <20>Х<EFBFBD><D0A5><EFBFBD> %ld of %ld"
+"<22><> %s / %s; <20><> %<PRId64> / %<PRId64>; ñ<><C3B1> %<PRId64> / %<PRId64>; ʸ<><CAB8> %<PRId64> / %<PRId64>; <20>Х<EFBFBD><D0A5><EFBFBD> %<PRId64> of %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> for BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=%N <20>ڡ<EFBFBD><DAA1><EFBFBD>"
@@ -4412,8 +4412,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Amigados<6F>ΥС<CEA5><D0A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 2.04<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹߤ<EFBFBD>ɬ<EFBFBD>פǤ<EFBFBD>\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "%s <20>ΥС<CEA5><D0A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><>ɬ<EFBFBD>פǤ<D7A4>\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "%s <20>ΥС<CEA5><D0A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><>ɬ<EFBFBD>פǤ<D7A4>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "NIL<49>򳫤<EFBFBD><F2B3ABA4>ޤ<EFBFBD><DEA4><EFBFBD>:\n"
@@ -4495,8 +4495,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: <20><>̿Ū<CCBF><C5AA><EFBFBD><EFBFBD><EFBFBD>ʥ<EFBFBD><CAA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Τ<EFBFBD><CEA4>ޤ<EFBFBD><DEA4><EFBFBD>\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "X<><58><EFBFBD><EFBFBD><EFBFBD>Фؤ<D0A4><D8A4><EFBFBD>³<EFBFBD><C2B3> %ld <20>ߥ<EFBFBD><DFA5>ä<EFBFBD><C3A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "X<><58><EFBFBD><EFBFBD><EFBFBD>Фؤ<D0A4><D8A4><EFBFBD>³<EFBFBD><C2B3> %<PRId64> <20>ߥ<EFBFBD><DFA5>ä<EFBFBD><C3A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 msgid ""
 "\n"
@@ -5277,8 +5277,8 @@ msgid "Performing soundfolding..."
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߤ<EFBFBD><DFA4>¹<EFBFBD><C2B9><EFBFBD>..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߸<EFBFBD><DFB8><EFBFBD><EFBFBD><EFBFBD>ñ<EFBFBD><C3B1><EFBFBD><EFBFBD>: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߸<EFBFBD><DFB8><EFBFBD><EFBFBD><EFBFBD>ñ<EFBFBD><C3B1><EFBFBD><EFBFBD>: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -5313,8 +5313,8 @@ msgid "Done!"
 msgstr "<22>¹Ԥ<C2B9><D4A4>ޤ<EFBFBD><DEA4><EFBFBD>!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' <20>ˤ<EFBFBD> %ld <20>ĤΥ<C4A4><CEA5><EFBFBD><EFBFBD>ȥ<EFBFBD><C8A5>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' <20>ˤ<EFBFBD> %<PRId64> <20>ĤΥ<C4A4><CEA5><EFBFBD><EFBFBD>ȥ<EFBFBD><C8A5>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
 msgid "Word removed from %s"
@@ -5331,8 +5331,8 @@ msgid "Sorry, no suggestions"
 msgstr "<22><>ǰ<EFBFBD>Ǥ<EFBFBD><C7A4><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "<22><>ǰ<EFBFBD>Ǥ<EFBFBD><C7A4><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "<22><>ǰ<EFBFBD>Ǥ<EFBFBD><C7A4><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5649,8 +5649,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: <20><><EFBFBD><EFBFBD><EFBFBD>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD> \"%s\" <20>Υե<CEA5><D5A5><EFBFBD><EFBFBD>ޥåȤ˥<C8A4><CBA5>顼<EFBFBD><E9A1BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD>"
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "ľ<><C4BE><EFBFBD><EFBFBD> %ld <20>Х<EFBFBD><D0A5><EFBFBD>"
+msgid "Before byte %<PRId64>"
+msgstr "ľ<><C4BE><EFBFBD><EFBFBD> %<PRId64> <20>Х<EFBFBD><D0A5><EFBFBD>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5794,8 +5794,8 @@ msgid "Already at newest change"
 msgstr "<22><><EFBFBD>˰<EFBFBD><CBB0>ֿ<EFBFBD><D6BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9>Ǥ<EFBFBD>"
 
 #, c-format
-msgid "E830: Undo number %ld not found"
-msgstr "E830: <20><><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5>ֹ<EFBFBD> %ld <20>ϸ<EFBFBD><CFB8>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgid "E830: Undo number %<PRId64> not found"
+msgstr "E830: <20><><EFBFBD><EFBFBD><EFBFBD>ɥ<EFBFBD><C9A5>ֹ<EFBFBD> %<PRId64> <20>ϸ<EFBFBD><CFB8>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: <20><><EFBFBD>ֹ椬<D6B9>ְ<EFBFBD><D6B0>äƤ<C3A4><C6A4>ޤ<EFBFBD>"
@@ -5819,8 +5819,8 @@ msgid "changes"
 msgstr "<22>ս<EFBFBD><D5BD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "<22><><EFBFBD><EFBFBD>"
@@ -5835,8 +5835,8 @@ msgid "number changes  when               saved"
 msgstr "<22><><EFBFBD><EFBFBD>   <20>ѹ<EFBFBD><D1B9><EFBFBD>   <20>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD>           <20><>¸<EFBFBD><C2B8>"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld <20>÷вᤷ<D0B2>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> <20>÷вᤷ<D0B2>Ƥ<EFBFBD><C6A4>ޤ<EFBFBD>"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undo <20><>ľ<EFBFBD><C4BE><EFBFBD><EFBFBD> undojoin <20>ϤǤ<CFA4><C7A4>ޤ<EFBFBD><DEA4><EFBFBD>"

src/po/ja.po

@@ -91,8 +91,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: リスト表示されるバッファはありません"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: バッファ %ld はありません"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: バッファ %<PRId64> はありません"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: 最後のバッファを越えて移動はできません"
@@ -101,8 +101,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: 最初のバッファより前へは移動できません"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: バッファ %ld の変更は保存されていません (! で変更を破棄)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: バッファ %<PRId64> の変更は保存されていません (! で変更を破棄)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: 最後のバッファは解放できません"
@@ -111,8 +111,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: 警告: ファイル名のリストが長過ぎます"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: バッファ %ld が見つかりません"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: バッファ %<PRId64> が見つかりません"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -123,8 +123,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: %s に該当するバッファはありませんでした"
 
 #, c-format
-msgid "line %ld"
-msgstr "行 %ld"
+msgid "line %<PRId64>"
+msgstr "行 %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: この名前のバッファは既にあります"
@@ -152,12 +152,12 @@ msgid "1 line --%d%%--"
 msgstr "1 行 --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld 行 --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> 行 --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "行 %ld (全体 %ld) --%d%%-- col "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "行 %<PRId64> (全体 %<PRId64>) --%d%%-- col "
 
 msgid "[No Name]"
 msgstr "[無名]"
@@ -203,12 +203,12 @@ msgid "Signs for %s:"
 msgstr "%s のサイン:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    行=%ld  識別子=%d  名前=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    行=%<PRId64>  識別子=%d  名前=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: %ld 以上のバッファはdiffできません"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: %<PRId64> 以上のバッファはdiffできません"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: 一時ファイルの読込もしくは書込ができません"
@@ -367,8 +367,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: 予期せぬ文字が :let にありました"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: リストのインデックスが範囲外です: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: リストのインデックスが範囲外です: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -782,8 +782,8 @@ msgid "%s aborted"
 msgstr "%s が中断されました"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s が #%ld を返しました"
+msgid "%s returning #%<PRId64>"
+msgstr "%s が #%<PRId64> を返しました"
 
 #, c-format
 msgid "%s returning %s"
@@ -832,12 +832,12 @@ msgid "1 line moved"
 msgstr "1 行が移動されました"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld 行が移動されました"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> 行が移動されました"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld 行がフィルタ処理されました"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> 行がフィルタ処理されました"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *フィルタ* autocommandは現在のバッファを変更してはいけません"
@@ -921,8 +921,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: スワップファイルが存在します: %s (:silent! を追加で上書)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: バッファ %ld には名前がありません"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: バッファ %<PRId64> には名前がありません"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: ファイルは保存されませんでした: 'write' オプションにより無効です"
@@ -979,19 +979,19 @@ msgid "1 substitution"
 msgstr "1 箇所置換しました"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld 箇所該当しました"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> 箇所該当しました"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld 箇所置換しました"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> 箇所置換しました"
 
 msgid " on 1 line"
 msgstr " (計 1 行内)"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " (計 %ld 行内)"
+msgid " on %<PRId64> lines"
+msgstr " (計 %<PRId64> 行内)"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global を再帰的には使えません"
@@ -1078,8 +1078,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: 無効なバッファ名です: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: 無効なsign識別子です: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: 無効なsign識別子です: %<PRId64>"
 
 # Added at 27-Jan-2004.
 msgid " (NOT FOUND)"
@@ -1095,16 +1095,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "デバッグモードに入ります. 続けるには \"cont\" と入力してください."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "行 %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "行 %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "コマンド: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "ブレークポイント \"%s%s\" 行 %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "ブレークポイント \"%s%s\" 行 %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -1114,8 +1114,8 @@ msgid "No breakpoints defined"
 msgstr "ブレークポイントが定義されていません"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  行 %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  行 %<PRId64>"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: 初めに \":profile start {fname}\" を実行してください"
@@ -1171,16 +1171,16 @@ msgid "could not source \"%s\""
 msgstr "\"%s\" を取込めません"
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "行 %ld: \"%s\" を取込めません"
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "行 %<PRId64>: \"%s\" を取込めません"
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "\"%s\" を取込中"
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "行 %ld: %s を取込中"
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "行 %<PRId64>: %s を取込中"
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1269,8 +1269,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: 編集すべきファイルが 1 個あります"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: 編集すべきファイルがあと %ld 個あります"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: 編集すべきファイルがあと %<PRId64> 個あります"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: コマンドが既にあります: 再定義するには ! を追加してください"
@@ -1464,8 +1464,8 @@ msgid "Exception discarded: %s"
 msgstr "例外が破棄されました: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, 行 %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, 行 %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1669,12 +1669,12 @@ msgid "[crypted]"
 msgstr "[暗号化]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[%ld 行目で変換エラー]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[%<PRId64> 行目で変換エラー]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[%ld 行目の不正なバイト]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[%<PRId64> 行目の不正なバイト]"
 
 msgid "[READ ERRORS]"
 msgstr "[読込エラー]"
@@ -1758,10 +1758,10 @@ msgstr "E513: 書込みエラー, 変換失敗 (上書するには 'fenc' を空
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: 書込みエラー, 変換失敗, 行数 %ld (上書するには 'fenc' を空にしてくださ"
+"E513: 書込みエラー, 変換失敗, 行数 %<PRId64> (上書するには 'fenc' を空にしてくださ"
 "い)"
 
 msgid "E514: write error (file system full?)"
@@ -1771,8 +1771,8 @@ msgid " CONVERSION ERROR"
 msgstr " 変換エラー"
 
 #, c-format
-msgid " in line %ld;"
-msgstr "行 %ld;"
+msgid " in line %<PRId64>;"
+msgstr "行 %<PRId64>;"
 
 msgid "[Device]"
 msgstr "[デバイス]"
@@ -1833,8 +1833,8 @@ msgid "1 line, "
 msgstr "1 行, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld 行, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> 行, "
 
 msgid "1 character"
 msgstr "1 文字"
@@ -1845,8 +1845,8 @@ msgstr "%<PRId64> 文字"
 
 #. Explicit typecast avoids warning on Mac OS X 10.6
 #, c-format
-msgid "%ld characters"
-msgstr "%ld 文字"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> 文字"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2258,16 +2258,16 @@ msgid "Font1: %s"
 msgstr "フォント1: %s"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0"
-msgstr "フォント%ld の幅がフォント0の2倍ではありません"
+msgid "Font%<PRId64> width is not twice that of font0"
+msgstr "フォント%<PRId64> の幅がフォント0の2倍ではありません"
 
 #, c-format
-msgid "Font0 width: %ld"
-msgstr "フォント0の幅: %ld"
+msgid "Font0 width: %<PRId64>"
+msgstr "フォント0の幅: %<PRId64>"
 
 #, c-format
-msgid "Font1 width: %ld"
-msgstr "フォント1の幅: %ld"
+msgid "Font1 width: %<PRId64>"
+msgstr "フォント1の幅: %<PRId64>"
 
 msgid "Invalid font specification"
 msgstr "無効なフォント指定です"
@@ -2444,8 +2444,8 @@ msgid "Added cscope database %s"
 msgstr "cscopeデータベース %s を追加"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: cscopeの接続 %ld を読込み中のエラーです"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: cscopeの接続 %<PRId64> を読込み中のエラーです"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: 未知のcscope検索型です"
@@ -3661,12 +3661,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: 維持に失敗しました"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: 無効なlnumです: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: 無効なlnumです: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: 行 %ld を見つけられません"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: 行 %<PRId64> を見つけられません"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: ポインタブロックのIDが間違っています 3"
@@ -3684,8 +3684,8 @@ msgid "deleted block 1?"
 msgstr "ブロック 1 は消された?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: 行 %ld が見つかりません"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: 行 %<PRId64> が見つかりません"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: ポインタブロックのIDが間違っています"
@@ -3694,12 +3694,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count がゼロです"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: 行番号が範囲外です: %ld 超えています"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: 行番号が範囲外です: %<PRId64> 超えています"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: ブロック %ld の行カウントが間違っています"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: ブロック %<PRId64> の行カウントが間違っています"
 
 msgid "Stack size increases"
 msgstr "スタックサイズが増えます"
@@ -3883,8 +3883,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "続けるにはENTERを押すかコマンドを入力してください"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s 行 %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s 行 %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- 継続 --"
@@ -3954,12 +3954,12 @@ msgid "1 line less"
 msgstr "1 行 削除しました"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld 行 追加しました"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> 行 追加しました"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld 行 削除しました"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> 行 削除しました"
 
 msgid " (Interrupted)"
 msgstr " (割込まれました)"
@@ -3997,8 +3997,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: 行が長くなり過ぎました"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: 内部エラー: lalloc(%ld,)"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: 内部エラー: lalloc(%<PRId64>,)"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4074,8 +4074,8 @@ msgid "read from Netbeans socket"
 msgstr "Netbeans のソケットを読込み"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: バッファ %ld の NetBeans 接続が失われました"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: バッファ %<PRId64> の NetBeans 接続が失われました"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: NetBeansはこのGUIには対応していません"
@@ -4126,23 +4126,23 @@ msgid "1 line %sed %d times"
 msgstr "1 行が %s で %d 回処理されました"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld 行が %s で 1 回処理されました"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> 行が %s で 1 回処理されました"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld 行が %s で %d 回処理されました"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> 行が %s で %d 回処理されました"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld 行がインデントされます... "
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> 行がインデントされます... "
 
 msgid "1 line indented "
 msgstr "1 行をインデントしました "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld 行をインデントしました "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> 行をインデントしました "
 
 msgid "E748: No previously used register"
 msgstr "E748: まだレジスタを使用していません"
@@ -4155,12 +4155,12 @@ msgid "1 line changed"
 msgstr "1 行が変更されました"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld 行が変更されました"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> 行が変更されました"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "%ld 行を解放中"
+msgid "freeing %<PRId64> lines"
+msgstr "%<PRId64> 行を解放中"
 
 msgid "block of 1 line yanked"
 msgstr "1 行のブロックがヤンクされました"
@@ -4169,12 +4169,12 @@ msgid "1 line yanked"
 msgstr "1 行がヤンクされました"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "%ld 行のブロックがヤンクされました"
+msgid "block of %<PRId64> lines yanked"
+msgstr "%<PRId64> 行のブロックがヤンクされました"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld 行がヤンクされました"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> 行がヤンクされました"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4203,33 +4203,33 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: 未知のレジスタ型 %d です"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld 列; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> 列; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "選択 %s%ld / %ld 行; %ld / %ld 単語; %ld / %ld バイト"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "選択 %s%<PRId64> / %<PRId64> 行; %<PRId64> / %<PRId64> 単語; %<PRId64> / %<PRId64> バイト"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
-msgstr "選択 %s%ld / %ld 行; %ld / %ld 単語; %ld / %ld 文字; %ld / %ld バイト"
+msgstr "選択 %s%<PRId64> / %<PRId64> 行; %<PRId64> / %<PRId64> 単語; %<PRId64> / %<PRId64> 文字; %<PRId64> / %<PRId64> バイト"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "列 %s / %s; 行 %ld of %ld; 単語 %ld / %ld; バイト %ld / %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "列 %s / %s; 行 %<PRId64> of %<PRId64>; 単語 %<PRId64> / %<PRId64>; バイト %<PRId64> / %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"列 %s / %s; 行 %ld / %ld; 単語 %ld / %ld; 文字 %ld / %ld; バイト %ld of %ld"
+"列 %s / %s; 行 %<PRId64> / %<PRId64>; 単語 %<PRId64> / %<PRId64>; 文字 %<PRId64> / %<PRId64>; バイト %<PRId64> of %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> for BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=%N ページ"
@@ -4412,8 +4412,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Amigadosのバージョン 2.04かそれ以降が必要です\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "%s のバージョン %ld が必要です\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "%s のバージョン %<PRId64> が必要です\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "NILを開けません:\n"
@@ -4495,8 +4495,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: 致命的シグナルを検知しました\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "Xサーバへの接続に %ld ミリ秒かかりました"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "Xサーバへの接続に %<PRId64> ミリ秒かかりました"
 
 msgid ""
 "\n"
@@ -5277,8 +5277,8 @@ msgid "Performing soundfolding..."
 msgstr "音声畳込みを実行中..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "音声畳込み後の総単語数: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "音声畳込み後の総単語数: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -5313,8 +5313,8 @@ msgid "Done!"
 msgstr "実行しました!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' には %ld 個のエントリはありません"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' には %<PRId64> 個のエントリはありません"
 
 #, c-format
 msgid "Word removed from %s"
@@ -5331,8 +5331,8 @@ msgid "Sorry, no suggestions"
 msgstr "残念ですが, 修正候補はありません"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "残念ですが, 修正候補は %ld 個しかありません"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "残念ですが, 修正候補は %<PRId64> 個しかありません"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5649,8 +5649,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: タグファイル \"%s\" のフォーマットにエラーがあります"
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "直前の %ld バイト"
+msgid "Before byte %<PRId64>"
+msgstr "直前の %<PRId64> バイト"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5794,8 +5794,8 @@ msgid "Already at newest change"
 msgstr "既に一番新しい変更です"
 
 #, c-format
-msgid "E830: Undo number %ld not found"
-msgstr "E830: アンドゥ番号 %ld は見つかりません"
+msgid "E830: Undo number %<PRId64> not found"
+msgstr "E830: アンドゥ番号 %<PRId64> は見つかりません"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: 行番号が間違っています"
@@ -5819,8 +5819,8 @@ msgid "changes"
 msgstr "箇所変更しました"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "前方"
@@ -5835,8 +5835,8 @@ msgid "number changes  when               saved"
 msgstr "通番   変更数   変更時期           保存済"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld 秒経過しています"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> 秒経過しています"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undo の直後に undojoin はできません"

src/po/ja.sjis.po

@@ -91,8 +91,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: <20><><EFBFBD>X<EFBFBD>g<EFBFBD>\\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>o<EFBFBD>b<EFBFBD>t<EFBFBD>@<40>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: <20>o<EFBFBD>b<EFBFBD>t<EFBFBD>@ %ld <20>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: <20>o<EFBFBD>b<EFBFBD>t<EFBFBD>@ %<PRId64> <20>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: <20>Ō<EFBFBD><C58C>̃o<CC83>b<EFBFBD>t<EFBFBD>@<40><><EFBFBD>z<EFBFBD><7A><EFBFBD>Ĉړ<C488><DA93>͂ł<CD82><C582>܂<EFBFBD><DC82><EFBFBD>"
@@ -101,8 +101,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: <20>ŏ<EFBFBD><C58F>̃o<CC83>b<EFBFBD>t<EFBFBD>@<40><><EFBFBD><EFBFBD><EFBFBD>O<EFBFBD>ւ͈ړ<CD88><DA93>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: <20>o<EFBFBD>b<EFBFBD>t<EFBFBD>@ %ld <20>̕ύX<CF8D>͕ۑ<CD95><DB91><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82><EFBFBD> (! <20>ŕύX<CF8D><58><EFBFBD>j<EFBFBD><6A>)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: <20>o<EFBFBD>b<EFBFBD>t<EFBFBD>@ %<PRId64> <20>̕ύX<CF8D>͕ۑ<CD95><DB91><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82><EFBFBD> (! <20>ŕύX<CF8D><58><EFBFBD>j<EFBFBD><6A>)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: <20>Ō<EFBFBD><C58C>̃o<CC83>b<EFBFBD>t<EFBFBD>@<40>͉<EFBFBD><CD89><EFBFBD><EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
@@ -111,8 +111,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: <20>x<EFBFBD><78>: <20>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD>̃<EFBFBD><CC83>X<EFBFBD>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD>߂<EFBFBD><DF82>܂<EFBFBD>"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: <20>o<EFBFBD>b<EFBFBD>t<EFBFBD>@ %ld <20><><EFBFBD><EFBFBD><EFBFBD>‚<EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: <20>o<EFBFBD>b<EFBFBD>t<EFBFBD>@ %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD>‚<EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -123,8 +123,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: %s <20>ɊY<C98A><59><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>o<EFBFBD>b<EFBFBD>t<EFBFBD>@<40>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD><EFBFBD>ł<EFBFBD><C582><EFBFBD>"
 
 #, c-format
-msgid "line %ld"
-msgstr "<22>s %ld"
+msgid "line %<PRId64>"
+msgstr "<22>s %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: <20><><EFBFBD>̖<EFBFBD><CC96>O<EFBFBD>̃o<CC83>b<EFBFBD>t<EFBFBD>@<40>͊<EFBFBD><CD8A>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>܂<EFBFBD>"
@@ -152,12 +152,12 @@ msgid "1 line --%d%%--"
 msgstr "1 <20>s --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld <20>s --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> <20>s --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "<22>s %ld (<28>S<EFBFBD><53> %ld) --%d%%-- col "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "<22>s %<PRId64> (<28>S<EFBFBD><53> %<PRId64>) --%d%%-- col "
 
 msgid "[No Name]"
 msgstr "[<5B><><EFBFBD><EFBFBD>]"
@@ -203,12 +203,12 @@ msgid "Signs for %s:"
 msgstr "%s <20>̃T<CC83>C<EFBFBD><43>:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    <20>s=%ld  <20><><EFBFBD>ʎq=%d  <20><><EFBFBD>O=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    <20>s=%<PRId64>  <20><><EFBFBD>ʎq=%d  <20><><EFBFBD>O=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: %ld <20>ȏ<EFBFBD><C88F>̃o<CC83>b<EFBFBD>t<EFBFBD>@<40><>diff<66>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: %<PRId64> <20>ȏ<EFBFBD><C88F>̃o<CC83>b<EFBFBD>t<EFBFBD>@<40><>diff<66>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: <20>ꎞ<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>̓Ǎ<CC93><C78D><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͏<EFBFBD><CD8F><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ł<EFBFBD><C582>܂<EFBFBD><DC82><EFBFBD>"
@@ -367,8 +367,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: <20>\\<5C><><EFBFBD><EFBFBD><EFBFBD>ʕ<EFBFBD><CA95><EFBFBD><EFBFBD><EFBFBD> :let <20>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: <20><><EFBFBD>X<EFBFBD>g<EFBFBD>̃C<CC83><43><EFBFBD>f<EFBFBD>b<EFBFBD>N<EFBFBD>X<EFBFBD><58><EFBFBD>͈͊O<CD8A>ł<EFBFBD>: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: <20><><EFBFBD>X<EFBFBD>g<EFBFBD>̃C<CC83><43><EFBFBD>f<EFBFBD>b<EFBFBD>N<EFBFBD>X<EFBFBD><58><EFBFBD>͈͊O<CD8A>ł<EFBFBD>: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -782,8 +782,8 @@ msgid "%s aborted"
 msgstr "%s <20><><EFBFBD><EFBFBD><EFBFBD>f<EFBFBD><66><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s <20><> #%ld <20><><EFBFBD>Ԃ<EFBFBD><D482>܂<EFBFBD><DC82><EFBFBD>"
+msgid "%s returning #%<PRId64>"
+msgstr "%s <20><> #%<PRId64> <20><><EFBFBD>Ԃ<EFBFBD><D482>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
 msgid "%s returning %s"
@@ -832,12 +832,12 @@ msgid "1 line moved"
 msgstr "1 <20>s<EFBFBD><73><EFBFBD>ړ<EFBFBD><DA93><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld <20>s<EFBFBD><73><EFBFBD>ړ<EFBFBD><DA93><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> <20>s<EFBFBD><73><EFBFBD>ړ<EFBFBD><DA93><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld <20>s<EFBFBD><73><EFBFBD>t<EFBFBD>B<EFBFBD><42><EFBFBD>^<5E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> <20>s<EFBFBD><73><EFBFBD>t<EFBFBD>B<EFBFBD><42><EFBFBD>^<5E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *<2A>t<EFBFBD>B<EFBFBD><42><EFBFBD>^* autocommand<6E>͌<EFBFBD><CD8C>݂̃o<CC83>b<EFBFBD>t<EFBFBD>@<40><><EFBFBD>ύX<CF8D><58><EFBFBD>Ă͂<C482><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
@@ -921,8 +921,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: <20>X<EFBFBD><58><EFBFBD>b<EFBFBD>v<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>݂<EFBFBD><DD82>܂<EFBFBD>: %s (:silent! <20><><EFBFBD>lj<EFBFBD><C789>ŏ㏑)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: <20>o<EFBFBD>b<EFBFBD>t<EFBFBD>@ %ld <20>ɂ͖<C982><CD96>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: <20>o<EFBFBD>b<EFBFBD>t<EFBFBD>@ %<PRId64> <20>ɂ͖<C982><CD96>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: <20>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>͕ۑ<CD95><DB91><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD><EFBFBD>ł<EFBFBD><C582><EFBFBD>: 'write' <20>I<EFBFBD>v<EFBFBD>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD><C982>薳<EFBFBD><E896B3><EFBFBD>ł<EFBFBD>"
@@ -979,19 +979,19 @@ msgid "1 substitution"
 msgstr "1 <20>ӏ<EFBFBD><D38F>u<EFBFBD><75><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld <20>ӏ<EFBFBD><D38F>Y<EFBFBD><59><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> <20>ӏ<EFBFBD><D38F>Y<EFBFBD><59><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld <20>ӏ<EFBFBD><D38F>u<EFBFBD><75><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> <20>ӏ<EFBFBD><D38F>u<EFBFBD><75><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 msgid " on 1 line"
 msgstr " (<28>v 1 <20>s<EFBFBD><73>)"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " (<28>v %ld <20>s<EFBFBD><73>)"
+msgid " on %<PRId64> lines"
+msgstr " (<28>v %<PRId64> <20>s<EFBFBD><73>)"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global <20><><EFBFBD>ċA<C48B>I<EFBFBD>ɂ͎g<CD8E><67><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
@@ -1078,8 +1078,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: <20><><EFBFBD><EFBFBD><EFBFBD>ȃo<C883>b<EFBFBD>t<EFBFBD>@<40><><EFBFBD>ł<EFBFBD>: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>sign<67><6E><EFBFBD>ʎq<CA8E>ł<EFBFBD>: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>sign<67><6E><EFBFBD>ʎq<CA8E>ł<EFBFBD>: %<PRId64>"
 
 # Added at 27-Jan-2004.
 msgid " (NOT FOUND)"
@@ -1095,16 +1095,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "<22>f<EFBFBD>o<EFBFBD>b<EFBFBD>O<EFBFBD><4F><EFBFBD>[<5B>h<EFBFBD>ɓ<EFBFBD><C993><EFBFBD><EFBFBD>܂<EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD> \"cont\" <20>Ɠ<EFBFBD><C693>͂<EFBFBD><CD82>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "<22>s %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "<22>s %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "<22>R<EFBFBD>}<7D><><EFBFBD>h: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "<22>u<EFBFBD><75><EFBFBD>[<5B>N<EFBFBD>|<7C>C<EFBFBD><43><EFBFBD>g \"%s%s\" <20>s %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "<22>u<EFBFBD><75><EFBFBD>[<5B>N<EFBFBD>|<7C>C<EFBFBD><43><EFBFBD>g \"%s%s\" <20>s %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -1114,8 +1114,8 @@ msgid "No breakpoints defined"
 msgstr "<22>u<EFBFBD><75><EFBFBD>[<5B>N<EFBFBD>|<7C>C<EFBFBD><43><EFBFBD>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD>`<60><><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  <20>s %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  <20>s %<PRId64>"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: <20><><EFBFBD>߂<EFBFBD> \":profile start {fname}\" <20><><EFBFBD><EFBFBD><EFBFBD>s<EFBFBD><73><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -1171,16 +1171,16 @@ msgid "could not source \"%s\""
 msgstr "\"%s\" <20><><EFBFBD>捞<EFBFBD>߂܂<DF82><DC82><EFBFBD>"
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "<22>s %ld: \"%s\" <20><><EFBFBD>捞<EFBFBD>߂܂<DF82><DC82><EFBFBD>"
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "<22>s %<PRId64>: \"%s\" <20><><EFBFBD>捞<EFBFBD>߂܂<DF82><DC82><EFBFBD>"
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "\"%s\" <20><><EFBFBD>捞<EFBFBD><E68D9E>"
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "<22>s %ld: %s <20><><EFBFBD>捞<EFBFBD><E68D9E>"
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "<22>s %<PRId64>: %s <20><><EFBFBD>捞<EFBFBD><E68D9E>"
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1269,8 +1269,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: <20>ҏW<D28F><57><EFBFBD>ׂ<EFBFBD><D782>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD> 1 <20>‚<EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD>"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: <20>ҏW<D28F><57><EFBFBD>ׂ<EFBFBD><D782>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20>‚<EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD>"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: <20>ҏW<D28F><57><EFBFBD>ׂ<EFBFBD><D782>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20>‚<EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD>"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: <20>R<EFBFBD>}<7D><><EFBFBD>h<EFBFBD><68><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>܂<EFBFBD>: <20>Ē<EFBFBD><C492>`<60><><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD> ! <20><><EFBFBD>lj<EFBFBD><C789><EFBFBD><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -1464,8 +1464,8 @@ msgid "Exception discarded: %s"
 msgstr "<22><><EFBFBD>O<EFBFBD><4F><EFBFBD>j<EFBFBD><6A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, <20>s %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, <20>s %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1669,12 +1669,12 @@ msgid "[crypted]"
 msgstr "[<5B>Í<EFBFBD><C38D><EFBFBD>]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[%ld <20>s<EFBFBD>ڂŕϊ<C595><CF8A>G<EFBFBD><47><EFBFBD>[]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[%<PRId64> <20>s<EFBFBD>ڂŕϊ<C595><CF8A>G<EFBFBD><47><EFBFBD>[]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[%ld <20>s<EFBFBD>ڂ̕s<CC95><73><EFBFBD>ȃo<C883>C<EFBFBD>g]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[%<PRId64> <20>s<EFBFBD>ڂ̕s<CC95><73><EFBFBD>ȃo<C883>C<EFBFBD>g]"
 
 msgid "[READ ERRORS]"
 msgstr "[<5B>Ǎ<EFBFBD><C78D>G<EFBFBD><47><EFBFBD>[]"
@@ -1758,10 +1758,10 @@ msgstr "E513:
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: <20><><EFBFBD><EFBFBD><EFBFBD>݃G<DD83><47><EFBFBD>[, <20>ϊ<EFBFBD><CF8A><EFBFBD><EFBFBD>s, <20>s<EFBFBD><73> %ld (<28>㏑<EFBFBD><E38F91><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD> 'fenc' <20><><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD><C982>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD>"
+"E513: <20><><EFBFBD><EFBFBD><EFBFBD>݃G<DD83><47><EFBFBD>[, <20>ϊ<EFBFBD><CF8A><EFBFBD><EFBFBD>s, <20>s<EFBFBD><73> %<PRId64> (<28>㏑<EFBFBD><E38F91><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD> 'fenc' <20><><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD><C982>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD>"
 "<22><>)"
 
 msgid "E514: write error (file system full?)"
@@ -1771,8 +1771,8 @@ msgid " CONVERSION ERROR"
 msgstr " <20>ϊ<EFBFBD><CF8A>G<EFBFBD><47><EFBFBD>["
 
 #, c-format
-msgid " in line %ld;"
-msgstr "<22>s %ld;"
+msgid " in line %<PRId64>;"
+msgstr "<22>s %<PRId64>;"
 
 msgid "[Device]"
 msgstr "[<5B>f<EFBFBD>o<EFBFBD>C<EFBFBD>X]"
@@ -1833,8 +1833,8 @@ msgid "1 line, "
 msgstr "1 <20>s, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld <20>s, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> <20>s, "
 
 msgid "1 character"
 msgstr "1 <20><><EFBFBD><EFBFBD>"
@@ -1845,8 +1845,8 @@ msgstr "%<PRId64>
 
 #. Explicit typecast avoids warning on Mac OS X 10.6
 #, c-format
-msgid "%ld characters"
-msgstr "%ld <20><><EFBFBD><EFBFBD>"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> <20><><EFBFBD><EFBFBD>"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2258,16 +2258,16 @@ msgid "Font1: %s"
 msgstr "<22>t<EFBFBD>H<EFBFBD><48><EFBFBD>g1: %s"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0"
-msgstr "<22>t<EFBFBD>H<EFBFBD><48><EFBFBD>g%ld <20>̕<EFBFBD><CC95><EFBFBD><EFBFBD>t<EFBFBD>H<EFBFBD><48><EFBFBD>g0<67><30>2<EFBFBD>{<7B>ł͂<C582><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "Font%<PRId64> width is not twice that of font0"
+msgstr "<22>t<EFBFBD>H<EFBFBD><48><EFBFBD>g%<PRId64> <20>̕<EFBFBD><CC95><EFBFBD><EFBFBD>t<EFBFBD>H<EFBFBD><48><EFBFBD>g0<67><30>2<EFBFBD>{<7B>ł͂<C582><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "Font0 width: %ld"
-msgstr "<22>t<EFBFBD>H<EFBFBD><48><EFBFBD>g0<67>̕<EFBFBD>: %ld"
+msgid "Font0 width: %<PRId64>"
+msgstr "<22>t<EFBFBD>H<EFBFBD><48><EFBFBD>g0<67>̕<EFBFBD>: %<PRId64>"
 
 #, c-format
-msgid "Font1 width: %ld"
-msgstr "<22>t<EFBFBD>H<EFBFBD><48><EFBFBD>g1<67>̕<EFBFBD>: %ld"
+msgid "Font1 width: %<PRId64>"
+msgstr "<22>t<EFBFBD>H<EFBFBD><48><EFBFBD>g1<67>̕<EFBFBD>: %<PRId64>"
 
 msgid "Invalid font specification"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>ȃt<C883>H<EFBFBD><48><EFBFBD>g<EFBFBD>w<EFBFBD><77><EFBFBD>ł<EFBFBD>"
@@ -2444,8 +2444,8 @@ msgid "Added cscope database %s"
 msgstr "cscope<70>f<EFBFBD>[<5B>^<5E>x<EFBFBD>[<5B>X %s <20><><EFBFBD>lj<EFBFBD>"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: cscope<70>̐ڑ<CC90> %ld <20><><EFBFBD>Ǎ<EFBFBD><C78D>ݒ<EFBFBD><DD92>̃G<CC83><47><EFBFBD>[<5B>ł<EFBFBD>"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: cscope<70>̐ڑ<CC90> %<PRId64> <20><><EFBFBD>Ǎ<EFBFBD><C78D>ݒ<EFBFBD><DD92>̃G<CC83><47><EFBFBD>[<5B>ł<EFBFBD>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: <20><><EFBFBD>m<EFBFBD><6D>cscope<70><65><EFBFBD><EFBFBD><EFBFBD>^<5E>ł<EFBFBD>"
@@ -3661,12 +3661,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: <20>ێ<EFBFBD><DB8E>Ɏ<EFBFBD><C98E>s<EFBFBD><73><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>lnum<75>ł<EFBFBD>: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>lnum<75>ł<EFBFBD>: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: <20>s %ld <20><><EFBFBD><EFBFBD><EFBFBD>‚<EFBFBD><C282><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: <20>s %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD>‚<EFBFBD><C282><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: <20>|<7C>C<EFBFBD><43><EFBFBD>^<5E>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD><4E>ID<49><44><EFBFBD>Ԉ<EFBFBD><D488><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD> 3"
@@ -3684,8 +3684,8 @@ msgid "deleted block 1?"
 msgstr "<22>u<EFBFBD><75><EFBFBD>b<EFBFBD>N 1 <20>͏<EFBFBD><CD8F><EFBFBD><EFBFBD>ꂽ?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: <20>s %ld <20><><EFBFBD><EFBFBD><EFBFBD>‚<EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: <20>s %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD>‚<EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: <20>|<7C>C<EFBFBD><43><EFBFBD>^<5E>u<EFBFBD><75><EFBFBD>b<EFBFBD>N<EFBFBD><4E>ID<49><44><EFBFBD>Ԉ<EFBFBD><D488><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
@@ -3694,12 +3694,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count <20><><EFBFBD>[<5B><><EFBFBD>ł<EFBFBD>"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: <20>s<EFBFBD>ԍ<EFBFBD><D48D><EFBFBD><EFBFBD>͈͊O<CD8A>ł<EFBFBD>: %ld <20><><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: <20>s<EFBFBD>ԍ<EFBFBD><D48D><EFBFBD><EFBFBD>͈͊O<CD8A>ł<EFBFBD>: %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: <20>u<EFBFBD><75><EFBFBD>b<EFBFBD>N %ld <20>̍s<CC8D>J<EFBFBD>E<EFBFBD><45><EFBFBD>g<EFBFBD><67><EFBFBD>Ԉ<EFBFBD><D488><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: <20>u<EFBFBD><75><EFBFBD>b<EFBFBD>N %<PRId64> <20>̍s<CC8D>J<EFBFBD>E<EFBFBD><45><EFBFBD>g<EFBFBD><67><EFBFBD>Ԉ<EFBFBD><D488><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
 
 msgid "Stack size increases"
 msgstr "<22>X<EFBFBD>^<5E>b<EFBFBD>N<EFBFBD>T<EFBFBD>C<EFBFBD>Y<EFBFBD><59><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>"
@@ -3883,8 +3883,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɂ<EFBFBD>ENTER<45><52><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>R<EFBFBD>}<7D><><EFBFBD>h<EFBFBD><68><EFBFBD><EFBFBD><EFBFBD>͂<EFBFBD><CD82>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s <20>s %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s <20>s %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- <20>p<EFBFBD><70> --"
@@ -3954,12 +3954,12 @@ msgid "1 line less"
 msgstr "1 <20>s <20>폜<EFBFBD><ED8F9C><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld <20>s <20>lj<EFBFBD><C789><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> <20>s <20>lj<EFBFBD><C789><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld <20>s <20>폜<EFBFBD><ED8F9C><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> <20>s <20>폜<EFBFBD><ED8F9C><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 msgid " (Interrupted)"
 msgstr " (<28><><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>܂<EFBFBD><DC82><EFBFBD>)"
@@ -3997,8 +3997,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: <20>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882>߂<EFBFBD><DF82>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: <20><><EFBFBD><EFBFBD><EFBFBD>G<EFBFBD><47><EFBFBD>[: lalloc(%ld,)"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: <20><><EFBFBD><EFBFBD><EFBFBD>G<EFBFBD><47><EFBFBD>[: lalloc(%<PRId64>,)"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4074,8 +4074,8 @@ msgid "read from Netbeans socket"
 msgstr "Netbeans <20>̃\\<5C>P<EFBFBD>b<EFBFBD>g<EFBFBD><67><EFBFBD>Ǎ<EFBFBD><C78D><EFBFBD>"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: <20>o<EFBFBD>b<EFBFBD>t<EFBFBD>@ %ld <20><> NetBeans <20>ڑ<EFBFBD><DA91><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: <20>o<EFBFBD>b<EFBFBD>t<EFBFBD>@ %<PRId64> <20><> NetBeans <20>ڑ<EFBFBD><DA91><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: NetBeans<6E>͂<EFBFBD><CD82><EFBFBD>GUI<55>ɂ͑Ή<CD91><CE89><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82><EFBFBD>"
@@ -4126,23 +4126,23 @@ msgid "1 line %sed %d times"
 msgstr "1 <20>s<EFBFBD><73> %s <20><> %d <20>񏈗<EFBFBD><F18F8897><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld <20>s<EFBFBD><73> %s <20><> 1 <20>񏈗<EFBFBD><F18F8897><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> <20>s<EFBFBD><73> %s <20><> 1 <20>񏈗<EFBFBD><F18F8897><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld <20>s<EFBFBD><73> %s <20><> %d <20>񏈗<EFBFBD><F18F8897><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> <20>s<EFBFBD><73> %s <20><> %d <20>񏈗<EFBFBD><F18F8897><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld <20>s<EFBFBD><73><EFBFBD>C<EFBFBD><43><EFBFBD>f<EFBFBD><66><EFBFBD>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>... "
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> <20>s<EFBFBD><73><EFBFBD>C<EFBFBD><43><EFBFBD>f<EFBFBD><66><EFBFBD>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>... "
 
 msgid "1 line indented "
 msgstr "1 <20>s<EFBFBD><73><EFBFBD>C<EFBFBD><43><EFBFBD>f<EFBFBD><66><EFBFBD>g<EFBFBD><67><EFBFBD>܂<EFBFBD><DC82><EFBFBD> "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld <20>s<EFBFBD><73><EFBFBD>C<EFBFBD><43><EFBFBD>f<EFBFBD><66><EFBFBD>g<EFBFBD><67><EFBFBD>܂<EFBFBD><DC82><EFBFBD> "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> <20>s<EFBFBD><73><EFBFBD>C<EFBFBD><43><EFBFBD>f<EFBFBD><66><EFBFBD>g<EFBFBD><67><EFBFBD>܂<EFBFBD><DC82><EFBFBD> "
 
 msgid "E748: No previously used register"
 msgstr "E748: <20>܂<EFBFBD><DC82><EFBFBD><EFBFBD>W<EFBFBD>X<EFBFBD>^<5E><><EFBFBD>g<EFBFBD>p<EFBFBD><70><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82><EFBFBD>"
@@ -4155,12 +4155,12 @@ msgid "1 line changed"
 msgstr "1 <20>s<EFBFBD><73><EFBFBD>ύX<CF8D><58><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld <20>s<EFBFBD><73><EFBFBD>ύX<CF8D><58><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> <20>s<EFBFBD><73><EFBFBD>ύX<CF8D><58><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "%ld <20>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "freeing %<PRId64> lines"
+msgstr "%<PRId64> <20>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "block of 1 line yanked"
 msgstr "1 <20>s<EFBFBD>̃u<CC83><75><EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
@@ -4169,12 +4169,12 @@ msgid "1 line yanked"
 msgstr "1 <20>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "%ld <20>s<EFBFBD>̃u<CC83><75><EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "block of %<PRId64> lines yanked"
+msgstr "%<PRId64> <20>s<EFBFBD>̃u<CC83><75><EFBFBD>b<EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld <20>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> <20>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4203,33 +4203,33 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: <20><><EFBFBD>m<EFBFBD>̃<EFBFBD><CC83>W<EFBFBD>X<EFBFBD>^<5E>^ %d <20>ł<EFBFBD>"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld <20><>; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> <20><>; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "<22>I<EFBFBD><49> %s%ld / %ld <20>s; %ld / %ld <20>P<EFBFBD><50>; %ld / %ld <20>o<EFBFBD>C<EFBFBD>g"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "<22>I<EFBFBD><49> %s%<PRId64> / %<PRId64> <20>s; %<PRId64> / %<PRId64> <20>P<EFBFBD><50>; %<PRId64> / %<PRId64> <20>o<EFBFBD>C<EFBFBD>g"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
-msgstr "<22>I<EFBFBD><49> %s%ld / %ld <20>s; %ld / %ld <20>P<EFBFBD><50>; %ld / %ld <20><><EFBFBD><EFBFBD>; %ld / %ld <20>o<EFBFBD>C<EFBFBD>g"
+msgstr "<22>I<EFBFBD><49> %s%<PRId64> / %<PRId64> <20>s; %<PRId64> / %<PRId64> <20>P<EFBFBD><50>; %<PRId64> / %<PRId64> <20><><EFBFBD><EFBFBD>; %<PRId64> / %<PRId64> <20>o<EFBFBD>C<EFBFBD>g"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "<22><> %s / %s; <20>s %ld of %ld; <20>P<EFBFBD><50> %ld / %ld; <20>o<EFBFBD>C<EFBFBD>g %ld / %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "<22><> %s / %s; <20>s %<PRId64> of %<PRId64>; <20>P<EFBFBD><50> %<PRId64> / %<PRId64>; <20>o<EFBFBD>C<EFBFBD>g %<PRId64> / %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"<22><> %s / %s; <20>s %ld / %ld; <20>P<EFBFBD><50> %ld / %ld; <20><><EFBFBD><EFBFBD> %ld / %ld; <20>o<EFBFBD>C<EFBFBD>g %ld of %ld"
+"<22><> %s / %s; <20>s %<PRId64> / %<PRId64>; <20>P<EFBFBD><50> %<PRId64> / %<PRId64>; <20><><EFBFBD><EFBFBD> %<PRId64> / %<PRId64>; <20>o<EFBFBD>C<EFBFBD>g %<PRId64> of %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> for BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=%N <20>y<EFBFBD>[<5B>W"
@@ -4412,8 +4412,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Amigados<6F>̃o<CC83>[<5B>W<EFBFBD><57><EFBFBD><EFBFBD> 2.04<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȍ~<7E><><EFBFBD>K<EFBFBD>v<EFBFBD>ł<EFBFBD>\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "%s <20>̃o<CC83>[<5B>W<EFBFBD><57><EFBFBD><EFBFBD> %ld <20><><EFBFBD>K<EFBFBD>v<EFBFBD>ł<EFBFBD>\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "%s <20>̃o<CC83>[<5B>W<EFBFBD><57><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD>K<EFBFBD>v<EFBFBD>ł<EFBFBD>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "NIL<49><4C><EFBFBD>J<EFBFBD><4A><EFBFBD>܂<EFBFBD><DC82><EFBFBD>:\n"
@@ -4495,8 +4495,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: <20>v<EFBFBD><76><EFBFBD>I<EFBFBD>V<EFBFBD>O<EFBFBD>i<EFBFBD><69><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>m<EFBFBD><6D><EFBFBD>܂<EFBFBD><DC82><EFBFBD>\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "X<>T<EFBFBD>[<5B>o<EFBFBD>ւ̐ڑ<CC90><DA91><EFBFBD> %ld <20>~<7E><><EFBFBD>b<EFBFBD><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "X<>T<EFBFBD>[<5B>o<EFBFBD>ւ̐ڑ<CC90><DA91><EFBFBD> %<PRId64> <20>~<7E><><EFBFBD>b<EFBFBD><62><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 msgid ""
 "\n"
@@ -5277,8 +5277,8 @@ msgid "Performing soundfolding..."
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>􍞂݂<F48D9E82><DD82><EFBFBD><EFBFBD>s<EFBFBD><73>..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>􍞂݌<F48D9E82><DD8C>̑<EFBFBD><CC91>P<EFBFBD>ꐔ: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>􍞂݌<F48D9E82><DD8C>̑<EFBFBD><CC91>P<EFBFBD>ꐔ: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -5313,8 +5313,8 @@ msgid "Done!"
 msgstr "<22><><EFBFBD>s<EFBFBD><73><EFBFBD>܂<EFBFBD><DC82><EFBFBD>!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' <20>ɂ<EFBFBD> %ld <20>‚̃G<CC83><47><EFBFBD>g<EFBFBD><67><EFBFBD>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' <20>ɂ<EFBFBD> %<PRId64> <20>‚̃G<CC83><47><EFBFBD>g<EFBFBD><67><EFBFBD>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
 msgid "Word removed from %s"
@@ -5331,8 +5331,8 @@ msgid "Sorry, no suggestions"
 msgstr "<22>c<EFBFBD>O<EFBFBD>ł<EFBFBD><C582><EFBFBD>, <20>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͂<EFBFBD><CD82><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "<22>c<EFBFBD>O<EFBFBD>ł<EFBFBD><C582><EFBFBD>, <20>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20>‚<EFBFBD><C282><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "<22>c<EFBFBD>O<EFBFBD>ł<EFBFBD><C582><EFBFBD>, <20>C<EFBFBD><43><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20>‚<EFBFBD><C282><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5649,8 +5649,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: <20>^<5E>O<EFBFBD>t<EFBFBD>@<40>C<EFBFBD><43> \"%s\" <20>̃t<CC83>H<EFBFBD>[<5B>}<7D>b<EFBFBD>g<EFBFBD>ɃG<C983><47><EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD>"
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "<22><><EFBFBD>O<EFBFBD><4F> %ld <20>o<EFBFBD>C<EFBFBD>g"
+msgid "Before byte %<PRId64>"
+msgstr "<22><><EFBFBD>O<EFBFBD><4F> %<PRId64> <20>o<EFBFBD>C<EFBFBD>g"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5794,8 +5794,8 @@ msgid "Already at newest change"
 msgstr "<22><><EFBFBD>Ɉ<EFBFBD><C988>ԐV<D490><56><EFBFBD><EFBFBD><EFBFBD>ύX<CF8D>ł<EFBFBD>"
 
 #, c-format
-msgid "E830: Undo number %ld not found"
-msgstr "E830: <20>A<EFBFBD><41><EFBFBD>h<EFBFBD>D<EFBFBD>ԍ<EFBFBD> %ld <20>͌<EFBFBD><CD8C>‚<EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgid "E830: Undo number %<PRId64> not found"
+msgstr "E830: <20>A<EFBFBD><41><EFBFBD>h<EFBFBD>D<EFBFBD>ԍ<EFBFBD> %<PRId64> <20>͌<EFBFBD><CD8C>‚<EFBFBD><C282><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: <20>s<EFBFBD>ԍ<EFBFBD><D48D><EFBFBD><EFBFBD>Ԉ<EFBFBD><D488><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
@@ -5819,8 +5819,8 @@ msgid "changes"
 msgstr "<22>ӏ<EFBFBD><D38F>ύX<CF8D><58><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "<22>O<EFBFBD><4F>"
@@ -5835,8 +5835,8 @@ msgid "number changes  when               saved"
 msgstr "<22>ʔ<EFBFBD>   <20>ύX<CF8D><58>   <20>ύX<CF8D><58><EFBFBD><EFBFBD>           <20>ۑ<EFBFBD><DB91><EFBFBD>"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld <20>b<EFBFBD>o<EFBFBD>߂<EFBFBD><DF82>Ă<EFBFBD><C482>܂<EFBFBD>"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> <20>b<EFBFBD>o<EFBFBD>߂<EFBFBD><DF82>Ă<EFBFBD><C482>܂<EFBFBD>"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undo <20>̒<EFBFBD><CC92><EFBFBD><EFBFBD><EFBFBD> undojoin <20>͂ł<CD82><C582>܂<EFBFBD><DC82><EFBFBD>"

src/po/ko.UTF-8.po

@@ -79,8 +79,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: 나열된 버퍼가 없습니다"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: 버퍼 %ld이(가) 존재하지 않습니다"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: 버퍼 %<PRId64>이(가) 존재하지 않습니다"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: 마지막 버퍼입니다"
@@ -89,9 +89,9 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: 첫 번째 버퍼입니다"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
 msgstr ""
-"E89: 버퍼 %ld을(를) 마지막으로 고친 뒤 저장하지 않았습니다 (덮어쓰려면 ! 더하"
+"E89: 버퍼 %<PRId64>을(를) 마지막으로 고친 뒤 저장하지 않았습니다 (덮어쓰려면 ! 더하"
 "기)"
 
 msgid "E90: Cannot unload last buffer"
@@ -101,8 +101,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: 경고: 파일 이름 목록이 넘쳤습니다"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: 버퍼 %ld을(를) 찾을 수 없습니다"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: 버퍼 %<PRId64>을(를) 찾을 수 없습니다"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -113,8 +113,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: %s와 맞는 버퍼가 없습니다"
 
 #, c-format
-msgid "line %ld"
-msgstr "%ld 줄"
+msgid "line %<PRId64>"
+msgstr "%<PRId64> 줄"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: 이 이름을 가진 버퍼가 이미 있습니다"
@@ -139,12 +139,12 @@ msgid "1 line --%d%%--"
 msgstr "1 줄 --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld 줄 --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> 줄 --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "%ld / %ld 줄 --%d%%-- 칸 "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "%<PRId64> / %<PRId64> 줄 --%d%%-- 칸 "
 
 msgid "[No Name]"
 msgstr "[이름 없음]"
@@ -190,12 +190,12 @@ msgid "Signs for %s:"
 msgstr "%s에 대한 기호:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    줄=%ld  id=%d  이름=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    줄=%<PRId64>  id=%d  이름=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: %ld개 이상의 버퍼에 대해서는 diff를 할 수 없습니다"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: %<PRId64>개 이상의 버퍼에 대해서는 diff를 할 수 없습니다"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: 임시 파일을 읽거나 쓸 수 없습니다"
@@ -354,8 +354,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: ':let'에 모르는 글자"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: 목록 번호가 범위를 벗어남: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: 목록 번호가 범위를 벗어남: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -736,8 +736,8 @@ msgid "%s aborted"
 msgstr "%s이(가) 중지되었습니다"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s이(가) #%ld을(를) 돌려주었습니다"
+msgid "%s returning #%<PRId64>"
+msgstr "%s이(가) #%<PRId64>을(를) 돌려주었습니다"
 
 #, c-format
 msgid "%s returning %s"
@@ -786,12 +786,12 @@ msgid "1 line moved"
 msgstr "1 줄 옮겨졌습니다"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld 줄 옮겨졌습니다"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> 줄 옮겨졌습니다"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld 줄을 걸렀습니다"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> 줄을 걸렀습니다"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filter* 자동명령은 현재 버퍼를 바꾸어서는 안 됩니다"
@@ -875,8 +875,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: 스왑 파일 있음: %s (덮어쓰려면 :silent! 사용)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: 버퍼 %ld의 파일 이름이 없습니다"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: 버퍼 %<PRId64>의 파일 이름이 없습니다"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: 파일이 써지지 않음: 'write' 옵션에 의해 쓸 수가 없습니다"
@@ -933,19 +933,19 @@ msgid "1 substitution"
 msgstr "1개 바꿨음"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld개 찾아짐"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64>개 찾아짐"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld개 바꿨음"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64>개 바꿨음"
 
 msgid " on 1 line"
 msgstr " 한 줄에서"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " %ld 줄에서"
+msgid " on %<PRId64> lines"
+msgstr " %<PRId64> 줄에서"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global은 재귀 호출 될 수 없습니다"
@@ -1027,8 +1027,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: 잘못된 버퍼 이름: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: 잘못된 sign ID: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: 잘못된 sign ID: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (못 찾았음)"
@@ -1043,16 +1043,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "디버그 상태로 들어감.  계속하려면 \"cont\"를 입력하십시오."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "%ld 줄: %s"
+msgid "line %<PRId64>: %s"
+msgstr "%<PRId64> 줄: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "명령: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "중지점: \"%s%s\" %ld 줄"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "중지점: \"%s%s\" %<PRId64> 줄"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -1062,8 +1062,8 @@ msgid "No breakpoints defined"
 msgstr "중지점이 정의되어 있지 않습니다"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  %ld 줄"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  %<PRId64> 줄"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: 먼저 \":profile start {fname}\"을 사용하세요"
@@ -1119,16 +1119,16 @@ msgid "could not source \"%s\""
 msgstr "\"%s\"을(를) 불러 들일 수 없습니다"
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "%ld 줄: \"%s\"을(를) 불러 들일 수 없습니다"
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "%<PRId64> 줄: \"%s\"을(를) 불러 들일 수 없습니다"
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "\"%s\"을(를) 불러들이는 중"
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "%ld 줄: \"%s\" 불러들이는 중"
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "%<PRId64> 줄: \"%s\" 불러들이는 중"
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1217,8 +1217,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: 고칠 파일이 한 개 더 있습니다"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: 고칠 파일이 %ld 개 더 있습니다"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: 고칠 파일이 %<PRId64> 개 더 있습니다"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: 명령이 이미 존재합니다: 바꾸려면 !을 더하세요"
@@ -1408,8 +1408,8 @@ msgid "Exception discarded: %s"
 msgstr "예외 버려짐: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, %ld 줄"
+msgid "%s, line %<PRId64>"
+msgstr "%s, %<PRId64> 줄"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1613,12 +1613,12 @@ msgid "[crypted]"
 msgstr "[암호화 되었습니다]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[%ld 줄에서 변환 에러]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[%<PRId64> 줄에서 변환 에러]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[%ld 줄에 잘못된 바이트]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[%<PRId64> 줄에 잘못된 바이트]"
 
 msgid "[READ ERRORS]"
 msgstr "[읽기 에러]"
@@ -1700,9 +1700,9 @@ msgstr "E513: 쓰기 에러, 변환 실패 (무시하려면 'fenc'를 비우면
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
 "override)"
-msgstr "E513: 쓰기 에러, %ld 줄에서 변환 실패 (무시하려면 'fenc'를 비우면 됨)"
+msgstr "E513: 쓰기 에러, %<PRId64> 줄에서 변환 실패 (무시하려면 'fenc'를 비우면 됨)"
 
 msgid "E514: write error (file system full?)"
 msgstr "E514: 쓰기 에러 (파일 시스템이 꽉찼나요?)"
@@ -1711,8 +1711,8 @@ msgid " CONVERSION ERROR"
 msgstr " 변환 에러"
 
 #, c-format
-msgid " in line %ld;"
-msgstr "%ld 줄에서;"
+msgid " in line %<PRId64>;"
+msgstr "%<PRId64> 줄에서;"
 
 msgid "[Device]"
 msgstr "[장치]"
@@ -1773,8 +1773,8 @@ msgid "1 line, "
 msgstr "1 줄, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld 줄, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> 줄, "
 
 msgid "1 character"
 msgstr "1 글자"
@@ -1785,8 +1785,8 @@ msgstr "%<PRId64> 글자"
 
 #. Explicit typecast avoids warning on Mac OS X 10.6
 #, c-format
-msgid "%ld characters"
-msgstr "%ld 글자"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> 글자"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2194,19 +2194,19 @@ msgid "Font1: %s\n"
 msgstr "글꼴1: %s\n"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "글꼴%ld 너비가 글꼴0의 두배가 아닙니다\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "글꼴%<PRId64> 너비가 글꼴0의 두배가 아닙니다\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "글꼴0 너비: %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "글꼴0 너비: %<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"글꼴1 너비: %ld\n"
+"글꼴1 너비: %<PRId64>\n"
 "\n"
 
 #~ msgid "Invalid font specification"
@@ -2383,8 +2383,8 @@ msgid "Added cscope database %s"
 msgstr "cscope 데이터베이스 %s에 더했습니다."
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: cscope 연결 %ld 읽기 에러"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: cscope 연결 %<PRId64> 읽기 에러"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: 모르는 cscope 찾기 형식"
@@ -3596,12 +3596,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: 파일 보존을 실패했습니다"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: 잘못된 lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: 잘못된 lnum: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: %ld 줄을 찾을 수 없습니다"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: %<PRId64> 줄을 찾을 수 없습니다"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: 잘못된 포인터 구역 id 3"
@@ -3619,8 +3619,8 @@ msgid "deleted block 1?"
 msgstr "구역 1이 지워졌나요?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: %ld 줄을 찾을 수 없습니다"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: %<PRId64> 줄을 찾을 수 없습니다"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: 잘못된 포인터 구역 id"
@@ -3629,12 +3629,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count가 0입니다"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: 줄 번호가 범위를 벗어났습니다: 마지막에서 %ld 만큼"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: 줄 번호가 범위를 벗어났습니다: 마지막에서 %<PRId64> 만큼"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: 구역 %ld의 줄 갯수가 틀렸습니다"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: 구역 %<PRId64>의 줄 갯수가 틀렸습니다"
 
 msgid "Stack size increases"
 msgstr "스택 크기 증가"
@@ -3822,8 +3822,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "계속하려면 엔터 혹은 명령을 입력하십시오"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s 줄 %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s 줄 %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- 더 --"
@@ -3892,12 +3892,12 @@ msgid "1 line less"
 msgstr "한 줄 이하"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld 보다 많은 줄"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> 보다 많은 줄"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld 보다 적은 줄"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> 보다 적은 줄"
 
 msgid " (Interrupted)"
 msgstr " (중단되었습니다)"
@@ -3931,8 +3931,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: 줄이 너무 길어졌습니다"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: 내부 에러: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: 내부 에러: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4004,8 +4004,8 @@ msgid "read from Netbeans socket"
 msgstr "Netbeans 소켓에서 읽기"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: 버퍼 %ld에 대한 NetBeans 연결을 잃어버렸습니다"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: 버퍼 %<PRId64>에 대한 NetBeans 연결을 잃어버렸습니다"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: 이 GUI는 netbeans를 지원하지 않습니다"
@@ -4055,23 +4055,23 @@ msgid "1 line %sed %d times"
 msgstr "1 line %sed %d times"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld lines %sed 1 time"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> lines %sed 1 time"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld lines %sed %d times"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> lines %sed %d times"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld lines to indent... "
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> lines to indent... "
 
 msgid "1 line indented "
 msgstr "1 line indented "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld lines indented "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> lines indented "
 
 #~ msgid "E748: No previously used register"
 #~ msgstr ""
@@ -4084,12 +4084,12 @@ msgid "1 line changed"
 msgstr "1 line changed"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld lines changed"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> lines changed"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "freeing %ld lines"
+msgid "freeing %<PRId64> lines"
+msgstr "freeing %<PRId64> lines"
 
 msgid "block of 1 line yanked"
 msgstr "block of 1 line yanked"
@@ -4098,12 +4098,12 @@ msgid "1 line yanked"
 msgstr "1 line yanked"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "block of %ld lines yanked"
+msgid "block of %<PRId64> lines yanked"
+msgstr "block of %<PRId64> lines yanked"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld lines yanked"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> lines yanked"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4132,36 +4132,36 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: 모르는 레지스터 형식 %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld 열; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> 열; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Selected %s%ld of %ld 라인; %ld of %ld 단어; %ld of %ld 바이트"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Selected %s%<PRId64> of %<PRId64> 라인; %<PRId64> of %<PRId64> 단어; %<PRId64> of %<PRId64> 바이트"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
 msgstr ""
-"Selected %s%ld of %ld 라인; %ld of %ld 단어; %ld of %ld 문자; %ld of %ld 바이"
+"Selected %s%<PRId64> of %<PRId64> 라인; %<PRId64> of %<PRId64> 단어; %<PRId64> of %<PRId64> 문자; %<PRId64> of %<PRId64> 바이"
 "트"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Col %s of %s; 라인 %ld of %ld; 단어 %ld of %ld; 바이트 %ld of %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Col %s of %s; 라인 %<PRId64> of %<PRId64>; 단어 %<PRId64> of %<PRId64>; 바이트 %<PRId64> of %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"Col %s of %s; 라인 %ld of %ld; 단어 %ld of %ld; 문자 %ld of %ld; 바이트 %ld "
-"of %ld"
+"Col %s of %s; 라인 %<PRId64> of %<PRId64>; 단어 %<PRId64> of %<PRId64>; 문자 %<PRId64> of %<PRId64>; 바이트 %<PRId64> "
+"of %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> for BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=페이지 %N"
@@ -4340,8 +4340,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "아미가도스 2.04나 더 높은 판이 필요합니다\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Need %s version %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Need %s version %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "NIL을 열 수 없음:\n"
@@ -4423,8 +4423,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "빔: 죽을 시그널을 잡았습니다\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "X 디스플레이를 여는 데 %ld msec이 걸렸습니다"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "X 디스플레이를 여는 데 %<PRId64> msec이 걸렸습니다"
 
 msgid ""
 "\n"
@@ -5117,8 +5117,8 @@ msgid "Performing soundfolding..."
 msgstr "soundfold 수행중..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "soundfold 수행 후의 단어 수: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "soundfold 수행 후의 단어 수: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -5153,8 +5153,8 @@ msgid "Done!"
 msgstr "끝!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile'에 %ld 항목이 없습니다"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile'에 %<PRId64> 항목이 없습니다"
 
 #, c-format
 msgid "Word removed from %s"
@@ -5171,8 +5171,8 @@ msgid "Sorry, no suggestions"
 msgstr "죄송, 제안할 게 없습니다"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "죄송, %ld개만 제안"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "죄송, %<PRId64>개만 제안"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5472,8 +5472,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: 태그 파일 \"%s\"에 형식 에러가 있습니다"
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "Before byte %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Before byte %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5620,8 +5620,8 @@ msgid "Already at newest change"
 msgstr "더 이상의 수정은 없었습니다"
 
 #, c-format
-msgid "E830: Undo number %ld not found"
-msgstr "E830: Undo 번호 %ld를 찾을 수 없습니다"
+msgid "E830: Undo number %<PRId64> not found"
+msgstr "E830: Undo 번호 %<PRId64>를 찾을 수 없습니다"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: 잘못된 줄 번호"
@@ -5645,8 +5645,8 @@ msgid "changes"
 msgstr "changes"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "before"
@@ -5661,8 +5661,8 @@ msgstr "취소할 게 없습니다"
 #~ msgstr ""
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld seconds ago"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> seconds ago"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undo 뒤에 undojoin은 할 수 없습니다"

src/po/ko.po

@@ -79,8 +79,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>۰<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: <20><><EFBFBD><EFBFBD> %ld<EFBFBD><EFBFBD>(<28><>) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ʽ<EFBFBD><CABD>ϴ<EFBFBD>"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: <20><><EFBFBD><EFBFBD> %<PRId64><EFBFBD><EFBFBD>(<28><>) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ʽ<EFBFBD><CABD>ϴ<EFBFBD>"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Դϴ<D4B4>"
@@ -89,9 +89,9 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: ù <20><>° <20><><EFBFBD><EFBFBD><EFBFBD>Դϴ<D4B4>"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
 msgstr ""
-"E89: <20><><EFBFBD><EFBFBD> %ld<EFBFBD><EFBFBD>(<28><>) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ģ <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ʾҽ<CABE><D2BD>ϴ<EFBFBD> (<28><><EFBFBD><EFBFBD><EEBEB2><EFBFBD><EFBFBD> ! <20><><EFBFBD><EFBFBD>"
+"E89: <20><><EFBFBD><EFBFBD> %<PRId64><EFBFBD><EFBFBD>(<28><>) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ģ <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ʾҽ<CABE><D2BD>ϴ<EFBFBD> (<28><><EFBFBD><EFBFBD><EEBEB2><EFBFBD><EFBFBD> ! <20><><EFBFBD><EFBFBD>"
 "<22><>)"
 
 msgid "E90: Cannot unload last buffer"
@@ -101,8 +101,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: <20><><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD> <20≯<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>ƽ<EFBFBD><C6BD>ϴ<EFBFBD>"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: <20><><EFBFBD><EFBFBD> %ld<EFBFBD><EFBFBD>(<28><>) ã<><C3A3> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: <20><><EFBFBD><EFBFBD> %<PRId64><EFBFBD><EFBFBD>(<28><>) ã<><C3A3> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -113,8 +113,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: %s<><73> <20>´<EFBFBD> <20><><EFBFBD>۰<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
 
 #, c-format
-msgid "line %ld"
-msgstr "%ld <20><>"
+msgid "line %<PRId64>"
+msgstr "%<PRId64> <20><>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: <20><> <20≯<EFBFBD><CCB8><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD>۰<EFBFBD> <20>̹<EFBFBD> <20>ֽ<EFBFBD><D6BD>ϴ<EFBFBD>"
@@ -139,12 +139,12 @@ msgid "1 line --%d%%--"
 msgstr "1 <20><> --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld <20><> --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> <20><> --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "%ld / %ld <20><> --%d%%-- ĭ "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "%<PRId64> / %<PRId64> <20><> --%d%%-- ĭ "
 
 msgid "[No Name]"
 msgstr "[<5B≯<EFBFBD> <20><><EFBFBD><EFBFBD>]"
@@ -190,12 +190,12 @@ msgid "Signs for %s:"
 msgstr "%s<><73> <20><><EFBFBD><EFBFBD> <20><>ȣ:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    <20><>=%ld  id=%d  <20≯<EFBFBD>=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    <20><>=%<PRId64>  id=%d  <20≯<EFBFBD>=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: %ld<EFBFBD><EFBFBD> <20>̻<EFBFBD><CCBB><EFBFBD> <20><><EFBFBD>ۿ<EFBFBD> <20><><EFBFBD>ؼ<EFBFBD><D8BC><EFBFBD> diff<66><66> <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: %<PRId64><EFBFBD><EFBFBD> <20>̻<EFBFBD><CCBB><EFBFBD> <20><><EFBFBD>ۿ<EFBFBD> <20><><EFBFBD>ؼ<EFBFBD><D8BC><EFBFBD> diff<66><66> <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: <20>ӽ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>аų<D0B0> <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
@@ -354,8 +354,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: ':let'<27><> <20>𸣴<EFBFBD> <20><><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: <20><><EFBFBD><EFBFBD> <20><>ȣ<EFBFBD><C8A3> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: <20><><EFBFBD><EFBFBD> <20><>ȣ<EFBFBD><C8A3> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -736,8 +736,8 @@ msgid "%s aborted"
 msgstr "%s<><73>(<28><>) <20><><EFBFBD><EFBFBD><EFBFBD>Ǿ<EFBFBD><C7BE><EFBFBD><EFBFBD>ϴ<EFBFBD>"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s<><73>(<28><>) #%ld<EFBFBD><EFBFBD>(<28><>) <20><><EFBFBD><EFBFBD><EFBFBD>־<EFBFBD><D6BE><EFBFBD><EFBFBD>ϴ<EFBFBD>"
+msgid "%s returning #%<PRId64>"
+msgstr "%s<><73>(<28><>) #%<PRId64><EFBFBD><EFBFBD>(<28><>) <20><><EFBFBD><EFBFBD><EFBFBD>־<EFBFBD><D6BE><EFBFBD><EFBFBD>ϴ<EFBFBD>"
 
 #, c-format
 msgid "%s returning %s"
@@ -786,12 +786,12 @@ msgid "1 line moved"
 msgstr "1 <20><> <20>Ű<EFBFBD><C5B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld <20><> <20>Ű<EFBFBD><C5B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> <20><> <20>Ű<EFBFBD><C5B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld <20><><EFBFBD><EFBFBD> <20>ɷ<EFBFBD><C9B7><EFBFBD><EFBFBD>ϴ<EFBFBD>"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> <20><><EFBFBD><EFBFBD> <20>ɷ<EFBFBD><C9B7><EFBFBD><EFBFBD>ϴ<EFBFBD>"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filter* <20>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD>۸<EFBFBD> <20>ٲپ<D9BE><EEBCAD> <20><> <20>˴ϴ<CBB4>"
@@ -875,8 +875,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>: %s (<28><><EFBFBD><EFBFBD><EEBEB2><EFBFBD><EFBFBD> :silent! <20><><EFBFBD><EFBFBD>)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: <20><><EFBFBD><EFBFBD> %ld<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20≯<EFBFBD><CCB8><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: <20><><EFBFBD><EFBFBD> %<PRId64><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20≯<EFBFBD><CCB8><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>: 'write' <20>ɼǿ<C9BC> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
@@ -933,19 +933,19 @@ msgid "1 substitution"
 msgstr "1<><31> <20>ٲ<EFBFBD><D9B2><EFBFBD>"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld<EFBFBD><EFBFBD> ã<><C3A3><EFBFBD><EFBFBD>"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64><EFBFBD><EFBFBD> ã<><C3A3><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld<EFBFBD><EFBFBD> <20>ٲ<EFBFBD><D9B2><EFBFBD>"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64><EFBFBD><EFBFBD> <20>ٲ<EFBFBD><D9B2><EFBFBD>"
 
 msgid " on 1 line"
 msgstr " <20><> <20>ٿ<EFBFBD><D9BF><EFBFBD>"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " %ld <20>ٿ<EFBFBD><D9BF><EFBFBD>"
+msgid " on %<PRId64> lines"
+msgstr " %<PRId64> <20>ٿ<EFBFBD><D9BF><EFBFBD>"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global<61><6C> <20><><EFBFBD><EFBFBD> ȣ<><C8A3> <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
@@ -1027,8 +1027,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: <20>߸<EFBFBD><DFB8><EFBFBD> <20><><EFBFBD><EFBFBD> <20≯<EFBFBD>: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: <20>߸<EFBFBD><DFB8><EFBFBD> sign ID: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: <20>߸<EFBFBD><DFB8><EFBFBD> sign ID: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (<28><> ã<><C3A3><EFBFBD><EFBFBD>)"
@@ -1043,16 +1043,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>·<EFBFBD> <20><><EFBFBD>.  <20><><EFBFBD><EFBFBD><EFBFBD>Ϸ<EFBFBD><CFB7><EFBFBD> \"cont\"<22><> <20>Է<EFBFBD><D4B7>Ͻʽÿ<CABD>."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "%ld <20><>: %s"
+msgid "line %<PRId64>: %s"
+msgstr "%<PRId64> <20><>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "<22><><EFBFBD><EFBFBD>: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: \"%s%s\" %ld <20><>"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: \"%s%s\" %<PRId64> <20><>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -1062,8 +1062,8 @@ msgid "No breakpoints defined"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>ǵǾ<C7B5> <20><><EFBFBD><EFBFBD> <20>ʽ<EFBFBD><CABD>ϴ<EFBFBD>"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  %ld <20><>"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  %<PRId64> <20><>"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: <20><><EFBFBD><EFBFBD> \":profile start {fname}\"<22><> <20><><EFBFBD><EFBFBD><EFBFBD>ϼ<EFBFBD><CFBC><EFBFBD>"
@@ -1119,16 +1119,16 @@ msgid "could not source \"%s\""
 msgstr "\"%s\"<22><>(<28><>) <20>ҷ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "%ld <20><>: \"%s\"<22><>(<28><>) <20>ҷ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "%<PRId64> <20><>: \"%s\"<22><>(<28><>) <20>ҷ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "\"%s\"<22><>(<28><>) <20>ҷ<EFBFBD><D2B7><EFBFBD><EFBFBD>̴<EFBFBD> <20><>"
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "%ld <20><>: \"%s\" <20>ҷ<EFBFBD><D2B7><EFBFBD><EFBFBD>̴<EFBFBD> <20><>"
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "%<PRId64> <20><>: \"%s\" <20>ҷ<EFBFBD><D2B7><EFBFBD><EFBFBD>̴<EFBFBD> <20><>"
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1217,8 +1217,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: <20><>ĥ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><> <20><> <20>ֽ<EFBFBD><D6BD>ϴ<EFBFBD>"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: <20><>ĥ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><> <20><> <20>ֽ<EFBFBD><D6BD>ϴ<EFBFBD>"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: <20><>ĥ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><> <20><> <20>ֽ<EFBFBD><D6BD>ϴ<EFBFBD>"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>̹<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>մϴ<D5B4>: <20>ٲٷ<D9B2><D9B7><EFBFBD> !<21><> <20><><EFBFBD>ϼ<EFBFBD><CFBC><EFBFBD>"
@@ -1408,8 +1408,8 @@ msgid "Exception discarded: %s"
 msgstr "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, %ld <20><>"
+msgid "%s, line %<PRId64>"
+msgstr "%s, %<PRId64> <20><>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1613,12 +1613,12 @@ msgid "[crypted]"
 msgstr "[<5B><>ȣȭ <20>Ǿ<EFBFBD><C7BE><EFBFBD><EFBFBD>ϴ<EFBFBD>]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[%ld <20>ٿ<EFBFBD><D9BF><EFBFBD> <20><>ȯ <20><><EFBFBD><EFBFBD>]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[%<PRId64> <20>ٿ<EFBFBD><D9BF><EFBFBD> <20><>ȯ <20><><EFBFBD><EFBFBD>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[%ld <20>ٿ<EFBFBD> <20>߸<EFBFBD><DFB8><EFBFBD> <20><><EFBFBD><EFBFBD>Ʈ]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[%<PRId64> <20>ٿ<EFBFBD> <20>߸<EFBFBD><DFB8><EFBFBD> <20><><EFBFBD><EFBFBD>Ʈ]"
 
 msgid "[READ ERRORS]"
 msgstr "[<5B>б<EFBFBD> <20><><EFBFBD><EFBFBD>]"
@@ -1700,9 +1700,9 @@ msgstr "E513:
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
 "override)"
-msgstr "E513: <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>, %ld <20>ٿ<EFBFBD><D9BF><EFBFBD> <20><>ȯ <20><><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD>Ϸ<EFBFBD><CFB7><EFBFBD> 'fenc'<27><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>)"
+msgstr "E513: <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>, %<PRId64> <20>ٿ<EFBFBD><D9BF><EFBFBD> <20><>ȯ <20><><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD>Ϸ<EFBFBD><CFB7><EFBFBD> 'fenc'<27><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>)"
 
 msgid "E514: write error (file system full?)"
 msgstr "E514: <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD> <20>ý<EFBFBD><C3BD><EFBFBD><EFBFBD><EFBFBD> <20><>á<EFBFBD><C3A1><EFBFBD><EFBFBD>?)"
@@ -1711,8 +1711,8 @@ msgid " CONVERSION ERROR"
 msgstr " <20><>ȯ <20><><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid " in line %ld;"
-msgstr "%ld <20>ٿ<EFBFBD><D9BF><EFBFBD>;"
+msgid " in line %<PRId64>;"
+msgstr "%<PRId64> <20>ٿ<EFBFBD><D9BF><EFBFBD>;"
 
 msgid "[Device]"
 msgstr "[<5B><>ġ]"
@@ -1773,8 +1773,8 @@ msgid "1 line, "
 msgstr "1 <20><>, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld <20><>, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> <20><>, "
 
 msgid "1 character"
 msgstr "1 <20><><EFBFBD><EFBFBD>"
@@ -1785,8 +1785,8 @@ msgstr "%<PRId64>
 
 #. Explicit typecast avoids warning on Mac OS X 10.6
 #, c-format
-msgid "%ld characters"
-msgstr "%ld <20><><EFBFBD><EFBFBD>"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> <20><><EFBFBD><EFBFBD>"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2194,19 +2194,19 @@ msgid "Font1: %s\n"
 msgstr "<22>۲<EFBFBD>1: %s\n"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "<22>۲<EFBFBD>%ld <20>ʺ<EFBFBD><CABA><EFBFBD> <20>۲<EFBFBD>0<EFBFBD><30> <20>ι谡 <20>ƴմϴ<D5B4>\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "<22>۲<EFBFBD>%<PRId64> <20>ʺ<EFBFBD><CABA><EFBFBD> <20>۲<EFBFBD>0<EFBFBD><30> <20>ι谡 <20>ƴմϴ<D5B4>\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "<22>۲<EFBFBD>0 <20>ʺ<EFBFBD>: %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "<22>۲<EFBFBD>0 <20>ʺ<EFBFBD>: %<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"<22>۲<EFBFBD>1 <20>ʺ<EFBFBD>: %ld\n"
+"<22>۲<EFBFBD>1 <20>ʺ<EFBFBD>: %<PRId64>\n"
 "\n"
 
 #~ msgid "Invalid font specification"
@@ -2383,8 +2383,8 @@ msgid "Added cscope database %s"
 msgstr "cscope <20><><EFBFBD><EFBFBD><EFBFBD>ͺ<EFBFBD><CDBA>̽<EFBFBD> %s<><73> <20><><EFBFBD>߽<EFBFBD><DFBD>ϴ<EFBFBD>."
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: cscope <20><><EFBFBD><EFBFBD> %ld <20>б<EFBFBD> <20><><EFBFBD><EFBFBD>"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: cscope <20><><EFBFBD><EFBFBD> %<PRId64> <20>б<EFBFBD> <20><><EFBFBD><EFBFBD>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: <20>𸣴<EFBFBD> cscope ã<><C3A3> <20><><EFBFBD><EFBFBD>"
@@ -3596,12 +3596,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>߽<EFBFBD><DFBD>ϴ<EFBFBD>"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: <20>߸<EFBFBD><DFB8><EFBFBD> lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: <20>߸<EFBFBD><DFB8><EFBFBD> lnum: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: %ld <20><><EFBFBD><EFBFBD> ã<><C3A3> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: %<PRId64> <20><><EFBFBD><EFBFBD> ã<><C3A3> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: <20>߸<EFBFBD><DFB8><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> id 3"
@@ -3619,8 +3619,8 @@ msgid "deleted block 1?"
 msgstr "<22><><EFBFBD><EFBFBD> 1<><31> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: %ld <20><><EFBFBD><EFBFBD> ã<><C3A3> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: %<PRId64> <20><><EFBFBD><EFBFBD> ã<><C3A3> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: <20>߸<EFBFBD><DFB8><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> id"
@@ -3629,12 +3629,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count<6E><74> 0<>Դϴ<D4B4>"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: <20><> <20><>ȣ<EFBFBD><C8A3> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EEB3B5><EFBFBD>ϴ<EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><>ŭ"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: <20><> <20><>ȣ<EFBFBD><C8A3> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EEB3B5><EFBFBD>ϴ<EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><>ŭ"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: <20><><EFBFBD><EFBFBD> %ld<EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ʋ<>Ƚ<EFBFBD><C8BD>ϴ<EFBFBD>"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: <20><><EFBFBD><EFBFBD> %<PRId64><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ʋ<>Ƚ<EFBFBD><C8BD>ϴ<EFBFBD>"
 
 msgid "Stack size increases"
 msgstr "<22><><EFBFBD><EFBFBD> ũ<><C5A9> <20><><EFBFBD><EFBFBD>"
@@ -3822,8 +3822,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>Ϸ<EFBFBD><CFB7><EFBFBD> <20><><EFBFBD><EFBFBD> Ȥ<><C8A4> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>Է<EFBFBD><D4B7>Ͻʽÿ<CABD>"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s <20><> %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s <20><> %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- <20><> --"
@@ -3892,12 +3892,12 @@ msgid "1 line less"
 msgstr "<22><> <20><> <20><><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><>"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><>"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><>"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><>"
 
 msgid " (Interrupted)"
 msgstr " (<28>ߴܵǾ<DCB5><C7BE><EFBFBD><EFBFBD>ϴ<EFBFBD>)"
@@ -3931,8 +3931,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: <20><><EFBFBD><EFBFBD> <20>ʹ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4004,8 +4004,8 @@ msgid "read from Netbeans socket"
 msgstr "Netbeans <20><><EFBFBD>Ͽ<EFBFBD><CFBF><EFBFBD> <20>б<EFBFBD>"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: <20><><EFBFBD><EFBFBD> %ld<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> NetBeans <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>Ҿ<EFBFBD><D2BE><EFBFBD><EFBFBD>Ƚ<EFBFBD><C8BD>ϴ<EFBFBD>"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: <20><><EFBFBD><EFBFBD> %<PRId64><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> NetBeans <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>Ҿ<EFBFBD><D2BE><EFBFBD><EFBFBD>Ƚ<EFBFBD><C8BD>ϴ<EFBFBD>"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: <20><> GUI<55><49> netbeans<6E><73> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ʽ<EFBFBD><CABD>ϴ<EFBFBD>"
@@ -4055,23 +4055,23 @@ msgid "1 line %sed %d times"
 msgstr "1 line %sed %d times"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld lines %sed 1 time"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> lines %sed 1 time"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld lines %sed %d times"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> lines %sed %d times"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld lines to indent... "
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> lines to indent... "
 
 msgid "1 line indented "
 msgstr "1 line indented "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld lines indented "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> lines indented "
 
 #~ msgid "E748: No previously used register"
 #~ msgstr ""
@@ -4084,12 +4084,12 @@ msgid "1 line changed"
 msgstr "1 line changed"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld lines changed"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> lines changed"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "freeing %ld lines"
+msgid "freeing %<PRId64> lines"
+msgstr "freeing %<PRId64> lines"
 
 msgid "block of 1 line yanked"
 msgstr "block of 1 line yanked"
@@ -4098,12 +4098,12 @@ msgid "1 line yanked"
 msgstr "1 line yanked"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "block of %ld lines yanked"
+msgid "block of %<PRId64> lines yanked"
+msgstr "block of %<PRId64> lines yanked"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld lines yanked"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> lines yanked"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4132,36 +4132,36 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: <20>𸣴<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld <20><>; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> <20><>; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Selected %s%ld of %ld <20><><EFBFBD><EFBFBD>; %ld of %ld <20>ܾ<EFBFBD>; %ld of %ld <20><><EFBFBD><EFBFBD>Ʈ"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Selected %s%<PRId64> of %<PRId64> <20><><EFBFBD><EFBFBD>; %<PRId64> of %<PRId64> <20>ܾ<EFBFBD>; %<PRId64> of %<PRId64> <20><><EFBFBD><EFBFBD>Ʈ"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
 msgstr ""
-"Selected %s%ld of %ld <20><><EFBFBD><EFBFBD>; %ld of %ld <20>ܾ<EFBFBD>; %ld of %ld <20><><EFBFBD><EFBFBD>; %ld of %ld <20><><EFBFBD><EFBFBD>"
+"Selected %s%<PRId64> of %<PRId64> <20><><EFBFBD><EFBFBD>; %<PRId64> of %<PRId64> <20>ܾ<EFBFBD>; %<PRId64> of %<PRId64> <20><><EFBFBD><EFBFBD>; %<PRId64> of %<PRId64> <20><><EFBFBD><EFBFBD>"
 "Ʈ"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Col %s of %s; <20><><EFBFBD><EFBFBD> %ld of %ld; <20>ܾ<EFBFBD> %ld of %ld; <20><><EFBFBD><EFBFBD>Ʈ %ld of %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Col %s of %s; <20><><EFBFBD><EFBFBD> %<PRId64> of %<PRId64>; <20>ܾ<EFBFBD> %<PRId64> of %<PRId64>; <20><><EFBFBD><EFBFBD>Ʈ %<PRId64> of %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"Col %s of %s; <20><><EFBFBD><EFBFBD> %ld of %ld; <20>ܾ<EFBFBD> %ld of %ld; <20><><EFBFBD><EFBFBD> %ld of %ld; <20><><EFBFBD><EFBFBD>Ʈ %ld "
-"of %ld"
+"Col %s of %s; <20><><EFBFBD><EFBFBD> %<PRId64> of %<PRId64>; <20>ܾ<EFBFBD> %<PRId64> of %<PRId64>; <20><><EFBFBD><EFBFBD> %<PRId64> of %<PRId64>; <20><><EFBFBD><EFBFBD>Ʈ %<PRId64> "
+"of %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> for BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=<3D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %N"
@@ -4340,8 +4340,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "<22>ƹ̰<C6B9><CCB0><EFBFBD><EFBFBD><EFBFBD> 2.04<EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>ʿ<EFBFBD><CABF>մϴ<D5B4>\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Need %s version %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Need %s version %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "NIL<49><4C> <20><> <20><> <20><><EFBFBD><EFBFBD>:\n"
@@ -4423,8 +4423,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "<22><>: <20><><EFBFBD><EFBFBD> <20>ñ׳<C3B1><D7B3><EFBFBD> <20><><EFBFBD>ҽ<EFBFBD><D2BD>ϴ<EFBFBD>\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "X <20><><EFBFBD><EFBFBD><EFBFBD>÷<EFBFBD><C3B7≯<EFBFBD> <20><><EFBFBD><EFBFBD> <20><> %ld msec<65><63> <20>ɷȽ<C9B7><C8BD>ϴ<EFBFBD>"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "X <20><><EFBFBD><EFBFBD><EFBFBD>÷<EFBFBD><C3B7≯<EFBFBD> <20><><EFBFBD><EFBFBD> <20><> %<PRId64> msec<65><63> <20>ɷȽ<C9B7><C8BD>ϴ<EFBFBD>"
 
 msgid ""
 "\n"
@@ -5117,8 +5117,8 @@ msgid "Performing soundfolding..."
 msgstr "soundfold <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "soundfold <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>ܾ<EFBFBD> <20><>: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "soundfold <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>ܾ<EFBFBD> <20><>: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -5153,8 +5153,8 @@ msgid "Done!"
 msgstr "<22><>!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile'<27><> %ld <20>׸<EFBFBD><D7B8><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile'<27><> %<PRId64> <20>׸<EFBFBD><D7B8><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
 
 #, c-format
 msgid "Word removed from %s"
@@ -5171,8 +5171,8 @@ msgid "Sorry, no suggestions"
 msgstr "<22>˼<EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "<22>˼<EFBFBD>, %ld<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "<22>˼<EFBFBD>, %<PRId64><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5472,8 +5472,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: <20>±<EFBFBD> <20><><EFBFBD><EFBFBD> \"%s\"<22><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ֽ<EFBFBD><D6BD>ϴ<EFBFBD>"
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "Before byte %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Before byte %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5620,8 +5620,8 @@ msgid "Already at newest change"
 msgstr "<22><> <20>̻<EFBFBD><CCBB><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
 
 #, c-format
-msgid "E830: Undo number %ld not found"
-msgstr "E830: Undo <20><>ȣ %ld<EFBFBD><EFBFBD> ã<><C3A3> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
+msgid "E830: Undo number %<PRId64> not found"
+msgstr "E830: Undo <20><>ȣ %<PRId64><EFBFBD><EFBFBD> ã<><C3A3> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: <20>߸<EFBFBD><DFB8><EFBFBD> <20><> <20><>ȣ"
@@ -5645,8 +5645,8 @@ msgid "changes"
 msgstr "changes"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "before"
@@ -5661,8 +5661,8 @@ msgstr "
 #~ msgstr ""
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld seconds ago"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> seconds ago"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undo <20>ڿ<EFBFBD> undojoin<69><6E> <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>"

src/po/nb.po

@@ -78,8 +78,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: Det finnes ingen listede buffere"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Bufferen %ld finnes ikke"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Bufferen %<PRId64> finnes ikke"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Kan ikke g<> forbi siste buffer"
@@ -88,9 +88,9 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: Kan ikke g<> forbi f<>rste buffer"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
 msgstr ""
-"E89: Ikke lagret siden forrige forandring av bufferen %ld (legg til ! for <20> "
+"E89: Ikke lagret siden forrige forandring av bufferen %<PRId64> (legg til ! for <20> "
 "overstyre)"
 
 msgid "E90: Cannot unload last buffer"
@@ -100,8 +100,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Advarsel: Listen med filnavn er overfylt"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Fant ikke bufferen %ld"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: Fant ikke bufferen %<PRId64>"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -112,8 +112,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Ingen samsvarende buffer for %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "linje %ld"
+msgid "line %<PRId64>"
+msgstr "linje %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: En buffer med dette navnet finnes allerede"
@@ -138,12 +138,12 @@ msgid "1 line --%d%%--"
 msgstr "1 linje --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld linjer --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> linjer --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "linje %ld av %ld --%d%%-- kol "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "linje %<PRId64> av %<PRId64> --%d%%-- kol "
 
 msgid "[No Name]"
 msgstr "[Uten navn]"
@@ -193,12 +193,12 @@ msgid "Signs for %s:"
 msgstr "Skilt for %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    linje=%ld  id=%d  navn=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    linje=%<PRId64>  id=%d  navn=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Kan ikke sammenligne flere enn %ld buffere"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Kan ikke sammenligne flere enn %<PRId64> buffere"
 
 msgid "E97: Cannot create diffs"
 msgstr "E97: Kan ikke lage differansefiler"
@@ -348,8 +348,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: Uventede tegn i :let"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: Listeindeks utenfor omr<6D>de: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: Listeindeks utenfor omr<6D>de: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -698,8 +698,8 @@ msgid "%s aborted"
 msgstr "%s avbrutt"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s returnerer #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s returnerer #%<PRId64>"
 
 #, c-format
 msgid "%s returning %s"
@@ -746,12 +746,12 @@ msgid "1 line moved"
 msgstr "1 linje flyttet"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld linjer flyttet"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> linjer flyttet"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld linjer filtrert"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> linjer filtrert"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filter* Autokommandoer m<> ikke forandre n<>v<EFBFBD>rende buffer"
@@ -834,8 +834,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Swapfilen finnes: %s (:silent! overstyrer)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: Mangler filnavn for buffer %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: Mangler filnavn for buffer %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: Filen ble ikke lagret: Lagring er deaktivert med 'write'-valget"
@@ -878,19 +878,19 @@ msgid "1 substitution"
 msgstr "1 erstatning"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld treff"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> treff"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld erstatninger"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> erstatninger"
 
 msgid " on 1 line"
 msgstr " i 1 linje"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " i %ld linjer"
+msgid " on %<PRId64> lines"
+msgstr " i %<PRId64> linjer"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: Kan ikke gj<67>re :global rekursiv"
@@ -973,8 +973,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Ugyldig buffernavn: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Ulovlig skilt-ID: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: Ulovlig skilt-ID: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (IKKE FUNNET)"
@@ -989,16 +989,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "G<>r inn i debuggingsmodus. Skriv \"cont\" for <20> fortsette."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "linje %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "linje %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "kommando: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Stoppunkt i \"%s%s\" linje %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Stoppunkt i \"%s%s\" linje %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -1008,8 +1008,8 @@ msgid "No breakpoints defined"
 msgstr "Ingen stoppunkt definert"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  linje %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  linje %<PRId64>"
 
 msgid "E750: First use :profile start <fname>"
 msgstr "E750: Bruk f<>rst :profile start <filnavn>"
@@ -1065,16 +1065,16 @@ msgid "could not source \"%s\""
 msgstr "kunne ikke kj<6B>re \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "linje %ld: Kunne ikke kj<6B>re \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "linje %<PRId64>: Kunne ikke kj<6B>re \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "kj<6B>rer \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "linje %ld: kj<6B>rer \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "linje %<PRId64>: kj<6B>rer \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1166,8 +1166,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: 1 annen fil <20> redigere"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: %ld andre filer <20> redigere"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: %<PRId64> andre filer <20> redigere"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: Kommandoen finnes allerede: Legg til ! for <20> erstatte den"
@@ -1355,8 +1355,8 @@ msgid "Exception discarded: %s"
 msgstr "Unntak forkastet: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, linje %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, linje %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1554,12 +1554,12 @@ msgid "[crypted]"
 msgstr "[kryptert]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[KONVERTERINGSFEIL i linje %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[KONVERTERINGSFEIL i linje %<PRId64>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[ULOVLIG BYTE i linje %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[ULOVLIG BYTE i linje %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[LESEFEIL]"
@@ -1703,15 +1703,15 @@ msgid "1 line, "
 msgstr "1 linje, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld linjer, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> linjer, "
 
 msgid "1 character"
 msgstr "1 tegn"
 
 #, c-format
-msgid "%ld characters"
-msgstr "%ld tegn"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> tegn"
 
 msgid "[noeol]"
 msgstr "[ingenlinjeslutt]"
@@ -2128,19 +2128,19 @@ msgid "Font1: %s\n"
 msgstr "Font1: %s\n"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "Font%ld-bredde er ikke to ganger bredden av font0\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "Font%<PRId64>-bredde er ikke to ganger bredden av font0\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "Font0-bredde: %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "Font0-bredde: %<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"Font1-bredde: %ld\n"
+"Font1-bredde: %<PRId64>\n"
 "\n"
 
 msgid "Invalid font specification"
@@ -2317,8 +2317,8 @@ msgid "Added cscope database %s"
 msgstr "La til cscope-database %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: Feil under lesing av cscope-forbindelse %ld"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: Feil under lesing av cscope-forbindelse %<PRId64>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: Ukjent cscope-s<>ketype"
@@ -3508,12 +3508,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: Bevaring feilet"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: Ugyldig lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: Ugyldig lnum: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: Kan ikke finne linje %ld"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: Kan ikke finne linje %<PRId64>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: Pekerblokk-id feil 3"
@@ -3531,8 +3531,8 @@ msgid "deleted block 1?"
 msgstr "slettet blokk 1?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Kan ikke finne linje %ld"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Kan ikke finne linje %<PRId64>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: Pekerblokk-id feil"
@@ -3541,12 +3541,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count er null"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: Linjenummer utenfor omr<6D>de: %ld forbi slutten"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: Linjenummer utenfor omr<6D>de: %<PRId64> forbi slutten"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: Linjeantall feil i blokk %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: Linjeantall feil i blokk %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "Stackst<73>rrelse <20>ker"
@@ -3735,8 +3735,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Trykk ENTER eller skriv kommando for <20> fortsette"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s linje %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s linje %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- Mer --"
@@ -3802,12 +3802,12 @@ msgid "1 line less"
 msgstr "1 linje fjernet"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld linjer lagt til"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> linjer lagt til"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld linjer fjernet"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> linjer fjernet"
 
 msgid " (Interrupted)"
 msgstr " (Avbrutt)"
@@ -3846,8 +3846,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: Linjen blir for lang"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Intern feil: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Intern feil: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -3921,8 +3921,8 @@ msgid "read from Netbeans socket"
 msgstr "les fra Netbeans-socket"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: Mistet NetBeans-forbindelse for buffer %ld"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: Mistet NetBeans-forbindelse for buffer %<PRId64>"
 
 msgid "E505: "
 msgstr "E505: "
@@ -3966,23 +3966,23 @@ msgid "1 line %sed %d times"
 msgstr "1 linje \"%s\"-et %d ganger"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld linjer \"%s\"-et 1 gang"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> linjer \"%s\"-et 1 gang"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld linjer \"%s\"-et %d ganger"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> linjer \"%s\"-et %d ganger"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld linjer <20> rykke inn<6E>... "
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> linjer <20> rykke inn<6E>... "
 
 msgid "1 line indented "
 msgstr "1 linje rykket inn "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld linjer rykket inn "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> linjer rykket inn "
 
 msgid "E748: No previously used register"
 msgstr "E748: Register ikke tidligere brukt"
@@ -3995,12 +3995,12 @@ msgid "1 line changed"
 msgstr "1 linje forandret"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld linjer forandret"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> linjer forandret"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "frigj<67>r %ld linjer"
+msgid "freeing %<PRId64> lines"
+msgstr "frigj<67>r %<PRId64> linjer"
 
 msgid "block of 1 line yanked"
 msgstr "blokk med 1 linje kopiert til utklippstavlen"
@@ -4009,12 +4009,12 @@ msgid "1 line yanked"
 msgstr "1 linje kopiert til utklippstavlen"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "blokk med %ld linjer kopiert til utklippstavlen"
+msgid "block of %<PRId64> lines yanked"
+msgstr "blokk med %<PRId64> linjer kopiert til utklippstavlen"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld linjer kopiert til utklippstavlen"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> linjer kopiert til utklippstavlen"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4044,35 +4044,35 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: Ukjent registertype %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld Kol; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> Kol; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Valgte %s%ld av %ld linjer; %ld av %ld ord; %ld av %ld bytes"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Valgte %s%<PRId64> av %<PRId64> linjer; %<PRId64> av %<PRId64> ord; %<PRId64> av %<PRId64> bytes"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
 msgstr ""
-"Valgte %s%ld av %ld linjer; %ld av %ld ord; %ld av %ld tegn; %ld av %ld bytes"
+"Valgte %s%<PRId64> av %<PRId64> linjer; %<PRId64> av %<PRId64> ord; %<PRId64> av %<PRId64> tegn; %<PRId64> av %<PRId64> bytes"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Kol %s av %s; Linje %ld av %ld; Ord %ld av %ld; Byte %ld av %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Kol %s av %s; Linje %<PRId64> av %<PRId64>; Ord %<PRId64> av %<PRId64>; Byte %<PRId64> av %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"Kol %s av %s; linje %ld av %ld; ord %ld av %ld; tegn %ld av %ld; byte %ld av "
-"%ld"
+"Kol %s av %s; linje %<PRId64> av %<PRId64>; ord %<PRId64> av %<PRId64>; tegn %<PRId64> av %<PRId64>; byte %<PRId64> av "
+"%<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> for BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Side %N"
@@ -4238,8 +4238,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Trenger Amigados versjon 2.04 eller nyere\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Trenger %s versjon %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Trenger %s versjon %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Kan ikke <20>pne NIL:\n"
@@ -4321,8 +4321,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Mottok d<>delig signal\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "<22>pning av X-display tok %ld millisekunder"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "<22>pning av X-display tok %<PRId64> millisekunder"
 
 msgid ""
 "\n"
@@ -4979,7 +4979,7 @@ msgstr "Pakket %d av %d noder; %d (%d%%) igjen"
 #~ msgstr ""
 
 #, c-format
-#~ msgid "Number of words after soundfolding: %ld"
+#~ msgid "Number of words after soundfolding: %<PRId64>"
 #~ msgstr ""
 
 #, c-format
@@ -5015,8 +5015,8 @@ msgid "Done!"
 msgstr "Ferdig!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' har ikke %ld poster"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' har ikke %<PRId64> poster"
 
 #, c-format
 msgid "Word removed from %s"
@@ -5033,8 +5033,8 @@ msgid "Sorry, no suggestions"
 msgstr "Dessverre, ingen forslag"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Dessverre bare %ld forslag"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "Dessverre bare %<PRId64> forslag"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5335,8 +5335,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Formatfeil i tagfil \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "F<>r byte %ld"
+msgid "Before byte %<PRId64>"
+msgstr "F<>r byte %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5399,8 +5399,8 @@ msgid "Already at newest change"
 msgstr "Allerede ved nyeste forandring"
 
 #, c-format
-msgid "Undo number %ld not found"
-msgstr "Angrenummer %ld ikke funnet"
+msgid "Undo number %<PRId64> not found"
+msgstr "Angrenummer %<PRId64> ikke funnet"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: Gale linjenummer"
@@ -5424,8 +5424,8 @@ msgid "changes"
 msgstr "forandringer"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "f<>r"
@@ -5440,8 +5440,8 @@ msgid "number changes  time"
 msgstr "nummer forandringer tidspunkt"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld sekunder siden"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> sekunder siden"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin er ikke tillatt etter undo"

src/po/nl.po

@@ -77,8 +77,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: er is geen vermelde buffer"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Buffer %ld bestaat niet"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Buffer %<PRId64> bestaat niet"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: kan niet voorbij het laatste buffer komen"
@@ -87,8 +87,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: kan niet vóór het eerste buffer komen"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: niets opgeslagen sinds laatste wijziging van buffer %ld (voeg ! toe om te forceren)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: niets opgeslagen sinds laatste wijziging van buffer %<PRId64> (voeg ! toe om te forceren)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: kan laatste buffer niet legen"
@@ -97,8 +97,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: waarschuwing: lijst met bestandsnamen is vol"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: buffer %ld niet gevonden"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: buffer %<PRId64> niet gevonden"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -109,8 +109,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: geen overeenkomstig buffer voor %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "regel %ld"
+msgid "line %<PRId64>"
+msgstr "regel %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: buffer met deze naam bestaat al"
@@ -135,12 +135,12 @@ msgid "1 line --%d%%--"
 msgstr "1 regel --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld regels --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> regels --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "regel %ld van %ld --%d%%-- kol "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "regel %<PRId64> van %<PRId64> --%d%%-- kol "
 
 msgid "[No Name]"
 msgstr "[Geen naam]"
@@ -193,12 +193,12 @@ msgid "Signs for %s:"
 msgstr "Tekens voor %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    regel=%ld  id=%d  naam=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    regel=%<PRId64>  id=%d  naam=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: kan niet meer dan %ld buffers vergelijken"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: kan niet meer dan %<PRId64> buffers vergelijken"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: kan tijdelijke bestand niet lezen of opslaan"
@@ -350,8 +350,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: onverwachte tekens in :let"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: lijstindex buiten bereik: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: lijstindex buiten bereik: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -732,8 +732,8 @@ msgid "%s aborted"
 msgstr "%s afgebroken"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s komt terug met de waarde #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s komt terug met de waarde #%<PRId64>"
 
 #, c-format
 msgid "%s returning %s"
@@ -782,12 +782,12 @@ msgid "1 line moved"
 msgstr "1 regel verplaatst"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld regels verplaatst"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> regels verplaatst"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld regels gefilterd"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> regels gefilterd"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filter* Autocommands mogen huidige buffer niet wijzigen"
@@ -873,8 +873,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: wisselbestand bestaat: %s (:silent! overschrijft)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: buffer %ld heeft geen bestandsnaam"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: buffer %<PRId64> heeft geen bestandsnaam"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: bestand is niet opgeslagen: opslaan is uitgeschakeld door 'write'-optie"
@@ -931,19 +931,19 @@ msgid "1 substitution"
 msgstr "1 vervanging"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld overeenkomsten"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> overeenkomsten"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld vervangingen"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> vervangingen"
 
 msgid " on 1 line"
 msgstr " op 1 regel"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " op %ld regels"
+msgid " on %<PRId64> lines"
+msgstr " op %<PRId64> regels"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: kan :global niet recursief uitvoeren"
@@ -1026,8 +1026,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: ongeldige buffernaam: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: ongeldige id margeteken: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: ongeldige id margeteken: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (NIET GEVONDEN)"
@@ -1042,16 +1042,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Debug-modus gestart.  Typ \"cont\" om verder te gaan."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "regel %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "regel %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "cmd: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "'Breakpoint' in \"%s%s\" regel %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "'Breakpoint' in \"%s%s\" regel %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -1061,8 +1061,8 @@ msgid "No breakpoints defined"
 msgstr "Geen 'breakpoints' opgegeven"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  regel %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  regel %<PRId64>"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: gebruik eerst \":profile start {fname}\""
@@ -1118,16 +1118,16 @@ msgid "could not source \"%s\""
 msgstr "kan \"%s\" niet laden"
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "regel %ld: kan \"%s\" niet laden"
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "regel %<PRId64>: kan \"%s\" niet laden"
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "\"%s\" laden"
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "regel %ld: \"%s\" laden"
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "regel %<PRId64>: \"%s\" laden"
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1216,8 +1216,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: 1 bestand wacht op bewerking"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: %ld bestanden wachten op bewerking"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: %<PRId64> bestanden wachten op bewerking"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: opdracht bestaat al: voeg ! toe om het te vervangen"
@@ -1401,8 +1401,8 @@ msgid "Exception discarded: %s"
 msgstr "Afgedankte uitzondering: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, regel %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, regel %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1606,12 +1606,12 @@ msgid "[crypted]"
 msgstr "[versleuteld]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[OMZETFOUT in regel %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[OMZETFOUT in regel %<PRId64>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[ONGELDIGE BYTE in regel %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[ONGELDIGE BYTE in regel %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[LEESFOUTEN]"
@@ -1692,8 +1692,8 @@ msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
 msgstr "E513: schrijffout waarbij omzetting is mislukt (leeg 'fenc' om te overschrijven)"
 
 #, c-format
-msgid "E513: write error, conversion failed in line %ld (make 'fenc' empty to override)"
-msgstr "E513: schrijffout waarbij omzetting in regel %ld is mislukt (leeg 'fenc' om te overschrijven)"
+msgid "E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to override)"
+msgstr "E513: schrijffout waarbij omzetting in regel %<PRId64> is mislukt (leeg 'fenc' om te overschrijven)"
 
 msgid "E514: write error (file system full?)"
 msgstr "E514: schrijffout (is bestandssysteem vol?)"
@@ -1702,8 +1702,8 @@ msgid " CONVERSION ERROR"
 msgstr " OMZETTINGFOUT"
 
 #, c-format
-msgid " in line %ld;"
-msgstr " in regel %ld;"
+msgid " in line %<PRId64>;"
+msgstr " in regel %<PRId64>;"
 
 msgid "[Device]"
 msgstr "[Apparaat]"
@@ -1764,8 +1764,8 @@ msgid "1 line, "
 msgstr "1 regel, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld regels, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> regels, "
 
 msgid "1 character"
 msgstr "1 teken"
@@ -1775,8 +1775,8 @@ msgid "%<PRId64> characters"
 msgstr "%<PRId64> tekens"
 
 #, c-format
-msgid "%ld characters"
-msgstr "%ld tekens"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> tekens"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2198,19 +2198,19 @@ msgid "Font1: %s\n"
 msgstr "Font1: %s\n"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "Breedte font%ld is niet het dubbele van font0\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "Breedte font%<PRId64> is niet het dubbele van font0\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "Font0-breedte: %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "Font0-breedte: %<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"Font1-breedte: %ld\n"
+"Font1-breedte: %<PRId64>\n"
 "\n"
 
 msgid "Invalid font specification"
@@ -2387,8 +2387,8 @@ msgid "Added cscope database %s"
 msgstr "cscope-databank %s toegevoegd"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: lezen van cscope-verbinding %ld is mislukt"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: lezen van cscope-verbinding %<PRId64> is mislukt"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: soort cscope-zoekopdracht is onbekend"
@@ -3342,8 +3342,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Toets ENTER of typ een opdracht om verder te gaan"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s regel %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s regel %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- meer --"
@@ -3405,12 +3405,12 @@ msgid "1 line less"
 msgstr "1 regel minder"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld regels meer"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> regels meer"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld regels minder"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> regels minder"
 
 msgid " (Interrupted)"
 msgstr " (onderbroken)"
@@ -3445,7 +3445,7 @@ msgstr "biep!"
 #~ msgstr ""
 
 #, c-format
-#~ msgid "E341: Internal error: lalloc(%ld, )"
+#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
 #~ msgstr ""
 
 #, c-format
@@ -3514,7 +3514,7 @@ msgstr "biep!"
 #~ msgstr ""
 
 #, c-format
-#~ msgid "E658: NetBeans connection lost for buffer %ld"
+#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
 #~ msgstr ""
 
 #~ msgid "E511: netbeans already connected"
@@ -3562,23 +3562,23 @@ msgid "1 line %sed %d times"
 msgstr "1 regel %sed %d maal"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld regels %sed 1 maal"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> regels %sed 1 maal"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld regels %sed %d maal"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> regels %sed %d maal"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld in te springen regels... "
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> in te springen regels... "
 
 msgid "1 line indented "
 msgstr "1 regel ingesprongen "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld regels ingesprongen "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> regels ingesprongen "
 
 #~ msgid "E748: No previously used register"
 #~ msgstr ""
@@ -3591,11 +3591,11 @@ msgid "1 line changed"
 msgstr "1 regel gewijzigd"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld regels gewijzigd"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> regels gewijzigd"
 
 #, c-format
-#~ msgid "freeing %ld lines"
+#~ msgid "freeing %<PRId64> lines"
 #~ msgstr ""
 
 msgid "block of 1 line yanked"
@@ -3605,12 +3605,12 @@ msgid "1 line yanked"
 msgstr "1 regel gekopieerd"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "blok van %ld regels gekopieerd"
+msgid "block of %<PRId64> lines yanked"
+msgstr "blok van %<PRId64> regels gekopieerd"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld regels gekopieerd"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> regels gekopieerd"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3640,28 +3640,28 @@ msgstr ""
 #~ msgstr ""
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld koln; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> koln; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "geselecteerd %s%ld van %ld regels; %ld van %ld woorden; %ld van %ld bytes"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "geselecteerd %s%<PRId64> van %<PRId64> regels; %<PRId64> van %<PRId64> woorden; %<PRId64> van %<PRId64> bytes"
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld Bytes"
-msgstr "geselecteerd %s%ld van %ld regels; %ld van %ld woorden; %ld van %ld rekens; %ld van %ld bytes"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
+msgstr "geselecteerd %s%<PRId64> van %<PRId64> regels; %<PRId64> van %<PRId64> woorden; %<PRId64> van %<PRId64> rekens; %<PRId64> van %<PRId64> bytes"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "kol %s van %s; regel %ld van %ld; woord %ld van %ld; byte %ld van %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "kol %s van %s; regel %<PRId64> van %<PRId64>; woord %<PRId64> van %<PRId64>; byte %<PRId64> van %<PRId64>"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of %ld"
-msgstr "kol %s van %s; regel %ld van %ld; woord %ld van %ld; teken %ld van %ld; byte %ld van %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "kol %s van %s; regel %<PRId64> van %<PRId64>; woord %<PRId64> van %<PRId64>; teken %<PRId64> van %<PRId64>; byte %<PRId64> van %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld voor BOD)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> voor BOD)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=pagina %N"
@@ -3834,8 +3834,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Vereist Amigados versie 2.04 of nieuwer\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Vereist %s versie %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Vereist %s versie %<PRId64>\n"
 
 #~ msgid "Cannot open NIL:\n"
 #~ msgstr ""
@@ -3920,8 +3920,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: fataal signaal gevangen\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "Openen van X-display vereiste %ld ms"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "Openen van X-display vereiste %<PRId64> ms"
 
 #~ msgid ""
 #~ "\n"
@@ -4571,7 +4571,7 @@ msgstr ""
 #~ msgstr ""
 
 #, c-format
-#~ msgid "Number of words after soundfolding: %ld"
+#~ msgid "Number of words after soundfolding: %<PRId64>"
 #~ msgstr ""
 
 #, c-format
@@ -4607,7 +4607,7 @@ msgstr ""
 #~ msgstr ""
 
 #, c-format
-#~ msgid "E765: 'spellfile' does not have %ld entries"
+#~ msgid "E765: 'spellfile' does not have %<PRId64> entries"
 #~ msgstr ""
 
 #, c-format
@@ -4625,7 +4625,7 @@ msgstr ""
 #~ msgstr ""
 
 #, c-format
-#~ msgid "Sorry, only %ld suggestions"
+#~ msgid "Sorry, only %<PRId64> suggestions"
 #~ msgstr ""
 
 #. for when 'cmdheight' > 1
@@ -4918,7 +4918,7 @@ msgstr "E426: tag niet gevonden: %s"
 #~ msgstr ""
 
 #, c-format
-#~ msgid "Before byte %ld"
+#~ msgid "Before byte %<PRId64>"
 #~ msgstr ""
 
 #, c-format
@@ -5061,8 +5061,8 @@ msgid "Already at newest change"
 msgstr "Reeds de nieuwste wijziging"
 
 #, c-format
-msgid "E830: Undo number %ld not found"
-msgstr "E830: Ongedaan-nummer %ld niet gevonden"
+msgid "E830: Undo number %<PRId64> not found"
+msgstr "E830: Ongedaan-nummer %<PRId64> niet gevonden"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: regelnummers onjuist"
@@ -5086,8 +5086,8 @@ msgid "changes"
 msgstr "wijzigingen"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "voor"
@@ -5102,8 +5102,8 @@ msgid "number changes  time"
 msgstr "aantal wijzign  tijd"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld seconden geleden"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> seconden geleden"
 
 #~ msgid "E790: undojoin is not allowed after undo"
 #~ msgstr ""

src/po/no.po

@@ -78,8 +78,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: Det finnes ingen listede buffere"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Bufferen %ld finnes ikke"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Bufferen %<PRId64> finnes ikke"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Kan ikke g<> forbi siste buffer"
@@ -88,9 +88,9 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: Kan ikke g<> forbi f<>rste buffer"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
 msgstr ""
-"E89: Ikke lagret siden forrige forandring av bufferen %ld (legg til ! for <20> "
+"E89: Ikke lagret siden forrige forandring av bufferen %<PRId64> (legg til ! for <20> "
 "overstyre)"
 
 msgid "E90: Cannot unload last buffer"
@@ -100,8 +100,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Advarsel: Listen med filnavn er overfylt"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Fant ikke bufferen %ld"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: Fant ikke bufferen %<PRId64>"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -112,8 +112,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Ingen samsvarende buffer for %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "linje %ld"
+msgid "line %<PRId64>"
+msgstr "linje %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: En buffer med dette navnet finnes allerede"
@@ -138,12 +138,12 @@ msgid "1 line --%d%%--"
 msgstr "1 linje --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld linjer --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> linjer --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "linje %ld av %ld --%d%%-- kol "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "linje %<PRId64> av %<PRId64> --%d%%-- kol "
 
 msgid "[No Name]"
 msgstr "[Uten navn]"
@@ -193,12 +193,12 @@ msgid "Signs for %s:"
 msgstr "Skilt for %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    linje=%ld  id=%d  navn=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    linje=%<PRId64>  id=%d  navn=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Kan ikke sammenligne flere enn %ld buffere"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Kan ikke sammenligne flere enn %<PRId64> buffere"
 
 msgid "E97: Cannot create diffs"
 msgstr "E97: Kan ikke lage differansefiler"
@@ -348,8 +348,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: Uventede tegn i :let"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: Listeindeks utenfor omr<6D>de: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: Listeindeks utenfor omr<6D>de: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -698,8 +698,8 @@ msgid "%s aborted"
 msgstr "%s avbrutt"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s returnerer #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s returnerer #%<PRId64>"
 
 #, c-format
 msgid "%s returning %s"
@@ -746,12 +746,12 @@ msgid "1 line moved"
 msgstr "1 linje flyttet"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld linjer flyttet"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> linjer flyttet"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld linjer filtrert"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> linjer filtrert"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filter* Autokommandoer m<> ikke forandre n<>v<EFBFBD>rende buffer"
@@ -834,8 +834,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Swapfilen finnes: %s (:silent! overstyrer)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: Mangler filnavn for buffer %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: Mangler filnavn for buffer %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: Filen ble ikke lagret: Lagring er deaktivert med 'write'-valget"
@@ -878,19 +878,19 @@ msgid "1 substitution"
 msgstr "1 erstatning"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld treff"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> treff"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld erstatninger"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> erstatninger"
 
 msgid " on 1 line"
 msgstr " i 1 linje"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " i %ld linjer"
+msgid " on %<PRId64> lines"
+msgstr " i %<PRId64> linjer"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: Kan ikke gj<67>re :global rekursiv"
@@ -973,8 +973,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Ugyldig buffernavn: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Ulovlig skilt-ID: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: Ulovlig skilt-ID: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (IKKE FUNNET)"
@@ -989,16 +989,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "G<>r inn i debuggingsmodus. Skriv \"cont\" for <20> fortsette."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "linje %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "linje %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "kommando: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Stoppunkt i \"%s%s\" linje %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Stoppunkt i \"%s%s\" linje %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -1008,8 +1008,8 @@ msgid "No breakpoints defined"
 msgstr "Ingen stoppunkt definert"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  linje %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  linje %<PRId64>"
 
 msgid "E750: First use :profile start <fname>"
 msgstr "E750: Bruk f<>rst :profile start <filnavn>"
@@ -1065,16 +1065,16 @@ msgid "could not source \"%s\""
 msgstr "kunne ikke kj<6B>re \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "linje %ld: Kunne ikke kj<6B>re \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "linje %<PRId64>: Kunne ikke kj<6B>re \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "kj<6B>rer \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "linje %ld: kj<6B>rer \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "linje %<PRId64>: kj<6B>rer \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1166,8 +1166,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: 1 annen fil <20> redigere"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: %ld andre filer <20> redigere"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: %<PRId64> andre filer <20> redigere"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: Kommandoen finnes allerede: Legg til ! for <20> erstatte den"
@@ -1355,8 +1355,8 @@ msgid "Exception discarded: %s"
 msgstr "Unntak forkastet: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, linje %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, linje %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1554,12 +1554,12 @@ msgid "[crypted]"
 msgstr "[kryptert]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[KONVERTERINGSFEIL i linje %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[KONVERTERINGSFEIL i linje %<PRId64>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[ULOVLIG BYTE i linje %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[ULOVLIG BYTE i linje %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[LESEFEIL]"
@@ -1703,15 +1703,15 @@ msgid "1 line, "
 msgstr "1 linje, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld linjer, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> linjer, "
 
 msgid "1 character"
 msgstr "1 tegn"
 
 #, c-format
-msgid "%ld characters"
-msgstr "%ld tegn"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> tegn"
 
 msgid "[noeol]"
 msgstr "[ingenlinjeslutt]"
@@ -2128,19 +2128,19 @@ msgid "Font1: %s\n"
 msgstr "Font1: %s\n"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "Font%ld-bredde er ikke to ganger bredden av font0\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "Font%<PRId64>-bredde er ikke to ganger bredden av font0\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "Font0-bredde: %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "Font0-bredde: %<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"Font1-bredde: %ld\n"
+"Font1-bredde: %<PRId64>\n"
 "\n"
 
 msgid "Invalid font specification"
@@ -2317,8 +2317,8 @@ msgid "Added cscope database %s"
 msgstr "La til cscope-database %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: Feil under lesing av cscope-forbindelse %ld"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: Feil under lesing av cscope-forbindelse %<PRId64>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: Ukjent cscope-s<>ketype"
@@ -3508,12 +3508,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: Bevaring feilet"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: Ugyldig lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: Ugyldig lnum: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: Kan ikke finne linje %ld"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: Kan ikke finne linje %<PRId64>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: Pekerblokk-id feil 3"
@@ -3531,8 +3531,8 @@ msgid "deleted block 1?"
 msgstr "slettet blokk 1?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Kan ikke finne linje %ld"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Kan ikke finne linje %<PRId64>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: Pekerblokk-id feil"
@@ -3541,12 +3541,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count er null"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: Linjenummer utenfor omr<6D>de: %ld forbi slutten"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: Linjenummer utenfor omr<6D>de: %<PRId64> forbi slutten"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: Linjeantall feil i blokk %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: Linjeantall feil i blokk %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "Stackst<73>rrelse <20>ker"
@@ -3735,8 +3735,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Trykk ENTER eller skriv kommando for <20> fortsette"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s linje %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s linje %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- Mer --"
@@ -3802,12 +3802,12 @@ msgid "1 line less"
 msgstr "1 linje fjernet"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld linjer lagt til"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> linjer lagt til"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld linjer fjernet"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> linjer fjernet"
 
 msgid " (Interrupted)"
 msgstr " (Avbrutt)"
@@ -3846,8 +3846,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: Linjen blir for lang"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Intern feil: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Intern feil: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -3921,8 +3921,8 @@ msgid "read from Netbeans socket"
 msgstr "les fra Netbeans-socket"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: Mistet NetBeans-forbindelse for buffer %ld"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: Mistet NetBeans-forbindelse for buffer %<PRId64>"
 
 msgid "E505: "
 msgstr "E505: "
@@ -3966,23 +3966,23 @@ msgid "1 line %sed %d times"
 msgstr "1 linje \"%s\"-et %d ganger"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld linjer \"%s\"-et 1 gang"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> linjer \"%s\"-et 1 gang"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld linjer \"%s\"-et %d ganger"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> linjer \"%s\"-et %d ganger"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld linjer <20> rykke inn<6E>... "
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> linjer <20> rykke inn<6E>... "
 
 msgid "1 line indented "
 msgstr "1 linje rykket inn "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld linjer rykket inn "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> linjer rykket inn "
 
 msgid "E748: No previously used register"
 msgstr "E748: Register ikke tidligere brukt"
@@ -3995,12 +3995,12 @@ msgid "1 line changed"
 msgstr "1 linje forandret"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld linjer forandret"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> linjer forandret"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "frigj<67>r %ld linjer"
+msgid "freeing %<PRId64> lines"
+msgstr "frigj<67>r %<PRId64> linjer"
 
 msgid "block of 1 line yanked"
 msgstr "blokk med 1 linje kopiert til utklippstavlen"
@@ -4009,12 +4009,12 @@ msgid "1 line yanked"
 msgstr "1 linje kopiert til utklippstavlen"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "blokk med %ld linjer kopiert til utklippstavlen"
+msgid "block of %<PRId64> lines yanked"
+msgstr "blokk med %<PRId64> linjer kopiert til utklippstavlen"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld linjer kopiert til utklippstavlen"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> linjer kopiert til utklippstavlen"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4044,35 +4044,35 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: Ukjent registertype %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld Kol; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> Kol; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Valgte %s%ld av %ld linjer; %ld av %ld ord; %ld av %ld bytes"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Valgte %s%<PRId64> av %<PRId64> linjer; %<PRId64> av %<PRId64> ord; %<PRId64> av %<PRId64> bytes"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
 msgstr ""
-"Valgte %s%ld av %ld linjer; %ld av %ld ord; %ld av %ld tegn; %ld av %ld bytes"
+"Valgte %s%<PRId64> av %<PRId64> linjer; %<PRId64> av %<PRId64> ord; %<PRId64> av %<PRId64> tegn; %<PRId64> av %<PRId64> bytes"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Kol %s av %s; Linje %ld av %ld; Ord %ld av %ld; Byte %ld av %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Kol %s av %s; Linje %<PRId64> av %<PRId64>; Ord %<PRId64> av %<PRId64>; Byte %<PRId64> av %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"Kol %s av %s; linje %ld av %ld; ord %ld av %ld; tegn %ld av %ld; byte %ld av "
-"%ld"
+"Kol %s av %s; linje %<PRId64> av %<PRId64>; ord %<PRId64> av %<PRId64>; tegn %<PRId64> av %<PRId64>; byte %<PRId64> av "
+"%<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> for BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Side %N"
@@ -4238,8 +4238,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Trenger Amigados versjon 2.04 eller nyere\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Trenger %s versjon %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Trenger %s versjon %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Kan ikke <20>pne NIL:\n"
@@ -4321,8 +4321,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Mottok d<>delig signal\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "<22>pning av X-display tok %ld millisekunder"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "<22>pning av X-display tok %<PRId64> millisekunder"
 
 msgid ""
 "\n"
@@ -4979,7 +4979,7 @@ msgstr "Pakket %d av %d noder; %d (%d%%) igjen"
 #~ msgstr ""
 
 #, c-format
-#~ msgid "Number of words after soundfolding: %ld"
+#~ msgid "Number of words after soundfolding: %<PRId64>"
 #~ msgstr ""
 
 #, c-format
@@ -5015,8 +5015,8 @@ msgid "Done!"
 msgstr "Ferdig!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' har ikke %ld poster"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' har ikke %<PRId64> poster"
 
 #, c-format
 msgid "Word removed from %s"
@@ -5033,8 +5033,8 @@ msgid "Sorry, no suggestions"
 msgstr "Dessverre, ingen forslag"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Dessverre bare %ld forslag"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "Dessverre bare %<PRId64> forslag"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5335,8 +5335,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Formatfeil i tagfil \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "F<>r byte %ld"
+msgid "Before byte %<PRId64>"
+msgstr "F<>r byte %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5399,8 +5399,8 @@ msgid "Already at newest change"
 msgstr "Allerede ved nyeste forandring"
 
 #, c-format
-msgid "Undo number %ld not found"
-msgstr "Angrenummer %ld ikke funnet"
+msgid "Undo number %<PRId64> not found"
+msgstr "Angrenummer %<PRId64> ikke funnet"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: Gale linjenummer"
@@ -5424,8 +5424,8 @@ msgid "changes"
 msgstr "forandringer"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "f<>r"
@@ -5440,8 +5440,8 @@ msgid "number changes  time"
 msgstr "nummer forandringer tidspunkt"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld sekunder siden"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> sekunder siden"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin er ikke tillatt etter undo"

src/po/pl.UTF-8.po

@@ -88,8 +88,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: Nie ma wylistowanych buforów"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Bufor \"%ld\" nie istnieje"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Bufor \"%<PRId64>\" nie istnieje"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Nie mogę przejść poza ostatni bufor"
@@ -98,8 +98,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: Nie mogę przejść przed pierwszy bufor"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: Nie zapisano zmian w buforze %ld (wymuś przez !)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: Nie zapisano zmian w buforze %<PRId64> (wymuś przez !)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Nie mogę wyładować ostatniego bufora"
@@ -108,8 +108,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: OSTRZEŻENIE: Przepełnienie listy nazw plików"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Nie znaleziono bufora %ld"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: Nie znaleziono bufora %<PRId64>"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -120,8 +120,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Żaden bufor nie pasuje do %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "wiersz %ld"
+msgid "line %<PRId64>"
+msgstr "wiersz %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Bufor o tej nazwie już istnieje"
@@ -149,12 +149,12 @@ msgid "1 line --%d%%--"
 msgstr "1 wiersz --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld wiersze --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> wiersze --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "wiersz %ld z %ld --%d%%-- kol "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "wiersz %<PRId64> z %<PRId64> --%d%%-- kol "
 
 msgid "[No Name]"
 msgstr "[Bez nazwy]"
@@ -200,12 +200,12 @@ msgid "Signs for %s:"
 msgstr "Znaki dla %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    wiersz=%ld  id=%d  nazwa=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    wiersz=%<PRId64>  id=%d  nazwa=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Nie mogę zróżnicować więcej niż %ld buforów"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Nie mogę zróżnicować więcej niż %<PRId64> buforów"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: Nie mogę otworzyć lub zapisać plików tymczasowych"
@@ -364,8 +364,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: Nieoczekiwane znaki w :let"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: Indeks listy poza zakresem: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: Indeks listy poza zakresem: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -779,8 +779,8 @@ msgid "%s aborted"
 msgstr "porzucono %s"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s zwraca #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s zwraca #%<PRId64>"
 
 #, c-format
 msgid "%s returning %s"
@@ -814,16 +814,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Wchodzę w tryb odpluskwiania. Wprowadź \"cont\" aby kontynuować."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "wiersz %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "wiersz %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "cmd: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Punkt kontrolny w \"%s%s\" wiersz %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Punkt kontrolny w \"%s%s\" wiersz %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -833,8 +833,8 @@ msgid "No breakpoints defined"
 msgstr "Nie określono żadnych punktów kontrolnych"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  wiersz %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  wiersz %<PRId64>"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Pierwsze użycie \":profile start {fname}\""
@@ -893,16 +893,16 @@ msgid "could not source \"%s\""
 msgstr "nie mogłem wczytać \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "wiersz: %ld nie mogłem wczytać \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "wiersz: %<PRId64> nie mogłem wczytać \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "wczytywanie \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "wiersz %ld: wczytywanie \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "wiersz %<PRId64>: wczytywanie \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -959,12 +959,12 @@ msgid "1 line moved"
 msgstr "1 wiersz przeniesiony"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld wiersze przeniesione"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> wiersze przeniesione"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld wierszy przefiltrowanych"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> wierszy przefiltrowanych"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: Autokomendy *Filter* nie mogą zmieniać bieżącego bufora"
@@ -1045,8 +1045,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Plik wymiany istnieje: %s (wymuś poprzez :silent!)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: Brak nazwy pliku dla bufora %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: Brak nazwy pliku dla bufora %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: Plik niezapisany: Zapis jest wyłączony opcją 'write'"
@@ -1103,19 +1103,19 @@ msgid "1 substitution"
 msgstr "1 podstawienie "
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld dopasowań"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> dopasowań"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld podstawień"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> podstawień"
 
 msgid " on 1 line"
 msgstr " w 1 wierszu"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " w %ld wierszach"
+msgid " on %<PRId64> lines"
+msgstr " w %<PRId64> wierszach"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: Nie mogę wykonać :global rekursywnie"
@@ -1202,8 +1202,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Niewłaściwa nazwa bufora: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Niewłaściwe ID znaku: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: Niewłaściwe ID znaku: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (NIE ZNALEZIONO)"
@@ -1266,8 +1266,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: 1 więcej plik do edycji"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: jeszcze %ld plików do edycji"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: jeszcze %<PRId64> plików do edycji"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: Komenda już istnieje; aby ją przedefiniować stosuj !"
@@ -1464,8 +1464,8 @@ msgid "Exception discarded: %s"
 msgstr "Wyjątek odrzucony: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, wiersz %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, wiersz %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1669,12 +1669,12 @@ msgid "[crypted]"
 msgstr "[zakodowane]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[BŁĄD W PRZEMIANIE w linii %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[BŁĄD W PRZEMIANIE w linii %<PRId64>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[NIEDOZWOLONY BAJT w wierszu %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[NIEDOZWOLONY BAJT w wierszu %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[BŁĘDY W ODCZYCIE]"
@@ -1758,10 +1758,10 @@ msgstr ""
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: Błąd zapisu, przemiana się nie powiodła w wierszu %ld (opróżnij 'fenc' "
+"E513: Błąd zapisu, przemiana się nie powiodła w wierszu %<PRId64> (opróżnij 'fenc' "
 "by wymusić)"
 
 msgid "E514: write error (file system full?)"
@@ -1771,8 +1771,8 @@ msgid " CONVERSION ERROR"
 msgstr " BŁĄD W PRZEMIANIE"
 
 #, c-format
-msgid " in line %ld;"
-msgstr " w wierszu %ld;"
+msgid " in line %<PRId64>;"
+msgstr " w wierszu %<PRId64>;"
 
 msgid "[Device]"
 msgstr "[Urządzenie]"
@@ -1833,8 +1833,8 @@ msgid "1 line, "
 msgstr "1 wiersz, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld wierszy, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> wierszy, "
 
 msgid "1 character"
 msgstr "1 znak"
@@ -1845,8 +1845,8 @@ msgstr "%<PRId64> znaków"
 
 #. Explicit typecast avoids warning on Mac OS X 10.6
 #, c-format
-msgid "%ld characters"
-msgstr "%ld znaków"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> znaków"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2264,16 +2264,16 @@ msgid "Font1: %s"
 msgstr "Font1: %s"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0"
-msgstr "Szerokość font%ld nie jest podwójną szerokością font0"
+msgid "Font%<PRId64> width is not twice that of font0"
+msgstr "Szerokość font%<PRId64> nie jest podwójną szerokością font0"
 
 #, c-format
-msgid "Font0 width: %ld"
-msgstr "Szerokość font0: %ld"
+msgid "Font0 width: %<PRId64>"
+msgstr "Szerokość font0: %<PRId64>"
 
 #, c-format
-msgid "Font1 width: %ld"
-msgstr "Szerokość font1: %ld"
+msgid "Font1 width: %<PRId64>"
+msgstr "Szerokość font1: %<PRId64>"
 
 msgid "Invalid font specification"
 msgstr "Nieprawidłowy opis czcionki"
@@ -2449,8 +2449,8 @@ msgid "Added cscope database %s"
 msgstr "Dodano bazę danych cscope %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: błąd odczytu połączenia z cscope %ld"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: błąd odczytu połączenia z cscope %<PRId64>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: nieznany typ szukania cscope"
@@ -3670,12 +3670,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: Nieudane zabezpieczenie"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: niewłaściwy lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: niewłaściwy lnum: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: nie znaleziono wiersza %ld"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: nie znaleziono wiersza %<PRId64>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: niepoprawne id wskaźnika bloku 3"
@@ -3693,8 +3693,8 @@ msgid "deleted block 1?"
 msgstr "blok nr 1 skasowany?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Nie mogę znaleźć wiersza %ld"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Nie mogę znaleźć wiersza %<PRId64>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: niepoprawne id bloku odniesienia"
@@ -3703,12 +3703,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count wynosi zero"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: numer wiersza poza zakresem: %ld jest poza końcem"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: numer wiersza poza zakresem: %<PRId64> jest poza końcem"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: liczba wierszy niepoprawna w bloku %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: liczba wierszy niepoprawna w bloku %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "Wielkość stosu wzrasta"
@@ -3892,8 +3892,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Naciśnij ENTER lub wprowadź komendę aby kontynuować"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s wiersz %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s wiersz %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- Więcej --"
@@ -3962,12 +3962,12 @@ msgid "1 line less"
 msgstr "1 wiersz mniej"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "dodano %ld wierszy"
+msgid "%<PRId64> more lines"
+msgstr "dodano %<PRId64> wierszy"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "usunięto %ld wierszy"
+msgid "%<PRId64> fewer lines"
+msgstr "usunięto %<PRId64> wierszy"
 
 msgid " (Interrupted)"
 msgstr " (Przerwane)"
@@ -4006,8 +4006,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: Wiersz staje się zbyt długi"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Wewnętrzny błąd: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Wewnętrzny błąd: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4082,8 +4082,8 @@ msgid "read from Netbeans socket"
 msgstr "odczyt z gniazda Netbeans"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: Bufor %ld utracił połączenie z NetBeans"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: Bufor %<PRId64> utracił połączenie z NetBeans"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: netbeans nie są obsługiwane przez to GUI"
@@ -4134,23 +4134,23 @@ msgid "1 line %sed %d times"
 msgstr "1 wiersz %sed %d razy"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld wierszy %sed 1 raz"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> wierszy %sed 1 raz"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld wierszy %sed %d razy"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> wierszy %sed %d razy"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld wierszy do wcięcia... "
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> wierszy do wcięcia... "
 
 msgid "1 line indented "
 msgstr "1 wiersz wcięty "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld wierszy wciętych "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> wierszy wciętych "
 
 msgid "E748: No previously used register"
 msgstr "E748: Brak poprzednio użytego rejestru"
@@ -4163,12 +4163,12 @@ msgid "1 line changed"
 msgstr "1 wiersz zmieniono"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld wierszy zmieniono"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> wierszy zmieniono"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "zwalniam %ld wierszy"
+msgid "freeing %<PRId64> lines"
+msgstr "zwalniam %<PRId64> wierszy"
 
 msgid "block of 1 line yanked"
 msgstr "skopiowano blok 1 wiersza"
@@ -4177,12 +4177,12 @@ msgid "1 line yanked"
 msgstr "1 wiersz skopiowano"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "%ld wierszy skopiowanych"
+msgid "block of %<PRId64> lines yanked"
+msgstr "%<PRId64> wierszy skopiowanych"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld wierszy skopiowanych"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> wierszy skopiowanych"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4211,36 +4211,36 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: Nieznany typ rejestru %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld Kolumn; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> Kolumn; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Wybrano %s%ld z %ld Wierszy; %ld z %ld Słów; %ld z %ld Bajtów"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Wybrano %s%<PRId64> z %<PRId64> Wierszy; %<PRId64> z %<PRId64> Słów; %<PRId64> z %<PRId64> Bajtów"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
 msgstr ""
-"Wybrano %s%ld z %ld Wierszy; %ld z %ld Słów; %ld z %ld Znaków; %ld z %ld "
+"Wybrano %s%<PRId64> z %<PRId64> Wierszy; %<PRId64> z %<PRId64> Słów; %<PRId64> z %<PRId64> Znaków; %<PRId64> z %<PRId64> "
 "Bajtów"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Kol %s z %s; Wiersz %ld z %ld; Słowo %ld z %ld; Bajt %ld z %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Kol %s z %s; Wiersz %<PRId64> z %<PRId64>; Słowo %<PRId64> z %<PRId64>; Bajt %<PRId64> z %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"Kol %s z %s; Wiersz %ld z %ld; Słowo %ld z %ld; Znak %ld z %ld; Bajt %ld z "
-"%ld"
+"Kol %s z %s; Wiersz %<PRId64> z %<PRId64>; Słowo %<PRId64> z %<PRId64>; Znak %<PRId64> z %<PRId64>; Bajt %<PRId64> z "
+"%<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld dla BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> dla BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Strona %N"
@@ -4422,8 +4422,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Potrzebuję Amigados w wersji 2.04 lub późniejszą\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Potrzebuję %s w wersji %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Potrzebuję %s w wersji %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Nie mogę otworzyć NIL:\n"
@@ -4506,8 +4506,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Załapał śmiertelny sygnał\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "Otwieranie ekranu X trwało %ld msec"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "Otwieranie ekranu X trwało %<PRId64> msec"
 
 msgid ""
 "\n"
@@ -5275,8 +5275,8 @@ msgid "Performing soundfolding..."
 msgstr "Wykonuję kompresję dźwiękową..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "Liczba słów po kompresji dźwiękowej: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "Liczba słów po kompresji dźwiękowej: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -5311,8 +5311,8 @@ msgid "Done!"
 msgstr "Zrobione!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' nie posiada wpisów %ld"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' nie posiada wpisów %<PRId64>"
 
 #, c-format
 msgid "Word removed from %s"
@@ -5329,8 +5329,8 @@ msgid "Sorry, no suggestions"
 msgstr "Przykro mi, brak podpowiedzi"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Przykro mi, tylko %ld podpowiedzi"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "Przykro mi, tylko %<PRId64> podpowiedzi"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5647,8 +5647,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Błąd formatu w pliku znaczników \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "Przed bajtem %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Przed bajtem %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5792,8 +5792,8 @@ msgid "Already at newest change"
 msgstr "Już w miejscu najnowszej zmiany"
 
 #, c-format
-msgid "E830: Undo number %ld not found"
-msgstr "E830: Nie znaleziono numeru cofnięcia %ld"
+msgid "E830: Undo number %<PRId64> not found"
+msgstr "E830: Nie znaleziono numeru cofnięcia %<PRId64>"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: niewłaściwe numery wierszy"
@@ -5817,8 +5817,8 @@ msgid "changes"
 msgstr "zmiany"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "przed"
@@ -5833,8 +5833,8 @@ msgid "number changes  when               saved"
 msgstr "liczba zmiany   kiedy              zapisano"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld sekund temu"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> sekund temu"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin nie jest dozwolone po undo"

src/po/pl.cp1250.po

@@ -88,8 +88,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: Nie ma wylistowanych bufor<6F>w"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Bufor \"%ld\" nie istnieje"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Bufor \"%<PRId64>\" nie istnieje"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Nie mog<6F> przej<65><6A> poza ostatni bufor"
@@ -98,8 +98,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: Nie mog<6F> przej<65><6A> przed pierwszy bufor"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: Nie zapisano zmian w buforze %ld (wymu<6D> przez !)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: Nie zapisano zmian w buforze %<PRId64> (wymu<6D> przez !)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Nie mog<6F> wy<77>adowa<77> ostatniego bufora"
@@ -108,8 +108,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: OSTRZE<5A>ENIE: Przepe<70>nienie listy nazw plik<69>w"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Nie znaleziono bufora %ld"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: Nie znaleziono bufora %<PRId64>"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -120,8 +120,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: <20>aden bufor nie pasuje do %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "wiersz %ld"
+msgid "line %<PRId64>"
+msgstr "wiersz %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Bufor o tej nazwie ju<6A> istnieje"
@@ -149,12 +149,12 @@ msgid "1 line --%d%%--"
 msgstr "1 wiersz --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld wiersze --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> wiersze --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "wiersz %ld z %ld --%d%%-- kol "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "wiersz %<PRId64> z %<PRId64> --%d%%-- kol "
 
 msgid "[No Name]"
 msgstr "[Bez nazwy]"
@@ -200,12 +200,12 @@ msgid "Signs for %s:"
 msgstr "Znaki dla %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    wiersz=%ld  id=%d  nazwa=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    wiersz=%<PRId64>  id=%d  nazwa=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Nie mog<6F> zr<7A><72>nicowa<77> wi<77>cej ni<6E> %ld bufor<6F>w"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Nie mog<6F> zr<7A><72>nicowa<77> wi<77>cej ni<6E> %<PRId64> bufor<6F>w"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: Nie mog<6F> otworzy<7A> lub zapisa<73> plik<69>w tymczasowych"
@@ -364,8 +364,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: Nieoczekiwane znaki w :let"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: Indeks listy poza zakresem: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: Indeks listy poza zakresem: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -779,8 +779,8 @@ msgid "%s aborted"
 msgstr "porzucono %s"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s zwraca #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s zwraca #%<PRId64>"
 
 #, c-format
 msgid "%s returning %s"
@@ -814,16 +814,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Wchodz<64> w tryb odpluskwiania. Wprowad<61> \"cont\" aby kontynuowa<77>."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "wiersz %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "wiersz %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "cmd: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Punkt kontrolny w \"%s%s\" wiersz %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Punkt kontrolny w \"%s%s\" wiersz %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -833,8 +833,8 @@ msgid "No breakpoints defined"
 msgstr "Nie okre<72>lono <20>adnych punkt<6B>w kontrolnych"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  wiersz %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  wiersz %<PRId64>"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Pierwsze u<>ycie \":profile start {fname}\""
@@ -893,16 +893,16 @@ msgid "could not source \"%s\""
 msgstr "nie mog<6F>em wczyta<74> \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "wiersz: %ld nie mog<6F>em wczyta<74> \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "wiersz: %<PRId64> nie mog<6F>em wczyta<74> \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "wczytywanie \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "wiersz %ld: wczytywanie \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "wiersz %<PRId64>: wczytywanie \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -959,12 +959,12 @@ msgid "1 line moved"
 msgstr "1 wiersz przeniesiony"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld wiersze przeniesione"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> wiersze przeniesione"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld wierszy przefiltrowanych"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> wierszy przefiltrowanych"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: Autokomendy *Filter* nie mog<6F> zmienia<69> bie<69><65>cego bufora"
@@ -1045,8 +1045,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Plik wymiany istnieje: %s (wymu<6D> poprzez :silent!)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: Brak nazwy pliku dla bufora %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: Brak nazwy pliku dla bufora %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: Plik niezapisany: Zapis jest wy<77><79>czony opcj<63> 'write'"
@@ -1103,19 +1103,19 @@ msgid "1 substitution"
 msgstr "1 podstawienie "
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld dopasowa<77>"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> dopasowa<77>"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld podstawie<69>"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> podstawie<69>"
 
 msgid " on 1 line"
 msgstr " w 1 wierszu"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " w %ld wierszach"
+msgid " on %<PRId64> lines"
+msgstr " w %<PRId64> wierszach"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: Nie mog<6F> wykona<6E> :global rekursywnie"
@@ -1202,8 +1202,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Niew<65>a<EFBFBD>ciwa nazwa bufora: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Niew<65>a<EFBFBD>ciwe ID znaku: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: Niew<65>a<EFBFBD>ciwe ID znaku: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (NIE ZNALEZIONO)"
@@ -1266,8 +1266,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: 1 wi<77>cej plik do edycji"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: jeszcze %ld plik<69>w do edycji"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: jeszcze %<PRId64> plik<69>w do edycji"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: Komenda ju<6A> istnieje; aby j<> przedefiniowa<77> stosuj !"
@@ -1464,8 +1464,8 @@ msgid "Exception discarded: %s"
 msgstr "Wyj<79>tek odrzucony: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, wiersz %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, wiersz %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1669,12 +1669,12 @@ msgid "[crypted]"
 msgstr "[zakodowane]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[B<><42>D W PRZEMIANIE w linii %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[B<><42>D W PRZEMIANIE w linii %<PRId64>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[NIEDOZWOLONY BAJT w wierszu %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[NIEDOZWOLONY BAJT w wierszu %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[B<><42>DY W ODCZYCIE]"
@@ -1758,10 +1758,10 @@ msgstr ""
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: B<><42>d zapisu, przemiana si<73> nie powiod<6F>a w wierszu %ld (opr<70><72>nij 'fenc' "
+"E513: B<><42>d zapisu, przemiana si<73> nie powiod<6F>a w wierszu %<PRId64> (opr<70><72>nij 'fenc' "
 "by wymusi<73>)"
 
 msgid "E514: write error (file system full?)"
@@ -1771,8 +1771,8 @@ msgid " CONVERSION ERROR"
 msgstr " B<><42>D W PRZEMIANIE"
 
 #, c-format
-msgid " in line %ld;"
-msgstr " w wierszu %ld;"
+msgid " in line %<PRId64>;"
+msgstr " w wierszu %<PRId64>;"
 
 msgid "[Device]"
 msgstr "[Urz<72>dzenie]"
@@ -1833,8 +1833,8 @@ msgid "1 line, "
 msgstr "1 wiersz, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld wierszy, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> wierszy, "
 
 msgid "1 character"
 msgstr "1 znak"
@@ -1845,8 +1845,8 @@ msgstr "%<PRId64> znak
 
 #. Explicit typecast avoids warning on Mac OS X 10.6
 #, c-format
-msgid "%ld characters"
-msgstr "%ld znak<61>w"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> znak<61>w"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2264,16 +2264,16 @@ msgid "Font1: %s"
 msgstr "Font1: %s"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0"
-msgstr "Szeroko<6B><6F> font%ld nie jest podw<64>jn<6A> szeroko<6B>ci<63> font0"
+msgid "Font%<PRId64> width is not twice that of font0"
+msgstr "Szeroko<6B><6F> font%<PRId64> nie jest podw<64>jn<6A> szeroko<6B>ci<63> font0"
 
 #, c-format
-msgid "Font0 width: %ld"
-msgstr "Szeroko<6B><6F> font0: %ld"
+msgid "Font0 width: %<PRId64>"
+msgstr "Szeroko<6B><6F> font0: %<PRId64>"
 
 #, c-format
-msgid "Font1 width: %ld"
-msgstr "Szeroko<6B><6F> font1: %ld"
+msgid "Font1 width: %<PRId64>"
+msgstr "Szeroko<6B><6F> font1: %<PRId64>"
 
 msgid "Invalid font specification"
 msgstr "Nieprawid<69>owy opis czcionki"
@@ -2449,8 +2449,8 @@ msgid "Added cscope database %s"
 msgstr "Dodano baz<61> danych cscope %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: b<><62>d odczytu po<70><6F>czenia z cscope %ld"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: b<><62>d odczytu po<70><6F>czenia z cscope %<PRId64>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: nieznany typ szukania cscope"
@@ -3670,12 +3670,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: Nieudane zabezpieczenie"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: niew<65>a<EFBFBD>ciwy lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: niew<65>a<EFBFBD>ciwy lnum: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: nie znaleziono wiersza %ld"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: nie znaleziono wiersza %<PRId64>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: niepoprawne id wska<6B>nika bloku 3"
@@ -3693,8 +3693,8 @@ msgid "deleted block 1?"
 msgstr "blok nr 1 skasowany?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Nie mog<6F> znale<6C><65> wiersza %ld"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Nie mog<6F> znale<6C><65> wiersza %<PRId64>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: niepoprawne id bloku odniesienia"
@@ -3703,12 +3703,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count wynosi zero"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: numer wiersza poza zakresem: %ld jest poza ko<6B>cem"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: numer wiersza poza zakresem: %<PRId64> jest poza ko<6B>cem"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: liczba wierszy niepoprawna w bloku %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: liczba wierszy niepoprawna w bloku %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "Wielko<6B><6F> stosu wzrasta"
@@ -3892,8 +3892,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Naci<63>nij ENTER lub wprowad<61> komend<6E> aby kontynuowa<77>"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s wiersz %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s wiersz %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- Wi<57>cej --"
@@ -3962,12 +3962,12 @@ msgid "1 line less"
 msgstr "1 wiersz mniej"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "dodano %ld wierszy"
+msgid "%<PRId64> more lines"
+msgstr "dodano %<PRId64> wierszy"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "usuni<6E>to %ld wierszy"
+msgid "%<PRId64> fewer lines"
+msgstr "usuni<6E>to %<PRId64> wierszy"
 
 msgid " (Interrupted)"
 msgstr " (Przerwane)"
@@ -4006,8 +4006,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: Wiersz staje si<73> zbyt d<>ugi"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Wewn<77>trzny b<><62>d: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Wewn<77>trzny b<><62>d: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4082,8 +4082,8 @@ msgid "read from Netbeans socket"
 msgstr "odczyt z gniazda Netbeans"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: Bufor %ld utraci<63> po<70><6F>czenie z NetBeans"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: Bufor %<PRId64> utraci<63> po<70><6F>czenie z NetBeans"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: netbeans nie s<> obs<62>ugiwane przez to GUI"
@@ -4134,23 +4134,23 @@ msgid "1 line %sed %d times"
 msgstr "1 wiersz %sed %d razy"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld wierszy %sed 1 raz"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> wierszy %sed 1 raz"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld wierszy %sed %d razy"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> wierszy %sed %d razy"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld wierszy do wci<63>cia... "
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> wierszy do wci<63>cia... "
 
 msgid "1 line indented "
 msgstr "1 wiersz wci<63>ty "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld wierszy wci<63>tych "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> wierszy wci<63>tych "
 
 msgid "E748: No previously used register"
 msgstr "E748: Brak poprzednio u<>ytego rejestru"
@@ -4163,12 +4163,12 @@ msgid "1 line changed"
 msgstr "1 wiersz zmieniono"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld wierszy zmieniono"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> wierszy zmieniono"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "zwalniam %ld wierszy"
+msgid "freeing %<PRId64> lines"
+msgstr "zwalniam %<PRId64> wierszy"
 
 msgid "block of 1 line yanked"
 msgstr "skopiowano blok 1 wiersza"
@@ -4177,12 +4177,12 @@ msgid "1 line yanked"
 msgstr "1 wiersz skopiowano"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "%ld wierszy skopiowanych"
+msgid "block of %<PRId64> lines yanked"
+msgstr "%<PRId64> wierszy skopiowanych"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld wierszy skopiowanych"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> wierszy skopiowanych"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4211,36 +4211,36 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: Nieznany typ rejestru %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld Kolumn; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> Kolumn; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Wybrano %s%ld z %ld Wierszy; %ld z %ld S<><53>w; %ld z %ld Bajt<6A>w"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Wybrano %s%<PRId64> z %<PRId64> Wierszy; %<PRId64> z %<PRId64> S<><53>w; %<PRId64> z %<PRId64> Bajt<6A>w"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
 msgstr ""
-"Wybrano %s%ld z %ld Wierszy; %ld z %ld S<><53>w; %ld z %ld Znak<61>w; %ld z %ld "
+"Wybrano %s%<PRId64> z %<PRId64> Wierszy; %<PRId64> z %<PRId64> S<><53>w; %<PRId64> z %<PRId64> Znak<61>w; %<PRId64> z %<PRId64> "
 "Bajt<6A>w"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Kol %s z %s; Wiersz %ld z %ld; S<>owo %ld z %ld; Bajt %ld z %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Kol %s z %s; Wiersz %<PRId64> z %<PRId64>; S<>owo %<PRId64> z %<PRId64>; Bajt %<PRId64> z %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"Kol %s z %s; Wiersz %ld z %ld; S<>owo %ld z %ld; Znak %ld z %ld; Bajt %ld z "
-"%ld"
+"Kol %s z %s; Wiersz %<PRId64> z %<PRId64>; S<>owo %<PRId64> z %<PRId64>; Znak %<PRId64> z %<PRId64>; Bajt %<PRId64> z "
+"%<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld dla BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> dla BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Strona %N"
@@ -4422,8 +4422,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Potrzebuj<75> Amigados w wersji 2.04 lub p<><70>niejsz<73>\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Potrzebuj<75> %s w wersji %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Potrzebuj<75> %s w wersji %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Nie mog<6F> otworzy<7A> NIL:\n"
@@ -4506,8 +4506,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Za<5A>apa<70> <20>miertelny sygna<6E>\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "Otwieranie ekranu X trwa<77>o %ld msec"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "Otwieranie ekranu X trwa<77>o %<PRId64> msec"
 
 msgid ""
 "\n"
@@ -5275,8 +5275,8 @@ msgid "Performing soundfolding..."
 msgstr "Wykonuj<75> kompresj<73> d<>wi<77>kow<6F>..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "Liczba s<><73>w po kompresji d<>wi<77>kowej: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "Liczba s<><73>w po kompresji d<>wi<77>kowej: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -5311,8 +5311,8 @@ msgid "Done!"
 msgstr "Zrobione!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' nie posiada wpis<69>w %ld"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' nie posiada wpis<69>w %<PRId64>"
 
 #, c-format
 msgid "Word removed from %s"
@@ -5329,8 +5329,8 @@ msgid "Sorry, no suggestions"
 msgstr "Przykro mi, brak podpowiedzi"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Przykro mi, tylko %ld podpowiedzi"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "Przykro mi, tylko %<PRId64> podpowiedzi"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5647,8 +5647,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: B<><42>d formatu w pliku znacznik<69>w \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "Przed bajtem %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Przed bajtem %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5792,8 +5792,8 @@ msgid "Already at newest change"
 msgstr "Ju<4A> w miejscu najnowszej zmiany"
 
 #, c-format
-msgid "E830: Undo number %ld not found"
-msgstr "E830: Nie znaleziono numeru cofni<6E>cia %ld"
+msgid "E830: Undo number %<PRId64> not found"
+msgstr "E830: Nie znaleziono numeru cofni<6E>cia %<PRId64>"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: niew<65>a<EFBFBD>ciwe numery wierszy"
@@ -5817,8 +5817,8 @@ msgid "changes"
 msgstr "zmiany"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "przed"
@@ -5833,8 +5833,8 @@ msgid "number changes  when               saved"
 msgstr "liczba zmiany   kiedy              zapisano"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld sekund temu"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> sekund temu"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin nie jest dozwolone po undo"

src/po/pl.po

@@ -88,8 +88,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: Nie ma wylistowanych bufor<6F>w"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Bufor \"%ld\" nie istnieje"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Bufor \"%<PRId64>\" nie istnieje"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Nie mog<6F> przej<65><6A> poza ostatni bufor"
@@ -98,8 +98,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: Nie mog<6F> przej<65><6A> przed pierwszy bufor"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: Nie zapisano zmian w buforze %ld (wymu<6D> przez !)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: Nie zapisano zmian w buforze %<PRId64> (wymu<6D> przez !)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Nie mog<6F> wy<77>adowa<77> ostatniego bufora"
@@ -108,8 +108,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: OSTRZE<5A>ENIE: Przepe<70>nienie listy nazw plik<69>w"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Nie znaleziono bufora %ld"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: Nie znaleziono bufora %<PRId64>"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -120,8 +120,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: <20>aden bufor nie pasuje do %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "wiersz %ld"
+msgid "line %<PRId64>"
+msgstr "wiersz %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Bufor o tej nazwie ju<6A> istnieje"
@@ -149,12 +149,12 @@ msgid "1 line --%d%%--"
 msgstr "1 wiersz --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld wiersze --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> wiersze --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "wiersz %ld z %ld --%d%%-- kol "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "wiersz %<PRId64> z %<PRId64> --%d%%-- kol "
 
 msgid "[No Name]"
 msgstr "[Bez nazwy]"
@@ -200,12 +200,12 @@ msgid "Signs for %s:"
 msgstr "Znaki dla %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    wiersz=%ld  id=%d  nazwa=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    wiersz=%<PRId64>  id=%d  nazwa=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Nie mog<6F> zr<7A><72>nicowa<77> wi<77>cej ni<6E> %ld bufor<6F>w"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Nie mog<6F> zr<7A><72>nicowa<77> wi<77>cej ni<6E> %<PRId64> bufor<6F>w"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: Nie mog<6F> otworzy<7A> lub zapisa<73> plik<69>w tymczasowych"
@@ -364,8 +364,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: Nieoczekiwane znaki w :let"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: Indeks listy poza zakresem: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: Indeks listy poza zakresem: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -779,8 +779,8 @@ msgid "%s aborted"
 msgstr "porzucono %s"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s zwraca #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s zwraca #%<PRId64>"
 
 #, c-format
 msgid "%s returning %s"
@@ -814,16 +814,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Wchodz<64> w tryb odpluskwiania. Wprowad<61> \"cont\" aby kontynuowa<77>."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "wiersz %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "wiersz %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "cmd: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Punkt kontrolny w \"%s%s\" wiersz %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Punkt kontrolny w \"%s%s\" wiersz %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -833,8 +833,8 @@ msgid "No breakpoints defined"
 msgstr "Nie okre<72>lono <20>adnych punkt<6B>w kontrolnych"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  wiersz %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  wiersz %<PRId64>"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Pierwsze u<>ycie \":profile start {fname}\""
@@ -893,16 +893,16 @@ msgid "could not source \"%s\""
 msgstr "nie mog<6F>em wczyta<74> \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "wiersz: %ld nie mog<6F>em wczyta<74> \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "wiersz: %<PRId64> nie mog<6F>em wczyta<74> \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "wczytywanie \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "wiersz %ld: wczytywanie \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "wiersz %<PRId64>: wczytywanie \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -959,12 +959,12 @@ msgid "1 line moved"
 msgstr "1 wiersz przeniesiony"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld wiersze przeniesione"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> wiersze przeniesione"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld wierszy przefiltrowanych"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> wierszy przefiltrowanych"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: Autokomendy *Filter* nie mog<6F> zmienia<69> bie<69><65>cego bufora"
@@ -1045,8 +1045,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Plik wymiany istnieje: %s (wymu<6D> poprzez :silent!)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: Brak nazwy pliku dla bufora %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: Brak nazwy pliku dla bufora %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: Plik niezapisany: Zapis jest wy<77><79>czony opcj<63> 'write'"
@@ -1103,19 +1103,19 @@ msgid "1 substitution"
 msgstr "1 podstawienie "
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld dopasowa<77>"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> dopasowa<77>"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld podstawie<69>"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> podstawie<69>"
 
 msgid " on 1 line"
 msgstr " w 1 wierszu"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " w %ld wierszach"
+msgid " on %<PRId64> lines"
+msgstr " w %<PRId64> wierszach"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: Nie mog<6F> wykona<6E> :global rekursywnie"
@@ -1202,8 +1202,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Niew<65>a<EFBFBD>ciwa nazwa bufora: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Niew<65>a<EFBFBD>ciwe ID znaku: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: Niew<65>a<EFBFBD>ciwe ID znaku: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (NIE ZNALEZIONO)"
@@ -1266,8 +1266,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: 1 wi<77>cej plik do edycji"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: jeszcze %ld plik<69>w do edycji"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: jeszcze %<PRId64> plik<69>w do edycji"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: Komenda ju<6A> istnieje; aby j<> przedefiniowa<77> stosuj !"
@@ -1464,8 +1464,8 @@ msgid "Exception discarded: %s"
 msgstr "Wyj<79>tek odrzucony: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, wiersz %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, wiersz %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1669,12 +1669,12 @@ msgid "[crypted]"
 msgstr "[zakodowane]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[B<><42>D W PRZEMIANIE w linii %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[B<><42>D W PRZEMIANIE w linii %<PRId64>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[NIEDOZWOLONY BAJT w wierszu %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[NIEDOZWOLONY BAJT w wierszu %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[B<><42>DY W ODCZYCIE]"
@@ -1758,10 +1758,10 @@ msgstr ""
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: B<><42>d zapisu, przemiana si<73> nie powiod<6F>a w wierszu %ld (opr<70><72>nij 'fenc' "
+"E513: B<><42>d zapisu, przemiana si<73> nie powiod<6F>a w wierszu %<PRId64> (opr<70><72>nij 'fenc' "
 "by wymusi<73>)"
 
 msgid "E514: write error (file system full?)"
@@ -1771,8 +1771,8 @@ msgid " CONVERSION ERROR"
 msgstr " B<><42>D W PRZEMIANIE"
 
 #, c-format
-msgid " in line %ld;"
-msgstr " w wierszu %ld;"
+msgid " in line %<PRId64>;"
+msgstr " w wierszu %<PRId64>;"
 
 msgid "[Device]"
 msgstr "[Urz<72>dzenie]"
@@ -1833,8 +1833,8 @@ msgid "1 line, "
 msgstr "1 wiersz, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld wierszy, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> wierszy, "
 
 msgid "1 character"
 msgstr "1 znak"
@@ -1845,8 +1845,8 @@ msgstr "%<PRId64> znak
 
 #. Explicit typecast avoids warning on Mac OS X 10.6
 #, c-format
-msgid "%ld characters"
-msgstr "%ld znak<61>w"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> znak<61>w"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2264,16 +2264,16 @@ msgid "Font1: %s"
 msgstr "Font1: %s"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0"
-msgstr "Szeroko<6B><6F> font%ld nie jest podw<64>jn<6A> szeroko<6B>ci<63> font0"
+msgid "Font%<PRId64> width is not twice that of font0"
+msgstr "Szeroko<6B><6F> font%<PRId64> nie jest podw<64>jn<6A> szeroko<6B>ci<63> font0"
 
 #, c-format
-msgid "Font0 width: %ld"
-msgstr "Szeroko<6B><6F> font0: %ld"
+msgid "Font0 width: %<PRId64>"
+msgstr "Szeroko<6B><6F> font0: %<PRId64>"
 
 #, c-format
-msgid "Font1 width: %ld"
-msgstr "Szeroko<6B><6F> font1: %ld"
+msgid "Font1 width: %<PRId64>"
+msgstr "Szeroko<6B><6F> font1: %<PRId64>"
 
 msgid "Invalid font specification"
 msgstr "Nieprawid<69>owy opis czcionki"
@@ -2449,8 +2449,8 @@ msgid "Added cscope database %s"
 msgstr "Dodano baz<61> danych cscope %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: b<><62>d odczytu po<70><6F>czenia z cscope %ld"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: b<><62>d odczytu po<70><6F>czenia z cscope %<PRId64>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: nieznany typ szukania cscope"
@@ -3670,12 +3670,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: Nieudane zabezpieczenie"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: niew<65>a<EFBFBD>ciwy lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: niew<65>a<EFBFBD>ciwy lnum: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: nie znaleziono wiersza %ld"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: nie znaleziono wiersza %<PRId64>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: niepoprawne id wska<6B>nika bloku 3"
@@ -3693,8 +3693,8 @@ msgid "deleted block 1?"
 msgstr "blok nr 1 skasowany?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Nie mog<6F> znale<6C><65> wiersza %ld"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Nie mog<6F> znale<6C><65> wiersza %<PRId64>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: niepoprawne id bloku odniesienia"
@@ -3703,12 +3703,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count wynosi zero"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: numer wiersza poza zakresem: %ld jest poza ko<6B>cem"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: numer wiersza poza zakresem: %<PRId64> jest poza ko<6B>cem"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: liczba wierszy niepoprawna w bloku %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: liczba wierszy niepoprawna w bloku %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "Wielko<6B><6F> stosu wzrasta"
@@ -3892,8 +3892,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Naci<63>nij ENTER lub wprowad<61> komend<6E> aby kontynuowa<77>"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s wiersz %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s wiersz %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- Wi<57>cej --"
@@ -3962,12 +3962,12 @@ msgid "1 line less"
 msgstr "1 wiersz mniej"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "dodano %ld wierszy"
+msgid "%<PRId64> more lines"
+msgstr "dodano %<PRId64> wierszy"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "usuni<6E>to %ld wierszy"
+msgid "%<PRId64> fewer lines"
+msgstr "usuni<6E>to %<PRId64> wierszy"
 
 msgid " (Interrupted)"
 msgstr " (Przerwane)"
@@ -4006,8 +4006,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: Wiersz staje si<73> zbyt d<>ugi"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Wewn<77>trzny b<><62>d: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Wewn<77>trzny b<><62>d: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4082,8 +4082,8 @@ msgid "read from Netbeans socket"
 msgstr "odczyt z gniazda Netbeans"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: Bufor %ld utraci<63> po<70><6F>czenie z NetBeans"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: Bufor %<PRId64> utraci<63> po<70><6F>czenie z NetBeans"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: netbeans nie s<> obs<62>ugiwane przez to GUI"
@@ -4134,23 +4134,23 @@ msgid "1 line %sed %d times"
 msgstr "1 wiersz %sed %d razy"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld wierszy %sed 1 raz"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> wierszy %sed 1 raz"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld wierszy %sed %d razy"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> wierszy %sed %d razy"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld wierszy do wci<63>cia... "
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> wierszy do wci<63>cia... "
 
 msgid "1 line indented "
 msgstr "1 wiersz wci<63>ty "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld wierszy wci<63>tych "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> wierszy wci<63>tych "
 
 msgid "E748: No previously used register"
 msgstr "E748: Brak poprzednio u<>ytego rejestru"
@@ -4163,12 +4163,12 @@ msgid "1 line changed"
 msgstr "1 wiersz zmieniono"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld wierszy zmieniono"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> wierszy zmieniono"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "zwalniam %ld wierszy"
+msgid "freeing %<PRId64> lines"
+msgstr "zwalniam %<PRId64> wierszy"
 
 msgid "block of 1 line yanked"
 msgstr "skopiowano blok 1 wiersza"
@@ -4177,12 +4177,12 @@ msgid "1 line yanked"
 msgstr "1 wiersz skopiowano"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "%ld wierszy skopiowanych"
+msgid "block of %<PRId64> lines yanked"
+msgstr "%<PRId64> wierszy skopiowanych"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld wierszy skopiowanych"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> wierszy skopiowanych"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4211,36 +4211,36 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: Nieznany typ rejestru %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld Kolumn; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> Kolumn; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Wybrano %s%ld z %ld Wierszy; %ld z %ld S<><53>w; %ld z %ld Bajt<6A>w"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Wybrano %s%<PRId64> z %<PRId64> Wierszy; %<PRId64> z %<PRId64> S<><53>w; %<PRId64> z %<PRId64> Bajt<6A>w"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
 msgstr ""
-"Wybrano %s%ld z %ld Wierszy; %ld z %ld S<><53>w; %ld z %ld Znak<61>w; %ld z %ld "
+"Wybrano %s%<PRId64> z %<PRId64> Wierszy; %<PRId64> z %<PRId64> S<><53>w; %<PRId64> z %<PRId64> Znak<61>w; %<PRId64> z %<PRId64> "
 "Bajt<6A>w"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Kol %s z %s; Wiersz %ld z %ld; S<>owo %ld z %ld; Bajt %ld z %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Kol %s z %s; Wiersz %<PRId64> z %<PRId64>; S<>owo %<PRId64> z %<PRId64>; Bajt %<PRId64> z %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"Kol %s z %s; Wiersz %ld z %ld; S<>owo %ld z %ld; Znak %ld z %ld; Bajt %ld z "
-"%ld"
+"Kol %s z %s; Wiersz %<PRId64> z %<PRId64>; S<>owo %<PRId64> z %<PRId64>; Znak %<PRId64> z %<PRId64>; Bajt %<PRId64> z "
+"%<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld dla BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> dla BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Strona %N"
@@ -4422,8 +4422,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Potrzebuj<75> Amigados w wersji 2.04 lub p<><70>niejsz<73>\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Potrzebuj<75> %s w wersji %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Potrzebuj<75> %s w wersji %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Nie mog<6F> otworzy<7A> NIL:\n"
@@ -4506,8 +4506,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Za<5A>apa<70> <20>miertelny sygna<6E>\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "Otwieranie ekranu X trwa<77>o %ld msec"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "Otwieranie ekranu X trwa<77>o %<PRId64> msec"
 
 msgid ""
 "\n"
@@ -5275,8 +5275,8 @@ msgid "Performing soundfolding..."
 msgstr "Wykonuj<75> kompresj<73> d<>wi<77>kow<6F>..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "Liczba s<><73>w po kompresji d<>wi<77>kowej: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "Liczba s<><73>w po kompresji d<>wi<77>kowej: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -5311,8 +5311,8 @@ msgid "Done!"
 msgstr "Zrobione!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' nie posiada wpis<69>w %ld"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' nie posiada wpis<69>w %<PRId64>"
 
 #, c-format
 msgid "Word removed from %s"
@@ -5329,8 +5329,8 @@ msgid "Sorry, no suggestions"
 msgstr "Przykro mi, brak podpowiedzi"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Przykro mi, tylko %ld podpowiedzi"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "Przykro mi, tylko %<PRId64> podpowiedzi"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5647,8 +5647,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: B<><42>d formatu w pliku znacznik<69>w \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "Przed bajtem %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Przed bajtem %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5792,8 +5792,8 @@ msgid "Already at newest change"
 msgstr "Ju<4A> w miejscu najnowszej zmiany"
 
 #, c-format
-msgid "E830: Undo number %ld not found"
-msgstr "E830: Nie znaleziono numeru cofni<6E>cia %ld"
+msgid "E830: Undo number %<PRId64> not found"
+msgstr "E830: Nie znaleziono numeru cofni<6E>cia %<PRId64>"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: niew<65>a<EFBFBD>ciwe numery wierszy"
@@ -5817,8 +5817,8 @@ msgid "changes"
 msgstr "zmiany"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "przed"
@@ -5833,8 +5833,8 @@ msgid "number changes  when               saved"
 msgstr "liczba zmiany   kiedy              zapisano"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld sekund temu"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> sekund temu"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin nie jest dozwolone po undo"

src/po/pt_BR.po

@@ -57,8 +57,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: N<>o h<> buffers listados"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Buffer %ld n<>o existe"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Buffer %<PRId64> n<>o existe"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: N<>o <20> poss<73>vel ir al<61>m do <20>ltimo buffer"
@@ -67,8 +67,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: N<>o <20> poss<73>vel ir para antes do primeiro buffer"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: Altera<72><61>es no buffer %ld n<>o foram gravadas (adicione ! para for<6F>ar)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: Altera<72><61>es no buffer %<PRId64> n<>o foram gravadas (adicione ! para for<6F>ar)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Imposs<73>vel descarregar <20>ltimo buffer"
@@ -77,8 +77,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Aviso: Estouro da lista de nomes de arquivos"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Buffer %ld n<>o encontrado"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: Buffer %<PRId64> n<>o encontrado"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -89,8 +89,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Nenhum buffer coincide com %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "linha %ld"
+msgid "line %<PRId64>"
+msgstr "linha %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: J<> existe um buffer com esse nome"
@@ -115,12 +115,12 @@ msgid "1 line --%d%%--"
 msgstr "1 linha --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld linhas --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> linhas --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "linha %ld de %ld --%d%%-- col "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "linha %<PRId64> de %<PRId64> --%d%%-- col "
 
 msgid "[No Name]"
 msgstr "[Sem nome]"
@@ -173,12 +173,12 @@ msgid "Signs for %s:"
 msgstr "Sinais para %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    linha=%ld  id=%d  nome=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    linha=%<PRId64>  id=%d  nome=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: N<>o <20> poss<73>vel usar diff com mais de %ld buffers"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: N<>o <20> poss<73>vel usar diff com mais de %<PRId64> buffers"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: N<>o foi poss<73>vel ler ou gravar arquivos tempor<6F>rios"
@@ -330,8 +330,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: Caracteres inesperados em :let"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: <20>ndice da lista fora dos limites: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: <20>ndice da lista fora dos limites: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -712,8 +712,8 @@ msgid "%s aborted"
 msgstr "%s cancelada"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s devolveu #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s devolveu #%<PRId64>"
 
 #, c-format
 msgid "%s returning %s"
@@ -747,16 +747,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Entrando modo de depura<72><61>o.  Digite \"cont\" para continuar."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "linha %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "linha %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "cmdo: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Ponto de interrup<75><70>o em \"%s%s\", linha %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Ponto de interrup<75><70>o em \"%s%s\", linha %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -766,8 +766,8 @@ msgid "No breakpoints defined"
 msgstr "Nenhum ponto de interrup<75><70>o definido"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  linha %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  linha %<PRId64>"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Primeiro digite \":profile start {nome_arquivo}\""
@@ -826,16 +826,16 @@ msgid "could not source \"%s\""
 msgstr "n<>o foi poss<73>vel executar \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "linha %ld: n<>o foi poss<73>vel executar \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "linha %<PRId64>: n<>o foi poss<73>vel executar \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "executando \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "linha %ld: executando \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "linha %<PRId64>: executando \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -892,12 +892,12 @@ msgid "1 line moved"
 msgstr "1 linha movida"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld linhas movidas"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> linhas movidas"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld linhas filtradas"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> linhas filtradas"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: Os autocomandos *Filter* n<>o devem modificar o buffer atual"
@@ -980,8 +980,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Arquivo de troca existe: %s (:silent! para for<6F>ar)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: Sem nome de arquivo para o buffer %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: Sem nome de arquivo para o buffer %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: Arquivo n<>o gravado: grava<76><61>o desativada pela op<6F><70>o 'write'"
@@ -1038,19 +1038,19 @@ msgid "1 substitution"
 msgstr "1 substitui<75><69>o"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld correspond<6E>ncias"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> correspond<6E>ncias"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld substitui<75><69>es"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> substitui<75><69>es"
 
 msgid " on 1 line"
 msgstr " em 1 linha"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " em %ld linhas"
+msgid " on %<PRId64> lines"
+msgstr " em %<PRId64> linhas"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global n<>o pode ser executado recursivamente"
@@ -1133,8 +1133,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Nome de buffer inv<6E>lido: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: ID de sinal inv<6E>lido: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: ID de sinal inv<6E>lido: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (N<>O ENCONTRADO)"
@@ -1196,8 +1196,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: Mais 1 arquivo para editar"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: Mais %ld arquivos para editar"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: Mais %<PRId64> arquivos para editar"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: Comando j<> existe; adicione ! para substitu<74>-lo"
@@ -1381,8 +1381,8 @@ msgid "Exception discarded: %s"
 msgstr "Exce<63><65>o descartada: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, linha %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, linha %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1586,12 +1586,12 @@ msgid "[crypted]"
 msgstr "[criptografado]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[ERRO DE CONVERS<52>O na linha %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[ERRO DE CONVERS<52>O na linha %<PRId64>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[BYTE INV<4E>LIDO na linha %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[BYTE INV<4E>LIDO na linha %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[ERROS DE LEITURA]"
@@ -1669,8 +1669,8 @@ msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
 msgstr "E513: erro de grava<76><61>o, convers<72>o falhou (torne 'fenc' vazio para for<6F>ar)"
 
 #, c-format
-msgid "E513: write error, conversion failed in line %ld (make 'fenc' empty to override)"
-msgstr "E513: erro de grava<76><61>o, convers<72>o falhou na linha %ld (deixe 'fenc' vazio para for<6F>ar)"
+msgid "E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to override)"
+msgstr "E513: erro de grava<76><61>o, convers<72>o falhou na linha %<PRId64> (deixe 'fenc' vazio para for<6F>ar)"
 
 msgid "E514: write error (file system full?)"
 msgstr "E514: erro de grava<76><61>o (sistema de arquivos cheio?)"
@@ -1679,8 +1679,8 @@ msgid " CONVERSION ERROR"
 msgstr " ERRO DE CONVERS<52>O"
 
 #, c-format
-msgid " in line %ld;"
-msgstr "na linha %ld;"
+msgid " in line %<PRId64>;"
+msgstr "na linha %<PRId64>;"
 
 msgid "[Device]"
 msgstr "[Dispositivo]"
@@ -1741,15 +1741,15 @@ msgid "1 line, "
 msgstr "1 linha, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld linhas, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> linhas, "
 
 msgid "1 character"
 msgstr "1 caractere"
 
 #, c-format
-msgid "%ld characters"
-msgstr "%ld caracteres"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> caracteres"
 
 msgid "[noeol]"
 msgstr "[sem fim de linha]"
@@ -2156,19 +2156,19 @@ msgid "Font1: %s\n"
 msgstr "Fonte1: %s\n"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "O tamanho da Fonte%ld n<>o <20> o dobro do da Fonte0\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "O tamanho da Fonte%<PRId64> n<>o <20> o dobro do da Fonte0\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "Tamanho da Fonte0: %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "Tamanho da Fonte0: %<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"Tamanho da Fonte1: %ld\n"
+"Tamanho da Fonte1: %<PRId64>\n"
 "\n"
 
 msgid "Invalid font specification"
@@ -2345,8 +2345,8 @@ msgid "Added cscope database %s"
 msgstr "Adicionado banco de dados do cscope %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: erro ao ler a conex<65>o %ld do cscope"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: erro ao ler a conex<65>o %<PRId64> do cscope"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: tipo desconhecido de busca do cscope"
@@ -3530,12 +3530,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: Preserva<76><61>o falhou"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: n<>mero de linha inv<6E>lido: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: n<>mero de linha inv<6E>lido: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: linha %ld n<>o encontrada"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: linha %<PRId64> n<>o encontrada"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: id do bloco de ponteiros incorreto: 3"
@@ -3553,8 +3553,8 @@ msgid "deleted block 1?"
 msgstr "bloco 1 apagado?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Linha %ld n<>o encontrada"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Linha %<PRId64> n<>o encontrada"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: id do bloco de ponteiros incorreto"
@@ -3563,12 +3563,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count <20> zero"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: n<>mero da linha fora dos limites: %ld al<61>m do fim"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: n<>mero da linha fora dos limites: %<PRId64> al<61>m do fim"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: n<>mero de linhas incorreto no bloco %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: n<>mero de linhas incorreto no bloco %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "Aumenta o tamanho da pilha"
@@ -3756,8 +3756,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Aperte ENTER ou digite um comando para continuar"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s, linha %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s, linha %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- Mais --"
@@ -3826,12 +3826,12 @@ msgid "1 line less"
 msgstr "1 linha a menos"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld linhas a mais"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> linhas a mais"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld linhas a menos"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> linhas a menos"
 
 msgid " (Interrupted)"
 msgstr " (Interrompido)"
@@ -3870,8 +3870,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: A linha est<73> tornando-se muito longa"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Erro interno: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Erro interno: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -3939,8 +3939,8 @@ msgid "read from Netbeans socket"
 msgstr "lido do socket do NetBeans"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: Conex<65>o com o NetBeans perdida para o buffer %ld"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: Conex<65>o com o NetBeans perdida para o buffer %<PRId64>"
 
 msgid "E505: "
 msgstr "E505: "
@@ -3984,23 +3984,23 @@ msgid "1 line %sed %d times"
 msgstr "1 linha %sada %d vezes"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld linhas %sadas 1 vez"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> linhas %sadas 1 vez"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld linhas %sadas %d vezes"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> linhas %sadas %d vezes"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld linhas para indentar... "
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> linhas para indentar... "
 
 msgid "1 line indented "
 msgstr "1 linha indentada "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld linhas indentadas "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> linhas indentadas "
 
 msgid "E748: No previously used register"
 msgstr "E748: Nenhum registrador foi anteriormente utilizado"
@@ -4013,12 +4013,12 @@ msgid "1 line changed"
 msgstr "1 linha alterada"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld linhas alteradas"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> linhas alteradas"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "liberando %ld linhas"
+msgid "freeing %<PRId64> lines"
+msgstr "liberando %<PRId64> linhas"
 
 msgid "block of 1 line yanked"
 msgstr "bloco de uma linha copiado"
@@ -4027,12 +4027,12 @@ msgid "1 line yanked"
 msgstr "1 linha copiada"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "bloco de %ld linhas copiado"
+msgid "block of %<PRId64> lines yanked"
+msgstr "bloco de %<PRId64> linhas copiado"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld linhas copiadas"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> linhas copiadas"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4062,28 +4062,28 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: Registrador de tipo desconhecido %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld colunas; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> colunas; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Selecionadas %s%ld de %ld linhas; %ld de %ld palavras; %ld de %ld bytes"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Selecionadas %s%<PRId64> de %<PRId64> linhas; %<PRId64> de %<PRId64> palavras; %<PRId64> de %<PRId64> bytes"
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld Bytes"
-msgstr "Selecionadas %s%ld de %ld linhas; %ld de %ld palavras; %ld de %ld caracteres; %ld de %ld bytes"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
+msgstr "Selecionadas %s%<PRId64> de %<PRId64> linhas; %<PRId64> de %<PRId64> palavras; %<PRId64> de %<PRId64> caracteres; %<PRId64> de %<PRId64> bytes"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Coluna %s de %s; linha %ld de %ld; palavra %ld de %ld; byte %ld de %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Coluna %s de %s; linha %<PRId64> de %<PRId64>; palavra %<PRId64> de %<PRId64>; byte %<PRId64> de %<PRId64>"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of %ld"
-msgstr "Coluna %s de %s; linha %ld de %ld; palavra %ld de %ld; caractere %ld de %ld; byte %ld de %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Coluna %s de %s; linha %<PRId64> de %<PRId64>; palavra %<PRId64> de %<PRId64>; caractere %<PRId64> de %<PRId64>; byte %<PRId64> de %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld para BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> para BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=P<>gina %N"
@@ -4256,8 +4256,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Necess<73>rio Amigados vers<72>o 2.04 ou mais nova\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Necess<73>rio %s vers<72>o %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Necess<73>rio %s vers<72>o %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Imposs<73>vel abrir NIL:\n"
@@ -4339,8 +4339,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Sinal mortal interceptado\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "Abertura do display X demorou %ld ms"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "Abertura do display X demorou %<PRId64> ms"
 
 msgid ""
 "\n"
@@ -5016,8 +5016,8 @@ msgid "Performing soundfolding..."
 msgstr "Realizando an<61>lise fon<6F>tica..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "N<>mero de palavras ap<61>s an<61>lise fon<6F>tica: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "N<>mero de palavras ap<61>s an<61>lise fon<6F>tica: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -5052,8 +5052,8 @@ msgid "Done!"
 msgstr "Conclu<6C>do!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' n<>o cont<6E>m %ld elementos"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' n<>o cont<6E>m %<PRId64> elementos"
 
 #, c-format
 msgid "Word removed from %s"
@@ -5070,8 +5070,8 @@ msgid "Sorry, no suggestions"
 msgstr "Desculpe, n<>o h<> sugest<73>es"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Desculpe, apenas %ld sugest<73>es"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "Desculpe, apenas %<PRId64> sugest<73>es"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5371,8 +5371,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Erro de formato no arquivo de marcadores \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "Antes do byte %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Antes do byte %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5445,8 +5445,8 @@ msgid "Already at newest change"
 msgstr "J<> est<73> na altera<72><61>o mais nova"
 
 #, c-format
-msgid "Undo number %ld not found"
-msgstr "Desfazimento n<> %ld n<>o encontrado"
+msgid "Undo number %<PRId64> not found"
+msgstr "Desfazimento n<> %<PRId64> n<>o encontrado"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: n<>meros de linha errados"
@@ -5470,8 +5470,8 @@ msgid "changes"
 msgstr "altera<72><61>es"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "antes de"
@@ -5486,8 +5486,8 @@ msgid "number changes  time"
 msgstr "n<>mero altera<72>. hora"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld segundos atr<74>s"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> segundos atr<74>s"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin n<>o <20> permitido depois de desfazer"

src/po/ru.cp1251.po

@@ -87,8 +87,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: <20><><EFBFBD><EFBFBD><EFBFBD> %ld <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
@@ -97,9 +97,9 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
 msgstr ""
-"E89: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> !, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
+"E89: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> !, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
@@ -108,8 +108,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: <20><><EFBFBD><EFBFBD><EFBFBD> %ld <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -120,8 +120,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "line %ld"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "line %<PRId64>"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -149,12 +149,12 @@ msgid "1 line --%d%%--"
 msgstr "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld <20><><EFBFBD>. --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> <20><><EFBFBD>. --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "<22><><EFBFBD>. %ld <20><> %ld --%d%%-- <20><><EFBFBD>. "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "<22><><EFBFBD>. %<PRId64> <20><> %<PRId64> --%d%%-- <20><><EFBFBD>. "
 
 msgid "[No Name]"
 msgstr "[<5B><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>]"
@@ -200,12 +200,12 @@ msgid "Signs for %s:"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>=%ld  id=%d  <20><><EFBFBD>=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>=%<PRId64>  id=%d  <20><><EFBFBD>=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
@@ -363,8 +363,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> :let"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -790,8 +790,8 @@ msgid "%s aborted"
 msgstr "%s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #%<PRId64>"
 
 #, c-format
 msgid "%s returning %s"
@@ -840,12 +840,12 @@ msgid "1 line moved"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "%<PRId64> lines moved"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "%<PRId64> lines filtered"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> *Filter* <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
@@ -930,8 +930,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: <20><><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s (:silent! <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: <20><><EFBFBD><EFBFBD><EFBFBD> %ld <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 'write'"
@@ -989,19 +989,19 @@ msgid "1 substitution"
 msgstr "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld <20><><EFBFBD><EFBFBD><EFBFBD>"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid " on 1 line"
 msgstr " <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " <20> %ld <20><><EFBFBD>."
+msgid " on %<PRId64> lines"
+msgstr " <20> %<PRId64> <20><><EFBFBD>."
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> :global <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -1087,8 +1087,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ID <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ID <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (<28><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
@@ -1103,16 +1103,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"cont\""
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> \"%s%s\" <20><><EFBFBD>. %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> \"%s%s\" <20><><EFBFBD>. %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -1122,8 +1122,8 @@ msgid "No breakpoints defined"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s <20><><EFBFBD>. %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s <20><><EFBFBD>. %<PRId64>"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \":profile start {<7B><><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD>}\""
@@ -1180,16 +1180,16 @@ msgid "could not source \"%s\""
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1279,8 +1279,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: 1 <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (%ld)."
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (%<PRId64>)."
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ! <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
@@ -1475,8 +1475,8 @@ msgid "Exception discarded: %s"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1680,12 +1680,12 @@ msgid "[crypted]"
 msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]"
@@ -1776,10 +1776,10 @@ msgstr ""
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "
+"E513: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "
 "'fenc', <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
 
 msgid "E514: write error (file system full?)"
@@ -1789,8 +1789,8 @@ msgid " CONVERSION ERROR"
 msgstr " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid " in line %ld;"
-msgstr " <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld;"
+msgid " in line %<PRId64>;"
+msgstr " <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>;"
 
 msgid "[Device]"
 msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]"
@@ -1852,8 +1852,8 @@ msgid "1 line, "
 msgstr "1 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>: %ld, "
+msgid "%<PRId64> lines, "
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>, "
 
 msgid "1 character"
 msgstr "1 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -1864,8 +1864,8 @@ msgstr "
 
 #. Explicit typecast avoids warning on Mac OS X 10.6
 #, c-format
-msgid "%ld characters"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "%<PRId64> characters"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2290,16 +2290,16 @@ msgid "Font1: %s"
 msgstr "Font1: %s"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> font%ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> font0"
+msgid "Font%<PRId64> width is not twice that of font0"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> font%<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> font0"
 
 #, c-format
-msgid "Font0 width: %ld"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> font0: %ld"
+msgid "Font0 width: %<PRId64>"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> font0: %<PRId64>"
 
 #, c-format
-msgid "Font1 width: %ld"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> font1: %ld"
+msgid "Font1 width: %<PRId64>"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> font1: %<PRId64>"
 
 msgid "Invalid font specification"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -2475,8 +2475,8 @@ msgid "Added cscope database %s"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> cscope %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> cscope %ld"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> cscope %<PRId64>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> cscope"
@@ -3717,12 +3717,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> lnum: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> 3"
@@ -3740,8 +3740,8 @@ msgid "deleted block 1?"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> 1?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
@@ -3750,12 +3750,12 @@ msgid "pe_line_count is zero"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> pe_line_count <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -3945,8 +3945,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ENTER <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> --"
@@ -4016,12 +4016,12 @@ msgid "1 line less"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "%<PRId64> more lines"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "%<PRId64> fewer lines"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 msgid " (Interrupted)"
 msgstr " (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
@@ -4059,8 +4059,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4136,8 +4136,8 @@ msgid "read from Netbeans socket"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NetBeans"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> NetBeans <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> NetBeans <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: NetBeans <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -4189,23 +4189,23 @@ msgid "1 line %sed %d times"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> 1 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (%s %d <20><><EFBFBD>)"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, %ld <20><><EFBFBD><EFBFBD><EFBFBD> (%s 1 <20><><EFBFBD>)"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD> (%s 1 <20><><EFBFBD>)"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, %ld <20><><EFBFBD><EFBFBD><EFBFBD> (%s %d <20><><EFBFBD>)"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD> (%s %d <20><><EFBFBD>)"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (%ld)..."
+msgid "%<PRId64> lines to indent... "
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (%<PRId64>)..."
 
 msgid "1 line indented "
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (%ld) "
+msgid "%<PRId64> lines indented "
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (%<PRId64>) "
 
 msgid "E748: No previously used register"
 msgstr "E748: <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -4218,12 +4218,12 @@ msgid "1 line changed"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "%<PRId64> lines changed"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "freeing %<PRId64> lines"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 msgid "block of 1 line yanked"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -4232,12 +4232,12 @@ msgid "1 line yanked"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "block of %<PRId64> lines yanked"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "%<PRId64> lines yanked"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4266,36 +4266,36 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %ld; "
+msgid "%<PRId64> Cols; "
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s%ld <20><> %ld <20><><EFBFBD><EFBFBD><EFBFBD>; %ld <20><> %ld <20><><EFBFBD><EFBFBD>; %ld <20><> %ld <20><><EFBFBD><EFBFBD>"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s%<PRId64> <20><> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD>; %<PRId64> <20><> %<PRId64> <20><><EFBFBD><EFBFBD>; %<PRId64> <20><> %<PRId64> <20><><EFBFBD><EFBFBD>"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
 msgstr ""
-"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s%ld <20><> %ld <20><><EFBFBD>.; %ld <20><> %ld <20><><EFBFBD><EFBFBD>; %ld <20><> %ld <20><><EFBFBD><EFBFBD>.; %ld <20><> %ld "
+"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s%<PRId64> <20><> %<PRId64> <20><><EFBFBD>.; %<PRId64> <20><> %<PRId64> <20><><EFBFBD><EFBFBD>; %<PRId64> <20><> %<PRId64> <20><><EFBFBD><EFBFBD>.; %<PRId64> <20><> %<PRId64> "
 "<22><><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "<22><><EFBFBD>. %s <20><> %s; <20><><EFBFBD>. %ld <20><> %ld; <20><>. %ld <20><> %ld; <20><><EFBFBD><EFBFBD> %ld <20><> %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "<22><><EFBFBD>. %s <20><> %s; <20><><EFBFBD>. %<PRId64> <20><> %<PRId64>; <20><>. %<PRId64> <20><> %<PRId64>; <20><><EFBFBD><EFBFBD> %<PRId64> <20><> %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"<22><><EFBFBD>. %s <20><> %s; <20><><EFBFBD>. %ld <20><> %ld; <20><>. %ld <20><> %ld; <20><><EFBFBD><EFBFBD>. %ld <20><> %ld; <20><><EFBFBD><EFBFBD> %ld "
-"<22><> %ld"
+"<22><><EFBFBD>. %s <20><> %s; <20><><EFBFBD>. %<PRId64> <20><> %<PRId64>; <20><>. %<PRId64> <20><> %<PRId64>; <20><><EFBFBD><EFBFBD>. %<PRId64> <20><> %<PRId64>; <20><><EFBFBD><EFBFBD> %<PRId64> "
+"<22><> %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=<3D><><EFBFBD>. %N"
@@ -4480,8 +4480,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Amigados <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 2.04 <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NIL:\n"
@@ -4563,8 +4563,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld msec"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> X <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> msec"
 
 msgid ""
 "\n"
@@ -5338,8 +5338,8 @@ msgid "Performing soundfolding..."
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -5374,8 +5374,8 @@ msgid "Done!"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
 msgid "Word removed from %s"
@@ -5392,8 +5392,8 @@ msgid "Sorry, no suggestions"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5711,8 +5711,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "Before byte %<PRId64>"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5856,8 +5856,8 @@ msgid "Already at newest change"
 msgstr "<22><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E830: Undo number %ld not found"
-msgstr "E830: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "E830: Undo number %<PRId64> not found"
+msgstr "E830: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
@@ -5881,8 +5881,8 @@ msgid "changes"
 msgstr "<22><><EFBFBD>."
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>"
@@ -5898,8 +5898,8 @@ msgid "number changes  when               saved"
 msgstr " <20><><EFBFBD><EFBFBD><EFBFBD>  <20><><EFBFBD><EFBFBD><EFBFBD>.  <20><><EFBFBD><EFBFBD><EFBFBD>              <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld <20> <20><><EFBFBD><EFBFBD><EFBFBD>"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> <20> <20><><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

src/po/ru.po

@@ -87,8 +87,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: Буферы в списке отсутствуют"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Буфер %ld не существует"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Буфер %<PRId64> не существует"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Это последний буфер"
@@ -97,9 +97,9 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: Это первый буфер"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
 msgstr ""
-"E89: Изменения в буфере %ld не сохранены (добавьте !, чтобы обойти проверку)"
+"E89: Изменения в буфере %<PRId64> не сохранены (добавьте !, чтобы обойти проверку)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Невозможно выгрузить из памяти последний буфер"
@@ -108,8 +108,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Предупреждение: переполнение списка имён файлов"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Буфер %ld не найден"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: Буфер %<PRId64> не найден"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -120,8 +120,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Нет соответствующего %s буфера"
 
 #, c-format
-msgid "line %ld"
-msgstr "строка %ld"
+msgid "line %<PRId64>"
+msgstr "строка %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Буфер с таким именем уже существует"
@@ -149,12 +149,12 @@ msgid "1 line --%d%%--"
 msgstr "Одна строка --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld стр. --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> стр. --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "стр. %ld из %ld --%d%%-- кол. "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "стр. %<PRId64> из %<PRId64> --%d%%-- кол. "
 
 msgid "[No Name]"
 msgstr "[Нет имени]"
@@ -200,12 +200,12 @@ msgid "Signs for %s:"
 msgstr "Значки для %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    строка=%ld  id=%d  имя=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    строка=%<PRId64>  id=%d  имя=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Следить за отличиями можно не более чем в %ld буферах"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Следить за отличиями можно не более чем в %<PRId64> буферах"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: Невозможно прочитать или записать временные файлы"
@@ -363,8 +363,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: Неожиданные символы в :let"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: Индекс списка за пределами диапазона: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: Индекс списка за пределами диапазона: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -790,8 +790,8 @@ msgid "%s aborted"
 msgstr "%s прервана"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s возвращает #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s возвращает #%<PRId64>"
 
 #, c-format
 msgid "%s returning %s"
@@ -840,12 +840,12 @@ msgid "1 line moved"
 msgstr "Перемещена одна строка"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "Перемещено строк: %ld"
+msgid "%<PRId64> lines moved"
+msgstr "Перемещено строк: %<PRId64>"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "Пропущено через фильтр строк: %ld"
+msgid "%<PRId64> lines filtered"
+msgstr "Пропущено через фильтр строк: %<PRId64>"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: Автокоманды *Filter* не должны изменять активный буфер"
@@ -930,8 +930,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Своп-файл существует: %s (:silent! чтобы обойти проверку)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: Буфер %ld не связан с именем файла"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: Буфер %<PRId64> не связан с именем файла"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: Файл не сохранён: запись отключена опцией 'write'"
@@ -989,19 +989,19 @@ msgid "1 substitution"
 msgstr "Одна замена"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld соответствий"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> соответствий"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld замен"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> замен"
 
 msgid " on 1 line"
 msgstr " в одной строке"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " в %ld стр."
+msgid " on %<PRId64> lines"
+msgstr " в %<PRId64> стр."
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: Команда :global не может быть рекурсивной"
@@ -1087,8 +1087,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Неправильное имя буфера: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Неправильный ID значка: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: Неправильный ID значка: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (НЕ НАЙДЕНО)"
@@ -1103,16 +1103,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Включён режим отладки. Для продолжения наберите \"cont\""
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "строка %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "строка %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "команда: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Точка остановки в \"%s%s\" стр. %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Точка остановки в \"%s%s\" стр. %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -1122,8 +1122,8 @@ msgid "No breakpoints defined"
 msgstr "Точки остановки не определены"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s стр. %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s стр. %<PRId64>"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Первое использование \":profile start {имя-файла}\""
@@ -1180,16 +1180,16 @@ msgid "could not source \"%s\""
 msgstr "невозможно считать \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "строка %ld: невозможно считать \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "строка %<PRId64>: невозможно считать \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "считывание сценария \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "строка %ld: считывание \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "строка %<PRId64>: считывание \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1279,8 +1279,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: 1 файл ожидает редактирования."
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: Есть неотредактированные файлы (%ld)."
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: Есть неотредактированные файлы (%<PRId64>)."
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: Команда уже существует. Добавьте ! для замены."
@@ -1475,8 +1475,8 @@ msgid "Exception discarded: %s"
 msgstr "Исключительная ситуация проигнорирована: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, строка %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, строка %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1680,12 +1680,12 @@ msgid "[crypted]"
 msgstr "[зашифровано]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[ОШИБКА ПРЕОБРАЗОВАНИЯ в строке %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[ОШИБКА ПРЕОБРАЗОВАНИЯ в строке %<PRId64>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[НЕДОПУСТИМЫЙ БАЙТ в строке %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[НЕДОПУСТИМЫЙ БАЙТ в строке %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[ОШИБКИ ЧТЕНИЯ]"
@@ -1776,10 +1776,10 @@ msgstr ""
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: Ошибка записи, преобразование не удалось на строке %ld (очистите "
+"E513: Ошибка записи, преобразование не удалось на строке %<PRId64> (очистите "
 "'fenc', чтобы обойти)"
 
 msgid "E514: write error (file system full?)"
@@ -1789,8 +1789,8 @@ msgid " CONVERSION ERROR"
 msgstr " ОШИБКА ПРЕОБРАЗОВАНИЯ"
 
 #, c-format
-msgid " in line %ld;"
-msgstr " на строке %ld;"
+msgid " in line %<PRId64>;"
+msgstr " на строке %<PRId64>;"
 
 msgid "[Device]"
 msgstr "[Устройство]"
@@ -1852,8 +1852,8 @@ msgid "1 line, "
 msgstr "1 строка, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "строк: %ld, "
+msgid "%<PRId64> lines, "
+msgstr "строк: %<PRId64>, "
 
 msgid "1 character"
 msgstr "1 символ"
@@ -1864,8 +1864,8 @@ msgstr "символов: %<PRId64>"
 
 #. Explicit typecast avoids warning on Mac OS X 10.6
 #, c-format
-msgid "%ld characters"
-msgstr "символов: %ld"
+msgid "%<PRId64> characters"
+msgstr "символов: %<PRId64>"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2290,16 +2290,16 @@ msgid "Font1: %s"
 msgstr "Font1: %s"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0"
-msgstr "Ширина шрифта font%ld должна быть вдвое больше ширины шрифта font0"
+msgid "Font%<PRId64> width is not twice that of font0"
+msgstr "Ширина шрифта font%<PRId64> должна быть вдвое больше ширины шрифта font0"
 
 #, c-format
-msgid "Font0 width: %ld"
-msgstr "Ширина шрифта font0: %ld"
+msgid "Font0 width: %<PRId64>"
+msgstr "Ширина шрифта font0: %<PRId64>"
 
 #, c-format
-msgid "Font1 width: %ld"
-msgstr "Ширина шрифта font1: %ld"
+msgid "Font1 width: %<PRId64>"
+msgstr "Ширина шрифта font1: %<PRId64>"
 
 msgid "Invalid font specification"
 msgstr "Неправильное определение шрифта"
@@ -2475,8 +2475,8 @@ msgid "Added cscope database %s"
 msgstr "Добавлена база данных cscope %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: Ошибка получения информации от соединения cscope %ld"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: Ошибка получения информации от соединения cscope %<PRId64>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: Неизвестный тип поиска cscope"
@@ -3717,12 +3717,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: Неудачная попытка обновления своп-файла"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: неправильное значение lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: неправильное значение lnum: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: невозможно найти строку %ld"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: невозможно найти строку %<PRId64>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: Неправильное значение указателя блока 3"
@@ -3740,8 +3740,8 @@ msgid "deleted block 1?"
 msgstr "удалён блок 1?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Строка %ld не обнаружена"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Строка %<PRId64> не обнаружена"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: Неправильное значение указателя блока"
@@ -3750,12 +3750,12 @@ msgid "pe_line_count is zero"
 msgstr "значение pe_line_count равно нулю"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: Номер строки за пределами диапазона: %ld"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: Номер строки за пределами диапазона: %<PRId64>"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: Неправильное значение счётчика строк в блоке %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: Неправильное значение счётчика строк в блоке %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "Размер стека увеличен"
@@ -3945,8 +3945,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Нажмите ENTER или введите команду для продолжения"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s строка %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s строка %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- Продолжение следует --"
@@ -4016,12 +4016,12 @@ msgid "1 line less"
 msgstr "Убрана одна строка"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "Добавлено строк: %ld"
+msgid "%<PRId64> more lines"
+msgstr "Добавлено строк: %<PRId64>"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "Убрано строк: %ld"
+msgid "%<PRId64> fewer lines"
+msgstr "Убрано строк: %<PRId64>"
 
 msgid " (Interrupted)"
 msgstr " (Прервано)"
@@ -4059,8 +4059,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: Строка становится слишком длинной"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Внутренняя ошибка: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Внутренняя ошибка: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4136,8 +4136,8 @@ msgid "read from Netbeans socket"
 msgstr "чтение из гнезда NetBeans"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: Потеряно соединение с NetBeans для буфера %ld"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: Потеряно соединение с NetBeans для буфера %<PRId64>"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: NetBeans не поддерживается с этим графическим интерфейсом"
@@ -4189,23 +4189,23 @@ msgid "1 line %sed %d times"
 msgstr "Изменены отступы в 1 строке (%s %d раз)"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "Изменены отступы, %ld строк (%s 1 раз)"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "Изменены отступы, %<PRId64> строк (%s 1 раз)"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "Изменены отступы, %ld строк (%s %d раз)"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "Изменены отступы, %<PRId64> строк (%s %d раз)"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "Изменяются отступы строках (%ld)..."
+msgid "%<PRId64> lines to indent... "
+msgstr "Изменяются отступы строках (%<PRId64>)..."
 
 msgid "1 line indented "
 msgstr "Изменён отступ в одной строке "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "Изменены отступы в строках (%ld) "
+msgid "%<PRId64> lines indented "
+msgstr "Изменены отступы в строках (%<PRId64>) "
 
 msgid "E748: No previously used register"
 msgstr "E748: Нет предыдущего использованного регистра"
@@ -4218,12 +4218,12 @@ msgid "1 line changed"
 msgstr "изменена 1 строка"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "изменено строк: %ld"
+msgid "%<PRId64> lines changed"
+msgstr "изменено строк: %<PRId64>"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "очищено строк: %ld"
+msgid "freeing %<PRId64> lines"
+msgstr "очищено строк: %<PRId64>"
 
 msgid "block of 1 line yanked"
 msgstr "скопирован блок из одной строки"
@@ -4232,12 +4232,12 @@ msgid "1 line yanked"
 msgstr "скопирована одна строка"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "скопирован блок из строк: %ld"
+msgid "block of %<PRId64> lines yanked"
+msgstr "скопирован блок из строк: %<PRId64>"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "скопировано строк: %ld"
+msgid "%<PRId64> lines yanked"
+msgstr "скопировано строк: %<PRId64>"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4266,36 +4266,36 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: Неизвестный тип регистра %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "Колонок: %ld; "
+msgid "%<PRId64> Cols; "
+msgstr "Колонок: %<PRId64>; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Выделено %s%ld из %ld строк; %ld из %ld слов; %ld из %ld байт"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Выделено %s%<PRId64> из %<PRId64> строк; %<PRId64> из %<PRId64> слов; %<PRId64> из %<PRId64> байт"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
 msgstr ""
-"Выделено %s%ld из %ld стр.; %ld из %ld слов; %ld из %ld симв.; %ld из %ld "
+"Выделено %s%<PRId64> из %<PRId64> стр.; %<PRId64> из %<PRId64> слов; %<PRId64> из %<PRId64> симв.; %<PRId64> из %<PRId64> "
 "байт"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Кол. %s из %s; стр. %ld из %ld; сл. %ld из %ld; байт %ld из %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Кол. %s из %s; стр. %<PRId64> из %<PRId64>; сл. %<PRId64> из %<PRId64>; байт %<PRId64> из %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"Кол. %s из %s; стр. %ld из %ld; сл. %ld из %ld; симв. %ld из %ld; байт %ld "
-"из %ld"
+"Кол. %s из %s; стр. %<PRId64> из %<PRId64>; сл. %<PRId64> из %<PRId64>; симв. %<PRId64> из %<PRId64>; байт %<PRId64> "
+"из %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld с учётом BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> с учётом BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Стр. %N"
@@ -4480,8 +4480,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Необходима Amigados версии 2.04 или более поздней\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Необходима %s версии %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Необходима %s версии %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Невозможно открыть NIL:\n"
@@ -4563,8 +4563,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Получен убийственный сигнал\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "Открытие дисплея X заняло %ld msec"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "Открытие дисплея X заняло %<PRId64> msec"
 
 msgid ""
 "\n"
@@ -5338,8 +5338,8 @@ msgid "Performing soundfolding..."
 msgstr "Выполнение звуковой свёртки..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "Количество слов после звуковой свёртки: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "Количество слов после звуковой свёртки: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -5374,8 +5374,8 @@ msgid "Done!"
 msgstr "Завершено!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' не содержит %ld элементов"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' не содержит %<PRId64> элементов"
 
 #, c-format
 msgid "Word removed from %s"
@@ -5392,8 +5392,8 @@ msgid "Sorry, no suggestions"
 msgstr "Извините, нет предположений"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Извините, только %ld предположений"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "Извините, только %<PRId64> предположений"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5711,8 +5711,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Ошибка формата в файле меток \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "Перед байтом %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Перед байтом %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5856,8 +5856,8 @@ msgid "Already at newest change"
 msgstr "Уже на самом последнем изменении"
 
 #, c-format
-msgid "E830: Undo number %ld not found"
-msgstr "E830: Не найдена отмена номер %ld"
+msgid "E830: Undo number %<PRId64> not found"
+msgstr "E830: Не найдена отмена номер %<PRId64>"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: неправильные номера строк"
@@ -5881,8 +5881,8 @@ msgid "changes"
 msgstr "изм."
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "перед"
@@ -5898,8 +5898,8 @@ msgid "number changes  when               saved"
 msgstr " номер  измен.  когда              сохранено"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld с назад"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> с назад"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: Объединение отмен не допускается после отмены"

src/po/sk.cp1250.po

@@ -59,8 +59,8 @@ msgstr "E84: Nebol n
 msgid "E85: There is no listed buffer"
 msgstr "E85: Nena<6E>iel som <20>iadny buffer"
 
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Buffer %ld neexistuje"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Buffer %<PRId64> neexistuje"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Za posledn<64> buffer sa ned<65> presko<6B>i<EFBFBD>"
@@ -68,8 +68,8 @@ msgstr "E87: Za posledn
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: Pred prv<72> buffer sa ned<65> presko<6B>i<EFBFBD>"
 
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: Zmeny v bufferi %ld neboli ulo<6C>en<65> (! pre vyn<79>tenie)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: Zmeny v bufferi %<PRId64> neboli ulo<6C>en<65> (! pre vyn<79>tenie)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Posledn<64> buffer sa ned<65> odstr<74>ni<6E>"
@@ -78,8 +78,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Varovanie: prete<74>enie zoznamu s n<>zvami s<>borov"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: buffer %ld nen<65>jden<65>"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: buffer %<PRId64> nen<65>jden<65>"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -90,8 +90,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Vzoru %s nevyhovuje <20>iadny buffer"
 
 #, c-format
-msgid "line %ld"
-msgstr "riadok %ld"
+msgid "line %<PRId64>"
+msgstr "riadok %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Buffer tak<61>hoto mena u<> existuje"
@@ -116,12 +116,12 @@ msgid "1 line --%d%%--"
 msgstr "1 riadok --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld riadkov --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> riadkov --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "riadok %ld z %ld --%d%%-- st<73>pec"
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "riadok %<PRId64> z %<PRId64> --%d%%-- st<73>pec"
 
 msgid "[No Name]"
 msgstr "[Bez mena]"
@@ -168,12 +168,12 @@ msgid "Signs for %s:"
 msgstr "Znaky pre %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    riadok=%ld  id=%d  meno=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    riadok=%<PRId64>  id=%d  meno=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Nem<65><6D>em porovna<6E> viac ako %ld bufferov"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Nem<65><6D>em porovna<6E> viac ako %<PRId64> bufferov"
 
 msgid "E97: Cannot create diffs"
 msgstr "E97: Nedaj<61> sa vytvori<72> porovnania"
@@ -311,8 +311,8 @@ msgstr "zhoda %d"
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: Neo<65>ek<65>van<61> znaky v :let"
 
-msgid "E684: list index out of range: %ld"
-msgstr "E684: index v zozname je mimo rozsah: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: index v zozname je mimo rozsah: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -620,8 +620,8 @@ msgid "%s aborted"
 msgstr "%s zru<72>en<65>"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s vr<76>tilo #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s vr<76>tilo #%<PRId64>"
 
 msgid "%s returning %s"
 msgstr "%s vr<76>tilo %s"
@@ -665,12 +665,12 @@ msgid "1 line moved"
 msgstr "1 riadok presunut<75>"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld riadkov presunut<75>ch"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> riadkov presunut<75>ch"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld riadkov filtrovan<61>ch"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> riadkov filtrovan<61>ch"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: Automatick<63> pr<70>kazy *Filter* nesm<73> meni<6E> aktu<74>lny buffer"
@@ -749,8 +749,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Odkladac<61> s<>bor existuje: %s (pou<6F>ite :silent! pre prep<65>sanie)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: <20>iadny n<>zov s<>boru pre buffer %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: <20>iadny n<>zov s<>boru pre buffer %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: S<>bor nebol ulo<6C>en<65>: ukladanie je zak<61>zan<61> vo<76>bou 'write'"
@@ -791,19 +791,19 @@ msgstr "1 zhoda"
 msgid "1 substitution"
 msgstr "1 nahradenie"
 
-msgid "%ld matches"
-msgstr "%ld zh<7A>d"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> zh<7A>d"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld nahraden<65>"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> nahraden<65>"
 
 msgid " on 1 line"
 msgstr " na 1 riadku"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " na %ld riadkov"
+msgid " on %<PRId64> lines"
+msgstr " na %<PRId64> riadkov"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global sa ned<65> vola<6C> rekurz<72>vne"
@@ -884,8 +884,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Chybn<62> meno bufferu: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Chybn<62> ID zna<6E>ky: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: Chybn<62> ID zna<6E>ky: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (NEN<45>JDEN<45>)"
@@ -900,16 +900,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Sp<53><70><EFBFBD>am re<72>im ladenia. Pre ukon<6F>enie nap<61><70>te \"cont\"."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "riadok %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "riadok %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "pr<70>kaz: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Bod preru<72>enia v \"%s%s\" na riadku %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Bod preru<72>enia v \"%s%s\" na riadku %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -919,8 +919,8 @@ msgid "No breakpoints defined"
 msgstr "Neboli definovn<76> <20>iadne body preru<72>enia"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  riadok %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  riadok %<PRId64>"
 
 msgid "E750: First use :profile start <fname>"
 msgstr "E750: Najprv pou<6F>ite pr<70>kaz :profile start <meno_suboru>"
@@ -975,16 +975,16 @@ msgid "could not source \"%s\""
 msgstr "ned<65> sa interpretova<76> \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "riadok %ld: nem<65><6D>no interpretova<76> \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "riadok %<PRId64>: nem<65><6D>no interpretova<76> \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "interpretujem \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "riadok %ld: interpretujem \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "riadok %<PRId64>: interpretujem \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1057,8 +1057,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: E<>te zost<73>va 1 s<>bor k <20>prave."
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: E<>te zost<73>va %ld s<>borov k <20>prave."
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: E<>te zost<73>va %<PRId64> s<>borov k <20>prave."
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: Pr<50>kaz u<> existuje: pou<6F>ite ! pre predefinovanie"
@@ -1225,8 +1225,8 @@ msgstr "V
 msgid "Exception discarded: %s"
 msgstr "V<>nimka zahoden<65>: %s"
 
-msgid "%s, line %ld"
-msgstr "%s, riadok %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, riadok %<PRId64>"
 
 #. always scroll up, don't overwrite
 msgid "Exception caught: %s"
@@ -1413,8 +1413,8 @@ msgid "[CONVERSION ERROR]"
 msgstr "[CHYBA PREVODU]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[NEPR<50>PUSTN<54> BAJT na riadku %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[NEPR<50>PUSTN<54> BAJT na riadku %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[CHYBY <20><>TANIA]"
@@ -1556,15 +1556,15 @@ msgid "1 line, "
 msgstr "1 riadok, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld riadkov, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> riadkov, "
 
 msgid "1 character"
 msgstr "1 znak"
 
 #, c-format
-msgid "%ld characters"
-msgstr "%ld znakov"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> znakov"
 
 msgid "[noeol]"
 msgstr "[bez znaku konca riadku]"
@@ -1964,19 +1964,19 @@ msgstr "P
 msgid "Font1: %s\n"
 msgstr "P<>smo1: %s\n"
 
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "P<>smo%ld nie je dvakr<6B>t <20>ir<69>ie ako p<>smo0\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "P<>smo%<PRId64> nie je dvakr<6B>t <20>ir<69>ie ako p<>smo0\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "<22><>rka p<>sma0: %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "<22><>rka p<>sma0: %<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"<22><>rka p<>sma1: %ld\n"
+"<22><>rka p<>sma1: %<PRId64>\n"
 "\n"
 
 msgid "Invalid font specification"
@@ -2145,8 +2145,8 @@ msgstr "E564: %s nie je ani adres
 msgid "Added cscope database %s"
 msgstr "Pridan<61> cscope datab<61>za %s"
 
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: chyba pri <20><>tan<61> cscope spojenia %ld"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: chyba pri <20><>tan<61> cscope spojenia %<PRId64>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: nezn<7A>my typ cscope h<>adania"
@@ -3308,12 +3308,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: Uchovanie sa nepodarilo"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: chybn<62> <20><>slo riadku: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: chybn<62> <20><>slo riadku: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: ned<65> sa n<>js<6A> riadok %ld"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: ned<65> sa n<>js<6A> riadok %<PRId64>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: chybn<62> <20><>slo ukazovate<74>a na blok 3"
@@ -3331,8 +3331,8 @@ msgid "deleted block 1?"
 msgstr "vymazan<61> blok 1?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Ned<65> sa n<>js<6A> riadok %ld"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Ned<65> sa n<>js<6A> riadok %<PRId64>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: chybn<62> <20><>slo ukazovate<74>a na blok"
@@ -3341,12 +3341,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count m<> nulov<6F> hodnotu"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: <20><>slo riadku je mimo rozsah: %ld (za koncom)"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: <20><>slo riadku je mimo rozsah: %<PRId64> (za koncom)"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: chybn<62> po<70>et riadkov v bloku %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: chybn<62> po<70>et riadkov v bloku %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "N<>rast ve<76>kosti z<>sobn<62>ku"
@@ -3589,12 +3589,12 @@ msgid "1 line less"
 msgstr "1 vymazan<61> riadok"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld nov<6F>ch riadkov"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> nov<6F>ch riadkov"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld vymazan<61>ch riadkov"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> vymazan<61>ch riadkov"
 
 msgid " (Interrupted)"
 msgstr " (Preru<72>en<65>)"
@@ -3633,8 +3633,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: Riadok sa st<73>va pr<70>li<6C> dlh<6C>m"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Vn<56>torn<72> chyba: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Vn<56>torn<72> chyba: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -3706,8 +3706,8 @@ msgstr "E668: Zl
 msgid "read from Netbeans socket"
 msgstr "<22><>tanie z Netbeans soketu"
 
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: Straten<65> NetBeans spojenie pre buffer %ld"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: Straten<65> NetBeans spojenie pre buffer %<PRId64>"
 
 msgid "E505: "
 msgstr "E505: "
@@ -3745,23 +3745,23 @@ msgid "1 line %sed %d times"
 msgstr "1 riadok upraven<65> pomocou %s %d kr<6B>t"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld riadkov upraven<65>ch naraz pomocou %s"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> riadkov upraven<65>ch naraz pomocou %s"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld riadkov upraven<65>ch pomocou %s %d kr<6B>t"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> riadkov upraven<65>ch pomocou %s %d kr<6B>t"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld riadkov pre odsadenie..."
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> riadkov pre odsadenie..."
 
 msgid "1 line indented "
 msgstr "1 riadok odsaden<65> "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld riadkov odsaden<65>ch "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> riadkov odsaden<65>ch "
 
 msgid "E748: No previously used register"
 msgstr "E748: <20>iadny predt<64>m pou<6F><75>van<61> register"
@@ -3774,12 +3774,12 @@ msgid "1 line changed"
 msgstr "1 riadok zmenen<65>"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld zmenen<65>ch riadkov"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> zmenen<65>ch riadkov"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "uvol<6F>ujem %ld riadkov"
+msgid "freeing %<PRId64> lines"
+msgstr "uvol<6F>ujem %<PRId64> riadkov"
 
 msgid "block of 1 line yanked"
 msgstr "skop<6F>rovan<61> blok 1 riadku"
@@ -3787,12 +3787,12 @@ msgstr "skop
 msgid "1 line yanked"
 msgstr "1 riadok skop<6F>rovan<61>"
 
-msgid "block of %ld lines yanked"
-msgstr "skop<6F>rovan<61> blok %ld riadkov"
+msgid "block of %<PRId64> lines yanked"
+msgstr "skop<6F>rovan<61> blok %<PRId64> riadkov"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld skop<6F>rovan<61>ch riadkov"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> skop<6F>rovan<61>ch riadkov"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3821,31 +3821,31 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: Nezn<7A>my typ registra %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld St<53>pcov; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> St<53>pcov; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Vybran<61>ch %s%ld z %ld Riadkov; %ld zo %ld Slov; %ld z %ld Bajtov"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Vybran<61>ch %s%<PRId64> z %<PRId64> Riadkov; %<PRId64> zo %<PRId64> Slov; %<PRId64> z %<PRId64> Bajtov"
 
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
-msgstr "Vybran<61>ch %s%ld z %ld Riadkov; %ld zo %ld Slov; %ld z %ld Znakov; %ld z %ld Bajtov"
+msgstr "Vybran<61>ch %s%<PRId64> z %<PRId64> Riadkov; %<PRId64> zo %<PRId64> Slov; %<PRId64> z %<PRId64> Znakov; %<PRId64> z %<PRId64> Bajtov"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "St<53>pec %s z %s; Riadok %ld z %ld; Slovo %ld z %ld; Bajt %ld z %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "St<53>pec %s z %s; Riadok %<PRId64> z %<PRId64>; Slovo %<PRId64> z %<PRId64>; Bajt %<PRId64> z %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
-msgstr "St<53>pec %s z %s; Riadok %ld z %ld; Slovo %ld z %ld; Znak %ld z %ld; Bajt %ld z %ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
+msgstr "St<53>pec %s z %s; Riadok %<PRId64> z %<PRId64>; Slovo %<PRId64> z %<PRId64>; Znak %<PRId64> z %<PRId64>; Bajt %<PRId64> z %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld pre BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> pre BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Strana %N"
@@ -4011,8 +4011,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Je potrebn<62> Amigados verzia 2.04 alebo nov<6F>ia\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Potrebn<62> %s verzia %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Potrebn<62> %s verzia %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Ned<65> sa otvori<72> NIL:\n"
@@ -4094,8 +4094,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Zachyten<65> smrtiaci sign<67>l\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "Otvorenie X displej zabralo %ld msec"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "Otvorenie X displej zabralo %<PRId64> msec"
 
 #. KDE sometimes produces X error that we want to ignore
 msgid ""
@@ -4744,8 +4744,8 @@ msgid "Estimated runtime memory use: %d bytes"
 msgstr "Ve<56>kos<6F> pou<6F><75>vanej pam<61>te: %d bajtov"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' nem<65> %ld polo<6C>iek"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' nem<65> %<PRId64> polo<6C>iek"
 
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: Znaky slov sa odli<6C>uj<75> medzi slovn<76>kov<6F>mi s<>bormi"
@@ -4754,8 +4754,8 @@ msgid "Sorry, no suggestions"
 msgstr "Prep<65><70>te, <20>iadne n<>vrhy"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Prep<65><70>te, iba %ld n<>vrhov"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "Prep<65><70>te, iba %<PRId64> n<>vrhov"
 
 #. avoid more prompt
 #, c-format
@@ -5034,8 +5034,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Chyba form<72>tovania v s<>bore tagov \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "Pred bajtom %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Pred bajtom %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5098,8 +5098,8 @@ msgid "1 change"
 msgstr "1 zmena"
 
 #, c-format
-msgid "%ld changes"
-msgstr "%ld zmien"
+msgid "%<PRId64> changes"
+msgstr "%<PRId64> zmien"
 
 msgid "E439: undo list corrupt"
 msgstr "E439: z<>znam o zmen<65>ch po<70>koden<65>"

src/po/sk.po

@@ -59,8 +59,8 @@ msgstr "E84: Nebol n
 msgid "E85: There is no listed buffer"
 msgstr "E85: Nena<6E>iel som <20>iadny buffer"
 
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Buffer %ld neexistuje"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Buffer %<PRId64> neexistuje"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Za posledn<64> buffer sa ned<65> presko<6B>i<EFBFBD>"
@@ -68,8 +68,8 @@ msgstr "E87: Za posledn
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: Pred prv<72> buffer sa ned<65> presko<6B>i<EFBFBD>"
 
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: Zmeny v bufferi %ld neboli ulo<6C>en<65> (! pre vyn<79>tenie)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: Zmeny v bufferi %<PRId64> neboli ulo<6C>en<65> (! pre vyn<79>tenie)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Posledn<64> buffer sa ned<65> odstr<74>ni<6E>"
@@ -78,8 +78,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Varovanie: prete<74>enie zoznamu s n<>zvami s<>borov"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: buffer %ld nen<65>jden<65>"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: buffer %<PRId64> nen<65>jden<65>"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -90,8 +90,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Vzoru %s nevyhovuje <20>iadny buffer"
 
 #, c-format
-msgid "line %ld"
-msgstr "riadok %ld"
+msgid "line %<PRId64>"
+msgstr "riadok %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Buffer tak<61>hoto mena u<> existuje"
@@ -116,12 +116,12 @@ msgid "1 line --%d%%--"
 msgstr "1 riadok --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld riadkov --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> riadkov --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "riadok %ld z %ld --%d%%-- st<73>pec"
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "riadok %<PRId64> z %<PRId64> --%d%%-- st<73>pec"
 
 msgid "[No Name]"
 msgstr "[Bez mena]"
@@ -168,12 +168,12 @@ msgid "Signs for %s:"
 msgstr "Znaky pre %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    riadok=%ld  id=%d  meno=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    riadok=%<PRId64>  id=%d  meno=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Nem<65><6D>em porovna<6E> viac ako %ld bufferov"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Nem<65><6D>em porovna<6E> viac ako %<PRId64> bufferov"
 
 msgid "E97: Cannot create diffs"
 msgstr "E97: Nedaj<61> sa vytvori<72> porovnania"
@@ -311,8 +311,8 @@ msgstr "zhoda %d"
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: Neo<65>ek<65>van<61> znaky v :let"
 
-msgid "E684: list index out of range: %ld"
-msgstr "E684: index v zozname je mimo rozsah: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: index v zozname je mimo rozsah: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -620,8 +620,8 @@ msgid "%s aborted"
 msgstr "%s zru<72>en<65>"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s vr<76>tilo #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s vr<76>tilo #%<PRId64>"
 
 msgid "%s returning %s"
 msgstr "%s vr<76>tilo %s"
@@ -665,12 +665,12 @@ msgid "1 line moved"
 msgstr "1 riadok presunut<75>"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld riadkov presunut<75>ch"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> riadkov presunut<75>ch"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld riadkov filtrovan<61>ch"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> riadkov filtrovan<61>ch"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: Automatick<63> pr<70>kazy *Filter* nesm<73> meni<6E> aktu<74>lny buffer"
@@ -749,8 +749,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Odkladac<61> s<>bor existuje: %s (pou<6F>ite :silent! pre prep<65>sanie)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: <20>iadny n<>zov s<>boru pre buffer %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: <20>iadny n<>zov s<>boru pre buffer %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: S<>bor nebol ulo<6C>en<65>: ukladanie je zak<61>zan<61> vo<76>bou 'write'"
@@ -791,19 +791,19 @@ msgstr "1 zhoda"
 msgid "1 substitution"
 msgstr "1 nahradenie"
 
-msgid "%ld matches"
-msgstr "%ld zh<7A>d"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> zh<7A>d"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld nahraden<65>"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> nahraden<65>"
 
 msgid " on 1 line"
 msgstr " na 1 riadku"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " na %ld riadkov"
+msgid " on %<PRId64> lines"
+msgstr " na %<PRId64> riadkov"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global sa ned<65> vola<6C> rekurz<72>vne"
@@ -884,8 +884,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Chybn<62> meno bufferu: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Chybn<62> ID zna<6E>ky: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: Chybn<62> ID zna<6E>ky: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (NEN<45>JDEN<45>)"
@@ -900,16 +900,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Sp<53><70><EFBFBD>am re<72>im ladenia. Pre ukon<6F>enie nap<61><70>te \"cont\"."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "riadok %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "riadok %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "pr<70>kaz: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Bod preru<72>enia v \"%s%s\" na riadku %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Bod preru<72>enia v \"%s%s\" na riadku %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -919,8 +919,8 @@ msgid "No breakpoints defined"
 msgstr "Neboli definovn<76> <20>iadne body preru<72>enia"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  riadok %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  riadok %<PRId64>"
 
 msgid "E750: First use :profile start <fname>"
 msgstr "E750: Najprv pou<6F>ite pr<70>kaz :profile start <meno_suboru>"
@@ -975,16 +975,16 @@ msgid "could not source \"%s\""
 msgstr "ned<65> sa interpretova<76> \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "riadok %ld: nem<65><6D>no interpretova<76> \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "riadok %<PRId64>: nem<65><6D>no interpretova<76> \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "interpretujem \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "riadok %ld: interpretujem \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "riadok %<PRId64>: interpretujem \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1057,8 +1057,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: E<>te zost<73>va 1 s<>bor k <20>prave."
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: E<>te zost<73>va %ld s<>borov k <20>prave."
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: E<>te zost<73>va %<PRId64> s<>borov k <20>prave."
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: Pr<50>kaz u<> existuje: pou<6F>ite ! pre predefinovanie"
@@ -1225,8 +1225,8 @@ msgstr "V
 msgid "Exception discarded: %s"
 msgstr "V<>nimka zahoden<65>: %s"
 
-msgid "%s, line %ld"
-msgstr "%s, riadok %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, riadok %<PRId64>"
 
 #. always scroll up, don't overwrite
 msgid "Exception caught: %s"
@@ -1413,8 +1413,8 @@ msgid "[CONVERSION ERROR]"
 msgstr "[CHYBA PREVODU]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[NEPR<50>PUSTN<54> BAJT na riadku %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[NEPR<50>PUSTN<54> BAJT na riadku %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[CHYBY <20><>TANIA]"
@@ -1556,15 +1556,15 @@ msgid "1 line, "
 msgstr "1 riadok, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld riadkov, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> riadkov, "
 
 msgid "1 character"
 msgstr "1 znak"
 
 #, c-format
-msgid "%ld characters"
-msgstr "%ld znakov"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> znakov"
 
 msgid "[noeol]"
 msgstr "[bez znaku konca riadku]"
@@ -1964,19 +1964,19 @@ msgstr "P
 msgid "Font1: %s\n"
 msgstr "P<>smo1: %s\n"
 
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "P<>smo%ld nie je dvakr<6B>t <20>ir<69>ie ako p<>smo0\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "P<>smo%<PRId64> nie je dvakr<6B>t <20>ir<69>ie ako p<>smo0\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "<22><>rka p<>sma0: %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "<22><>rka p<>sma0: %<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"<22><>rka p<>sma1: %ld\n"
+"<22><>rka p<>sma1: %<PRId64>\n"
 "\n"
 
 msgid "Invalid font specification"
@@ -2145,8 +2145,8 @@ msgstr "E564: %s nie je ani adres
 msgid "Added cscope database %s"
 msgstr "Pridan<61> cscope datab<61>za %s"
 
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: chyba pri <20><>tan<61> cscope spojenia %ld"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: chyba pri <20><>tan<61> cscope spojenia %<PRId64>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: nezn<7A>my typ cscope h<>adania"
@@ -3308,12 +3308,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: Uchovanie sa nepodarilo"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: chybn<62> <20><>slo riadku: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: chybn<62> <20><>slo riadku: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: ned<65> sa n<>js<6A> riadok %ld"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: ned<65> sa n<>js<6A> riadok %<PRId64>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: chybn<62> <20><>slo ukazovate<74>a na blok 3"
@@ -3331,8 +3331,8 @@ msgid "deleted block 1?"
 msgstr "vymazan<61> blok 1?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Ned<65> sa n<>js<6A> riadok %ld"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Ned<65> sa n<>js<6A> riadok %<PRId64>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: chybn<62> <20><>slo ukazovate<74>a na blok"
@@ -3341,12 +3341,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count m<> nulov<6F> hodnotu"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: <20><>slo riadku je mimo rozsah: %ld (za koncom)"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: <20><>slo riadku je mimo rozsah: %<PRId64> (za koncom)"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: chybn<62> po<70>et riadkov v bloku %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: chybn<62> po<70>et riadkov v bloku %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "N<>rast ve<76>kosti z<>sobn<62>ku"
@@ -3589,12 +3589,12 @@ msgid "1 line less"
 msgstr "1 vymazan<61> riadok"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld nov<6F>ch riadkov"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> nov<6F>ch riadkov"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld vymazan<61>ch riadkov"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> vymazan<61>ch riadkov"
 
 msgid " (Interrupted)"
 msgstr " (Preru<72>en<65>)"
@@ -3633,8 +3633,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: Riadok sa st<73>va pr<70>li<6C> dlh<6C>m"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Vn<56>torn<72> chyba: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Vn<56>torn<72> chyba: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -3706,8 +3706,8 @@ msgstr "E668: Zl
 msgid "read from Netbeans socket"
 msgstr "<22><>tanie z Netbeans soketu"
 
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: Straten<65> NetBeans spojenie pre buffer %ld"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: Straten<65> NetBeans spojenie pre buffer %<PRId64>"
 
 msgid "E505: "
 msgstr "E505: "
@@ -3745,23 +3745,23 @@ msgid "1 line %sed %d times"
 msgstr "1 riadok upraven<65> pomocou %s %d kr<6B>t"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld riadkov upraven<65>ch naraz pomocou %s"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> riadkov upraven<65>ch naraz pomocou %s"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld riadkov upraven<65>ch pomocou %s %d kr<6B>t"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> riadkov upraven<65>ch pomocou %s %d kr<6B>t"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld riadkov pre odsadenie..."
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> riadkov pre odsadenie..."
 
 msgid "1 line indented "
 msgstr "1 riadok odsaden<65> "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld riadkov odsaden<65>ch "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> riadkov odsaden<65>ch "
 
 msgid "E748: No previously used register"
 msgstr "E748: <20>iadny predt<64>m pou<6F><75>van<61> register"
@@ -3774,12 +3774,12 @@ msgid "1 line changed"
 msgstr "1 riadok zmenen<65>"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld zmenen<65>ch riadkov"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> zmenen<65>ch riadkov"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "uvol<6F>ujem %ld riadkov"
+msgid "freeing %<PRId64> lines"
+msgstr "uvol<6F>ujem %<PRId64> riadkov"
 
 msgid "block of 1 line yanked"
 msgstr "skop<6F>rovan<61> blok 1 riadku"
@@ -3787,12 +3787,12 @@ msgstr "skop
 msgid "1 line yanked"
 msgstr "1 riadok skop<6F>rovan<61>"
 
-msgid "block of %ld lines yanked"
-msgstr "skop<6F>rovan<61> blok %ld riadkov"
+msgid "block of %<PRId64> lines yanked"
+msgstr "skop<6F>rovan<61> blok %<PRId64> riadkov"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld skop<6F>rovan<61>ch riadkov"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> skop<6F>rovan<61>ch riadkov"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3821,31 +3821,31 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: Nezn<7A>my typ registra %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld St<53>pcov; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> St<53>pcov; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Vybran<61>ch %s%ld z %ld Riadkov; %ld zo %ld Slov; %ld z %ld Bajtov"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Vybran<61>ch %s%<PRId64> z %<PRId64> Riadkov; %<PRId64> zo %<PRId64> Slov; %<PRId64> z %<PRId64> Bajtov"
 
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
-msgstr "Vybran<61>ch %s%ld z %ld Riadkov; %ld zo %ld Slov; %ld z %ld Znakov; %ld z %ld Bajtov"
+msgstr "Vybran<61>ch %s%<PRId64> z %<PRId64> Riadkov; %<PRId64> zo %<PRId64> Slov; %<PRId64> z %<PRId64> Znakov; %<PRId64> z %<PRId64> Bajtov"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "St<53>pec %s z %s; Riadok %ld z %ld; Slovo %ld z %ld; Bajt %ld z %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "St<53>pec %s z %s; Riadok %<PRId64> z %<PRId64>; Slovo %<PRId64> z %<PRId64>; Bajt %<PRId64> z %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
-msgstr "St<53>pec %s z %s; Riadok %ld z %ld; Slovo %ld z %ld; Znak %ld z %ld; Bajt %ld z %ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
+msgstr "St<53>pec %s z %s; Riadok %<PRId64> z %<PRId64>; Slovo %<PRId64> z %<PRId64>; Znak %<PRId64> z %<PRId64>; Bajt %<PRId64> z %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld pre BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> pre BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Strana %N"
@@ -4011,8 +4011,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Je potrebn<62> Amigados verzia 2.04 alebo nov<6F>ia\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Potrebn<62> %s verzia %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Potrebn<62> %s verzia %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Ned<65> sa otvori<72> NIL:\n"
@@ -4094,8 +4094,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Zachyten<65> smrtiaci sign<67>l\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "Otvorenie X displej zabralo %ld msec"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "Otvorenie X displej zabralo %<PRId64> msec"
 
 #. KDE sometimes produces X error that we want to ignore
 msgid ""
@@ -4744,8 +4744,8 @@ msgid "Estimated runtime memory use: %d bytes"
 msgstr "Ve<56>kos<6F> pou<6F><75>vanej pam<61>te: %d bajtov"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' nem<65> %ld polo<6C>iek"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' nem<65> %<PRId64> polo<6C>iek"
 
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: Znaky slov sa odli<6C>uj<75> medzi slovn<76>kov<6F>mi s<>bormi"
@@ -4754,8 +4754,8 @@ msgid "Sorry, no suggestions"
 msgstr "Prep<65><70>te, <20>iadne n<>vrhy"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Prep<65><70>te, iba %ld n<>vrhov"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "Prep<65><70>te, iba %<PRId64> n<>vrhov"
 
 #. avoid more prompt
 #, c-format
@@ -5034,8 +5034,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Chyba form<72>tovania v s<>bore tagov \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "Pred bajtom %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Pred bajtom %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5098,8 +5098,8 @@ msgid "1 change"
 msgstr "1 zmena"
 
 #, c-format
-msgid "%ld changes"
-msgstr "%ld zmien"
+msgid "%<PRId64> changes"
+msgstr "%<PRId64> zmien"
 
 msgid "E439: undo list corrupt"
 msgstr "E439: z<>znam o zmen<65>ch po<70>koden<65>"

src/po/sv.po

@@ -57,8 +57,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: Det finns inga listade buffertar"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Buffert %ld existerar inte"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Buffert %<PRId64> existerar inte"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Kan inte g<> bortom sista buffert"
@@ -67,9 +67,9 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: Kan inte g<> f<>re f<>rsta buffert"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
 msgstr ""
-"E89: Ingen skrivning sedan senaste <20>ndring f<>r buffert %ld (l<>gg till ! f<>r "
+"E89: Ingen skrivning sedan senaste <20>ndring f<>r buffert %<PRId64> (l<>gg till ! f<>r "
 "att tvinga)"
 
 msgid "E90: Cannot unload last buffer"
@@ -79,8 +79,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Varning: Lista <20>ver filnamn fl<66>dar <20>ver"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Buffer %ld hittades inte"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: Buffer %<PRId64> hittades inte"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -91,8 +91,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Ingen matchande buffert f<>r %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "rad %ld"
+msgid "line %<PRId64>"
+msgstr "rad %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Buffer med det h<>r namnet existerar redan"
@@ -117,12 +117,12 @@ msgid "1 line --%d%%--"
 msgstr "1 rad --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld rader --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> rader --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "rad %ld av %ld --%d%%-- kol "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "rad %<PRId64> av %<PRId64> --%d%%-- kol "
 
 msgid "[No Name]"
 msgstr "[Inget Namn]"
@@ -172,12 +172,12 @@ msgid "Signs for %s:"
 msgstr "Tecken f<>r %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    line=%ld  id=%d  namn=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    line=%<PRId64>  id=%d  namn=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Kan inte skilja fler <20>n %ld buffertar"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Kan inte skilja fler <20>n %<PRId64> buffertar"
 
 msgid "E97: Cannot create diffs"
 msgstr "E97: Kan inte skapa skiljare"
@@ -325,8 +325,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: Ov<4F>ntade tecken i :let"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: listindex utanf<6E>r omr<6D>de: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: listindex utanf<6E>r omr<6D>de: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -676,8 +676,8 @@ msgid "%s aborted"
 msgstr "%s avbr<62>ts"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s returnerar #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s returnerar #%<PRId64>"
 
 #, c-format
 msgid "%s returning %s"
@@ -709,16 +709,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "G<>r in i fels<6C>kningsl<73>ge.  Skriv \"cont\" f<>r att forts<74>tta."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "rad %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "rad %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "kommando: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Brytpunkt i \"%s%s\" rad %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Brytpunkt i \"%s%s\" rad %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -728,8 +728,8 @@ msgid "No breakpoints defined"
 msgstr "Inga brytpunkter definierade"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  rad %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  rad %<PRId64>"
 
 msgid "E750: First use :profile start <fname>"
 msgstr "E750: Anv<6E>nd :profile start <fnamn> f<>rst"
@@ -788,16 +788,16 @@ msgid "could not source \"%s\""
 msgstr "kunde inte l<>sa \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "rad %ld: kunde inte l<>sa \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "rad %<PRId64>: kunde inte l<>sa \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "l<>ser \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "rad %ld: l<>ser \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "rad %<PRId64>: l<>ser \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -854,12 +854,12 @@ msgid "1 line moved"
 msgstr "1 rad flyttad"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld rader flyttade"
+msgid "%<PRId64> lines moved"
+msgstr "%<PRId64> rader flyttade"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "%ld rader filtrerade"
+msgid "%<PRId64> lines filtered"
+msgstr "%<PRId64> rader filtrerade"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filter*-Autokommandon f<>r inte <20>ndra aktuell buffert"
@@ -939,8 +939,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: V<>xlingsfil existerar: %s (:silent! tvingar)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: Inget filnamn f<>r buffert %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: Inget filnamn f<>r buffert %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: Filen skrevs inte: Skrivning <20>r inaktiverat med 'write'-flaggan"
@@ -983,19 +983,19 @@ msgid "1 substitution"
 msgstr "1 ers<72>ttning"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld tr<74>ffar"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> tr<74>ffar"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld ers<72>ttningar"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> ers<72>ttningar"
 
 msgid " on 1 line"
 msgstr " p<> 1 rad"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " p<> %ld rader"
+msgid " on %<PRId64> lines"
+msgstr " p<> %<PRId64> rader"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: Kan inte g<>ra :global rekursivt"
@@ -1078,8 +1078,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Ogiltigt buffertnamn: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Ogiltigt signatur-ID: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: Ogiltigt signatur-ID: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (INTE HITTADE)"
@@ -1141,8 +1141,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: 1 fil till att redigera"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: %ld filer till att redigera"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: %<PRId64> filer till att redigera"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: Kommando existerar redan: l<>gg till ! f<>r att ers<72>tta det"
@@ -1323,8 +1323,8 @@ msgid "Exception discarded: %s"
 msgstr "Undantag f<>rkastade: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, rad %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, rad %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1522,12 +1522,12 @@ msgid "[crypted]"
 msgstr "[krypterad]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[KONVERTERINGSFEL p<> rad %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[KONVERTERINGSFEL p<> rad %<PRId64>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[OTILL<4C>TEN BIT p<> rad %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[OTILL<4C>TEN BIT p<> rad %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[L<>SFEL]"
@@ -1673,15 +1673,15 @@ msgid "1 line, "
 msgstr "1 rad, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld rader, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> rader, "
 
 msgid "1 character"
 msgstr "1 tecken"
 
 #, c-format
-msgid "%ld characters"
-msgstr "%ld tecken"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> tecken"
 
 msgid "[noeol]"
 msgstr "[inget radslut]"
@@ -2098,19 +2098,19 @@ msgid "Font1: %s\n"
 msgstr "Typsnitt1: %s\n"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "Typsnitt%ld <20>r inte dubbelt s<> bred som font0\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "Typsnitt%<PRId64> <20>r inte dubbelt s<> bred som font0\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "Typsnitt0 bredd: %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "Typsnitt0 bredd: %<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"Typsnitt1 bredd: %ld\n"
+"Typsnitt1 bredd: %<PRId64>\n"
 "\n"
 
 msgid "Invalid font specification"
@@ -2287,8 +2287,8 @@ msgid "Added cscope database %s"
 msgstr "Lade till cscope-databas %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: fel vid l<>sning av cscope-anslutning %ld"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: fel vid l<>sning av cscope-anslutning %<PRId64>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: ok<6F>nd cscope-s<>ktyp"
@@ -3487,12 +3487,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: Bevaring misslyckades"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: ogiltigt lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: ogiltigt lnum: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: kan inte hitta rad %ld"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: kan inte hitta rad %<PRId64>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: pekarblock-id fel 3"
@@ -3510,8 +3510,8 @@ msgid "deleted block 1?"
 msgstr "tagit bort block 1?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Kan inte hitta rad %ld"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Kan inte hitta rad %<PRId64>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: pekarblock-id fel"
@@ -3520,12 +3520,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count <20>r noll"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: radnummer utanf<6E>r omr<6D>de: %ld bakom slutet"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: radnummer utanf<6E>r omr<6D>de: %<PRId64> bakom slutet"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: radantal fel i block %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: radantal fel i block %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "Stackstorlek <20>kar"
@@ -3713,8 +3713,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Tryck RETUR eller skriv kommando f<>r att forts<74>tta"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s rad %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s rad %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- Mer --"
@@ -3780,12 +3780,12 @@ msgid "1 line less"
 msgstr "1 rad mindre"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld rad till"
+msgid "%<PRId64> more lines"
+msgstr "%<PRId64> rad till"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld f<>rre rader"
+msgid "%<PRId64> fewer lines"
+msgstr "%<PRId64> f<>rre rader"
 
 msgid " (Interrupted)"
 msgstr " (Avbruten)"
@@ -3825,8 +3825,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: Rad b<>rjar bli f<>r l<>ng"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Internt fel: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Internt fel: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -3899,8 +3899,8 @@ msgid "read from Netbeans socket"
 msgstr "l<>s fr<66>n Netbeans-uttag"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: NetBeans-anslutning tappad f<>r buffert %ld"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: NetBeans-anslutning tappad f<>r buffert %<PRId64>"
 
 msgid "E505: "
 msgstr "E505: "
@@ -3944,23 +3944,23 @@ msgid "1 line %sed %d times"
 msgstr "1 rad %sade %d g<>nger"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld rader %sad 1 g<>ng"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> rader %sad 1 g<>ng"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld rader %sade %d g<>nger"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> rader %sade %d g<>nger"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld rader att indentera... "
+msgid "%<PRId64> lines to indent... "
+msgstr "%<PRId64> rader att indentera... "
 
 msgid "1 line indented "
 msgstr "1 rad indenterad "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld rader indenterade "
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> rader indenterade "
 
 msgid "E748: No previously used register"
 msgstr "E748: Inget tidigare anv<6E>nt register"
@@ -3973,12 +3973,12 @@ msgid "1 line changed"
 msgstr "1 rad <20>ndrad"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld rader <20>ndrade"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> rader <20>ndrade"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "frig<69>r %ld rader"
+msgid "freeing %<PRId64> lines"
+msgstr "frig<69>r %<PRId64> rader"
 
 msgid "block of 1 line yanked"
 msgstr "block om 1 rad kopierat"
@@ -3987,12 +3987,12 @@ msgid "1 line yanked"
 msgstr "1 rad kopierad"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "block om %ld rader kopierade"
+msgid "block of %<PRId64> lines yanked"
+msgstr "block om %<PRId64> rader kopierade"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld rader kopierade"
+msgid "%<PRId64> lines yanked"
+msgstr "%<PRId64> rader kopierade"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4022,36 +4022,36 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: Ok<4F>nd registertyp %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld kolumner; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> kolumner; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Markerade %s%ld av %ld rader; %ld av %ld ord; %ld av %ld bitar"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Markerade %s%<PRId64> av %<PRId64> rader; %<PRId64> av %<PRId64> ord; %<PRId64> av %<PRId64> bitar"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
 msgstr ""
-"Markerade %s%ld av %ld rader; %ld av %ld ord; %ld av %ld tecken; %ld av %ld "
+"Markerade %s%<PRId64> av %<PRId64> rader; %<PRId64> av %<PRId64> ord; %<PRId64> av %<PRId64> tecken; %<PRId64> av %<PRId64> "
 "bitar"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Kol %s av %s; rad %ld av %ld; ord %ld av %ld; bit %ld av %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Kol %s av %s; rad %<PRId64> av %<PRId64>; ord %<PRId64> av %<PRId64>; bit %<PRId64> av %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"Kol %s av %s; rad %ld av %ld; ord %ld av %ld; tecken %ld av %ld; bit %ld av %"
+"Kol %s av %s; rad %<PRId64> av %<PRId64>; ord %<PRId64> av %<PRId64>; tecken %<PRId64> av %<PRId64>; bit %<PRId64> av %"
 "ld"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld f<>r BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> f<>r BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Sida %N"
@@ -4217,8 +4217,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Beh<65>ver Amigados version 2.04 eller senare\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Beh<65>ver %s version %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Beh<65>ver %s version %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Kan inte <20>ppna NIL:\n"
@@ -4300,8 +4300,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: F<>ngade d<>dlig signal\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "<22>ppning av X-display tog %ld ms"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "<22>ppning av X-display tog %<PRId64> ms"
 
 msgid ""
 "\n"
@@ -4961,8 +4961,8 @@ msgid "Performing soundfolding..."
 msgstr "Utf<74>r ljudvikning..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "Antal ord efter ljudvikning: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "Antal ord efter ljudvikning: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -4997,8 +4997,8 @@ msgid "Done!"
 msgstr "Klar!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' har inte %ld poster"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' har inte %<PRId64> poster"
 
 #, c-format
 msgid "Word removed from %s"
@@ -5015,8 +5015,8 @@ msgid "Sorry, no suggestions"
 msgstr "Tyv<79>rr, inga f<>reslag"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Tyv<79>rr, bara %ld f<>reslag"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "Tyv<79>rr, bara %<PRId64> f<>reslag"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5316,8 +5316,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Formateringsfel i tagg-fil \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "F<>re byte %ld"
+msgid "Before byte %<PRId64>"
+msgstr "F<>re byte %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5380,8 +5380,8 @@ msgid "Already at newest change"
 msgstr "Redan vid nyaste <20>ndring"
 
 #, c-format
-msgid "Undo number %ld not found"
-msgstr "<22>ngra-nummer %ld hittades inte"
+msgid "Undo number %<PRId64> not found"
+msgstr "<22>ngra-nummer %<PRId64> hittades inte"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: radnummer fel"
@@ -5405,8 +5405,8 @@ msgid "changes"
 msgstr "<22>ndringar"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "f<>re"
@@ -5421,8 +5421,8 @@ msgid "number changes  time"
 msgstr "antal <20>ndringar  tid"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld sekunder sedan"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> sekunder sedan"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin <20>r inte till<6C>tet efter undo"

src/po/uk.cp1251.po

@@ -89,8 +89,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
@@ -99,8 +99,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: <20><><EFBFBD><EFBFBD><EFBFBD> %ld <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (! <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (! <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
@@ -109,8 +109,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: <20><><EFBFBD><EFBFBD><EFBFBD> %ld <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -121,8 +121,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "line %<PRId64>"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
@@ -150,12 +150,12 @@ msgid "1 line --%d%%--"
 msgstr "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld <20><><EFBFBD><EFBFBD><EFBFBD>(<28><>) --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD>(<28><>) --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> %ld <20> %ld --%d%%-- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20> %<PRId64> --%d%%-- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "
 
 msgid "[No Name]"
 msgstr "[<5B><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>]"
@@ -201,12 +201,12 @@ msgid "Signs for %s:"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    <20><><EFBFBD><EFBFBD><EFBFBD>=%ld  id=%d <20><><EFBFBD><EFBFBD><EFBFBD>=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    <20><><EFBFBD><EFBFBD><EFBFBD>=%<PRId64>  id=%d <20><><EFBFBD><EFBFBD><EFBFBD>=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<28><>)"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<28><>)"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
@@ -368,8 +368,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> :let"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -803,8 +803,8 @@ msgid "%s aborted"
 msgstr "%s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #%<PRId64>"
 
 #, c-format
 msgid "%s returning %s"
@@ -838,16 +838,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.  <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>cont<6E>."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20>%s%s<> <20><><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20>%s%s<> <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -857,8 +857,8 @@ msgid "No breakpoints defined"
 msgstr "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d %s %s   <20><><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d %s %s   <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>:profile start {<7B><><EFBFBD><EFBFBD>}<7D>"
@@ -919,16 +919,16 @@ msgid "could not source \"%s\""
 msgstr "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>%s<>"
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> %ld: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>%s<>"
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> %<PRId64>: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>%s<>"
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>%s<>"
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> %ld: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>%s<>"
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> %<PRId64>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>%s<>"
 
 #, c-format
 msgid "finished sourcing %s"
@@ -987,12 +987,12 @@ msgid "1 line moved"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><><EFBFBD><EFBFBD><EFBFBD>(<28><>)"
+msgid "%<PRId64> lines moved"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD>(<28><>)"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><><EFBFBD><EFBFBD><EFBFBD>(<28><>)"
+msgid "%<PRId64> lines filtered"
+msgstr "³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD>(<28><>)"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> *Filter* <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
@@ -1073,8 +1073,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: %s (:silent! <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 'write'"
@@ -1132,19 +1132,19 @@ msgid "1 substitution"
 msgstr "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld <20><><EFBFBD><EFBFBD><EFBFBD>(<28><>)"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD>(<28><>)"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld <20><><EFBFBD><EFBFBD><EFBFBD>(<28>)"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD>(<28>)"
 
 msgid " on 1 line"
 msgstr " <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " <20> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid " on %<PRId64> lines"
+msgstr " <20> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -1230,8 +1230,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ID <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ID <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (<28><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
@@ -1293,8 +1293,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, ! <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>"
@@ -1503,8 +1503,8 @@ msgid "Exception discarded: %s"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, <20><><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1714,12 +1714,12 @@ msgid "[crypted]"
 msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֲ<EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֲ<EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]"
@@ -1805,10 +1805,10 @@ msgstr "E513:
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> %ld (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 'fenc')"
+"E513: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 'fenc')"
 
 msgid "E514: write error (file system full?)"
 msgstr "E514: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>?)"
@@ -1817,8 +1817,8 @@ msgid " CONVERSION ERROR"
 msgstr " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֲ<EFBFBD>"
 
 #, c-format
-msgid " in line %ld;"
-msgstr " <20> <20><><EFBFBD><EFBFBD><EFBFBD> %ld;"
+msgid " in line %<PRId64>;"
+msgstr " <20> <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64>;"
 
 msgid "[Device]"
 msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]"
@@ -1879,8 +1879,8 @@ msgid "1 line, "
 msgstr "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, "
 
 msgid "1 character"
 msgstr "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -1891,8 +1891,8 @@ msgstr "%<PRId64>
 
 #. Explicit typecast avoids warning on Mac OS X 10.6
 #, c-format
-msgid "%ld characters"
-msgstr "%ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2325,16 +2325,16 @@ msgid "Font1: %s"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>1: %s"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>%ld <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0"
+msgid "Font%<PRId64> width is not twice that of font0"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>%<PRId64> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0"
 
 #, c-format
-msgid "Font0 width: %ld"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0: %ld"
+msgid "Font0 width: %<PRId64>"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0: %<PRId64>"
 
 #, c-format
-msgid "Font1 width: %ld"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>1: %ld"
+msgid "Font1 width: %<PRId64>"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>1: %<PRId64>"
 
 msgid "Invalid font specification"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -2515,8 +2515,8 @@ msgid "Added cscope database %s"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> cscope %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20>'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> cscope %ld"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20>'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> cscope %<PRId64>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> cscope"
@@ -3752,13 +3752,13 @@ msgstr "E314:
 
 # msgstr "E314: "
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> lnum: %<PRId64>"
 
 # msgstr "E315: "
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 # msgstr "E316: "
 msgid "E317: pointer block id wrong 3"
@@ -3778,8 +3778,8 @@ msgid "deleted block 1?"
 msgstr "<22><><EFBFBD><EFBFBD> 1 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -3789,13 +3789,13 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 0"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD>: %ld <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD>: %<PRId64> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 # msgstr "E322: "
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: ʳ<><CAB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: ʳ<><CAB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 # msgstr "E323: "
 msgid "Stack size increases"
@@ -3994,8 +3994,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ENTER <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s <20><><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- <20><> --"
@@ -4065,12 +4065,12 @@ msgid "1 line less"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "%<PRId64> more lines"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "%<PRId64> fewer lines"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 msgid " (Interrupted)"
 msgstr " (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
@@ -4102,8 +4102,8 @@ msgstr "E340:
 
 # msgstr "E340: "
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: lalloc(%<PRId64>, )"
 
 # msgstr "E341: "
 #, c-format
@@ -4186,8 +4186,8 @@ msgid "read from Netbeans socket"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Netbeans"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>'<27><><EFBFBD><EFBFBD> <20><> NetBeans <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>'<27><><EFBFBD><EFBFBD> <20><> NetBeans <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: netbeans <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD> GUI"
@@ -4239,23 +4239,23 @@ msgid "1 line %sed %d times"
 msgstr "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> %s-<2D><> %d <20><><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s-<2D><>"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s-<2D><>"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s-<2D><> %d <20><><EFBFBD><EFBFBD><EFBFBD>"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s-<2D><> %d <20><><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
+msgid "%<PRId64> lines to indent... "
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 
 msgid "1 line indented "
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "%<PRId64> lines indented "
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 msgid "E748: No previously used register"
 msgstr "E748: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -4268,12 +4268,12 @@ msgid "1 line changed"
 msgstr "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "%<PRId64> lines changed"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "freeing %<PRId64> lines"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 msgid "block of 1 line yanked"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
@@ -4282,12 +4282,12 @@ msgid "1 line yanked"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "block of %<PRId64> lines yanked"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "%<PRId64> lines yanked"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4317,36 +4317,36 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "<22><><EFBFBD><EFBFBD>.: %ld; "
+msgid "%<PRId64> Cols; "
+msgstr "<22><><EFBFBD><EFBFBD>.: %<PRId64>; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s%ld <20> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; %ld <20> %ld <20><><EFBFBD><EFBFBD>; %ld <20> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s%<PRId64> <20> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; %<PRId64> <20> %<PRId64> <20><><EFBFBD><EFBFBD>; %<PRId64> <20> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
 msgstr ""
-"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s%ld <20> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; %ld <20> %ld <20><><EFBFBD><EFBFBD>; %ld of %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; %ld <20> %ld "
+"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s%<PRId64> <20> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; %<PRId64> <20> %<PRId64> <20><><EFBFBD><EFBFBD>; %<PRId64> of %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; %<PRId64> <20> %<PRId64> "
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s <20> %s; <20><><EFBFBD><EFBFBD><EFBFBD> %ld <20> %ld; <20><><EFBFBD><EFBFBD><EFBFBD> %ld <20> %ld; <20><><EFBFBD><EFBFBD> %ld <20> %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s <20> %s; <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20> %<PRId64>; <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20> %<PRId64>; <20><><EFBFBD><EFBFBD> %<PRId64> <20> %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s <20> %s; <20><><EFBFBD><EFBFBD><EFBFBD> %ld <20> %ld; <20><><EFBFBD><EFBFBD><EFBFBD> %ld <20> %ld; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld of %ld; <20><><EFBFBD><EFBFBD> "
-"%ld <20> %ld"
+"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s <20> %s; <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20> %<PRId64>; <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20> %<PRId64>; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> of %<PRId64>; <20><><EFBFBD><EFBFBD> "
+"%<PRId64> <20> %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld <20><><EFBFBD> BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> <20><><EFBFBD> BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=<3D><><EFBFBD><EFBFBD>. %N"
@@ -4533,8 +4533,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Amigados 2.04 <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NIL:\n"
@@ -4608,8 +4608,8 @@ msgid "E245: Illegal char '%c' in font name \"%s\""
 msgstr "E245: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %c <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>%s<>"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> X <20><><EFBFBD><EFBFBD><EFBFBD> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> X <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid ""
 "\n"
@@ -5399,8 +5399,8 @@ msgid "Performing soundfolding..."
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "ʳ<><CAB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "ʳ<><CAB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -5435,8 +5435,8 @@ msgid "Done!"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
 msgid "Word '%.*s' removed from %s"
@@ -5453,8 +5453,8 @@ msgid "Sorry, no suggestions"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5804,8 +5804,8 @@ msgstr "E431:
 
 # msgstr "E431: "
 #, c-format
-msgid "Before byte %ld"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "Before byte %<PRId64>"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5955,8 +5955,8 @@ msgid "Already at newest change"
 msgstr "<22><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E830: Undo number %ld not found"
-msgstr "E830: <20><><EFBFBD><EFBFBD><EFBFBD> %ld <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E830: Undo number %<PRId64> not found"
+msgstr "E830: <20><><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -5982,8 +5982,8 @@ msgid "changes"
 msgstr "<22><><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>"
@@ -5998,8 +5998,8 @@ msgid "number changes  when               saved"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>  <20><><EFBFBD><EFBFBD><EFBFBD>    <20><><EFBFBD>             <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
 
 # msgstr "E406: "
 msgid "E790: undojoin is not allowed after undo"

src/po/uk.po

@@ -89,8 +89,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: У списку немає буферів"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Буфера %ld немає"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Буфера %<PRId64> немає"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Це вже останній буфер"
@@ -99,8 +99,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: Це вже найперший буфер"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: Буфер %ld має зміни (! щоб не зважати)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: Буфер %<PRId64> має зміни (! щоб не зважати)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Не можу вивантажити останній буфер"
@@ -109,8 +109,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Обережно: Список назв файлів переповнено"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Буфер %ld не знайдено"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: Буфер %<PRId64> не знайдено"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -121,8 +121,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Не знайдено буфер, схожий на %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "рядок %ld"
+msgid "line %<PRId64>"
+msgstr "рядок %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Буфер з такою назвою вже існує"
@@ -150,12 +150,12 @@ msgid "1 line --%d%%--"
 msgstr "один рядок --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld рядки(ів) --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> рядки(ів) --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "рядок %ld з %ld --%d%%-- колонка "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "рядок %<PRId64> з %<PRId64> --%d%%-- колонка "
 
 msgid "[No Name]"
 msgstr "[Без назви]"
@@ -201,12 +201,12 @@ msgid "Signs for %s:"
 msgstr "Позначки для %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    рядок=%ld  id=%d назва=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    рядок=%<PRId64>  id=%d назва=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Не можна порівнювати понад %ld буфери(ів)"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Не можна порівнювати понад %<PRId64> буфери(ів)"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: Не можна читати чи записувати тимчасові файли"
@@ -368,8 +368,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: Неочікувані символи у :let"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: Індекс списку поза межами: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: Індекс списку поза межами: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -803,8 +803,8 @@ msgid "%s aborted"
 msgstr "%s припинено"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s повертає #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s повертає #%<PRId64>"
 
 #, c-format
 msgid "%s returning %s"
@@ -838,16 +838,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Режим налагодження.  Щоб продовжити введіть «cont»."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "рядок %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "рядок %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "команда: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Точка зупинки в «%s%s» рядок %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Точка зупинки в «%s%s» рядок %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -857,8 +857,8 @@ msgid "No breakpoints defined"
 msgstr "Не визначено жодної точки зупинки"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d %s %s   рядок %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d %s %s   рядок %<PRId64>"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Спочатку зробіть «:profile start {файл}»"
@@ -919,16 +919,16 @@ msgid "could not source \"%s\""
 msgstr "Не вдалося виконати «%s»"
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "рядок %ld: не вдалося виконати «%s»"
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "рядок %<PRId64>: не вдалося виконати «%s»"
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "виконується «%s»"
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "рядок %ld: виконується «%s»"
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "рядок %<PRId64>: виконується «%s»"
 
 #, c-format
 msgid "finished sourcing %s"
@@ -987,12 +987,12 @@ msgid "1 line moved"
 msgstr "Переміщено один рядок"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "Переміщено %ld рядки(ів)"
+msgid "%<PRId64> lines moved"
+msgstr "Переміщено %<PRId64> рядки(ів)"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "Відфільтровано %ld рядки(ів)"
+msgid "%<PRId64> lines filtered"
+msgstr "Відфільтровано %<PRId64> рядки(ів)"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: Автокоманди *Filter* не повинні змінювати поточний буфер"
@@ -1073,8 +1073,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Файл обміну існує: %s (:silent! переважує)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: Немає вхідного файлу для буфера %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: Немає вхідного файлу для буфера %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: Файл не записано: запис заборонено опцією 'write'"
@@ -1132,19 +1132,19 @@ msgid "1 substitution"
 msgstr "Одна заміна"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld збіги(ів)"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> збіги(ів)"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld замін(и)"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> замін(и)"
 
 msgid " on 1 line"
 msgstr " в одному рядку"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " в %ld рядках"
+msgid " on %<PRId64> lines"
+msgstr " в %<PRId64> рядках"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global не можна вживати рекурсивно"
@@ -1230,8 +1230,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Некоректна назва буфера: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Неправильний ID надпису: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: Неправильний ID надпису: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (НЕ ЗНАЙДЕНО)"
@@ -1293,8 +1293,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: Залишилося відредагувати ще один файл"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: Залишилося %ld не редагованих файлів"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: Залишилося %<PRId64> не редагованих файлів"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: Команда вже існує, ! щоб замінити її"
@@ -1503,8 +1503,8 @@ msgid "Exception discarded: %s"
 msgstr "Виняток скинуто: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, рядок %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, рядок %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1714,12 +1714,12 @@ msgid "[crypted]"
 msgstr "[зашифровано]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[ПОМИЛКА КОНВЕРТАЦІЇ у рядку %ld]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[ПОМИЛКА КОНВЕРТАЦІЇ у рядку %<PRId64>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[НЕКОРЕКТНИЙ БАЙТ у рядку %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[НЕКОРЕКТНИЙ БАЙТ у рядку %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[ПОМИЛКА ЧИТАННЯ]"
@@ -1805,10 +1805,10 @@ msgstr "E513: Помилка запису, конвертація не вдал
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: Помилка запису, конвертація не вдалася у рядку %ld (скиньте 'fenc')"
+"E513: Помилка запису, конвертація не вдалася у рядку %<PRId64> (скиньте 'fenc')"
 
 msgid "E514: write error (file system full?)"
 msgstr "E514: Помилка запису (скінчилось вільне місце?)"
@@ -1817,8 +1817,8 @@ msgid " CONVERSION ERROR"
 msgstr " ПОМИЛКА КОНВЕРТАЦІЇ"
 
 #, c-format
-msgid " in line %ld;"
-msgstr " у рядку %ld;"
+msgid " in line %<PRId64>;"
+msgstr " у рядку %<PRId64>;"
 
 msgid "[Device]"
 msgstr "[Пристрій]"
@@ -1879,8 +1879,8 @@ msgid "1 line, "
 msgstr "один рядок, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld рядків, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> рядків, "
 
 msgid "1 character"
 msgstr "один символ"
@@ -1891,8 +1891,8 @@ msgstr "%<PRId64> символів"
 
 #. Explicit typecast avoids warning on Mac OS X 10.6
 #, c-format
-msgid "%ld characters"
-msgstr "%ld символів"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> символів"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2325,16 +2325,16 @@ msgid "Font1: %s"
 msgstr "Шрифт1: %s"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0"
-msgstr "Ширина шрифту%ld не більша удвічі за ширину шрифту0"
+msgid "Font%<PRId64> width is not twice that of font0"
+msgstr "Ширина шрифту%<PRId64> не більша удвічі за ширину шрифту0"
 
 #, c-format
-msgid "Font0 width: %ld"
-msgstr "Ширина шрифту0: %ld"
+msgid "Font0 width: %<PRId64>"
+msgstr "Ширина шрифту0: %<PRId64>"
 
 #, c-format
-msgid "Font1 width: %ld"
-msgstr "Ширина шрифту1: %ld"
+msgid "Font1 width: %<PRId64>"
+msgstr "Ширина шрифту1: %<PRId64>"
 
 msgid "Invalid font specification"
 msgstr "Некоректна специфікація шрифту"
@@ -2515,8 +2515,8 @@ msgid "Added cscope database %s"
 msgstr "Додано базу даних cscope %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: Помилка читання зі з'єднання cscope %ld"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: Помилка читання зі з'єднання cscope %<PRId64>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: Невідомий тип пошуку cscope"
@@ -3752,13 +3752,13 @@ msgstr "E314: Збереження не вдалося"
 
 # msgstr "E314: "
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: неправильний lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: неправильний lnum: %<PRId64>"
 
 # msgstr "E315: "
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: не знайшов рядок %ld"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: не знайшов рядок %<PRId64>"
 
 # msgstr "E316: "
 msgid "E317: pointer block id wrong 3"
@@ -3778,8 +3778,8 @@ msgid "deleted block 1?"
 msgstr "блок 1 знищено?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Не вдалося знайти рядок %ld"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Не вдалося знайти рядок %<PRId64>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: Вказівник блоку помилковий"
@@ -3789,13 +3789,13 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count дорівнює 0"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: Номер рядка вийшов за межі: %ld за кінцем"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: Номер рядка вийшов за межі: %<PRId64> за кінцем"
 
 # msgstr "E322: "
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: Кількість рядків у блоці %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: Кількість рядків у блоці %<PRId64>"
 
 # msgstr "E323: "
 msgid "Stack size increases"
@@ -3994,8 +3994,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Натисніть ENTER або введіть команду для продовження"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s рядок %ld"
+msgid "%s line %<PRId64>"
+msgstr "%s рядок %<PRId64>"
 
 msgid "-- More --"
 msgstr "-- Ще --"
@@ -4065,12 +4065,12 @@ msgid "1 line less"
 msgstr "знищено один рядок"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "додано рядків: %ld"
+msgid "%<PRId64> more lines"
+msgstr "додано рядків: %<PRId64>"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "знищено рядків: %ld"
+msgid "%<PRId64> fewer lines"
+msgstr "знищено рядків: %<PRId64>"
 
 msgid " (Interrupted)"
 msgstr " (Перервано)"
@@ -4102,8 +4102,8 @@ msgstr "E340: Рядок стає занадто довгим"
 
 # msgstr "E340: "
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Внутрішня помилка: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Внутрішня помилка: lalloc(%<PRId64>, )"
 
 # msgstr "E341: "
 #, c-format
@@ -4186,8 +4186,8 @@ msgid "read from Netbeans socket"
 msgstr "читається з сокета Netbeans"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: Втрачено зв'язок із NetBeans для буфера %ld"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: Втрачено зв'язок із NetBeans для буфера %<PRId64>"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: netbeans не підтримується з цим GUI"
@@ -4239,23 +4239,23 @@ msgid "1 line %sed %d times"
 msgstr "Один рядок %s-но %d разів"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld рядків %s-но"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> рядків %s-но"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld рядків %s-но %d разів"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> рядків %s-но %d разів"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "Залишилося вирівняти %ld рядків..."
+msgid "%<PRId64> lines to indent... "
+msgstr "Залишилося вирівняти %<PRId64> рядків..."
 
 msgid "1 line indented "
 msgstr "Вирівняно один рядок"
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "Вирівняно рядків: %ld"
+msgid "%<PRId64> lines indented "
+msgstr "Вирівняно рядків: %<PRId64>"
 
 msgid "E748: No previously used register"
 msgstr "E748: Регістри перед цим не вживались"
@@ -4268,12 +4268,12 @@ msgid "1 line changed"
 msgstr "Один рядок змінено"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "Змінено рядків: %ld"
+msgid "%<PRId64> lines changed"
+msgstr "Змінено рядків: %<PRId64>"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "Звільнено рядків: %ld"
+msgid "freeing %<PRId64> lines"
+msgstr "Звільнено рядків: %<PRId64>"
 
 msgid "block of 1 line yanked"
 msgstr "Запам'ятав блок з одного рядка"
@@ -4282,12 +4282,12 @@ msgid "1 line yanked"
 msgstr "Запам'ятав один рядок"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "Запам'ятав блок із %ld рядків"
+msgid "block of %<PRId64> lines yanked"
+msgstr "Запам'ятав блок із %<PRId64> рядків"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "Запам'ятав рядків: %ld"
+msgid "%<PRId64> lines yanked"
+msgstr "Запам'ятав рядків: %<PRId64>"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4317,36 +4317,36 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: Невідомий тип регістру %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "довж.: %ld; "
+msgid "%<PRId64> Cols; "
+msgstr "довж.: %<PRId64>; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Вибрано %s%ld з %ld рядків; %ld з %ld слів; %ld з %ld байтів"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Вибрано %s%<PRId64> з %<PRId64> рядків; %<PRId64> з %<PRId64> слів; %<PRId64> з %<PRId64> байтів"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
 msgstr ""
-"Вибрано %s%ld з %ld рядків; %ld з %ld слів; %ld of %ld символів; %ld з %ld "
+"Вибрано %s%<PRId64> з %<PRId64> рядків; %<PRId64> з %<PRId64> слів; %<PRId64> of %<PRId64> символів; %<PRId64> з %<PRId64> "
 "байтів"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Колонка %s з %s; рядок %ld з %ld; слово %ld з %ld; байт %ld з %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Колонка %s з %s; рядок %<PRId64> з %<PRId64>; слово %<PRId64> з %<PRId64>; байт %<PRId64> з %<PRId64>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"Колонка %s з %s; рядок %ld з %ld; слово %ld з %ld; символ %ld of %ld; байт "
-"%ld з %ld"
+"Колонка %s з %s; рядок %<PRId64> з %<PRId64>; слово %<PRId64> з %<PRId64>; символ %<PRId64> of %<PRId64>; байт "
+"%<PRId64> з %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld для BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> для BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Стор. %N"
@@ -4533,8 +4533,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Потрібна Amigados 2.04 або пізніша\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Потрібно %s версії %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Потрібно %s версії %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Не вдалося відкрити NIL:\n"
@@ -4608,8 +4608,8 @@ msgid "E245: Illegal char '%c' in font name \"%s\""
 msgstr "E245: Помилковий символ %c в назві шрифту «%s»"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "На відкриття дисплею X пішло %ld мілісекунд"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "На відкриття дисплею X пішло %<PRId64> мілісекунд"
 
 msgid ""
 "\n"
@@ -5399,8 +5399,8 @@ msgid "Performing soundfolding..."
 msgstr "Виконується згортання звуків..."
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "Кількість слів після згортання звуків: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "Кількість слів після згортання звуків: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -5435,8 +5435,8 @@ msgid "Done!"
 msgstr "Зроблено!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' не містить %ld елементів"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' не містить %<PRId64> елементів"
 
 #, c-format
 msgid "Word '%.*s' removed from %s"
@@ -5453,8 +5453,8 @@ msgid "Sorry, no suggestions"
 msgstr "Пробачте, немає пропозицій"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Пробачте, тільки %ld пропозицій"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "Пробачте, тільки %<PRId64> пропозицій"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
@@ -5804,8 +5804,8 @@ msgstr "E431: Помилка формату у файлі теґів «%s»"
 
 # msgstr "E431: "
 #, c-format
-msgid "Before byte %ld"
-msgstr "Перед байтом %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Перед байтом %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5955,8 +5955,8 @@ msgid "Already at newest change"
 msgstr "Вже на найновішій зміні"
 
 #, c-format
-msgid "E830: Undo number %ld not found"
-msgstr "E830: Зміну %ld не знайдено в історії"
+msgid "E830: Undo number %<PRId64> not found"
+msgstr "E830: Зміну %<PRId64> не знайдено в історії"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: неправильні номери рядків"
@@ -5982,8 +5982,8 @@ msgid "changes"
 msgstr "змін"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s; %s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "перед"
@@ -5998,8 +5998,8 @@ msgid "number changes  when               saved"
 msgstr "номер  зміни    час             збережено"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "%ld секунд тому"
+msgid "%<PRId64> seconds ago"
+msgstr "%<PRId64> секунд тому"
 
 # msgstr "E406: "
 msgid "E790: undojoin is not allowed after undo"

src/po/vi.po

@@ -58,8 +58,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: Không có bộ đệm được liệt kê"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: Bộ đệm %ld không tồn tại"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Bộ đệm %<PRId64> không tồn tại"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Đây là bộ đệm cuối cùng"
@@ -68,9 +68,9 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: Đây là bộ đệm đầu tiên"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
 msgstr ""
-"E89: Thay đổi trong bộ đệm %ld chưa được ghi lại (thêm ! để thoát ra bằng "
+"E89: Thay đổi trong bộ đệm %<PRId64> chưa được ghi lại (thêm ! để thoát ra bằng "
 "mọi giá)"
 
 msgid "E90: Cannot unload last buffer"
@@ -80,8 +80,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Cảnh báo: Danh sách tên tập tin quá đầy"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Bộ đệm %ld không được tìm thấy"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: Bộ đệm %<PRId64> không được tìm thấy"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -92,8 +92,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Không có bộ đệm tương ứng với %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "dòng %ld"
+msgid "line %<PRId64>"
+msgstr "dòng %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Đã có bộ đệm với tên như vậy"
@@ -118,12 +118,12 @@ msgid "1 line --%d%%--"
 msgstr "1 dòng --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld dòng --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> dòng --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "dòng %ld của %ld --%d%%-- cột "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "dòng %<PRId64> của %<PRId64> --%d%%-- cột "
 
 msgid "[No file]"
 msgstr "[Không có tập tin]"
@@ -172,12 +172,12 @@ msgid "Signs for %s:"
 msgstr "Ký hiệu cho %s:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    dòng=%ld  id=%d  tên=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    dòng=%<PRId64>  id=%d  tên=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: Chỉ có thể theo dõi sự khác nhau trong nhiều nhất %ld bộ đệm"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: Chỉ có thể theo dõi sự khác nhau trong nhiều nhất %<PRId64> bộ đệm"
 
 msgid "E97: Cannot create diffs"
 msgstr "E97: Không thể tạo tập tin khác biệt (diff)"
@@ -463,8 +463,8 @@ msgid "%s aborted"
 msgstr "%s dừng"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s trả lại #%ld"
+msgid "%s returning #%<PRId64>"
+msgstr "%s trả lại #%<PRId64>"
 
 #, c-format
 msgid "%s returning \"%s\""
@@ -489,16 +489,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Bật chế độ sửa lỗi (Debug). Gõ \"cont\" để tiếp tục."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "dòng %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "dòng %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "câu lệnh: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Điểm dừng trên \"%s%s\" dòng %ld"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "Điểm dừng trên \"%s%s\" dòng %<PRId64>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -508,8 +508,8 @@ msgid "No breakpoints defined"
 msgstr "Điểm dừng không được xác định"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s dòng %ld"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s dòng %<PRId64>"
 
 msgid "Save As"
 msgstr "Ghi nhớ như"
@@ -567,16 +567,16 @@ msgid "could not source \"%s\""
 msgstr "không thực hiện được \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "dòng %ld: không thực hiện được \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "dòng %<PRId64>: không thực hiện được \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "thực hiện \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "dòng %ld: thực hiện \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "dòng %<PRId64>: thực hiện \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -690,12 +690,12 @@ msgid "1 line moved"
 msgstr "Đã di chuyển 1 dòng"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "Đã di chuyển %ld dòng"
+msgid "%<PRId64> lines moved"
+msgstr "Đã di chuyển %<PRId64> dòng"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "Đã lọc %ld dòng"
+msgid "%<PRId64> lines filtered"
+msgstr "Đã lọc %<PRId64> dòng"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: Các lệnh tự động *Filter* không được thay đổi bộ đệm hiện thời"
@@ -769,8 +769,8 @@ msgid "Overwrite existing file \"%.*s\"?"
 msgstr "Ghi đè lên tập tin đã có \"%.*s\"?"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: Không có tên tập tin cho bộ đệm %ld"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: Không có tên tập tin cho bộ đệm %<PRId64>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: Tập tin chưa được ghi nhớ: Ghi nhớ bị tắt bởi tùy chọn 'write'"
@@ -810,15 +810,15 @@ msgid "1 substitution"
 msgstr "1 thay thế"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld thay thế"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> thay thế"
 
 msgid " on 1 line"
 msgstr " trên 1 dòng"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " trên %ld dòng"
+msgid " on %<PRId64> lines"
+msgstr " trên %<PRId64> dòng"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: Không thực hiện được lệnh :global đệ qui"
@@ -901,8 +901,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Tên bộ đệm không đúng: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: ID của ký hiệu không đúng: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: ID của ký hiệu không đúng: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (KHÔNG TÌM THẤY)"
@@ -966,8 +966,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: 1 tập tin nữa chờ soạn thảo."
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: %ld tập tin nữa chưa soạn thảo."
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: %<PRId64> tập tin nữa chưa soạn thảo."
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: Đã có câu lệnh: Thêm ! để thay thế"
@@ -1131,8 +1131,8 @@ msgid "Exception discarded: %s"
 msgstr "Trường hợp ngoại lệ bị bỏ qua: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, dòng %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, dòng %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1316,8 +1316,8 @@ msgid "[CONVERSION ERROR]"
 msgstr "[LỖI CHUYỂN BẢNG MÃ]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[BYTE KHÔNG CHO PHÉP trên dòng %ld]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[BYTE KHÔNG CHO PHÉP trên dòng %<PRId64>]"
 
 msgid "[READ ERRORS]"
 msgstr "[LỖI ĐỌC]"
@@ -1461,15 +1461,15 @@ msgid "1 line, "
 msgstr "1 dòng, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld dòng, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> dòng, "
 
 msgid "1 character"
 msgstr "1 ký tự"
 
 #, c-format
-msgid "%ld characters"
-msgstr "%ld ký tự"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> ký tự"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -1831,20 +1831,20 @@ msgid "Font1: %s\n"
 msgstr "Font1: %s\n"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
 msgstr ""
-"Chiều rộng phông chữ font%ld phải lớn hơn hai lần so với chiều rộng font0\n"
+"Chiều rộng phông chữ font%<PRId64> phải lớn hơn hai lần so với chiều rộng font0\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "Chiều rộng font0: %ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "Chiều rộng font0: %<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"Chiều rộng font1: %ld\n"
+"Chiều rộng font1: %<PRId64>\n"
 "\n"
 
 msgid "E256: Hangul automata ERROR"
@@ -1898,8 +1898,8 @@ msgid "Added cscope database %s"
 msgstr "Đã thêm cơ sở dữ liệu cscope %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: lỗi lấy thông tin từ kết nối cscope %ld"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: lỗi lấy thông tin từ kết nối cscope %<PRId64>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: không rõ loại tìm kiếm cscope"
@@ -3017,12 +3017,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: Cập nhật không thành công"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: giá trị lnum không đúng: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: giá trị lnum không đúng: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: không tìm được dòng %ld"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: không tìm được dòng %<PRId64>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: Giá trị của pointer khối số 3 không đúng"
@@ -3040,8 +3040,8 @@ msgid "deleted block 1?"
 msgstr "đã xóa khối số 1?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: Không tìm được dòng %ld"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: Không tìm được dòng %<PRId64>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: giá trị của pointer khối không đúng"
@@ -3050,12 +3050,12 @@ msgid "pe_line_count is zero"
 msgstr "giá trị pe_line_count bằng không"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: số thứ tự dòng vượt quá giới hạn : %ld"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: số thứ tự dòng vượt quá giới hạn : %<PRId64>"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: giá trị đếm dòng không đúng trong khối %ld"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: giá trị đếm dòng không đúng trong khối %<PRId64>"
 
 msgid "Stack size increases"
 msgstr "Kích thước của đống tăng lên"
@@ -3293,12 +3293,12 @@ msgid "1 line less"
 msgstr "Bớt 1 dòng"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "Thêm %ld dòng"
+msgid "%<PRId64> more lines"
+msgstr "Thêm %<PRId64> dòng"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "Bớt %ld dòng"
+msgid "%<PRId64> fewer lines"
+msgstr "Bớt %<PRId64> dòng"
 
 msgid " (Interrupted)"
 msgstr " (Bị gián đoạn)"
@@ -3333,8 +3333,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: Dòng đang trở thành quá dài"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Lỗi nội bộ: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: Lỗi nội bộ: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -3417,8 +3417,8 @@ msgid "read from Netbeans socket"
 msgstr "đọc từ socket NetBeans"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: Bị mất liên kết với NetBeans cho bộ đệm %ld"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: Bị mất liên kết với NetBeans cho bộ đệm %<PRId64>"
 
 msgid "Warning: terminal cannot highlight"
 msgstr "Cảnh báo: terminal không thực hiện được sự chiếu sáng"
@@ -3455,23 +3455,23 @@ msgid "1 line %sed %d times"
 msgstr "Trên 1 dòng %s %d lần"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "Trên %ld dòng %s 1 lần"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "Trên %<PRId64> dòng %s 1 lần"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "Trên %ld dòng %s %d lần"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "Trên %<PRId64> dòng %s %d lần"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "Thụt đầu %ld dòng..."
+msgid "%<PRId64> lines to indent... "
+msgstr "Thụt đầu %<PRId64> dòng..."
 
 msgid "1 line indented "
 msgstr "Đã thụt đầu 1 dòng"
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld dòng đã thụt đầu"
+msgid "%<PRId64> lines indented "
+msgstr "%<PRId64> dòng đã thụt đầu"
 
 #. must display the prompt
 msgid "cannot yank; delete anyway"
@@ -3481,19 +3481,19 @@ msgid "1 line changed"
 msgstr "1 dòng đã thay đổi"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld đã thay đổi"
+msgid "%<PRId64> lines changed"
+msgstr "%<PRId64> đã thay đổi"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "đã làm sạch %ld dòng"
+msgid "freeing %<PRId64> lines"
+msgstr "đã làm sạch %<PRId64> dòng"
 
 msgid "1 line yanked"
 msgstr "đã sao chép 1 dòng"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "đã sao chép %ld dòng"
+msgid "%<PRId64> lines yanked"
+msgstr "đã sao chép %<PRId64> dòng"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3526,20 +3526,20 @@ msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Tên sổ đăng ký không cho phép: '%s'"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld Cột; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> Cột; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Chọn %s%ld của %ld Dòng; %ld của %ld Từ; %ld của %ld Byte"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "Chọn %s%<PRId64> của %<PRId64> Dòng; %<PRId64> của %<PRId64> Từ; %<PRId64> của %<PRId64> Byte"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Cột %s của %s;  Dòng %ld của %ld; Từ %ld của %ld; Byte %ld của %ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "Cột %s của %s;  Dòng %<PRId64> của %<PRId64>; Từ %<PRId64> của %<PRId64>; Byte %<PRId64> của %<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld cho BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> cho BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Trang %N"
@@ -3712,8 +3712,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "Cần Amigados phiên bản 2.04 hoặc mới hơn\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "Cần %s phiên bản %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "Cần %s phiên bản %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "Không mở được NIL:\n"
@@ -3797,8 +3797,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: Nhận được tín hiệu chết\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "Mở màn hình X mất %ld mili giây"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "Mở màn hình X mất %<PRId64> mili giây"
 
 msgid ""
 "\n"
@@ -4449,8 +4449,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Lỗi định dạng trong tập tin thẻ ghi \"%s\""
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "Trước byte %ld"
+msgid "Before byte %<PRId64>"
+msgstr "Trước byte %<PRId64>"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -4513,8 +4513,8 @@ msgid "1 change"
 msgstr "duy nhất 1 thay đổi"
 
 #, c-format
-msgid "%ld changes"
-msgstr "%ld thay đổi"
+msgid "%<PRId64> changes"
+msgstr "%<PRId64> thay đổi"
 
 msgid "E439: undo list corrupt"
 msgstr "E439: danh sách hủy thao tác (undo) bị hỏng"

src/po/zh_CN.UTF-8.po

@@ -67,8 +67,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: 没有可列出的缓冲区"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: 缓冲区 %ld 不存在"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: 缓冲区 %<PRId64> 不存在"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: 无法切换，已是最后一个缓冲区"
@@ -77,8 +77,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: 无法切换，已是第一个缓冲区"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: 缓冲区 %ld 已修改但尚未保存 (请加 ! 强制执行)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: 缓冲区 %<PRId64> 已修改但尚未保存 (请加 ! 强制执行)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: 无法释放最后一个缓冲区"
@@ -87,8 +87,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: 警告: 文件名过多"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: 找不到缓冲区 %ld"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: 找不到缓冲区 %<PRId64>"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -99,8 +99,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: 没有匹配的缓冲区 %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "第 %ld 行"
+msgid "line %<PRId64>"
+msgstr "第 %<PRId64> 行"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: 已有缓冲区使用该名称"
@@ -125,12 +125,12 @@ msgid "1 line --%d%%--"
 msgstr "1 行 --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld 行 --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> 行 --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "行 %ld / %ld --%d%%-- 列 "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "行 %<PRId64> / %<PRId64> --%d%%-- 列 "
 
 msgid "[No Name]"
 msgstr "[未命名]"
@@ -180,12 +180,12 @@ msgid "Signs for %s:"
 msgstr "%s 的 Signs:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    行=%ld  id=%d  名称=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    行=%<PRId64>  id=%d  名称=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: 不能比较(diff) %ld 个以上的缓冲区"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: 不能比较(diff) %<PRId64> 个以上的缓冲区"
 
 msgid "E97: Cannot create diffs"
 msgstr "E97: 无法创建 diff"
@@ -326,8 +326,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: :let 中出现异常字符"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: List 索引超出范围: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: List 索引超出范围: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -656,8 +656,8 @@ msgid "%s aborted"
 msgstr "%s 已中止"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s 返回 #%ld "
+msgid "%s returning #%<PRId64>"
+msgstr "%s 返回 #%<PRId64> "
 
 #, c-format
 msgid "%s returning %s"
@@ -704,12 +704,12 @@ msgid "1 line moved"
 msgstr "移动了 1 行"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "移动了 %ld 行"
+msgid "%<PRId64> lines moved"
+msgstr "移动了 %<PRId64> 行"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "过滤了 %ld 行"
+msgid "%<PRId64> lines filtered"
+msgstr "过滤了 %<PRId64> 行"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filter* 自动命令不可以改变当前缓冲区"
@@ -795,8 +795,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: 交换文件已存在: %s (:silent! 强制执行)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: 缓冲区 %ld 没有文件名"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: 缓冲区 %<PRId64> 没有文件名"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: 文件未写入: 写入被 'write' 选项禁用"
@@ -839,19 +839,19 @@ msgid "1 substitution"
 msgstr "1 次替换，"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld 个匹配，"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> 个匹配，"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld 次替换，"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> 次替换，"
 
 msgid " on 1 line"
 msgstr "共 1 行"
 
 #, c-format
-msgid " on %ld lines"
-msgstr "共 %ld 行"
+msgid " on %<PRId64> lines"
+msgstr "共 %<PRId64> 行"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global 不能递归执行"
@@ -935,8 +935,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: 无效的缓冲区名: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: 无效的 sign ID: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: 无效的 sign ID: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (找不到)"
@@ -951,16 +951,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "进入调试模式。输入 \"cont\" 继续运行。"
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "第 %ld 行: %s"
+msgid "line %<PRId64>: %s"
+msgstr "第 %<PRId64> 行: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "命令: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "断点 \"%s%s\" 第 %ld 行"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "断点 \"%s%s\" 第 %<PRId64> 行"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -970,8 +970,8 @@ msgid "No breakpoints defined"
 msgstr "没有定义断点"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  第 %ld 行"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  第 %<PRId64> 行"
 
 msgid "E750: First use :profile start <fname>"
 msgstr "E750: 请先使用 :profile start <fname>"
@@ -1027,16 +1027,16 @@ msgid "could not source \"%s\""
 msgstr "不能执行 \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "第 %ld 行: 不能执行 \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "第 %<PRId64> 行: 不能执行 \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "执行 \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "第 %ld 行: 执行 \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "第 %<PRId64> 行: 执行 \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1125,8 +1125,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: 还有 1 个文件未编辑"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: 还有 %ld 个文件未编辑"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: 还有 %<PRId64> 个文件未编辑"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: 命令已存在: 请加 ! 强制替换"
@@ -1304,8 +1304,8 @@ msgid "Exception discarded: %s"
 msgstr "丢弃异常: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s，第 %ld 行"
+msgid "%s, line %<PRId64>"
+msgstr "%s，第 %<PRId64> 行"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1509,12 +1509,12 @@ msgid "[crypted]"
 msgstr "[已加密]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[第 %ld 行转换错误]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[第 %<PRId64> 行转换错误]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[第 %ld 行无效字符]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[第 %<PRId64> 行无效字符]"
 
 msgid "[READ ERRORS]"
 msgstr "[读错误]"
@@ -1653,15 +1653,15 @@ msgid "1 line, "
 msgstr "1 行，"
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld 行，"
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> 行，"
 
 msgid "1 character"
 msgstr "1 个字符"
 
 #, c-format
-msgid "%ld characters"
-msgstr "%ld 个字符"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> 个字符"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2073,19 +2073,19 @@ msgid "Font1: %s\n"
 msgstr "字体1: %s\n"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "字体%ld的宽度不是字体0的两倍\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "字体%<PRId64>的宽度不是字体0的两倍\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "字体0的宽度：%ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "字体0的宽度：%<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"字体1的宽度: %ld\n"
+"字体1的宽度: %<PRId64>\n"
 "\n"
 
 msgid "Invalid font specification"
@@ -2262,8 +2262,8 @@ msgid "Added cscope database %s"
 msgstr "添加了 cscope 数据库 %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: 读取 cscope 连接 %ld 出错"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: 读取 cscope 连接 %<PRId64> 出错"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: 未知的 cscope 查找类型"
@@ -3418,12 +3418,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: 保留失败"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: 无效的 lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: 无效的 lnum: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: 找不到第 %ld 行"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: 找不到第 %<PRId64> 行"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: 指针块 id 错误 3"
@@ -3441,8 +3441,8 @@ msgid "deleted block 1?"
 msgstr "删除了块 1？"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: 找不到第 %ld 行"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: 找不到第 %<PRId64> 行"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: 指针块 id 错误"
@@ -3451,12 +3451,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count 为零"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: 行号超出范围: %ld 超出结尾"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: 行号超出范围: %<PRId64> 超出结尾"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: 块 %ld 行数错误"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: 块 %<PRId64> 行数错误"
 
 msgid "Stack size increases"
 msgstr "堆栈大小增加"
@@ -3640,8 +3640,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "请按 ENTER 或其它命令继续"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s 第 %ld 行"
+msgid "%s line %<PRId64>"
+msgstr "%s 第 %<PRId64> 行"
 
 msgid "-- More --"
 msgstr "-- 更多 --"
@@ -3707,12 +3707,12 @@ msgid "1 line less"
 msgstr "少了 1 行"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "多了 %ld 行"
+msgid "%<PRId64> more lines"
+msgstr "多了 %<PRId64> 行"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "少了 %ld 行"
+msgid "%<PRId64> fewer lines"
+msgstr "少了 %<PRId64> 行"
 
 msgid " (Interrupted)"
 msgstr " (已中断)"
@@ -3751,8 +3751,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: 此行过长"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: 内部错误: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: 内部错误: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -3823,8 +3823,8 @@ msgid "read from Netbeans socket"
 msgstr "从 Netbeans 套接字读取"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: 缓冲区 %ld 丢失 NetBeans 连接"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: 缓冲区 %<PRId64> 丢失 NetBeans 连接"
 
 msgid "E505: "
 msgstr "E505: "
@@ -3868,23 +3868,23 @@ msgid "1 line %sed %d times"
 msgstr "1 行 %s 了 %d 次"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld 行 %s 了 1 次"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> 行 %s 了 1 次"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld 行 %s 了 %d 次"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> 行 %s 了 %d 次"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "缩进 %ld 行…… "
+msgid "%<PRId64> lines to indent... "
+msgstr "缩进 %<PRId64> 行…… "
 
 msgid "1 line indented "
 msgstr "缩进了 1 行 "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "缩进了 %ld 行 "
+msgid "%<PRId64> lines indented "
+msgstr "缩进了 %<PRId64> 行 "
 
 msgid "E748: No previously used register"
 msgstr "E748: 没有前一个使用的寄存器"
@@ -3897,12 +3897,12 @@ msgid "1 line changed"
 msgstr "改变了 1 行"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "改变了 %ld 行"
+msgid "%<PRId64> lines changed"
+msgstr "改变了 %<PRId64> 行"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "释放了 %ld 行"
+msgid "freeing %<PRId64> lines"
+msgstr "释放了 %<PRId64> 行"
 
 msgid "block of 1 line yanked"
 msgstr "复制了 1 行的块"
@@ -3911,12 +3911,12 @@ msgid "1 line yanked"
 msgstr "复制了 1 行"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "复制了 %ld 行的块"
+msgid "block of %<PRId64> lines yanked"
+msgstr "复制了 %<PRId64> 行的块"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "复制了 %ld 行"
+msgid "%<PRId64> lines yanked"
+msgstr "复制了 %<PRId64> 行"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3946,33 +3946,33 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: 未知的寄存器类型 %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld 列; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> 列; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "选择了 %s%ld/%ld 行; %ld/%ld 个词; %ld/%ld 个字节"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "选择了 %s%<PRId64>/%<PRId64> 行; %<PRId64>/%<PRId64> 个词; %<PRId64>/%<PRId64> 个字节"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
-msgstr "选择了 %s%ld/%ld 行; %ld/%ld 个词; %ld/%ld 个字符; %ld/%ld 个字节"
+msgstr "选择了 %s%<PRId64>/%<PRId64> 行; %<PRId64>/%<PRId64> 个词; %<PRId64>/%<PRId64> 个字符; %<PRId64>/%<PRId64> 个字节"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "第 %s/%s 列; 第 %ld/%ld 行; 第 %ld/%ld 个词; 第 %ld/%ld 个字节"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "第 %s/%s 列; 第 %<PRId64>/%<PRId64> 行; 第 %<PRId64>/%<PRId64> 个词; 第 %<PRId64>/%<PRId64> 个字节"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"第 %s/%s 列; 第 %ld/%ld 行; 第 %ld/%ld 个词; 第 %ld/%ld 个字符; 第 %ld/%ld 个"
+"第 %s/%s 列; 第 %<PRId64>/%<PRId64> 行; 第 %<PRId64>/%<PRId64> 个词; 第 %<PRId64>/%<PRId64> 个字符; 第 %<PRId64>/%<PRId64> 个"
 "字节"
 
 #, c-format
-#~ msgid "(+%ld for BOM)"
+#~ msgid "(+%<PRId64> for BOM)"
 #~ msgstr ""
 
 #~ msgid "%<%f%h%m%=Page %N"
@@ -4139,8 +4139,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "需要 Amigados 版本 2.04 以上\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "需要 %s 版本 %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "需要 %s 版本 %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "不能打开 NIL:\n"
@@ -4222,8 +4222,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: 拦截到致命信号(deadly signal)\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "打开 X display 用时 %ld 秒"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "打开 X display 用时 %<PRId64> 秒"
 
 msgid ""
 "\n"
@@ -4872,8 +4872,8 @@ msgid "Performing soundfolding..."
 msgstr "正在 soundfolding……"
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "soundfolding 后的单词数: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "soundfolding 后的单词数: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -4908,8 +4908,8 @@ msgid "Done!"
 msgstr "完成！"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' 没有 %ld 项"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' 没有 %<PRId64> 项"
 
 #, c-format
 msgid "Word removed from %s"
@@ -4926,8 +4926,8 @@ msgid "Sorry, no suggestions"
 msgstr "抱歉，没有建议"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "抱歉，只有 %ld 条建议"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "抱歉，只有 %<PRId64> 条建议"
 
 #. avoid more prompt
 #, c-format
@@ -5228,8 +5228,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Tag 文件 \"%s\" 格式错误"
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "在第 %ld 字节之前"
+msgid "Before byte %<PRId64>"
+msgstr "在第 %<PRId64> 字节之前"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5292,8 +5292,8 @@ msgid "Already at newest change"
 msgstr "已位于最新的改变"
 
 #, c-format
-msgid "Undo number %ld not found"
-msgstr "找不到撤销号 %ld"
+msgid "Undo number %<PRId64> not found"
+msgstr "找不到撤销号 %<PRId64>"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: 行号错误"
@@ -5317,8 +5317,8 @@ msgid "changes"
 msgstr "行发生改变"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s；%s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s；%s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "before"

src/po/zh_CN.cp936.po

@@ -67,8 +67,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: û<>п<EFBFBD><D0BF>г<EFBFBD><D0B3>Ļ<EFBFBD><C4BB><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: <20>޷<EFBFBD><DEB7>л<EFBFBD><D0BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -77,8 +77,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: <20>޷<EFBFBD><DEB7>л<EFBFBD><D0BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǵ<EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><><EFBFBD>޸ĵ<DEB8><C4B5><EFBFBD>δ<EFBFBD><CEB4><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD> ! ǿ<><C7BF>ִ<EFBFBD><D6B4>)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD>޸ĵ<DEB8><C4B5><EFBFBD>δ<EFBFBD><CEB4><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD> ! ǿ<><C7BF>ִ<EFBFBD><D6B4>)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: <20>޷<EFBFBD><DEB7>ͷ<EFBFBD><CDB7><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -87,8 +87,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: <20><><EFBFBD><EFBFBD>: <20>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: <20>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: <20>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -99,8 +99,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: û<><C3BB>ƥ<EFBFBD><C6A5><EFBFBD>Ļ<EFBFBD><C4BB><EFBFBD><EFBFBD><EFBFBD> %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "<22><> %ld <20><>"
+msgid "line %<PRId64>"
+msgstr "<22><> %<PRId64> <20><>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: <20><><EFBFBD>л<EFBFBD><D0BB><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD>ø<EFBFBD><C3B8><EFBFBD><EFBFBD><EFBFBD>"
@@ -125,12 +125,12 @@ msgid "1 line --%d%%--"
 msgstr "1 <20><> --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld <20><> --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> <20><> --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "<22><> %ld / %ld --%d%%-- <20><> "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "<22><> %<PRId64> / %<PRId64> --%d%%-- <20><> "
 
 msgid "[No Name]"
 msgstr "[δ<><CEB4><EFBFBD><EFBFBD>]"
@@ -180,12 +180,12 @@ msgid "Signs for %s:"
 msgstr "%s <20><> Signs:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    <20><>=%ld  id=%d  <20><><EFBFBD><EFBFBD>=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    <20><>=%<PRId64>  id=%d  <20><><EFBFBD><EFBFBD>=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: <20><><EFBFBD>ܱȽ<DCB1>(diff) %ld <20><><EFBFBD><EFBFBD><EFBFBD>ϵĻ<CFB5><C4BB><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: <20><><EFBFBD>ܱȽ<DCB1>(diff) %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD>ϵĻ<CFB5><C4BB><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "E97: Cannot create diffs"
 msgstr "E97: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> diff"
@@ -327,8 +327,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: :let <20>г<EFBFBD><D0B3><EFBFBD><EFBFBD>쳣<EFBFBD>ַ<EFBFBD>"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: List <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Χ: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: List <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Χ: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -657,8 +657,8 @@ msgid "%s aborted"
 msgstr "%s <20><><EFBFBD><EFBFBD>ֹ"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s <20><><EFBFBD><EFBFBD> #%ld "
+msgid "%s returning #%<PRId64>"
+msgstr "%s <20><><EFBFBD><EFBFBD> #%<PRId64> "
 
 #, c-format
 msgid "%s returning %s"
@@ -705,12 +705,12 @@ msgid "1 line moved"
 msgstr "<22>ƶ<EFBFBD><C6B6><EFBFBD> 1 <20><>"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "<22>ƶ<EFBFBD><C6B6><EFBFBD> %ld <20><>"
+msgid "%<PRId64> lines moved"
+msgstr "<22>ƶ<EFBFBD><C6B6><EFBFBD> %<PRId64> <20><>"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><>"
+msgid "%<PRId64> lines filtered"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><>"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filter* <20>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD><EFBFBD><EEB2BB><EFBFBD>Ըı䵱ǰ<E4B5B1><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -796,8 +796,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC>Ѵ<EFBFBD><D1B4><EFBFBD>: %s (:silent! ǿ<><C7BF>ִ<EFBFBD><D6B4>)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld û<><C3BB><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> û<><C3BB><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: <20>ļ<EFBFBD>δд<CEB4><D0B4>: д<>뱻 'write' ѡ<><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -840,19 +840,19 @@ msgid "1 substitution"
 msgstr "1 <20><><EFBFBD>滻<EFBFBD><E6BBBB>"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld <20><>ƥ<EFBFBD>䣬"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> <20><>ƥ<EFBFBD>䣬"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld <20><><EFBFBD>滻<EFBFBD><E6BBBB>"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> <20><><EFBFBD>滻<EFBFBD><E6BBBB>"
 
 msgid " on 1 line"
 msgstr "<22><> 1 <20><>"
 
 #, c-format
-msgid " on %ld lines"
-msgstr "<22><> %ld <20><>"
+msgid " on %<PRId64> lines"
+msgstr "<22><> %<PRId64> <20><>"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global <20><><EFBFBD>ܵݹ<DCB5>ִ<EFBFBD><D6B4>"
@@ -936,8 +936,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: <20><>Ч<EFBFBD>Ļ<EFBFBD><C4BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: <20><>Ч<EFBFBD><D0A7> sign ID: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: <20><>Ч<EFBFBD><D0A7> sign ID: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (<28>Ҳ<EFBFBD><D2B2><EFBFBD>)"
@@ -952,16 +952,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģʽ<C4A3><CABD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"cont\" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>С<EFBFBD>"
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "<22><> %ld <20><>: %s"
+msgid "line %<PRId64>: %s"
+msgstr "<22><> %<PRId64> <20><>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "<22><><EFBFBD><EFBFBD>: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "<22>ϵ<EFBFBD> \"%s%s\" <20><> %ld <20><>"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "<22>ϵ<EFBFBD> \"%s%s\" <20><> %<PRId64> <20><>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -971,8 +971,8 @@ msgid "No breakpoints defined"
 msgstr "û<>ж<EFBFBD><D0B6><EFBFBD><EFBFBD>ϵ<EFBFBD>"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  <20><> %ld <20><>"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  <20><> %<PRId64> <20><>"
 
 msgid "E750: First use :profile start <fname>"
 msgstr "E750: <20><><EFBFBD><EFBFBD>ʹ<EFBFBD><CAB9> :profile start <fname>"
@@ -1028,16 +1028,16 @@ msgid "could not source \"%s\""
 msgstr "<22><><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4> \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "<22><> %ld <20><>: <20><><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4> \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "<22><> %<PRId64> <20><>: <20><><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4> \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "ִ<><D6B4> \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "<22><> %ld <20><>: ִ<><D6B4> \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "<22><> %<PRId64> <20><>: ִ<><D6B4> \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1126,8 +1126,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: <20><><EFBFBD><EFBFBD> 1 <20><><EFBFBD>ļ<EFBFBD>δ<EFBFBD>༭"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: <20><><EFBFBD><EFBFBD> %ld <20><><EFBFBD>ļ<EFBFBD>δ<EFBFBD>༭"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: <20><><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD>ļ<EFBFBD>δ<EFBFBD>༭"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: <20><><EFBFBD><EFBFBD><EFBFBD>Ѵ<EFBFBD><D1B4><EFBFBD>: <20><><EFBFBD><EFBFBD> ! ǿ<><C7BF><EFBFBD>滻"
@@ -1305,8 +1305,8 @@ msgid "Exception discarded: %s"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>쳣: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s<><73><EFBFBD><EFBFBD> %ld <20><>"
+msgid "%s, line %<PRId64>"
+msgstr "%s<><73><EFBFBD><EFBFBD> %<PRId64> <20><>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1510,12 +1510,12 @@ msgid "[crypted]"
 msgstr "[<5B>Ѽ<EFBFBD><D1BC><EFBFBD>]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[<5B><> %ld <20><>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[<5B><> %<PRId64> <20><>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[<5B><> %ld <20><><EFBFBD><EFBFBD>Ч<EFBFBD>ַ<EFBFBD>]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[<5B><> %<PRId64> <20><><EFBFBD><EFBFBD>Ч<EFBFBD>ַ<EFBFBD>]"
 
 msgid "[READ ERRORS]"
 msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]"
@@ -1654,15 +1654,15 @@ msgid "1 line, "
 msgstr "1 <20>У<EFBFBD>"
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld <20>У<EFBFBD>"
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> <20>У<EFBFBD>"
 
 msgid "1 character"
 msgstr "1 <20><><EFBFBD>ַ<EFBFBD>"
 
 #, c-format
-msgid "%ld characters"
-msgstr "%ld <20><><EFBFBD>ַ<EFBFBD>"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> <20><><EFBFBD>ַ<EFBFBD>"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2074,19 +2074,19 @@ msgid "Font1: %s\n"
 msgstr "<22><><EFBFBD><EFBFBD>1: %s\n"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "<22><><EFBFBD><EFBFBD>%ld<EFBFBD>Ŀ<EFBFBD><EFBFBD>Ȳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "<22><><EFBFBD><EFBFBD>%<PRId64><EFBFBD>Ŀ<EFBFBD><EFBFBD>Ȳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "<22><><EFBFBD><EFBFBD>0<EFBFBD>Ŀ<EFBFBD><C4BF>ȣ<EFBFBD>%ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "<22><><EFBFBD><EFBFBD>0<EFBFBD>Ŀ<EFBFBD><C4BF>ȣ<EFBFBD>%<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"<22><><EFBFBD><EFBFBD>1<EFBFBD>Ŀ<EFBFBD><C4BF><EFBFBD>: %ld\n"
+"<22><><EFBFBD><EFBFBD>1<EFBFBD>Ŀ<EFBFBD><C4BF><EFBFBD>: %<PRId64>\n"
 "\n"
 
 msgid "Invalid font specification"
@@ -2263,8 +2263,8 @@ msgid "Added cscope database %s"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> cscope <20><><EFBFBD>ݿ<EFBFBD> %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: <20><>ȡ cscope <20><><EFBFBD><EFBFBD> %ld <20><><EFBFBD><EFBFBD>"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: <20><>ȡ cscope <20><><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD><EFBFBD>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: δ֪<CEB4><D6AA> cscope <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -3419,12 +3419,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: <20><><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: <20><>Ч<EFBFBD><D0A7> lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: <20><>Ч<EFBFBD><D0A7> lnum: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: <20>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD><EFBFBD> %ld <20><>"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: <20>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: ָ<><D6B8><EFBFBD><EFBFBD> id <20><><EFBFBD><EFBFBD> 3"
@@ -3442,8 +3442,8 @@ msgid "deleted block 1?"
 msgstr "ɾ<><C9BE><EFBFBD>˿<EFBFBD> 1<><31>"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: <20>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD><EFBFBD> %ld <20><>"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: <20>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: ָ<><D6B8><EFBFBD><EFBFBD> id <20><><EFBFBD><EFBFBD>"
@@ -3452,12 +3452,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count Ϊ<><CEAA>"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: <20>кų<D0BA><C5B3><EFBFBD><EFBFBD><EFBFBD>Χ: %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>β"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: <20>кų<D0BA><C5B3><EFBFBD><EFBFBD><EFBFBD>Χ: %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>β"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: <20><> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: <20><> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "Stack size increases"
 msgstr "<22><>ջ<EFBFBD><D5BB>С<EFBFBD><D0A1><EFBFBD><EFBFBD>"
@@ -3641,8 +3641,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "<22>밴 ENTER <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s <20><> %ld <20><>"
+msgid "%s line %<PRId64>"
+msgstr "%s <20><> %<PRId64> <20><>"
 
 msgid "-- More --"
 msgstr "-- <20><><EFBFBD><EFBFBD> --"
@@ -3708,12 +3708,12 @@ msgid "1 line less"
 msgstr "<22><><EFBFBD><EFBFBD> 1 <20><>"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "<22><><EFBFBD><EFBFBD> %ld <20><>"
+msgid "%<PRId64> more lines"
+msgstr "<22><><EFBFBD><EFBFBD> %<PRId64> <20><>"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "<22><><EFBFBD><EFBFBD> %ld <20><>"
+msgid "%<PRId64> fewer lines"
+msgstr "<22><><EFBFBD><EFBFBD> %<PRId64> <20><>"
 
 msgid " (Interrupted)"
 msgstr " (<28><><EFBFBD>ж<EFBFBD>)"
@@ -3752,8 +3752,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: <20><><EFBFBD>й<EFBFBD><D0B9><EFBFBD>"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: <20>ڲ<EFBFBD><DAB2><EFBFBD><EFBFBD><EFBFBD>: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: <20>ڲ<EFBFBD><DAB2><EFBFBD><EFBFBD><EFBFBD>: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -3824,8 +3824,8 @@ msgid "read from Netbeans socket"
 msgstr "<22><> Netbeans <20>׽<EFBFBD><D7BD>ֶ<EFBFBD>ȡ"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><>ʧ NetBeans <20><><EFBFBD><EFBFBD>"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><>ʧ NetBeans <20><><EFBFBD><EFBFBD>"
 
 msgid "E505: "
 msgstr "E505: "
@@ -3869,23 +3869,23 @@ msgid "1 line %sed %d times"
 msgstr "1 <20><> %s <20><> %d <20><>"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld <20><> %s <20><> 1 <20><>"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> <20><> %s <20><> 1 <20><>"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld <20><> %s <20><> %d <20><>"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> <20><> %s <20><> %d <20><>"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "<22><><EFBFBD><EFBFBD> %ld <20>С<EFBFBD><D0A1><EFBFBD> "
+msgid "%<PRId64> lines to indent... "
+msgstr "<22><><EFBFBD><EFBFBD> %<PRId64> <20>С<EFBFBD><D0A1><EFBFBD> "
 
 msgid "1 line indented "
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1 <20><> "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><> "
+msgid "%<PRId64> lines indented "
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><> "
 
 msgid "E748: No previously used register"
 msgstr "E748: û<><C3BB>ǰһ<C7B0><D2BB>ʹ<EFBFBD>õļĴ<C4BC><C4B4><EFBFBD>"
@@ -3898,12 +3898,12 @@ msgid "1 line changed"
 msgstr "<22>ı<EFBFBD><C4B1><EFBFBD> 1 <20><>"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "<22>ı<EFBFBD><C4B1><EFBFBD> %ld <20><>"
+msgid "%<PRId64> lines changed"
+msgstr "<22>ı<EFBFBD><C4B1><EFBFBD> %<PRId64> <20><>"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "<22>ͷ<EFBFBD><CDB7><EFBFBD> %ld <20><>"
+msgid "freeing %<PRId64> lines"
+msgstr "<22>ͷ<EFBFBD><CDB7><EFBFBD> %<PRId64> <20><>"
 
 msgid "block of 1 line yanked"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1 <20>еĿ<D0B5>"
@@ -3912,12 +3912,12 @@ msgid "1 line yanked"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1 <20><>"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20>еĿ<D0B5>"
+msgid "block of %<PRId64> lines yanked"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20>еĿ<D0B5>"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><>"
+msgid "%<PRId64> lines yanked"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><>"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3947,33 +3947,33 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: δ֪<CEB4>ļĴ<C4BC><C4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld <20><>; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> <20><>; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "ѡ<><D1A1><EFBFBD><EFBFBD> %s%ld/%ld <20><>; %ld/%ld <20><><EFBFBD><EFBFBD>; %ld/%ld <20><><EFBFBD>ֽ<EFBFBD>"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "ѡ<><D1A1><EFBFBD><EFBFBD> %s%<PRId64>/%<PRId64> <20><>; %<PRId64>/%<PRId64> <20><><EFBFBD><EFBFBD>; %<PRId64>/%<PRId64> <20><><EFBFBD>ֽ<EFBFBD>"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
-msgstr "ѡ<><D1A1><EFBFBD><EFBFBD> %s%ld/%ld <20><>; %ld/%ld <20><><EFBFBD><EFBFBD>; %ld/%ld <20><><EFBFBD>ַ<EFBFBD>; %ld/%ld <20><><EFBFBD>ֽ<EFBFBD>"
+msgstr "ѡ<><D1A1><EFBFBD><EFBFBD> %s%<PRId64>/%<PRId64> <20><>; %<PRId64>/%<PRId64> <20><><EFBFBD><EFBFBD>; %<PRId64>/%<PRId64> <20><><EFBFBD>ַ<EFBFBD>; %<PRId64>/%<PRId64> <20><><EFBFBD>ֽ<EFBFBD>"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "<22><> %s/%s <20><>; <20><> %ld/%ld <20><>; <20><> %ld/%ld <20><><EFBFBD><EFBFBD>; <20><> %ld/%ld <20><><EFBFBD>ֽ<EFBFBD>"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "<22><> %s/%s <20><>; <20><> %<PRId64>/%<PRId64> <20><>; <20><> %<PRId64>/%<PRId64> <20><><EFBFBD><EFBFBD>; <20><> %<PRId64>/%<PRId64> <20><><EFBFBD>ֽ<EFBFBD>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"<22><> %s/%s <20><>; <20><> %ld/%ld <20><>; <20><> %ld/%ld <20><><EFBFBD><EFBFBD>; <20><> %ld/%ld <20><><EFBFBD>ַ<EFBFBD>; <20><> %ld/%ld <20><>"
+"<22><> %s/%s <20><>; <20><> %<PRId64>/%<PRId64> <20><>; <20><> %<PRId64>/%<PRId64> <20><><EFBFBD><EFBFBD>; <20><> %<PRId64>/%<PRId64> <20><><EFBFBD>ַ<EFBFBD>; <20><> %<PRId64>/%<PRId64> <20><>"
 "<22>ֽ<EFBFBD>"
 
 #, c-format
-#~ msgid "(+%ld for BOM)"
+#~ msgid "(+%<PRId64> for BOM)"
 #~ msgstr ""
 
 #~ msgid "%<%f%h%m%=Page %N"
@@ -4140,8 +4140,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "<22><>Ҫ Amigados <20>汾 2.04 <20><><EFBFBD><EFBFBD>\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "<22><>Ҫ %s <20>汾 %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "<22><>Ҫ %s <20>汾 %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "<22><><EFBFBD>ܴ<EFBFBD><DCB4><EFBFBD> NIL:\n"
@@ -4223,8 +4223,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: <20><><EFBFBD>ص<EFBFBD><D8B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ź<EFBFBD>(deadly signal)\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "<22><><EFBFBD><EFBFBD> X display <20><>ʱ %ld <20><>"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "<22><><EFBFBD><EFBFBD> X display <20><>ʱ %<PRId64> <20><>"
 
 msgid ""
 "\n"
@@ -4873,8 +4873,8 @@ msgid "Performing soundfolding..."
 msgstr "<22><><EFBFBD><EFBFBD> soundfolding<6E><67><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "soundfolding <20><><EFBFBD>ĵ<EFBFBD><C4B5><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "soundfolding <20><><EFBFBD>ĵ<EFBFBD><C4B5><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -4909,8 +4909,8 @@ msgid "Done!"
 msgstr "<22><><EFBFBD>ɣ<EFBFBD>"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' û<><C3BB> %ld <20><>"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' û<><C3BB> %<PRId64> <20><>"
 
 #, c-format
 msgid "Word removed from %s"
@@ -4927,8 +4927,8 @@ msgid "Sorry, no suggestions"
 msgstr "<22><>Ǹ<EFBFBD><C7B8>û<EFBFBD>н<EFBFBD><D0BD><EFBFBD>"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "<22><>Ǹ<EFBFBD><C7B8>ֻ<EFBFBD><D6BB> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "<22><>Ǹ<EFBFBD><C7B8>ֻ<EFBFBD><D6BB> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #. avoid more prompt
 #, c-format
@@ -5229,8 +5229,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Tag <20>ļ<EFBFBD> \"%s\" <20><>ʽ<EFBFBD><CABD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "<22>ڵ<EFBFBD> %ld <20>ֽ<EFBFBD>֮ǰ"
+msgid "Before byte %<PRId64>"
+msgstr "<22>ڵ<EFBFBD> %<PRId64> <20>ֽ<EFBFBD>֮ǰ"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5293,8 +5293,8 @@ msgid "Already at newest change"
 msgstr "<22><>λ<EFBFBD><CEBB><EFBFBD><EFBFBD><EFBFBD>µĸı<C4B8>"
 
 #, c-format
-msgid "Undo number %ld not found"
-msgstr "<22>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "Undo number %<PRId64> not found"
+msgstr "<22>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: <20>кŴ<D0BA><C5B4><EFBFBD>"
@@ -5318,8 +5318,8 @@ msgid "changes"
 msgstr "<22>з<EFBFBD><D0B7><EFBFBD><EFBFBD>ı<EFBFBD>"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s<><73>%s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s<><73>%s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "before"

src/po/zh_CN.po

@@ -67,8 +67,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: û<>п<EFBFBD><D0BF>г<EFBFBD><D0B3>Ļ<EFBFBD><C4BB><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: <20>޷<EFBFBD><DEB7>л<EFBFBD><D0BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -77,8 +77,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: <20>޷<EFBFBD><DEB7>л<EFBFBD><D0BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǵ<EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><><EFBFBD>޸ĵ<DEB8><C4B5><EFBFBD>δ<EFBFBD><CEB4><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD> ! ǿ<><C7BF>ִ<EFBFBD><D6B4>)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD>޸ĵ<DEB8><C4B5><EFBFBD>δ<EFBFBD><CEB4><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD> ! ǿ<><C7BF>ִ<EFBFBD><D6B4>)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: <20>޷<EFBFBD><DEB7>ͷ<EFBFBD><CDB7><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -87,8 +87,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: <20><><EFBFBD><EFBFBD>: <20>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: <20>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: <20>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -99,8 +99,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: û<><C3BB>ƥ<EFBFBD><C6A5><EFBFBD>Ļ<EFBFBD><C4BB><EFBFBD><EFBFBD><EFBFBD> %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "<22><> %ld <20><>"
+msgid "line %<PRId64>"
+msgstr "<22><> %<PRId64> <20><>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: <20><><EFBFBD>л<EFBFBD><D0BB><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD>ø<EFBFBD><C3B8><EFBFBD><EFBFBD><EFBFBD>"
@@ -125,12 +125,12 @@ msgid "1 line --%d%%--"
 msgstr "1 <20><> --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld <20><> --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "%<PRId64> <20><> --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "<22><> %ld / %ld --%d%%-- <20><> "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "<22><> %<PRId64> / %<PRId64> --%d%%-- <20><> "
 
 msgid "[No Name]"
 msgstr "[δ<><CEB4><EFBFBD><EFBFBD>]"
@@ -180,12 +180,12 @@ msgid "Signs for %s:"
 msgstr "%s <20><> Signs:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    <20><>=%ld  id=%d  <20><><EFBFBD><EFBFBD>=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    <20><>=%<PRId64>  id=%d  <20><><EFBFBD><EFBFBD>=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: <20><><EFBFBD>ܱȽ<DCB1>(diff) %ld <20><><EFBFBD><EFBFBD><EFBFBD>ϵĻ<CFB5><C4BB><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: <20><><EFBFBD>ܱȽ<DCB1>(diff) %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD>ϵĻ<CFB5><C4BB><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "E97: Cannot create diffs"
 msgstr "E97: <20>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD> diff"
@@ -327,8 +327,8 @@ msgid "E18: Unexpected characters in :let"
 msgstr "E18: :let <20>г<EFBFBD><D0B3><EFBFBD><EFBFBD>쳣<EFBFBD>ַ<EFBFBD>"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: List <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Χ: %ld"
+msgid "E684: list index out of range: %<PRId64>"
+msgstr "E684: List <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Χ: %<PRId64>"
 
 #, c-format
 msgid "E121: Undefined variable: %s"
@@ -657,8 +657,8 @@ msgid "%s aborted"
 msgstr "%s <20><><EFBFBD><EFBFBD>ֹ"
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s <20><><EFBFBD><EFBFBD> #%ld "
+msgid "%s returning #%<PRId64>"
+msgstr "%s <20><><EFBFBD><EFBFBD> #%<PRId64> "
 
 #, c-format
 msgid "%s returning %s"
@@ -705,12 +705,12 @@ msgid "1 line moved"
 msgstr "<22>ƶ<EFBFBD><C6B6><EFBFBD> 1 <20><>"
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "<22>ƶ<EFBFBD><C6B6><EFBFBD> %ld <20><>"
+msgid "%<PRId64> lines moved"
+msgstr "<22>ƶ<EFBFBD><C6B6><EFBFBD> %<PRId64> <20><>"
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><>"
+msgid "%<PRId64> lines filtered"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><>"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filter* <20>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD><EFBFBD><EEB2BB><EFBFBD>Ըı䵱ǰ<E4B5B1><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -796,8 +796,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: <20><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC>Ѵ<EFBFBD><D1B4><EFBFBD>: %s (:silent! ǿ<><C7BF>ִ<EFBFBD><D6B4>)"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld û<><C3BB><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> û<><C3BB><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: <20>ļ<EFBFBD>δд<CEB4><D0B4>: д<>뱻 'write' ѡ<><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -840,19 +840,19 @@ msgid "1 substitution"
 msgstr "1 <20><><EFBFBD>滻<EFBFBD><E6BBBB>"
 
 #, c-format
-msgid "%ld matches"
-msgstr "%ld <20><>ƥ<EFBFBD>䣬"
+msgid "%<PRId64> matches"
+msgstr "%<PRId64> <20><>ƥ<EFBFBD>䣬"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld <20><><EFBFBD>滻<EFBFBD><E6BBBB>"
+msgid "%<PRId64> substitutions"
+msgstr "%<PRId64> <20><><EFBFBD>滻<EFBFBD><E6BBBB>"
 
 msgid " on 1 line"
 msgstr "<22><> 1 <20><>"
 
 #, c-format
-msgid " on %ld lines"
-msgstr "<22><> %ld <20><>"
+msgid " on %<PRId64> lines"
+msgstr "<22><> %<PRId64> <20><>"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global <20><><EFBFBD>ܵݹ<DCB5>ִ<EFBFBD><D6B4>"
@@ -936,8 +936,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: <20><>Ч<EFBFBD>Ļ<EFBFBD><C4BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: <20><>Ч<EFBFBD><D0A7> sign ID: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: <20><>Ч<EFBFBD><D0A7> sign ID: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (<28>Ҳ<EFBFBD><D2B2><EFBFBD>)"
@@ -952,16 +952,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ģʽ<C4A3><CABD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"cont\" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>С<EFBFBD>"
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "<22><> %ld <20><>: %s"
+msgid "line %<PRId64>: %s"
+msgstr "<22><> %<PRId64> <20><>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "<22><><EFBFBD><EFBFBD>: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "<22>ϵ<EFBFBD> \"%s%s\" <20><> %ld <20><>"
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "<22>ϵ<EFBFBD> \"%s%s\" <20><> %<PRId64> <20><>"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -971,8 +971,8 @@ msgid "No breakpoints defined"
 msgstr "û<>ж<EFBFBD><D0B6><EFBFBD><EFBFBD>ϵ<EFBFBD>"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  <20><> %ld <20><>"
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  <20><> %<PRId64> <20><>"
 
 msgid "E750: First use :profile start <fname>"
 msgstr "E750: <20><><EFBFBD><EFBFBD>ʹ<EFBFBD><CAB9> :profile start <fname>"
@@ -1028,16 +1028,16 @@ msgid "could not source \"%s\""
 msgstr "<22><><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4> \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "<22><> %ld <20><>: <20><><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4> \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "<22><> %<PRId64> <20><>: <20><><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4> \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "ִ<><D6B4> \"%s\""
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "<22><> %ld <20><>: ִ<><D6B4> \"%s\""
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "<22><> %<PRId64> <20><>: ִ<><D6B4> \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1126,8 +1126,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: <20><><EFBFBD><EFBFBD> 1 <20><><EFBFBD>ļ<EFBFBD>δ<EFBFBD>༭"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: <20><><EFBFBD><EFBFBD> %ld <20><><EFBFBD>ļ<EFBFBD>δ<EFBFBD>༭"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: <20><><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD>ļ<EFBFBD>δ<EFBFBD>༭"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: <20><><EFBFBD><EFBFBD><EFBFBD>Ѵ<EFBFBD><D1B4><EFBFBD>: <20><><EFBFBD><EFBFBD> ! ǿ<><C7BF><EFBFBD>滻"
@@ -1305,8 +1305,8 @@ msgid "Exception discarded: %s"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>쳣: %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s<><73><EFBFBD><EFBFBD> %ld <20><>"
+msgid "%s, line %<PRId64>"
+msgstr "%s<><73><EFBFBD><EFBFBD> %<PRId64> <20><>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1510,12 +1510,12 @@ msgid "[crypted]"
 msgstr "[<5B>Ѽ<EFBFBD><D1BC><EFBFBD>]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %ld]"
-msgstr "[<5B><> %ld <20><>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]"
+msgid "[CONVERSION ERROR in line %<PRId64>]"
+msgstr "[<5B><> %<PRId64> <20><>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[<5B><> %ld <20><><EFBFBD><EFBFBD>Ч<EFBFBD>ַ<EFBFBD>]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[<5B><> %<PRId64> <20><><EFBFBD><EFBFBD>Ч<EFBFBD>ַ<EFBFBD>]"
 
 msgid "[READ ERRORS]"
 msgstr "[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]"
@@ -1654,15 +1654,15 @@ msgid "1 line, "
 msgstr "1 <20>У<EFBFBD>"
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld <20>У<EFBFBD>"
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> <20>У<EFBFBD>"
 
 msgid "1 character"
 msgstr "1 <20><><EFBFBD>ַ<EFBFBD>"
 
 #, c-format
-msgid "%ld characters"
-msgstr "%ld <20><><EFBFBD>ַ<EFBFBD>"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64> <20><><EFBFBD>ַ<EFBFBD>"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2074,19 +2074,19 @@ msgid "Font1: %s\n"
 msgstr "<22><><EFBFBD><EFBFBD>1: %s\n"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "<22><><EFBFBD><EFBFBD>%ld<EFBFBD>Ŀ<EFBFBD><EFBFBD>Ȳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "<22><><EFBFBD><EFBFBD>%<PRId64><EFBFBD>Ŀ<EFBFBD><EFBFBD>Ȳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "<22><><EFBFBD><EFBFBD>0<EFBFBD>Ŀ<EFBFBD><C4BF>ȣ<EFBFBD>%ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "<22><><EFBFBD><EFBFBD>0<EFBFBD>Ŀ<EFBFBD><C4BF>ȣ<EFBFBD>%<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"<22><><EFBFBD><EFBFBD>1<EFBFBD>Ŀ<EFBFBD><C4BF><EFBFBD>: %ld\n"
+"<22><><EFBFBD><EFBFBD>1<EFBFBD>Ŀ<EFBFBD><C4BF><EFBFBD>: %<PRId64>\n"
 "\n"
 
 msgid "Invalid font specification"
@@ -2263,8 +2263,8 @@ msgid "Added cscope database %s"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> cscope <20><><EFBFBD>ݿ<EFBFBD> %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: <20><>ȡ cscope <20><><EFBFBD><EFBFBD> %ld <20><><EFBFBD><EFBFBD>"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: <20><>ȡ cscope <20><><EFBFBD><EFBFBD> %<PRId64> <20><><EFBFBD><EFBFBD>"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: δ֪<CEB4><D6AA> cscope <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -3419,12 +3419,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: <20><><EFBFBD><EFBFBD>ʧ<EFBFBD><CAA7>"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: <20><>Ч<EFBFBD><D0A7> lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: <20><>Ч<EFBFBD><D0A7> lnum: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: <20>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD><EFBFBD> %ld <20><>"
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: <20>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><>"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: ָ<><D6B8><EFBFBD><EFBFBD> id <20><><EFBFBD><EFBFBD> 3"
@@ -3442,8 +3442,8 @@ msgid "deleted block 1?"
 msgstr "ɾ<><C9BE><EFBFBD>˿<EFBFBD> 1<><31>"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: <20>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD><EFBFBD> %ld <20><>"
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: <20>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><>"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: ָ<><D6B8><EFBFBD><EFBFBD> id <20><><EFBFBD><EFBFBD>"
@@ -3452,12 +3452,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count Ϊ<><CEAA>"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: <20>кų<D0BA><C5B3><EFBFBD><EFBFBD><EFBFBD>Χ: %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>β"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: <20>кų<D0BA><C5B3><EFBFBD><EFBFBD><EFBFBD>Χ: %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>β"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: <20><> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: <20><> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "Stack size increases"
 msgstr "<22><>ջ<EFBFBD><D5BB>С<EFBFBD><D0A1><EFBFBD><EFBFBD>"
@@ -3641,8 +3641,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "<22>밴 ENTER <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%s line %ld"
-msgstr "%s <20><> %ld <20><>"
+msgid "%s line %<PRId64>"
+msgstr "%s <20><> %<PRId64> <20><>"
 
 msgid "-- More --"
 msgstr "-- <20><><EFBFBD><EFBFBD> --"
@@ -3708,12 +3708,12 @@ msgid "1 line less"
 msgstr "<22><><EFBFBD><EFBFBD> 1 <20><>"
 
 #, c-format
-msgid "%ld more lines"
-msgstr "<22><><EFBFBD><EFBFBD> %ld <20><>"
+msgid "%<PRId64> more lines"
+msgstr "<22><><EFBFBD><EFBFBD> %<PRId64> <20><>"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "<22><><EFBFBD><EFBFBD> %ld <20><>"
+msgid "%<PRId64> fewer lines"
+msgstr "<22><><EFBFBD><EFBFBD> %<PRId64> <20><>"
 
 msgid " (Interrupted)"
 msgstr " (<28><><EFBFBD>ж<EFBFBD>)"
@@ -3752,8 +3752,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: <20><><EFBFBD>й<EFBFBD><D0B9><EFBFBD>"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: <20>ڲ<EFBFBD><DAB2><EFBFBD><EFBFBD><EFBFBD>: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: <20>ڲ<EFBFBD><DAB2><EFBFBD><EFBFBD><EFBFBD>: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -3824,8 +3824,8 @@ msgid "read from Netbeans socket"
 msgstr "<22><> Netbeans <20>׽<EFBFBD><D7BD>ֶ<EFBFBD>ȡ"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><>ʧ NetBeans <20><><EFBFBD><EFBFBD>"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><>ʧ NetBeans <20><><EFBFBD><EFBFBD>"
 
 msgid "E505: "
 msgstr "E505: "
@@ -3869,23 +3869,23 @@ msgid "1 line %sed %d times"
 msgstr "1 <20><> %s <20><> %d <20><>"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld <20><> %s <20><> 1 <20><>"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> <20><> %s <20><> 1 <20><>"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld <20><> %s <20><> %d <20><>"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> <20><> %s <20><> %d <20><>"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "<22><><EFBFBD><EFBFBD> %ld <20>С<EFBFBD><D0A1><EFBFBD> "
+msgid "%<PRId64> lines to indent... "
+msgstr "<22><><EFBFBD><EFBFBD> %<PRId64> <20>С<EFBFBD><D0A1><EFBFBD> "
 
 msgid "1 line indented "
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1 <20><> "
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><> "
+msgid "%<PRId64> lines indented "
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><> "
 
 msgid "E748: No previously used register"
 msgstr "E748: û<><C3BB>ǰһ<C7B0><D2BB>ʹ<EFBFBD>õļĴ<C4BC><C4B4><EFBFBD>"
@@ -3898,12 +3898,12 @@ msgid "1 line changed"
 msgstr "<22>ı<EFBFBD><C4B1><EFBFBD> 1 <20><>"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "<22>ı<EFBFBD><C4B1><EFBFBD> %ld <20><>"
+msgid "%<PRId64> lines changed"
+msgstr "<22>ı<EFBFBD><C4B1><EFBFBD> %<PRId64> <20><>"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "<22>ͷ<EFBFBD><CDB7><EFBFBD> %ld <20><>"
+msgid "freeing %<PRId64> lines"
+msgstr "<22>ͷ<EFBFBD><CDB7><EFBFBD> %<PRId64> <20><>"
 
 msgid "block of 1 line yanked"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1 <20>еĿ<D0B5>"
@@ -3912,12 +3912,12 @@ msgid "1 line yanked"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1 <20><>"
 
 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20>еĿ<D0B5>"
+msgid "block of %<PRId64> lines yanked"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20>еĿ<D0B5>"
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld <20><>"
+msgid "%<PRId64> lines yanked"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64> <20><>"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3947,33 +3947,33 @@ msgid "E574: Unknown register type %d"
 msgstr "E574: δ֪<CEB4>ļĴ<C4BC><C4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld <20><>; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> <20><>; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "ѡ<><D1A1><EFBFBD><EFBFBD> %s%ld/%ld <20><>; %ld/%ld <20><><EFBFBD><EFBFBD>; %ld/%ld <20><><EFBFBD>ֽ<EFBFBD>"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "ѡ<><D1A1><EFBFBD><EFBFBD> %s%<PRId64>/%<PRId64> <20><>; %<PRId64>/%<PRId64> <20><><EFBFBD><EFBFBD>; %<PRId64>/%<PRId64> <20><><EFBFBD>ֽ<EFBFBD>"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> "
 "Bytes"
-msgstr "ѡ<><D1A1><EFBFBD><EFBFBD> %s%ld/%ld <20><>; %ld/%ld <20><><EFBFBD><EFBFBD>; %ld/%ld <20><><EFBFBD>ַ<EFBFBD>; %ld/%ld <20><><EFBFBD>ֽ<EFBFBD>"
+msgstr "ѡ<><D1A1><EFBFBD><EFBFBD> %s%<PRId64>/%<PRId64> <20><>; %<PRId64>/%<PRId64> <20><><EFBFBD><EFBFBD>; %<PRId64>/%<PRId64> <20><><EFBFBD>ַ<EFBFBD>; %<PRId64>/%<PRId64> <20><><EFBFBD>ֽ<EFBFBD>"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "<22><> %s/%s <20><>; <20><> %ld/%ld <20><>; <20><> %ld/%ld <20><><EFBFBD><EFBFBD>; <20><> %ld/%ld <20><><EFBFBD>ֽ<EFBFBD>"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "<22><> %s/%s <20><>; <20><> %<PRId64>/%<PRId64> <20><>; <20><> %<PRId64>/%<PRId64> <20><><EFBFBD><EFBFBD>; <20><> %<PRId64>/%<PRId64> <20><><EFBFBD>ֽ<EFBFBD>"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char %<PRId64> of %<PRId64>; Byte %<PRId64> of "
+"%<PRId64>"
 msgstr ""
-"<22><> %s/%s <20><>; <20><> %ld/%ld <20><>; <20><> %ld/%ld <20><><EFBFBD><EFBFBD>; <20><> %ld/%ld <20><><EFBFBD>ַ<EFBFBD>; <20><> %ld/%ld <20><>"
+"<22><> %s/%s <20><>; <20><> %<PRId64>/%<PRId64> <20><>; <20><> %<PRId64>/%<PRId64> <20><><EFBFBD><EFBFBD>; <20><> %<PRId64>/%<PRId64> <20><><EFBFBD>ַ<EFBFBD>; <20><> %<PRId64>/%<PRId64> <20><>"
 "<22>ֽ<EFBFBD>"
 
 #, c-format
-#~ msgid "(+%ld for BOM)"
+#~ msgid "(+%<PRId64> for BOM)"
 #~ msgstr ""
 
 #~ msgid "%<%f%h%m%=Page %N"
@@ -4140,8 +4140,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "<22><>Ҫ Amigados <20>汾 2.04 <20><><EFBFBD><EFBFBD>\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "<22><>Ҫ %s <20>汾 %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "<22><>Ҫ %s <20>汾 %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "<22><><EFBFBD>ܴ<EFBFBD><DCB4><EFBFBD> NIL:\n"
@@ -4223,8 +4223,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: <20><><EFBFBD>ص<EFBFBD><D8B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ź<EFBFBD>(deadly signal)\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "<22><><EFBFBD><EFBFBD> X display <20><>ʱ %ld <20><>"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "<22><><EFBFBD><EFBFBD> X display <20><>ʱ %<PRId64> <20><>"
 
 msgid ""
 "\n"
@@ -4873,8 +4873,8 @@ msgid "Performing soundfolding..."
 msgstr "<22><><EFBFBD><EFBFBD> soundfolding<6E><67><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "Number of words after soundfolding: %ld"
-msgstr "soundfolding <20><><EFBFBD>ĵ<EFBFBD><C4B5><EFBFBD><EFBFBD><EFBFBD>: %ld"
+msgid "Number of words after soundfolding: %<PRId64>"
+msgstr "soundfolding <20><><EFBFBD>ĵ<EFBFBD><C4B5><EFBFBD><EFBFBD><EFBFBD>: %<PRId64>"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -4909,8 +4909,8 @@ msgid "Done!"
 msgstr "<22><><EFBFBD>ɣ<EFBFBD>"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' û<><C3BB> %ld <20><>"
+msgid "E765: 'spellfile' does not have %<PRId64> entries"
+msgstr "E765: 'spellfile' û<><C3BB> %<PRId64> <20><>"
 
 #, c-format
 msgid "Word removed from %s"
@@ -4927,8 +4927,8 @@ msgid "Sorry, no suggestions"
 msgstr "<22><>Ǹ<EFBFBD><C7B8>û<EFBFBD>н<EFBFBD><D0BD><EFBFBD>"
 
 #, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "<22><>Ǹ<EFBFBD><C7B8>ֻ<EFBFBD><D6BB> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "Sorry, only %<PRId64> suggestions"
+msgstr "<22><>Ǹ<EFBFBD><C7B8>ֻ<EFBFBD><D6BB> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #. avoid more prompt
 #, c-format
@@ -5229,8 +5229,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Tag <20>ļ<EFBFBD> \"%s\" <20><>ʽ<EFBFBD><CABD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "<22>ڵ<EFBFBD> %ld <20>ֽ<EFBFBD>֮ǰ"
+msgid "Before byte %<PRId64>"
+msgstr "<22>ڵ<EFBFBD> %<PRId64> <20>ֽ<EFBFBD>֮ǰ"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5293,8 +5293,8 @@ msgid "Already at newest change"
 msgstr "<22><>λ<EFBFBD><CEBB><EFBFBD><EFBFBD><EFBFBD>µĸı<C4B8>"
 
 #, c-format
-msgid "Undo number %ld not found"
-msgstr "<22>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %ld"
+msgid "Undo number %<PRId64> not found"
+msgstr "<22>Ҳ<EFBFBD><D2B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %<PRId64>"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: <20>кŴ<D0BA><C5B4><EFBFBD>"
@@ -5318,8 +5318,8 @@ msgid "changes"
 msgstr "<22>з<EFBFBD><D0B7><EFBFBD><EFBFBD>ı<EFBFBD>"
 
 #, c-format
-msgid "%ld %s; %s #%ld  %s"
-msgstr "%ld %s<><73>%s #%ld  %s"
+msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+msgstr "%<PRId64> %s<><73>%s #%<PRId64>  %s"
 
 msgid "before"
 msgstr "before"

src/po/zh_TW.UTF-8.po

@@ -26,8 +26,8 @@
 #
 # Note (2005.01.27):
 #  A bug was found for UTF8 mode.
-#   > msgid "%ld fewer lines" "on %ld lines"
-#   If you don't put more (at least 2) spaces after %ld
+#   > msgid "%<PRId64> fewer lines" "on %<PRId64> lines"
+#   If you don't put more (at least 2) spaces after %<PRId64>
 #   gvim/win32 will crash (no reason).
 #   So please change [行"] to [行 "]
 #
@@ -99,8 +99,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: 沒有列出的緩衝區"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: 緩衝區 %ld 不存在"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: 緩衝區 %<PRId64> 不存在"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: 無法切換到更後面的緩衝區"
@@ -109,8 +109,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: 無法切換到更前面的緩衝區"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: 已更改過緩衝區 %ld 但尚未存檔 (可用 ! 強制執行)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: 已更改過緩衝區 %<PRId64> 但尚未存檔 (可用 ! 強制執行)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: 無法釋放最後一個緩衝區"
@@ -119,8 +119,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: 警告: 檔名過多"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: 找不到第 %ld 個緩衝區"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: 找不到第 %<PRId64> 個緩衝區"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -131,8 +131,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: 找不到 %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "行 %ld"
+msgid "line %<PRId64>"
+msgstr "行 %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: 已有緩衝區使用這個名字"
@@ -157,12 +157,12 @@ msgid "1 line --%d%%--"
 msgstr "行數 1 --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "行數 %ld --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "行數 %<PRId64> --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "行 %ld/%ld --%d%%-- 欄 "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "行 %<PRId64>/%<PRId64> --%d%%-- 欄 "
 
 msgid "[No file]"
 msgstr "[未命名]"
@@ -212,12 +212,12 @@ msgid "Signs for %s:"
 msgstr "%s 的符號:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    行=%ld  id=%d  名稱=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    行=%<PRId64>  id=%d  名稱=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: 無法比較(diff) %ld個以上的緩衝區"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: 無法比較(diff) %<PRId64>個以上的緩衝區"
 
 msgid "E97: Cannot create diffs"
 msgstr "E97: 不能建立 "
@@ -503,8 +503,8 @@ msgid "%s aborted"
 msgstr "%s 被強制中斷執行 "
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s 傳回值 #%ld "
+msgid "%s returning #%<PRId64>"
+msgstr "%s 傳回值 #%<PRId64> "
 
 #, c-format
 msgid "%s returning \"%s\""
@@ -545,12 +545,12 @@ msgid "1 line moved"
 msgstr "已搬移 1 行 "
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "已搬移 %ld 行 "
+msgid "%<PRId64> lines moved"
+msgstr "已搬移 %<PRId64> 行 "
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "已處理 %ld 行 "
+msgid "%<PRId64> lines filtered"
+msgstr "已處理 %<PRId64> 行 "
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filter* Autocommand 不可以更改緩衝區的內容"
@@ -629,8 +629,8 @@ msgid "Overwrite existing file \"%.*s\"?"
 msgstr "要覆寫已存在的檔案 \"%.*s\"？"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: 緩衝區 %ld 沒有檔案名稱"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: 緩衝區 %<PRId64> 沒有檔案名稱"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: 檔案未寫入，因為 'write' 選項被關閉"
@@ -670,15 +670,15 @@ msgid "1 substitution"
 msgstr "取代一組 "
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "取代 %ld 組 "
+msgid "%<PRId64> substitutions"
+msgstr "取代 %<PRId64> 組 "
 
 msgid " on 1 line"
 msgstr "，範圍：一行 "
 
 #, c-format
-msgid " on %ld lines"
-msgstr "，範圍： %ld 行 "
+msgid " on %<PRId64> lines"
+msgstr "，範圍： %<PRId64> 行 "
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global 無法遞迴執行 "
@@ -761,8 +761,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: 緩衝區名稱錯誤: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Sign ID 錯誤: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: Sign ID 錯誤: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (找不到) "
@@ -777,16 +777,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "進入除錯模式. 輸入 \"cont\" 以回到正常模式."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "行 %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "行 %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "cmd: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "\"%s%s\" 中斷點: 第 %ld 行 "
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "\"%s%s\" 中斷點: 第 %<PRId64> 行 "
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -796,8 +796,8 @@ msgid "No breakpoints defined"
 msgstr "沒有定義中斷點"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  第 %ld 行 "
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  第 %<PRId64> 行 "
 
 #, c-format
 msgid "Save changes to \"%.*s\"?"
@@ -850,16 +850,16 @@ msgid "could not source \"%s\""
 msgstr "無法執行 \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "第 %ld 行: 無法執行 \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "第 %<PRId64> 行: 無法執行 \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "執行 \"%s\" 中"
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "第 %ld 行: 結束執行 %s"
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "第 %<PRId64> 行: 結束執行 %s"
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1007,8 +1007,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: 還有一個檔案未編輯 "
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: 還有 %ld 個檔案未編輯"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: 還有 %<PRId64> 個檔案未編輯"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: 命令已經存在, 請使用 ! 強制重新定義"
@@ -1169,8 +1169,8 @@ msgid "Exception discarded: %s"
 msgstr "已丟棄例外： %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, 行 %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, 行 %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1353,8 +1353,8 @@ msgid "[CONVERSION ERROR]"
 msgstr "轉換錯誤"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[行 %ld 有不正確的位元]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[行 %<PRId64> 有不正確的位元]"
 
 msgid "[READ ERRORS]"
 msgstr "[讀取錯誤]"
@@ -1490,15 +1490,15 @@ msgid "1 line, "
 msgstr "1 行, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld 行, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> 行, "
 
 msgid "1 character"
 msgstr "一個字元"
 
 #, c-format
-msgid "%ld characters"
-msgstr "%ld個字元"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64>個字元"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -1850,19 +1850,19 @@ msgid "Font1: %s\n"
 msgstr "Font1: %s\n"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "字型%ld 寬度不是 字型0 的兩倍\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "字型%<PRId64> 寬度不是 字型0 的兩倍\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "字型0的寬度：%ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "字型0的寬度：%<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"字型1寬度: %ld\n"
+"字型1寬度: %<PRId64>\n"
 "\n"
 
 msgid "E256: Hangul automata ERROR"
@@ -1915,8 +1915,8 @@ msgid "Added cscope database %s"
 msgstr "新增 cscope 資料庫 %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: 讀取 cscope 連線 %ld 錯誤"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: 讀取 cscope 連線 %<PRId64> 錯誤"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: 未知的 cscope 搜尋形態"
@@ -3008,12 +3008,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: 保留失敗"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: 錯誤的 lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: 錯誤的 lnum: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: 找不到第 %ld 行 "
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: 找不到第 %<PRId64> 行 "
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: 指標區塊 id 錯誤 3"
@@ -3031,8 +3031,8 @@ msgid "deleted block 1?"
 msgstr "刪除區塊 1?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: 找不到第 %ld 行 "
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: 找不到第 %<PRId64> 行 "
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: 指標區塊 id 錯誤"
@@ -3041,12 +3041,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count 為零"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: 行號超出範圍: %ld 超過結尾"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: 行號超出範圍: %<PRId64> 超過結尾"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: 區塊 %ld 行數錯誤"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: 區塊 %<PRId64> 行數錯誤"
 
 msgid "Stack size increases"
 msgstr "堆疊大小增加"
@@ -3279,12 +3279,12 @@ msgid "1 line less"
 msgstr "少於一行 "
 
 #, c-format
-msgid "%ld more lines"
-msgstr "多了 %ld 行 "
+msgid "%<PRId64> more lines"
+msgstr "多了 %<PRId64> 行 "
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "少了 %ld 行 "
+msgid "%<PRId64> fewer lines"
+msgstr "少了 %<PRId64> 行 "
 
 msgid " (Interrupted)"
 msgstr " (已中斷)"
@@ -3320,8 +3320,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: 此行過長"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: 內部錯誤: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: 內部錯誤: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -3401,8 +3401,8 @@ msgid "read from Netbeans socket"
 msgstr "由 Netbeans socket 讀取"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: 緩衝區 %ld 與 NetBeans 的連線已中斷"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: 緩衝區 %<PRId64> 與 NetBeans 的連線已中斷"
 
 msgid "Warning: terminal cannot highlight"
 msgstr "注意: 你的終端機無法顯示高亮度"
@@ -3437,23 +3437,23 @@ msgid "1 line %sed %d times"
 msgstr "一行 %s 過 %d 次"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld 行 %s 過 一次"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> 行 %s 過 一次"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld 行 %s 過 %d 次"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> 行 %s 過 %d 次"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "縮排 %ld 行... "
+msgid "%<PRId64> lines to indent... "
+msgstr "縮排 %<PRId64> 行... "
 
 msgid "1 line indented "
 msgstr "一行已縮排"
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "已縮排 %ld 行 "
+msgid "%<PRId64> lines indented "
+msgstr "已縮排 %<PRId64> 行 "
 
 #. must display the prompt
 msgid "cannot yank; delete anyway"
@@ -3463,19 +3463,19 @@ msgid "1 line changed"
 msgstr " 1 行 ~ed"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "已改變 %ld 行 "
+msgid "%<PRId64> lines changed"
+msgstr "已改變 %<PRId64> 行 "
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "釋放 %ld 行中 "
+msgid "freeing %<PRId64> lines"
+msgstr "釋放 %<PRId64> 行中 "
 
 msgid "1 line yanked"
 msgstr "已複製 1 行 "
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "已複製 %ld 行 "
+msgid "%<PRId64> lines yanked"
+msgstr "已複製 %<PRId64> 行 "
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3509,20 +3509,20 @@ msgid "E354: Invalid register name: '%s'"
 msgstr "E354: 暫存器名稱錯誤: '%s'"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld 欄; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> 欄; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "選擇了 %s%ld/%ld 行; %ld/%ld 字(Word); %ld/%ld 字元(Bytes)"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "選擇了 %s%<PRId64>/%<PRId64> 行; %<PRId64>/%<PRId64> 字(Word); %<PRId64>/%<PRId64> 字元(Bytes)"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "欄 %s/%s; 行 %ld/%ld; 字(Word) %ld/%ld; 字元(Byte) %ld/%ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "欄 %s/%s; 行 %<PRId64>/%<PRId64>; 字(Word) %<PRId64>/%<PRId64>; 字元(Byte) %<PRId64>/%<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> for BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=第 %N 頁"
@@ -3696,8 +3696,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "需要 Amigados 版本 2.04 以上\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "需要 %s 版本 %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "需要 %s 版本 %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "無法開啟 NIL:\n"
@@ -3782,8 +3782,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: 攔截到致命的信號(deadly signale)\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "開啟 X Window 耗時 %ld msec"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "開啟 X Window 耗時 %<PRId64> msec"
 
 msgid ""
 "\n"
@@ -4434,8 +4434,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Tag 檔 \"%s\" 格式錯誤"
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "在 %ld 位元之前"
+msgid "Before byte %<PRId64>"
+msgstr "在 %<PRId64> 位元之前"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -4498,8 +4498,8 @@ msgid "1 change"
 msgstr "一項改變"
 
 #, c-format
-msgid "%ld changes"
-msgstr "%ld 項改變"
+msgid "%<PRId64> changes"
+msgstr "%<PRId64> 項改變"
 
 msgid "E439: undo list corrupt"
 msgstr "E439: 復原列表損壞"

src/po/zh_TW.po

@@ -19,8 +19,8 @@
 #
 # Note (2005.01.27):
 #  A bug was found for UTF8 mode.
-#   > msgid "%ld fewer lines" "on %ld lines"
-#   If you don't put more (at least 2) spaces after %ld
+#   > msgid "%<PRId64> fewer lines" "on %<PRId64> lines"
+#   If you don't put more (at least 2) spaces after %<PRId64>
 #   gvim/win32 will crash (no reason).
 #   So please change [<5B><>"] to [<5B><> "]
 #
@@ -92,8 +92,8 @@ msgid "E85: There is no listed buffer"
 msgstr "E85: <20>S<EFBFBD><53><EFBFBD>C<EFBFBD>X<EFBFBD><58><EFBFBD>w<EFBFBD>İ<EFBFBD>"
 
 #, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: <20>w<EFBFBD>İ<EFBFBD> %ld <20><><EFBFBD>s<EFBFBD>b"
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: <20>w<EFBFBD>İ<EFBFBD> %<PRId64> <20><><EFBFBD>s<EFBFBD>b"
 
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: <20>L<EFBFBD>k<EFBFBD><6B><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>᭱<EFBFBD><E1ADB1><EFBFBD>w<EFBFBD>İ<EFBFBD>"
@@ -102,8 +102,8 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: <20>L<EFBFBD>k<EFBFBD><6B><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>e<EFBFBD><65><EFBFBD><EFBFBD><EFBFBD>w<EFBFBD>İ<EFBFBD>"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: <20>w<EFBFBD><77><EFBFBD><EFBFBD><EFBFBD>L<EFBFBD>w<EFBFBD>İ<EFBFBD> %ld <20><><EFBFBD>|<7C><><EFBFBD>s<EFBFBD><73> (<28>i<EFBFBD><69> ! <20>j<EFBFBD><6A><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
+msgid "E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgstr "E89: <20>w<EFBFBD><77><EFBFBD><EFBFBD><EFBFBD>L<EFBFBD>w<EFBFBD>İ<EFBFBD> %<PRId64> <20><><EFBFBD>|<7C><><EFBFBD>s<EFBFBD><73> (<28>i<EFBFBD><69> ! <20>j<EFBFBD><6A><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: <20>L<EFBFBD>k<EFBFBD><6B><EFBFBD><EFBFBD><EFBFBD>̫<EFBFBD><CCAB>@<40>ӽw<D3BD>İ<EFBFBD>"
@@ -112,8 +112,8 @@ msgid "W14: Warning: List of file names overflow"
 msgstr "W14: ĵ<>i: <20>ɦW<C9A6>L<EFBFBD>h"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: <20>䤣<EFBFBD><E4A4A3><EFBFBD><EFBFBD> %ld <20>ӽw<D3BD>İ<EFBFBD>"
+msgid "E92: Buffer %<PRId64> not found"
+msgstr "E92: <20>䤣<EFBFBD><E4A4A3><EFBFBD><EFBFBD> %<PRId64> <20>ӽw<D3BD>İ<EFBFBD>"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -124,8 +124,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: <20>䤣<EFBFBD><E4A4A3> %s"
 
 #, c-format
-msgid "line %ld"
-msgstr "<22><> %ld"
+msgid "line %<PRId64>"
+msgstr "<22><> %<PRId64>"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: <20>w<EFBFBD><77><EFBFBD>w<EFBFBD>İϨϥγo<CEB3>ӦW<D3A6>r"
@@ -150,12 +150,12 @@ msgid "1 line --%d%%--"
 msgstr "<22><><EFBFBD><EFBFBD> 1 --%d%%--"
 
 #, c-format
-msgid "%ld lines --%d%%--"
-msgstr "<22><><EFBFBD><EFBFBD> %ld --%d%%--"
+msgid "%<PRId64> lines --%d%%--"
+msgstr "<22><><EFBFBD><EFBFBD> %<PRId64> --%d%%--"
 
 #, c-format
-msgid "line %ld of %ld --%d%%-- col "
-msgstr "<22><> %ld/%ld --%d%%-- <20><> "
+msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+msgstr "<22><> %<PRId64>/%<PRId64> --%d%%-- <20><> "
 
 msgid "[No file]"
 msgstr "[<5B><><EFBFBD>R<EFBFBD>W]"
@@ -205,12 +205,12 @@ msgid "Signs for %s:"
 msgstr "%s <20><><EFBFBD>Ÿ<EFBFBD>:"
 
 #, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    <20><>=%ld  id=%d  <20>W<EFBFBD><57>=%s"
+msgid "    line=%<PRId64>  id=%d  name=%s"
+msgstr "    <20><>=%<PRId64>  id=%d  <20>W<EFBFBD><57>=%s"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: <20>L<EFBFBD>k<EFBFBD><6B><EFBFBD><EFBFBD>(diff) %ld<EFBFBD>ӥH<EFBFBD>W<EFBFBD><EFBFBD><EFBFBD>w<EFBFBD>İ<EFBFBD>"
+msgid "E96: Can not diff more than %<PRId64> buffers"
+msgstr "E96: <20>L<EFBFBD>k<EFBFBD><6B><EFBFBD><EFBFBD>(diff) %<PRId64><EFBFBD>ӥH<EFBFBD>W<EFBFBD><EFBFBD><EFBFBD>w<EFBFBD>İ<EFBFBD>"
 
 msgid "E97: Cannot create diffs"
 msgstr "E97: <20><><EFBFBD><EFBFBD><EFBFBD>إ<EFBFBD> "
@@ -496,8 +496,8 @@ msgid "%s aborted"
 msgstr "%s <20>Q<EFBFBD>j<EFBFBD><EFBFBD>_<EFBFBD><5F><EFBFBD><EFBFBD> "
 
 #, c-format
-msgid "%s returning #%ld"
-msgstr "%s <20>Ǧ^<5E><> #%ld "
+msgid "%s returning #%<PRId64>"
+msgstr "%s <20>Ǧ^<5E><> #%<PRId64> "
 
 #, c-format
 msgid "%s returning \"%s\""
@@ -538,12 +538,12 @@ msgid "1 line moved"
 msgstr "<22>w<EFBFBD>h<EFBFBD><68> 1 <20><> "
 
 #, c-format
-msgid "%ld lines moved"
-msgstr "<22>w<EFBFBD>h<EFBFBD><68> %ld <20><> "
+msgid "%<PRId64> lines moved"
+msgstr "<22>w<EFBFBD>h<EFBFBD><68> %<PRId64> <20><> "
 
 #, c-format
-msgid "%ld lines filtered"
-msgstr "<22>w<EFBFBD>B<EFBFBD>z %ld <20><> "
+msgid "%<PRId64> lines filtered"
+msgstr "<22>w<EFBFBD>B<EFBFBD>z %<PRId64> <20><> "
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filter* Autocommand <20><><EFBFBD>i<EFBFBD>H<EFBFBD><48><EFBFBD><EFBFBD><EFBFBD>w<EFBFBD>İϪ<C4B0><CFAA><EFBFBD><EFBFBD>e"
@@ -622,8 +622,8 @@ msgid "Overwrite existing file \"%.*s\"?"
 msgstr "<22>n<EFBFBD>мg<D0BC>w<EFBFBD>s<EFBFBD>b<EFBFBD><62><EFBFBD>ɮ<EFBFBD> \"%.*s\"<22>H"
 
 #, c-format
-msgid "E141: No file name for buffer %ld"
-msgstr "E141: <20>w<EFBFBD>İ<EFBFBD> %ld <20>S<EFBFBD><53><EFBFBD>ɮצW<D7A6><57>"
+msgid "E141: No file name for buffer %<PRId64>"
+msgstr "E141: <20>w<EFBFBD>İ<EFBFBD> %<PRId64> <20>S<EFBFBD><53><EFBFBD>ɮצW<D7A6><57>"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: <20>ɮץ<C9AE><D7A5>g<EFBFBD>J<EFBFBD>A<EFBFBD>]<5D><> 'write' <20>ﶵ<EFBFBD>Q<EFBFBD><51><EFBFBD><EFBFBD>"
@@ -663,15 +663,15 @@ msgid "1 substitution"
 msgstr "<22><><EFBFBD>N<EFBFBD>@<40><> "
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "<22><><EFBFBD>N %ld <20><> "
+msgid "%<PRId64> substitutions"
+msgstr "<22><><EFBFBD>N %<PRId64> <20><> "
 
 msgid " on 1 line"
 msgstr "<22>A<EFBFBD>d<EFBFBD><64><EFBFBD>G<EFBFBD>@<40><> "
 
 #, c-format
-msgid " on %ld lines"
-msgstr "<22>A<EFBFBD>d<EFBFBD><64><EFBFBD>G %ld <20><> "
+msgid " on %<PRId64> lines"
+msgstr "<22>A<EFBFBD>d<EFBFBD><64><EFBFBD>G %<PRId64> <20><> "
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global <20>L<EFBFBD>k<EFBFBD><6B><EFBFBD>j<EFBFBD><6A><EFBFBD><EFBFBD> "
@@ -754,8 +754,8 @@ msgid "E158: Invalid buffer name: %s"
 msgstr "E158: <20>w<EFBFBD>İϦW<CFA6>ٿ<EFBFBD><D9BF>~: %s"
 
 #, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Sign ID <20><><EFBFBD>~: %ld"
+msgid "E157: Invalid sign ID: %<PRId64>"
+msgstr "E157: Sign ID <20><><EFBFBD>~: %<PRId64>"
 
 msgid " (NOT FOUND)"
 msgstr " (<28>䤣<EFBFBD><E4A4A3>) "
@@ -770,16 +770,16 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "<22>i<EFBFBD>J<EFBFBD><4A><EFBFBD><EFBFBD><EFBFBD>Ҧ<EFBFBD>. <20><><EFBFBD>J \"cont\" <20>H<EFBFBD>^<5E>쥿<EFBFBD>`<60>Ҧ<EFBFBD>."
 
 #, c-format
-msgid "line %ld: %s"
-msgstr "<22><> %ld: %s"
+msgid "line %<PRId64>: %s"
+msgstr "<22><> %<PRId64>: %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "cmd: %s"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "\"%s%s\" <20><><EFBFBD>_<EFBFBD>I: <20><> %ld <20><> "
+msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+msgstr "\"%s%s\" <20><><EFBFBD>_<EFBFBD>I: <20><> %<PRId64> <20><> "
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -789,8 +789,8 @@ msgid "No breakpoints defined"
 msgstr "<22>S<EFBFBD><53><EFBFBD>w<EFBFBD>q<EFBFBD><71><EFBFBD>_<EFBFBD>I"
 
 #, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  <20><> %ld <20><> "
+msgid "%3d  %s %s  line %<PRId64>"
+msgstr "%3d  %s %s  <20><> %<PRId64> <20><> "
 
 #, c-format
 msgid "Save changes to \"%.*s\"?"
@@ -843,16 +843,16 @@ msgid "could not source \"%s\""
 msgstr "<22>L<EFBFBD>k<EFBFBD><6B><EFBFBD><EFBFBD> \"%s\""
 
 #, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "<22><> %ld <20><>: <20>L<EFBFBD>k<EFBFBD><6B><EFBFBD><EFBFBD> \"%s\""
+msgid "line %<PRId64>: could not source \"%s\""
+msgstr "<22><> %<PRId64> <20><>: <20>L<EFBFBD>k<EFBFBD><6B><EFBFBD><EFBFBD> \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "<22><><EFBFBD><EFBFBD> \"%s\" <20><>"
 
 #, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "<22><> %ld <20><>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s"
+msgid "line %<PRId64>: sourcing \"%s\""
+msgstr "<22><> %<PRId64> <20><>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s"
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1000,8 +1000,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: <20>٦<EFBFBD><D9A6>@<40><><EFBFBD>ɮץ<C9AE><D7A5>s<EFBFBD><73> "
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: <20>٦<EFBFBD> %ld <20><><EFBFBD>ɮץ<C9AE><D7A5>s<EFBFBD><73>"
+msgid "E173: %<PRId64> more files to edit"
+msgstr "E173: <20>٦<EFBFBD> %<PRId64> <20><><EFBFBD>ɮץ<C9AE><D7A5>s<EFBFBD><73>"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: <20>R<EFBFBD>O<EFBFBD>w<EFBFBD>g<EFBFBD>s<EFBFBD>b, <20>Шϥ<D0A8> ! <20>j<EFBFBD><EFBFBD>s<EFBFBD>w<EFBFBD>q"
@@ -1162,8 +1162,8 @@ msgid "Exception discarded: %s"
 msgstr "<22>w<EFBFBD><77><EFBFBD><EFBFBD><EFBFBD>ҥ~<7E>G %s"
 
 #, c-format
-msgid "%s, line %ld"
-msgstr "%s, <20><> %ld"
+msgid "%s, line %<PRId64>"
+msgstr "%s, <20><> %<PRId64>"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1346,8 +1346,8 @@ msgid "[CONVERSION ERROR]"
 msgstr "<22>ഫ<EFBFBD><E0B4AB><EFBFBD>~"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[<5B><> %ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>T<EFBFBD><54><EFBFBD>줸]"
+msgid "[ILLEGAL BYTE in line %<PRId64>]"
+msgstr "[<5B><> %<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>T<EFBFBD><54><EFBFBD>줸]"
 
 msgid "[READ ERRORS]"
 msgstr "[Ū<><C5AA><EFBFBD><EFBFBD><EFBFBD>~]"
@@ -1483,15 +1483,15 @@ msgid "1 line, "
 msgstr "1 <20><>, "
 
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld <20><>, "
+msgid "%<PRId64> lines, "
+msgstr "%<PRId64> <20><>, "
 
 msgid "1 character"
 msgstr "<22>@<40>Ӧr<D3A6><72>"
 
 #, c-format
-msgid "%ld characters"
-msgstr "%ld<EFBFBD>Ӧr<EFBFBD><EFBFBD>"
+msgid "%<PRId64> characters"
+msgstr "%<PRId64><EFBFBD>Ӧr<EFBFBD><EFBFBD>"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -1843,19 +1843,19 @@ msgid "Font1: %s\n"
 msgstr "Font1: %s\n"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "<22>r<EFBFBD><72>%ld <20>e<EFBFBD>פ<EFBFBD><D7A4>O <20>r<EFBFBD><72>0 <20><><EFBFBD>⭿\n"
+msgid "Font%<PRId64> width is not twice that of font0\n"
+msgstr "<22>r<EFBFBD><72>%<PRId64> <20>e<EFBFBD>פ<EFBFBD><D7A4>O <20>r<EFBFBD><72>0 <20><><EFBFBD>⭿\n"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "<22>r<EFBFBD><72>0<EFBFBD><30><EFBFBD>e<EFBFBD>סG%ld\n"
+msgid "Font0 width: %<PRId64>\n"
+msgstr "<22>r<EFBFBD><72>0<EFBFBD><30><EFBFBD>e<EFBFBD>סG%<PRId64>\n"
 
 #, c-format
 msgid ""
-"Font1 width: %ld\n"
+"Font1 width: %<PRId64>\n"
 "\n"
 msgstr ""
-"<22>r<EFBFBD><72>1<EFBFBD>e<EFBFBD><65>: %ld\n"
+"<22>r<EFBFBD><72>1<EFBFBD>e<EFBFBD><65>: %<PRId64>\n"
 "\n"
 
 msgid "E256: Hangul automata ERROR"
@@ -1908,8 +1908,8 @@ msgid "Added cscope database %s"
 msgstr "<22>s<EFBFBD>W cscope <20><><EFBFBD>Ʈw %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: Ū<><C5AA> cscope <20>s<EFBFBD>u %ld <20><><EFBFBD>~"
+msgid "E262: error reading cscope connection %<PRId64>"
+msgstr "E262: Ū<><C5AA> cscope <20>s<EFBFBD>u %<PRId64> <20><><EFBFBD>~"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> cscope <20>j<EFBFBD>M<EFBFBD>κA"
@@ -3001,12 +3001,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: <20>O<EFBFBD>d<EFBFBD><64><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: <20><><EFBFBD>~<7E><> lnum: %ld"
+msgid "E315: ml_get: invalid lnum: %<PRId64>"
+msgstr "E315: ml_get: <20><><EFBFBD>~<7E><> lnum: %<PRId64>"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: <20>䤣<EFBFBD><E4A4A3><EFBFBD><EFBFBD> %ld <20><> "
+msgid "E316: ml_get: cannot find line %<PRId64>"
+msgstr "E316: ml_get: <20>䤣<EFBFBD><E4A4A3><EFBFBD><EFBFBD> %<PRId64> <20><> "
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: <20><><EFBFBD>а϶<D0B0> id <20><><EFBFBD>~ 3"
@@ -3024,8 +3024,8 @@ msgid "deleted block 1?"
 msgstr "<22>R<EFBFBD><52><EFBFBD>϶<EFBFBD> 1?"
 
 #, c-format
-msgid "E320: Cannot find line %ld"
-msgstr "E320: <20>䤣<EFBFBD><E4A4A3><EFBFBD><EFBFBD> %ld <20><> "
+msgid "E320: Cannot find line %<PRId64>"
+msgstr "E320: <20>䤣<EFBFBD><E4A4A3><EFBFBD><EFBFBD> %<PRId64> <20><> "
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: <20><><EFBFBD>а϶<D0B0> id <20><><EFBFBD>~"
@@ -3034,12 +3034,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count <20><><EFBFBD>s"
 
 #, c-format
-msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: <20>渹<EFBFBD>W<EFBFBD>X<EFBFBD>d<EFBFBD><64>: %ld <20>W<EFBFBD>L<EFBFBD><4C><EFBFBD><EFBFBD>"
+msgid "E322: line number out of range: %<PRId64> past the end"
+msgstr "E322: <20>渹<EFBFBD>W<EFBFBD>X<EFBFBD>d<EFBFBD><64>: %<PRId64> <20>W<EFBFBD>L<EFBFBD><4C><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "E323: line count wrong in block %ld"
-msgstr "E323: <20>϶<EFBFBD> %ld <20><><EFBFBD>ƿ<EFBFBD><C6BF>~"
+msgid "E323: line count wrong in block %<PRId64>"
+msgstr "E323: <20>϶<EFBFBD> %<PRId64> <20><><EFBFBD>ƿ<EFBFBD><C6BF>~"
 
 msgid "Stack size increases"
 msgstr "<22><><EFBFBD>|<7C>j<EFBFBD>p<EFBFBD>W<EFBFBD>["
@@ -3272,12 +3272,12 @@ msgid "1 line less"
 msgstr "<22>֩<EFBFBD><D6A9>@<40><> "
 
 #, c-format
-msgid "%ld more lines"
-msgstr "<22>٦<EFBFBD> %ld <20><> "
+msgid "%<PRId64> more lines"
+msgstr "<22>٦<EFBFBD> %<PRId64> <20><> "
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "<22>u<EFBFBD><75> %ld <20><> "
+msgid "%<PRId64> fewer lines"
+msgstr "<22>u<EFBFBD><75> %<PRId64> <20><> "
 
 msgid " (Interrupted)"
 msgstr " (<28>w<EFBFBD><77><EFBFBD>_)"
@@ -3313,8 +3313,8 @@ msgid "E340: Line is becoming too long"
 msgstr "E340: <20><><EFBFBD><EFBFBD><EFBFBD>L<EFBFBD><4C>"
 
 #, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>~: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(%<PRId64>, )"
+msgstr "E341: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>~: lalloc(%<PRId64>, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -3394,8 +3394,8 @@ msgid "read from Netbeans socket"
 msgstr "<22><> Netbeans socket Ū<><C5AA>"
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: <20>w<EFBFBD>İ<EFBFBD> %ld <20>P NetBeans <20><><EFBFBD>s<EFBFBD>u<EFBFBD>w<EFBFBD><77><EFBFBD>_"
+msgid "E658: NetBeans connection lost for buffer %<PRId64>"
+msgstr "E658: <20>w<EFBFBD>İ<EFBFBD> %<PRId64> <20>P NetBeans <20><><EFBFBD>s<EFBFBD>u<EFBFBD>w<EFBFBD><77><EFBFBD>_"
 
 msgid "Warning: terminal cannot highlight"
 msgstr "<22>`<60>N: <20>A<EFBFBD><41><EFBFBD>׺ݾ<D7BA><DDBE>L<EFBFBD>k<EFBFBD><6B><EFBFBD>ܰ<EFBFBD><DCB0>G<EFBFBD><47>"
@@ -3430,23 +3430,23 @@ msgid "1 line %sed %d times"
 msgstr "<22>@<40><> %s <20>L %d <20><>"
 
 #, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld <20><> %s <20>L <20>@<40><>"
+msgid "%<PRId64> lines %sed 1 time"
+msgstr "%<PRId64> <20><> %s <20>L <20>@<40><>"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld <20><> %s <20>L %d <20><>"
+msgid "%<PRId64> lines %sed %d times"
+msgstr "%<PRId64> <20><> %s <20>L %d <20><>"
 
 #, c-format
-msgid "%ld lines to indent... "
-msgstr "<22>Y<EFBFBD><59> %ld <20><>... "
+msgid "%<PRId64> lines to indent... "
+msgstr "<22>Y<EFBFBD><59> %<PRId64> <20><>... "
 
 msgid "1 line indented "
 msgstr "<22>@<40><><EFBFBD>w<EFBFBD>Y<EFBFBD><59>"
 
 #, c-format
-msgid "%ld lines indented "
-msgstr "<22>w<EFBFBD>Y<EFBFBD><59> %ld <20><> "
+msgid "%<PRId64> lines indented "
+msgstr "<22>w<EFBFBD>Y<EFBFBD><59> %<PRId64> <20><> "
 
 #. must display the prompt
 msgid "cannot yank; delete anyway"
@@ -3456,19 +3456,19 @@ msgid "1 line changed"
 msgstr " 1 <20><> ~ed"
 
 #, c-format
-msgid "%ld lines changed"
-msgstr "<22>w<EFBFBD><77><EFBFBD><EFBFBD> %ld <20><> "
+msgid "%<PRId64> lines changed"
+msgstr "<22>w<EFBFBD><77><EFBFBD><EFBFBD> %<PRId64> <20><> "
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "<22><><EFBFBD><EFBFBD> %ld <20>椤 "
+msgid "freeing %<PRId64> lines"
+msgstr "<22><><EFBFBD><EFBFBD> %<PRId64> <20>椤 "
 
 msgid "1 line yanked"
 msgstr "<22>w<EFBFBD>ƻs 1 <20><> "
 
 #, c-format
-msgid "%ld lines yanked"
-msgstr "<22>w<EFBFBD>ƻs %ld <20><> "
+msgid "%<PRId64> lines yanked"
+msgstr "<22>w<EFBFBD>ƻs %<PRId64> <20><> "
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3502,20 +3502,20 @@ msgid "E354: Invalid register name: '%s'"
 msgstr "E354: <20>Ȧs<C8A6><73><EFBFBD>W<EFBFBD>ٿ<EFBFBD><D9BF>~: '%s'"
 
 #, c-format
-msgid "%ld Cols; "
-msgstr "%ld <20><>; "
+msgid "%<PRId64> Cols; "
+msgstr "%<PRId64> <20><>; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "<22><><EFBFBD>ܤF %s%ld/%ld <20><>; %ld/%ld <20>r(Word); %ld/%ld <20>r<EFBFBD><72>(Bytes)"
+msgid "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; %<PRId64> of %<PRId64> Bytes"
+msgstr "<22><><EFBFBD>ܤF %s%<PRId64>/%<PRId64> <20><>; %<PRId64>/%<PRId64> <20>r(Word); %<PRId64>/%<PRId64> <20>r<EFBFBD><72>(Bytes)"
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "<22><> %s/%s; <20><> %ld/%ld; <20>r(Word) %ld/%ld; <20>r<EFBFBD><72>(Byte) %ld/%ld"
+msgid "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+msgstr "<22><> %s/%s; <20><> %<PRId64>/%<PRId64>; <20>r(Word) %<PRId64>/%<PRId64>; <20>r<EFBFBD><72>(Byte) %<PRId64>/%<PRId64>"
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+msgid "(+%<PRId64> for BOM)"
+msgstr "(+%<PRId64> for BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=<3D><> %N <20><>"
@@ -3689,8 +3689,8 @@ msgid "Need Amigados version 2.04 or later\n"
 msgstr "<22>ݭn Amigados <20><><EFBFBD><EFBFBD> 2.04 <20>H<EFBFBD>W\n"
 
 #, c-format
-msgid "Need %s version %ld\n"
-msgstr "<22>ݭn %s <20><><EFBFBD><EFBFBD> %ld\n"
+msgid "Need %s version %<PRId64>\n"
+msgstr "<22>ݭn %s <20><><EFBFBD><EFBFBD> %<PRId64>\n"
 
 msgid "Cannot open NIL:\n"
 msgstr "<22>L<EFBFBD>k<EFBFBD>}<7D><> NIL:\n"
@@ -3775,8 +3775,8 @@ msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: <20>d<EFBFBD>I<EFBFBD><49><EFBFBD>P<EFBFBD>R<EFBFBD><52><EFBFBD>H<EFBFBD><48>(deadly signale)\n"
 
 #, c-format
-msgid "Opening the X display took %ld msec"
-msgstr "<22>}<7D><> X Window <20>Ӯ<EFBFBD> %ld msec"
+msgid "Opening the X display took %<PRId64> msec"
+msgstr "<22>}<7D><> X Window <20>Ӯ<EFBFBD> %<PRId64> msec"
 
 msgid ""
 "\n"
@@ -4427,8 +4427,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Tag <20><> \"%s\" <20>榡<EFBFBD><E6A6A1><EFBFBD>~"
 
 #, c-format
-msgid "Before byte %ld"
-msgstr "<22>b %ld <20>줸<EFBFBD><ECA4B8><EFBFBD>e"
+msgid "Before byte %<PRId64>"
+msgstr "<22>b %<PRId64> <20>줸<EFBFBD><ECA4B8><EFBFBD>e"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -4491,8 +4491,8 @@ msgid "1 change"
 msgstr "<22>@<40><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 #, c-format
-msgid "%ld changes"
-msgstr "%ld <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgid "%<PRId64> changes"
+msgstr "%<PRId64> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
 msgid "E439: undo list corrupt"
 msgstr "E439: <20>_<EFBFBD><5F><EFBFBD>C<EFBFBD><43><EFBFBD>l<EFBFBD>a"