diff options
| author | Hans Hagen <pragma@wxs.nl> | 2020-07-20 11:09:33 +0200 |
|---|---|---|
| committer | Context Git Mirror Bot <phg@phi-gamma.net> | 2020-07-20 11:09:33 +0200 |
| commit | 81095dd1bf20eb5f7e126adbdc8047f940504180 (patch) | |
| tree | c0cdf7b074e8a2d00c56fde09519e89f155bd425 /tex | |
| parent | f1129626606384a7a55a21a83531f51f8b5dee25 (diff) | |
| download | context-81095dd1bf20eb5f7e126adbdc8047f940504180.tar.gz | |
2020-07-20 10:42:00
Diffstat (limited to 'tex')
91 files changed, 4413 insertions, 3076 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index bc18e3c22..c377cbe88 100644 --- a/tex/context/base/mkii/cont-new.mkii +++ b/tex/context/base/mkii/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2020.07.13 23:44} +\newcontextversion{2020.07.20 10:40} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii index f45afe0a8..1ebb35693 100644 --- a/tex/context/base/mkii/context.mkii +++ b/tex/context/base/mkii/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2020.07.13 23:44} +\edef\contextversion{2020.07.20 10:40} %D For those who want to use this: diff --git a/tex/context/base/mkiv/back-lua.lua b/tex/context/base/mkiv/back-lua.lmt index 87093afd4..dc836f12b 100644 --- a/tex/context/base/mkiv/back-lua.lua +++ b/tex/context/base/mkiv/back-lua.lmt @@ -228,10 +228,15 @@ local function flushrule(current, pos_h, pos_v, pos_r, size_h, size_v, subtype) return rule(pos_h, pos_v, pos_r, size_h, size_v, rule_s, rule_o) end -local function flushsimplerule(current, pos_h, pos_v, pos_r, size_h, size_v) +local function flushsimplerule(pos_h, pos_v, pos_r, size_h, size_v) return rule(pos_h, pos_v, pos_r, size_h, size_v, "normal", nil) end +local function flushspecialrule(pos_h, pos_v, pos_r, w, h, d, l, outline) + -- no l support yet + return rule(pos_h, pos_v - d, pos_r, w, h + d, outline and "outline" or "normal") +end + -- file stuff too -- todo: default flushers -- also color (via hash) @@ -253,6 +258,8 @@ drivers.install { updatefontstate = updatefontstate, character = flushcharacter, rule = flushrule, + simplerule = flushsimplerule, + specialrule = flushspecialrule, } } @@ -300,6 +307,8 @@ drivers.install { updatefontstate = updatefontstate, character = flushcharacter, rule = flushrule, + simplerule = flushsimplerule, + specialrule = flushspecialrule, } } @@ -351,5 +360,7 @@ drivers.install { updatefontstate = updatefontstate, character = flushcharacter, rule = flushrule, + simplerule = flushsimplerule, + specialrule = flushspecialrule, } } diff --git a/tex/context/base/mkiv/back-lua.mkxl b/tex/context/base/mkiv/back-lua.mkxl index 82ba8f9f1..6c5aaf82c 100644 --- a/tex/context/base/mkiv/back-lua.mkxl +++ b/tex/context/base/mkiv/back-lua.mkxl @@ -12,7 +12,7 @@ %C details. \ifcase\contextlmtxmode \else - \registerctxluafile{back-lua}{optimize} + \registerctxluafile{back-lua}{autosuffix,optimize} \fi \endinput diff --git a/tex/context/base/mkiv/back-mps.lua b/tex/context/base/mkiv/back-mps.lmt index 13a0d6d42..4a2a573c4 100644 --- a/tex/context/base/mkiv/back-mps.lua +++ b/tex/context/base/mkiv/back-mps.lmt @@ -137,9 +137,12 @@ local function flushrule(current, pos_h, pos_v, pod_r, size_h, size_v, subtype) end end -local function flushsimplerule(current, pos_h, pos_v, pod_r, size_h, size_v) - b = b + 1 - buffer[b] = f_rule(size_h*bpfactor,size_v*bpfactor,pos_h*bpfactor,pos_v*bpfactor) +local function flushsimplerule(pos_h, pos_v, pod_r, size_h, size_v) + flush_rule(false,pos_h,pos_v,pod_r,size_h,size_v,normalrule_code) +end + +local function flushspecialrule(pos_h, pos_v, pod_r, w, h, d, l, outline) + flush_rule(false,pos_h,pos_v-d,pod_r,w,h+d,outline and outlinerule_code or normalrule_code) end -- installer @@ -160,6 +163,7 @@ drivers.install { character = flushcharacter, rule = flushrule, simplerule = flushsimplerule, + specialrule = flushspecialrule, } } diff --git a/tex/context/base/mkiv/back-mps.mkxl b/tex/context/base/mkiv/back-mps.mkxl index 0a6640614..318b73848 100644 --- a/tex/context/base/mkiv/back-mps.mkxl +++ b/tex/context/base/mkiv/back-mps.mkxl @@ -12,7 +12,7 @@ %C details. \ifcase\contextlmtxmode \else - \registerctxluafile{back-mps}{optimize} + \registerctxluafile{back-mps}{autosuffix,optimize} \fi \endinput diff --git a/tex/context/base/mkiv/back-out.lua b/tex/context/base/mkiv/back-out.lmt index 5ea5aa048..5ea5aa048 100644 --- a/tex/context/base/mkiv/back-out.lua +++ b/tex/context/base/mkiv/back-out.lmt diff --git a/tex/context/base/mkiv/back-out.mkxl b/tex/context/base/mkiv/back-out.mkxl index 26548a0a4..248622c54 100644 --- a/tex/context/base/mkiv/back-out.mkxl +++ b/tex/context/base/mkiv/back-out.mkxl @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\registerctxluafile{back-out}{} +\registerctxluafile{back-out}{autosuffix} \let\normalimmediate\immediate \let\normalopenout \openout diff --git a/tex/context/base/mkiv/back-pdf.mkiv b/tex/context/base/mkiv/back-pdf.mkiv index a1265e47a..a8b157019 100644 --- a/tex/context/base/mkiv/back-pdf.mkiv +++ b/tex/context/base/mkiv/back-pdf.mkiv @@ -21,6 +21,7 @@ \registerctxluafile{lpdf-nod}{} \registerctxluafile{lpdf-eng}{optimize} \registerctxluafile{lpdf-col}{} +\registerctxluafile{lpdf-vfc}{} \registerctxluafile{lpdf-xmp}{} \registerctxluafile{lpdf-ano}{} \registerctxluafile{lpdf-res}{} diff --git a/tex/context/base/mkiv/back-pdf.mkxl b/tex/context/base/mkiv/back-pdf.mkxl index f9bb23ac9..9c55654d0 100644 --- a/tex/context/base/mkiv/back-pdf.mkxl +++ b/tex/context/base/mkiv/back-pdf.mkxl @@ -18,9 +18,9 @@ \writestatus{loading}{ConTeXt Backend Macros / PDF} \registerctxluafile{lpdf-ini}{optimize} -\registerctxluafile{lpdf-lmt}{optimize} - +\registerctxluafile{lpdf-lmt}{autosuffix,optimize} \registerctxluafile{lpdf-col}{} +\registerctxluafile{lpdf-vfc}{autosuffix} \registerctxluafile{lpdf-xmp}{} \registerctxluafile{lpdf-ano}{} \registerctxluafile{lpdf-res}{} @@ -35,9 +35,9 @@ \registerctxluafile{lpdf-tag}{} \registerctxluafile{lpdf-fmt}{} \registerctxluafile{lpdf-pde}{} -\registerctxluafile{lpdf-img}{optimize} +\registerctxluafile{lpdf-img}{autosuffix,optimize} \registerctxluafile{lpdf-epa}{} -\registerctxluafile{lpdf-emb}{optimize} +\registerctxluafile{lpdf-emb}{autosuffix,optimize} \registerctxluafile{lpdf-fnt}{} \registerctxluafile{back-pdp}{} diff --git a/tex/context/base/mkiv/cldf-ini.mkiv b/tex/context/base/mkiv/cldf-ini.mkiv index 4ce48d7af..0ec2d408b 100644 --- a/tex/context/base/mkiv/cldf-ini.mkiv +++ b/tex/context/base/mkiv/cldf-ini.mkiv @@ -15,7 +15,7 @@ \newcount\trialtypesettingstate % gets aliased at the Lua end -\registerctxluafile{cldf-ini}{} +\registerctxluafile{cldf-ini}{autosuffix} %D With each new update of \MKIV\ we can join Within Temptation in singing: %D diff --git a/tex/context/base/mkiv/cldf-int.lmt b/tex/context/base/mkiv/cldf-int.lmt new file mode 100644 index 000000000..4f486221b --- /dev/null +++ b/tex/context/base/mkiv/cldf-int.lmt @@ -0,0 +1,252 @@ +if not modules then modules = { } end modules ['cldf-int'] = { + version = 1.001, + comment = "companion to cldf-int.mkiv", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files" +} + +-- another experiment +-- needs upgrading +-- needs checking +-- todo: multilingual + +local byte = string.byte +local insert, remove, concat = table.insert, table.remove, table.concat +local unpack, type = unpack or table.unpack, type + +local ctxcatcodes = catcodes.numbers.ctxcatcodes +local context = context +local contextsprint = context.sprint + +local trace_define = false trackers.register("context.define", function(v) trace_define = v end) + +interfaces = interfaces or { } +local implement = interfaces.implement +local estart = interfaces.elements.start +local estop = interfaces.elements.stop + +local scanners = tokens.scanners +local shortcuts = tokens.shortcuts + +local peekchar = scanners.peekchar +local scankey = scanners.key +local scanvalue = scanners.value +local scanskip = scanners.skip + +local open = byte('[') +local close = byte(']') +local equal = byte('=') +local comma = byte(',') + +function scanhash(scanners) + if peekchar() == open then + local data = { } + scanskip() + while true do + local c = peekchar() + if c == comma then + scanskip() + elseif c == close then + scanskip() + break + else + local key = scankey(equal) + if key then + if peekchar() == equal then + scanskip() + if scanners then + local scanner = scanners[key] + if scanner then + data[key] = scanner() + else + data[key] = scanvalue(comma,close) or "" + end + else + data[key] = scanvalue(comma,close) or "" + end + else + break + end + else + break + end + end + end + return data + end +end + +function scanarray() + if peekchar() == open then + local data = { } + local d = 0 + scanskip() + while true do + local c = peekchar() + if c == comma then + scanskip() + elseif c == close then + scanskip() + break + else + local v = scanvalue(comma,close) or "" + d = d + 1 + data[d] = v + end + end + return data + end +end + +shortcuts.scanhash = scanhash +shortcuts.scanarray = scanarray + +scanners.hash = scanhash +scanners.array = scanarray + +local function remap(arguments) + -- backward compatibility + if type(arguments) == "table" then + for i=1,#arguments do + local a = arguments[i] + if type(a) == "table" then + local t = a[2] + arguments[i] = t == "list" and "array" or t + end + end + return arguments + end +end + +function interfaces.definecommand(name,specification) -- name is optional + if type(name) == "table" then + specification = name + name = specification.name + end + if name and specification then + local environment = specification.environment + local arguments = remap(specification.arguments) + if environment then + local starter = specification.starter + local stopper = specification.stopper + if starter and stopper then + implement { + name = estart .. name, + arguments = arguments, + public = true, + protected = true, + actions = starter, + } + implement { + name = estop .. name, + public = true, + protected = true, + actions = stopper, + } + else + -- message + end + end + if not environment or environment == "both" then + local macro = specification.macro + if macro then + implement { + name = name, + arguments = arguments, + public = true, + protected = true, + actions = macro, + } + else + -- message + end + end + else + -- message + end +end + +function interfaces.tolist(t) + if t then + local r = { } + for i=1,#t do + r[i] = t[i] + end + local n = #r + for k,v in table.sortedhash(t) do + if type(k) ~= "number" then + n = n + 1 + r[n] = k .. "=" .. v + end + end + return concat(r,", ") + else + return "" + end +end + +-- \startluacode +-- function test(opt_1, opt_2, arg_1) +-- context.startnarrower() +-- context("options 1: %s",interfaces.tolist(opt_1)) +-- context.par() +-- context("options 2: %s",interfaces.tolist(opt_2)) +-- context.par() +-- context("argument 1: %s",arg_1) +-- context.stopnarrower() +-- end +-- +-- interfaces.definecommand { +-- name = "test", +-- arguments = { +-- { "option", "list" }, +-- { "option", "hash" }, +-- { "content", "string" }, +-- }, +-- macro = test, +-- } +-- \stopluacode +-- +-- test: \test[1][a=3]{whatever} +-- +-- \startluacode +-- local function startmore(opt_1) +-- context.startnarrower() +-- context("start more, options: %s",interfaces.tolist(opt_1)) +-- context.startnarrower() +-- end +-- +-- local function stopmore() +-- context.stopnarrower() +-- context("stop more") +-- context.stopnarrower() +-- end +-- +-- interfaces.definecommand ( "more", { +-- environment = true, +-- arguments = { +-- { "option", "list" }, +-- }, +-- starter = startmore, +-- stopper = stopmore, +-- } ) +-- \stopluacode +-- +-- more: \startmore[1] one \startmore[2] two \stopmore one \stopmore +-- +-- More modern (no need for option or content): +-- +-- \startluacode +-- interfaces.definecommand { +-- name = "test", +-- arguments = { +-- "array", -- or list +-- "hash", +-- "string", +-- "number", +-- }, +-- macro = test, +-- } +-- \stopluacode +-- diff --git a/tex/context/base/mkiv/cldf-int.lua b/tex/context/base/mkiv/cldf-int.lua index 47f825a4a..39a4eb335 100644 --- a/tex/context/base/mkiv/cldf-int.lua +++ b/tex/context/base/mkiv/cldf-int.lua @@ -1,315 +1,154 @@ if not modules then modules = { } end modules ['cldf-int'] = { version = 1.001, - comment = "companion to mult-clm.mkiv", + comment = "companion to cldf-int.mkiv", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", copyright = "PRAGMA ADE / ConTeXt Development Team", license = "see context related readme files" } --- another experiment --- needs upgrading --- needs checking --- todo: multilingual +-- another experiment, won't change etc ... mkiv stuff .. used? -local format, byte = string.format, string.byte local insert, remove, concat = table.insert, table.remove, table.concat local unpack, type = unpack or table.unpack, type -local catcodenumbers = catcodes.numbers - -local ctxcatcodes = catcodenumbers.ctxcatcodes -local vrbcatcodes = catcodenumbers.vrbcatcodes - +local ctxcatcodes = catcodes.numbers.ctxcatcodes local context = context local contextsprint = context.sprint local trace_define = false trackers.register("context.define", function(v) trace_define = v end) interfaces = interfaces or { } -local implement = interfaces.implement local estart = interfaces.elements.start local estop = interfaces.elements.stop -if CONTEXTLMTXMODE > 0 then +_clmh_ = utilities.parsers.settings_to_hash +_clma_ = utilities.parsers.settings_to_array +_clmn_ = tonumber - local scanners = tokens.scanners - local shortcuts = tokens.shortcuts +local starters, stoppers, macros, stack = { }, { }, { }, { } - local peekchar = scanners.peekchar - local scankey = scanners.key - local scanvalue = scanners.value - local scanskip = scanners.skip +local checkers = { + [0] = "", + "\\dosingleempty", + "\\dodoubleempty", + "\\dotripleempty", + "\\doquadrupleempty", + "\\doquintupleempty", + "\\dosixtupleempty", +} - local open = byte('[') - local close = byte(']') - local equal = byte('=') - local comma = byte(',') +function _clmm_(name,...) + macros[name](...) +end - function scanhash(scanners) - if peekchar() == open then - local data = { } - scanskip() - while true do - local c = peekchar() - if c == comma then - scanskip() - elseif c == close then - scanskip() - break - else - local key = scankey(equal) - if key then - if peekchar() == equal then - scanskip() - if scanners then - local scanner = scanners[key] - if scanner then - data[key] = scanner() - else - data[key] = scanvalue(comma,close) or "" - end - else - data[key] = scanvalue(comma,close) or "" - end - else - break - end - else - break - end - end - end - return data - end - end +function _clmb_(name,...) + local sn = stack[name] + insert(sn,{...}) + starters[name](...) +end - function scanarray() - if peekchar() == open then - local data = { } - local d = 0 - scanskip() - while true do - local c = peekchar() - if c == comma then - scanskip() - elseif c == close then - scanskip() - break - else - local v = scanvalue(comma,close) or "" - d = d + 1 - data[d] = v - end - end - return data - end +function _clme_(name) + local sn = stack[name] + local sv = remove(sn) + if sv then + stoppers[name](unpack(sv)) + else + -- nesting error end +end - shortcuts.scanhash = scanhash - shortcuts.scanarray = scanarray - - scanners.hash = scanhash - scanners.array = scanarray +-- this is a bit old definition ... needs to be modernized - local function remap(arguments) - -- backward compatibility - if type(arguments) == "table" then - for i=1,#arguments do - local a = arguments[i] - if type(a) == "table" then - local t = a[2] - arguments[i] = t == "list" and "array" or t - end - end - return arguments - end +function interfaces.definecommand(name,specification) -- name is optional + if type(name) == "table" then + specification = name + name = specification.name end - - function interfaces.definecommand(name,specification) -- name is optional - if type(name) == "table" then - specification = name - name = specification.name - end - if name and specification then - local environment = specification.environment - local arguments = remap(specification.arguments) + if name and specification then + local arguments = specification.arguments + local na = (arguments and #arguments) or 0 + local environment = specification.environment + if na == 0 then if environment then - local starter = specification.starter - local stopper = specification.stopper - if starter and stopper then - implement { - name = estart .. name, - arguments = arguments, - public = true, - protected = true, - actions = starter, - } - implement { - name = estop .. name, - public = true, - protected = true, - actions = stopper, - } - else - -- message - end + contextsprint(ctxcatcodes,"\\setuvalue{",estart,name,"}{\\ctxlua{_clmb_('",name,"')}}") + contextsprint(ctxcatcodes,"\\setuvalue{",estop, name,"}{\\ctxlua{_clme_('",name,"')}}") end if not environment or environment == "both" then - local macro = specification.macro - if macro then - implement { - name = name, - arguments = arguments, - public = true, - protected = true, - actions = macro, - } - else - -- message - end + contextsprint(ctxcatcodes,"\\setuvalue{", name,"}{\\ctxlua{_clmm_('",name,"')}}") end else - -- message - end - end - - -else - - _clmh_ = utilities.parsers.settings_to_hash - _clma_ = utilities.parsers.settings_to_array - - local starters, stoppers, macros, stack = { }, { }, { }, { } - - local checkers = { - [0] = "", - "\\dosingleempty", - "\\dodoubleempty", - "\\dotripleempty", - "\\doquadrupleempty", - "\\doquintupleempty", - "\\dosixtupleempty", - } - - function _clmm_(name,...) - macros[name](...) - end - - function _clmb_(name,...) - local sn = stack[name] - insert(sn,{...}) - starters[name](...) - end - - function _clme_(name) - local sn = stack[name] - local sv = remove(sn) - if sv then - stoppers[name](unpack(sv)) - else - -- nesting error - end - end - - _clmn_ = tonumber - - local estart = interfaces.elements.start - local estop = interfaces.elements.stop - - -- this is a bit old definition ... needs to be modernized - - function interfaces.definecommand(name,specification) -- name is optional - if type(name) == "table" then - specification = name - name = specification.name - end - if name and specification then - local arguments = specification.arguments - local na = (arguments and #arguments) or 0 - local environment = specification.environment - if na == 0 then - if environment then - contextsprint(ctxcatcodes,"\\setuvalue{",estart,name,"}{\\ctxlua{_clmb_('",name,"')}}") - contextsprint(ctxcatcodes,"\\setuvalue{",estop, name,"}{\\ctxlua{_clme_('",name,"')}}") - end - if not environment or environment == "both" then - contextsprint(ctxcatcodes,"\\setuvalue{", name,"}{\\ctxlua{_clmm_('",name,"')}}") - end - else - -- we could flush immediate but tracing is bad then - stack[name] = { } - local opt = 0 - local done = false - local snippets = { } -- we can reuse it - local mkivdo = "\\mkivdo" .. name -- maybe clddo - snippets[#snippets+1] = "\\def" - snippets[#snippets+1] = mkivdo - for i=1,na do - local a = arguments[i] - local variant = a[1] - if variant == "option" then - snippets[#snippets+1] = "[#" - snippets[#snippets+1] = i - snippets[#snippets+1] = "]" - if not done then - opt = opt + 1 - end - else - done = true -- no more optional checking after this - snippets[#snippets+1] = "#" - snippets[#snippets+1] = i + -- we could flush immediate but tracing is bad then + stack[name] = { } + local opt = 0 + local done = false + local snippets = { } -- we can reuse it + local mkivdo = "\\mkivdo" .. name -- maybe clddo + snippets[#snippets+1] = "\\def" + snippets[#snippets+1] = mkivdo + for i=1,na do + local a = arguments[i] + local variant = a[1] + if variant == "option" then + snippets[#snippets+1] = "[#" + snippets[#snippets+1] = i + snippets[#snippets+1] = "]" + if not done then + opt = opt + 1 end - end - if environment then - snippets[#snippets+1] = "{\\ctxlua{_clmb_('" - snippets[#snippets+1] = name - snippets[#snippets+1] = "'" else - snippets[#snippets+1] = "{\\ctxlua{_clmm_('" - snippets[#snippets+1] = name - snippets[#snippets+1] = "'" - end - for i=1,na do - local a = arguments[i] - local variant = a[2] - if variant == "list" then - snippets[#snippets+1] = ",_clma_([==[#" - snippets[#snippets+1] = i - snippets[#snippets+1] = "]==])" - elseif variant == "hash" then - snippets[#snippets+1] = ",_clmh_([==[#" - snippets[#snippets+1] = i - snippets[#snippets+1] = "]==])" - elseif variant == "number" then - snippets[#snippets+1] = ",_clmn_([==[#" - snippets[#snippets+1] = i - snippets[#snippets+1] = "]==])" - else - snippets[#snippets+1] = ",[==[#" - snippets[#snippets+1] = i - snippets[#snippets+1] = "]==]" - end - end - snippets[#snippets+1] = ")}}" - contextsprint(ctxcatcodes,unpack(snippets)) - if environment then - -- needs checking - contextsprint(ctxcatcodes,"\\setuvalue{",estart,name,"}{",checkers[opt],mkivdo,"}") - contextsprint(ctxcatcodes,"\\setuvalue{",estop, name,"}{\\ctxlua{_clme_('",name,"')}}") - end - if not environment or environment == "both" then - contextsprint(ctxcatcodes,"\\setuvalue{", name,"}{",checkers[opt],mkivdo,"}") + done = true -- no more optional checking after this + snippets[#snippets+1] = "#" + snippets[#snippets+1] = i end end if environment then - starters[name] = specification.starter - stoppers[name] = specification.stopper + snippets[#snippets+1] = "{\\ctxlua{_clmb_('" + snippets[#snippets+1] = name + snippets[#snippets+1] = "'" else - macros[name] = specification.macro + snippets[#snippets+1] = "{\\ctxlua{_clmm_('" + snippets[#snippets+1] = name + snippets[#snippets+1] = "'" end + for i=1,na do + local a = arguments[i] + local variant = a[2] + if variant == "list" then + snippets[#snippets+1] = ",_clma_([==[#" + snippets[#snippets+1] = i + snippets[#snippets+1] = "]==])" + elseif variant == "hash" then + snippets[#snippets+1] = ",_clmh_([==[#" + snippets[#snippets+1] = i + snippets[#snippets+1] = "]==])" + elseif variant == "number" then + snippets[#snippets+1] = ",_clmn_([==[#" + snippets[#snippets+1] = i + snippets[#snippets+1] = "]==])" + else + snippets[#snippets+1] = ",[==[#" + snippets[#snippets+1] = i + snippets[#snippets+1] = "]==]" + end + end + snippets[#snippets+1] = ")}}" + contextsprint(ctxcatcodes,unpack(snippets)) + if environment then + -- needs checking + contextsprint(ctxcatcodes,"\\setuvalue{",estart,name,"}{",checkers[opt],mkivdo,"}") + contextsprint(ctxcatcodes,"\\setuvalue{",estop, name,"}{\\ctxlua{_clme_('",name,"')}}") + end + if not environment or environment == "both" then + contextsprint(ctxcatcodes,"\\setuvalue{", name,"}{",checkers[opt],mkivdo,"}") + end + end + if environment then + starters[name] = specification.starter + stoppers[name] = specification.stopper + else + macros[name] = specification.macro end end - end function interfaces.tolist(t) diff --git a/tex/context/base/mkiv/cldf-int.mkxl b/tex/context/base/mkiv/cldf-int.mkxl index aae7d0416..603c22afc 100644 --- a/tex/context/base/mkiv/cldf-int.mkxl +++ b/tex/context/base/mkiv/cldf-int.mkxl @@ -13,7 +13,7 @@ \writestatus{loading}{ConTeXt Multilingual Macros / Lua} -\registerctxluafile{cldf-int}{} +\registerctxluafile{cldf-int}{autosuffix} \unprotect diff --git a/tex/context/base/mkiv/cldf-lmt.lua b/tex/context/base/mkiv/cldf-lmt.lmt index b23ab1bd0..b23ab1bd0 100644 --- a/tex/context/base/mkiv/cldf-lmt.lua +++ b/tex/context/base/mkiv/cldf-lmt.lmt diff --git a/tex/context/base/mkiv/colo-ini.mkxl b/tex/context/base/mkiv/colo-ini.mkxl index 724316629..398465a8d 100644 --- a/tex/context/base/mkiv/colo-ini.mkxl +++ b/tex/context/base/mkiv/colo-ini.mkxl @@ -687,23 +687,17 @@ \else \colo_helpers_set_model\s!rgb \fi - \else - \ifconditional\c_colo_cmyk_supported - \colo_helpers_set_model\s!cmyk - \else - \ifconditional\c_colo_convert_gray - \colo_helpers_set_model\s!gray - \else - \colo_helpers_set_model\s!none - \fi - \fi - \fi - \else - \ifconditional\c_colo_convert_gray + \orelse\ifconditional\c_colo_cmyk_supported + \colo_helpers_set_model\s!cmyk + \orelse\ifconditional\c_colo_convert_gray \colo_helpers_set_model\s!gray \else \colo_helpers_set_model\s!none \fi + \orelse\ifconditional\c_colo_convert_gray + \colo_helpers_set_model\s!gray + \else + \colo_helpers_set_model\s!none \fi} %D Currently in mkiv transparency is implemented independent of color. This costs a @@ -846,9 +840,10 @@ {\advance\c_colo_protection\minusone} \def\colo_basics_define[#1][#2]% - {\edef\m_colo_old{#1}% - \edef\m_colo_new{#2}% - \ifx\m_colo_old\m_colo_new +% {\edef\m_colo_old{#1}% +% \edef\m_colo_new{#2}% +% \ifx\m_colo_old\m_colo_new + {\iftok{#1}{#2}% % maybe a warning \else \clf_defineprocesscolorlocal{#1}{#2}\v_colo_freeze_state\relax @@ -859,9 +854,10 @@ \fi} \def\colo_basics_define_global[#1][#2]% - {\edef\m_colo_old{#1}% - \edef\m_colo_new{#2}% - \ifx\m_colo_old\m_colo_new +% {\edef\m_colo_old{#1}% +% \edef\m_colo_new{#2}% +% \ifx\m_colo_old\m_colo_new + {\iftok{#1}{#2}% % maybe a warning \else \clf_defineprocesscolorglobal{#1}{#2}\v_colo_freeze_state\relax @@ -1284,26 +1280,41 @@ \def\thecolorattribute #1{\number\ifcsname\??colorattribute \currentcolorprefix#1\endcsname\lastnamedcs\orelse\ifcsname\??colorattribute #1\endcsname\lastnamedcs\else\zerocount\fi} \def\thetransparencyattribute#1{\number\ifcsname\??transparencyattribute\currentcolorprefix#1\endcsname\lastnamedcs\orelse\ifcsname\??transparencyattribute#1\endcsname\lastnamedcs\else\zerocount\fi} -\def\internalspotcolorname #1{\clf_spotcolorname \thecolorattribute{#1} } -\def\internalspotcolorparent #1{\clf_spotcolorparent\thecolorattribute{#1} } -\def\internalspotcolorsize #1{\clf_spotcolorvalue \thecolorattribute{#1} } -\def\colorcomponents #1{\clf_colorcomponents \thecolorattribute {#1} } -\def\transparencycomponents #1{\clf_transparencycomponents\thetransparencyattribute{#1} } -\def\processcolorcomponents #1{\clf_processcolorcomponents\thecolorattribute {#1} } +% \def\internalspotcolorname #1{\clf_spotcolorname \thecolorattribute{#1} } +% \def\internalspotcolorparent #1{\clf_spotcolorparent\thecolorattribute{#1} } +% \def\internalspotcolorsize #1{\clf_spotcolorvalue \thecolorattribute{#1} } +% +% \def\colorcomponents #1{\clf_colorcomponents \thecolorattribute {#1} } +% \def\transparencycomponents #1{\clf_transparencycomponents\thetransparencyattribute{#1} } +% \def\processcolorcomponents #1{\clf_processcolorcomponents\thecolorattribute {#1} } +% +% \def\colorvalue #1{\clf_formatcolor\thecolorattribute{#1}{\colorformatseparator}} +% \def\grayvalue #1{\clf_formatgray \thecolorattribute{#1}{\colorformatseparator}} +% +% \def\doifelseblack #1{\clf_doifelseblack\thecolorattribute{#1} } +% \def\doifelsedrawingblack {\clf_doifelsedrawingblack} +% +% \let\doifblackelse \doifelseblack +% \let\doifdrawingblackelse \doifelsedrawingblack -\def\colorvalue #1{\clf_formatcolor\thecolorattribute{#1}{\colorformatseparator}} -\def\grayvalue #1{\clf_formatgray \thecolorattribute{#1}{\colorformatseparator}} +\def\internalspotcolorname #1{\clf_spotcolorname \rawcolorattribute{#1}} +\def\internalspotcolorparent #1{\clf_spotcolorparent\rawcolorattribute{#1}} +\def\internalspotcolorsize #1{\clf_spotcolorvalue \rawcolorattribute{#1}} -\def\doifelseblack #1{\clf_doifelseblack\thecolorattribute{#1} } +\def\colorcomponents #1{\clf_colorcomponents \rawcolorattribute {#1}} +\def\transparencycomponents #1{\clf_transparencycomponents\rawtransparencyattribute{#1}} +\def\processcolorcomponents #1{\clf_processcolorcomponents\rawcolorattribute {#1}} + +\def\colorvalue #1{\clf_formatcolor\rawcolorattribute{#1}{\colorformatseparator}} +\def\grayvalue #1{\clf_formatgray \rawcolorattribute{#1}{\colorformatseparator}} + +\def\doifelseblack #1{\clf_doifelseblack\rawcolorattribute{#1}} \def\doifelsedrawingblack {\clf_doifelsedrawingblack} \let\doifblackelse \doifelseblack \let\doifdrawingblackelse \doifelsedrawingblack -\let\doifblackelse \doifelseblack -\let\doifdrawingblackelse\doifelsedrawingblack - %D \macros %D {forcecolorhack} %D @@ -1328,7 +1339,7 @@ % % I really need to sort this out! -\unexpanded\def\forcecolorhack{\leaders\hrule height\zeropoint depth\zeropoint\hskip\zeropoint\relax} % relax is needed ! +\unexpanded\def\forcecolorhack{\leaders\hrule\s!height\zeropoint\s!depth\zeropoint\hskip\zeropoint\relax} % relax is needed ! %D We default to the colors defined in \type {colo-imp-rgb} and %D support both \RGB\ and \CMYK\ output. Transparencies are defined diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index dad7578d4..08aa956ca 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -13,7 +13,7 @@ % \normalend % uncomment this to get the real base runtime -\newcontextversion{2020.07.13 23:44} +\newcontextversion{2020.07.20 10:40} %D This file is loaded at runtime, thereby providing an excellent place for hacks, %D patches, extensions and new features. There can be local overloads in cont-loc diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 3ef78b28c..f7b67bb15 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -45,7 +45,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2020.07.13 23:44} +\edef\contextversion{2020.07.20 10:40} %D Kind of special: diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl index 614c9a659..696be2dc8 100644 --- a/tex/context/base/mkiv/context.mkxl +++ b/tex/context/base/mkiv/context.mkxl @@ -29,7 +29,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2020.07.13 23:44} +\edef\contextversion{2020.07.20 10:40} %D Kind of special: diff --git a/tex/context/base/mkiv/core-env.lua b/tex/context/base/mkiv/core-env.lua index c496a5a8c..da10c26f5 100644 --- a/tex/context/base/mkiv/core-env.lua +++ b/tex/context/base/mkiv/core-env.lua @@ -100,27 +100,19 @@ setmetatableindex(texsystemmodes, function(t,k) end end end) + setmetatablenewindex(texsystemmodes, function(t,k) report_mode("you cannot set the %s named %a this way","systemmode",k) end) -setmetatableindex(texconstants, function(t,k) - return cache[k].mode ~= 0 and texgetcount(k) or 0 -end) setmetatablenewindex(texconstants, function(t,k) report_mode("you cannot set the %s named %a this way","constant",k) end) -setmetatableindex(texconditionals, function(t,k) -- 0 == true - return cache[k].mode ~= 0 and texgetcount(k) == 0 -end) setmetatablenewindex(texconditionals, function(t,k) report_mode("you cannot set the %s named %a this way","conditional",k) end) -table.setmetatableindex(texifs, function(t,k) - return cache[k].mode == iftrue -end) setmetatablenewindex(texifs, function(t,k) -- just ignore end) @@ -140,13 +132,27 @@ if CONTEXTLMTXMODE > 0 then return cache[k].command == countcode and texgetcount(k) == 0 end) - table.setmetatableindex(texifs, function(t,k) + setmetatableindex(texifs, function(t,k) local c = cache[k] print(k) inspect(c) return c.command == conditioncode and c.index == iftrue end) +else + + setmetatableindex(texconstants, function(t,k) + return cache[k].mode ~= 0 and texgetcount(k) or 0 + end) + + setmetatableindex(texconditionals, function(t,k) -- 0 == true + return cache[k].mode ~= 0 and texgetcount(k) == 0 + end) + + setmetatableindex(texifs, function(t,k) + return cache[k].mode == iftrue + end) + end tex.isdefined = isdefined diff --git a/tex/context/base/mkiv/core-lmt.lua b/tex/context/base/mkiv/core-lmt.lmt index 700ce4721..700ce4721 100644 --- a/tex/context/base/mkiv/core-lmt.lua +++ b/tex/context/base/mkiv/core-lmt.lmt diff --git a/tex/context/base/mkiv/core-lmt.mkxl b/tex/context/base/mkiv/core-lmt.mkxl index 7fb38e830..77ef17966 100644 --- a/tex/context/base/mkiv/core-lmt.mkxl +++ b/tex/context/base/mkiv/core-lmt.mkxl @@ -13,7 +13,7 @@ \writestatus{loading}{ConTeXt System Macros / Primitives} -\registerctxluafile{core-lmt}{} +\registerctxluafile{core-lmt}{autosuffix} \unprotect diff --git a/tex/context/base/mkiv/driv-shp.lua b/tex/context/base/mkiv/driv-shp.lmt index a23cca3a8..2e9751b9c 100644 --- a/tex/context/base/mkiv/driv-shp.lua +++ b/tex/context/base/mkiv/driv-shp.lmt @@ -182,6 +182,8 @@ local tospace = false directives.register("backends.spaces", function(v) tospac -- todo: cache streams +local default = 16384 * number.dimenfactors.bp -- 65536 // 4 + local function flush_vf_packet(pos_h,pos_v,pos_r,font,char,data,factor,vfcommands) if nesting > 100 then @@ -270,13 +272,13 @@ local function flush_vf_packet(pos_h,pos_v,pos_r,font,char,data,factor,vfcommand end end elseif command == "right" then - local h = packet[2] -- * siz + local h = packet[2] * siz -- * siz is really needed for boldening if factor ~= 0 and h ~= 0 then h = h + h * factor / 1000 -- expansion end pos_h = pos_h + h elseif command == "down" then - local v = packet[2] -- * siz + local v = packet[2] * siz -- * siz is really needed for boldening pos_v = pos_v - v elseif command == "push" then level = level + 1 @@ -295,12 +297,35 @@ local function flush_vf_packet(pos_h,pos_v,pos_r,font,char,data,factor,vfcommand elseif command == "rule" then local size_v = packet[2] local size_h = packet[3] - if factor ~= 0 and size_h > 0 then - size_h = size_h + size_h * factor / 1000 - end if size_h > 0 and size_v > 0 then - flushsimplerule(pos_h,pos_v,pos_r,size_h,size_v) - pos_h = pos_h + size_h + if factor ~= 0 then + size_h = size_h + size_h * factor / 1000 + end + if size_h > 0 then + flushsimplerule(pos_h,pos_v,pos_r,size_h,size_v) + pos_h = pos_h + size_h + end + end + elseif command == "frame" then + local width = packet[2] + if width > 0 then + local height = packet[3] or 0 + local depth = packet[4] or 0 + local total = height + depth + if total > 0 then + if factor ~= 0 then + width = width + width * factor / 1000 + end + if width > 0 then + local line = packet[5] or default + local outline = not packet[6] + local advance = not packet[7] + flushspecialrule(pos_h,pos_v,pos_r,width,height,depth,line,outline) + if advance then + pos_h = pos_h + width + end + end + end end elseif command == "font" then local index = packet[2] @@ -362,7 +387,9 @@ flush_character = function(current,font,char,factor,vfcommands,pos_h,pos_v,pos_r end return 0, 0, 0 end - + if vfcommands then + vfcommands = data.commands + end local width, height, depth, naturalwidth if current then naturalwidth, height, depth, factor = getwhd(current,true) -- also get corrected width @@ -382,12 +409,8 @@ flush_character = function(current,font,char,factor,vfcommands,pos_h,pos_v,pos_r factor = 0 end end - if pos_r == righttoleft_code then - pos_h = pos_h - width - end - if vfcommands then - vfcommands = data.commands + pos_h = pos_h - width -- here ? end if vfcommands then flush_vf_packet(pos_h,pos_v,pos_r,font,char,data,factor,vfcommands) -- also f ? @@ -1172,6 +1195,7 @@ function drivers.converters.lmtx(driver,box,smode,objnum,specification) flushfontchar = flushers.fontchar flushrule = flushers.rule flushsimplerule = flushers.simplerule + flushspecialrule = flushers.specialrule flushspecial = flushers.special flushliteral = flushers.literal flushsetmatrix = flushers.setmatrix diff --git a/tex/context/base/mkiv/driv-shp.mkxl b/tex/context/base/mkiv/driv-shp.mkxl index 68b62c72a..199215a59 100644 --- a/tex/context/base/mkiv/driv-shp.mkxl +++ b/tex/context/base/mkiv/driv-shp.mkxl @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\registerctxluafile{driv-shp}{optimize} +\registerctxluafile{driv-shp}{autosuffix,optimize} \unprotect diff --git a/tex/context/base/mkiv/font-con.lua b/tex/context/base/mkiv/font-con.lua index 6f4abe111..495148341 100644 --- a/tex/context/base/mkiv/font-con.lua +++ b/tex/context/base/mkiv/font-con.lua @@ -566,6 +566,15 @@ function constructors.scale(tfmdata,specification) targetparameters.quad = targetquad targetparameters.extra_space = targetextra_space -- + local hshift = parameters.hshift + if hshift then + targetparameters.hshift = delta * hshift + end + local vshift = parameters.vshift + if vshift then + targetparameters.vshift = delta * vshift + end + -- local ascender = parameters.ascender if ascender then targetparameters.ascender = delta * ascender diff --git a/tex/context/base/mkiv/font-imp-effects.lua b/tex/context/base/mkiv/font-imp-effects.lua index cc6e4c0bf..bd6cce879 100644 --- a/tex/context/base/mkiv/font-imp-effects.lua +++ b/tex/context/base/mkiv/font-imp-effects.lua @@ -280,6 +280,9 @@ end -- local show_effect = { "lua", "print('!')" } +----- shiftmode = false -- test in mkiv and lmtx +local shiftmode = CONTEXTLMTXMODE > 0 + local function manipulateeffect(tfmdata) local effect = tfmdata.properties.effect if effect then @@ -301,42 +304,49 @@ local function manipulateeffect(tfmdata) local factor = (1 + effect.factor) * factor local hfactor = (1 + effect.hfactor) * hfactor local vfactor = (1 + effect.vfactor) * vfactor - local vshift = vshift ~= 0 and upcommand[vshift] or false + if shiftmode then + parameters.hshift = hshift + parameters.vshift = vshift + else + vshift = vshift ~= 0 and upcommand[vshift] or false + hshift = rightcommand[hshift] + end for unicode, character in next, characters do local oldwidth = character.width local oldheight = character.height local olddepth = character.depth if oldwidth and oldwidth > 0 then character.width = oldwidth + wdelta - local commands = character.commands - local hshift = rightcommand[hshift] - if vshift then - if commands then - prependcommands ( commands, --- show_effect, - hshift, - vshift - ) - else - character.commands = { --- show_effect, - hshift, - vshift, - charcommand[unicode] - } - end - else - if commands then - prependcommands ( commands, --- show_effect, - hshift - ) + if not shiftmode then + local commands = character.commands + if vshift then + if commands then + prependcommands ( commands, + -- show_effect, + hshift, + vshift + ) + else + character.commands = { + -- show_effect, + hshift, + vshift, + charcommand[unicode] + } + end else - character.commands = { --- show_effect, - hshift, - charcommand[unicode] - } + if commands then + prependcommands ( commands, + -- show_effect, + hshift + ) + else + character.commands = { + -- show_effect, + hshift, + charcommand[unicode] + } + end end end end diff --git a/tex/context/base/mkiv/font-imp-tracing.lua b/tex/context/base/mkiv/font-imp-tracing.lua index 6ce445143..1acf14558 100644 --- a/tex/context/base/mkiv/font-imp-tracing.lua +++ b/tex/context/base/mkiv/font-imp-tracing.lua @@ -47,58 +47,22 @@ local v_none = variables.none -- boundingbox={yes|background|frame|empty|<color>} -local bp = number.dimenfactors.bp -local r = 16384 * bp -- 65536 // 4 -local f_1 = formatters["%.6F w 0 %.6F %.6F %.6F re f"] -local f_2 = formatters["[] 0 d 0 J %.6F w %.6F %.6F %.6F %.6F re S"] - --- change this into w h d instead of h d w - -local backcache = setmetatableindex(function(t,h) - local h = h * bp - local v = setmetatableindex(function(t,d) - local d = d * bp - local v = setmetatableindex(function(t,w) - local v = { "pdf", "origin", f_1(r,-d,w*bp,h+d) } - t[w] = v - return v - end) - t[d] = v - return v - end) - t[h] = v - return v -end) - -local forecache = setmetatableindex(function(t,h) - local h = h * bp - local v = setmetatableindex(function(t,d) - local d = d * bp - local v = setmetatableindex(function(t,w) - -- the frame goes through the boundingbox - local v = { "pdf", "origin", f_2(r,r/2,-d+r/2,w*bp-r,h+d-r) } - t[w] = v - return v - end) - t[d] = v - return v - end) - t[h] = v - return v -end) - -local startcolor = nil -local stopcolor = nil +local backgrounds = nil +local outlines = nil +local startcolor = nil +local stopcolor = nil local function initialize(tfmdata,key,value) if value then - if not backcolors then + if not backgrounds then local vfspecials = backends.pdf.tables.vfspecials - startcolor = vfspecials.startcolor - stopcolor = vfspecials.stopcolor + startcolor = vfspecials.startcolor + stopcolor = vfspecials.stopcolor + backgrounds = vfspecials.backgrounds + outlines = vfspecials.outlines end local characters = tfmdata.characters - local rulecache = backcache + local rulecache = backgrounds local showchar = true local color = "palegray" if type(value) == "string" then @@ -106,9 +70,9 @@ local function initialize(tfmdata,key,value) for i=1,#value do local v = value[i] if v == v_frame then - rulecache = forecache + rulecache = outlines elseif v == v_background then - rulecache = backcache + rulecache = backgrounds elseif v == v_empty then showchar = false elseif v == v_none then diff --git a/tex/context/base/mkiv/font-lib.mkvi b/tex/context/base/mkiv/font-lib.mkvi index 133143224..f4a20c8df 100644 --- a/tex/context/base/mkiv/font-lib.mkvi +++ b/tex/context/base/mkiv/font-lib.mkvi @@ -58,7 +58,7 @@ \registerctxluafile{font-ocm}{} \fi \else - \registerctxluafile{font-ogr}{} % lmtx + \registerctxluafile{font-ogr}{autosuffix} % lmtx \fi % we use otf code for type one diff --git a/tex/context/base/mkiv/font-ogr.lua b/tex/context/base/mkiv/font-ogr.lmt index 94cf91494..94cf91494 100644 --- a/tex/context/base/mkiv/font-ogr.lua +++ b/tex/context/base/mkiv/font-ogr.lmt diff --git a/tex/context/base/mkiv/font-otr.lua b/tex/context/base/mkiv/font-otr.lua index 119687f12..531f665de 100644 --- a/tex/context/base/mkiv/font-otr.lua +++ b/tex/context/base/mkiv/font-otr.lua @@ -2421,6 +2421,7 @@ function readers.loadfont(filename,n,instance) hascolor = fontdata.hascolor or false, instance = fontdata.instance, factors = fontdata.factors, + nofsubfonts = fontdata.subfonts and #fontdata.subfonts or nil, }, resources = { -- filename = fontdata.filename, diff --git a/tex/context/base/mkiv/grph-inc.lua b/tex/context/base/mkiv/grph-inc.lua index 508f3247a..6fdf74c08 100644 --- a/tex/context/base/mkiv/grph-inc.lua +++ b/tex/context/base/mkiv/grph-inc.lua @@ -703,9 +703,9 @@ implement { name = "figurestatus", actions = { get, context }, arguments = { " implement { name = "figurerequest", actions = { get, context }, arguments = { "'request'", "string", "string" } } implement { name = "figureused", actions = { get, context }, arguments = { "'used'", "string", "string" } } -implement { name = "figurefilepath", actions = { get, file.dirname, context }, arguments = { "'used'", "'fullname'" } } -implement { name = "figurefilename", actions = { get, file.nameonly, context }, arguments = { "'used'", "'fullname'" } } -implement { name = "figurefiletype", actions = { get, file.extname, context }, arguments = { "'used'", "'fullname'" } } +implement { name = "figurefilepath", public = true, actions = { get, file.dirname, context }, arguments = { "'used'", "'fullname'" } } +implement { name = "figurefilename", public = true, actions = { get, file.nameonly, context }, arguments = { "'used'", "'fullname'" } } +implement { name = "figurefiletype", public = true, actions = { get, file.extname, context }, arguments = { "'used'", "'fullname'" } } implement { name = "figuresetdimensions", actions = setdimensions, arguments = "integer" } diff --git a/tex/context/base/mkiv/grph-inc.mkiv b/tex/context/base/mkiv/grph-inc.mkiv index 578bad1d0..1b630de49 100644 --- a/tex/context/base/mkiv/grph-inc.mkiv +++ b/tex/context/base/mkiv/grph-inc.mkiv @@ -568,9 +568,9 @@ \def\figurefullname {\clf_figureused{fullname}{}} \def\noffigurepages {\clf_figureused{pages}{0}} -\def\figurefilepath {\clf_figurefilepath} -\def\figurefilename {\clf_figurefilename} -\def\figurefiletype {\clf_figurefiletype} +% \def\figurefilepath {\clf_figurefilepath} % public in lua +% \def\figurefilename {\clf_figurefilename} % public in lua +% \def\figurefiletype {\clf_figurefiletype} % public in lua \let\naturalfigurewidth \figurenaturalwidth \let\naturalfigureheight \figurenaturalheight diff --git a/tex/context/base/mkiv/libs-imp-curl.lua b/tex/context/base/mkiv/libs-imp-curl.lmt index b30739794..b30739794 100644 --- a/tex/context/base/mkiv/libs-imp-curl.lua +++ b/tex/context/base/mkiv/libs-imp-curl.lmt diff --git a/tex/context/base/mkiv/libs-imp-ghostscript.lua b/tex/context/base/mkiv/libs-imp-ghostscript.lmt index b129a58c1..b129a58c1 100644 --- a/tex/context/base/mkiv/libs-imp-ghostscript.lua +++ b/tex/context/base/mkiv/libs-imp-ghostscript.lmt diff --git a/tex/context/base/mkiv/libs-imp-graphicsmagick.lua b/tex/context/base/mkiv/libs-imp-graphicsmagick.lmt index 6f5d1d967..6f5d1d967 100644 --- a/tex/context/base/mkiv/libs-imp-graphicsmagick.lua +++ b/tex/context/base/mkiv/libs-imp-graphicsmagick.lmt diff --git a/tex/context/base/mkiv/libs-imp-kpse.lua b/tex/context/base/mkiv/libs-imp-kpse.lmt index f8e4a9907..f8e4a9907 100644 --- a/tex/context/base/mkiv/libs-imp-kpse.lua +++ b/tex/context/base/mkiv/libs-imp-kpse.lmt diff --git a/tex/context/base/mkiv/libs-imp-kpse.mkxl b/tex/context/base/mkiv/libs-imp-kpse.mkxl index 8a3d7826f..f76c99029 100644 --- a/tex/context/base/mkiv/libs-imp-kpse.mkxl +++ b/tex/context/base/mkiv/libs-imp-kpse.mkxl @@ -15,7 +15,7 @@ %D know when it comes in handy; probably never in a real run, but I might want to %D make a \LUAMETATEX\ plain format one day, just for the fun of it. -% \registerctxluafile{libs-imp-kpse}{} +% \registerctxluafile{libs-imp-kpse}{autosuffix} \continueifinputfile{libs-imp-kpse.mkxl} diff --git a/tex/context/base/mkiv/libs-imp-mujs.lua b/tex/context/base/mkiv/libs-imp-mujs.lmt index 264c8e531..264c8e531 100644 --- a/tex/context/base/mkiv/libs-imp-mujs.lua +++ b/tex/context/base/mkiv/libs-imp-mujs.lmt diff --git a/tex/context/base/mkiv/libs-imp-mujs.mkxl b/tex/context/base/mkiv/libs-imp-mujs.mkxl index 3fc9d9124..a8fe5801f 100644 --- a/tex/context/base/mkiv/libs-imp-mujs.mkxl +++ b/tex/context/base/mkiv/libs-imp-mujs.mkxl @@ -21,7 +21,7 @@ \expandafter \endinput \fi -\registerctxluafile{libs-imp-mujs}{} +\registerctxluafile{libs-imp-mujs}{autosuffix} \unprotect diff --git a/tex/context/base/mkiv/libs-imp-mysql.lua b/tex/context/base/mkiv/libs-imp-mysql.lmt index 3e938a6de..3e938a6de 100644 --- a/tex/context/base/mkiv/libs-imp-mysql.lua +++ b/tex/context/base/mkiv/libs-imp-mysql.lmt diff --git a/tex/context/base/mkiv/libs-imp-postgress.lua b/tex/context/base/mkiv/libs-imp-postgress.lmt index 629079b01..629079b01 100644 --- a/tex/context/base/mkiv/libs-imp-postgress.lua +++ b/tex/context/base/mkiv/libs-imp-postgress.lmt diff --git a/tex/context/base/mkiv/libs-imp-sqlite.lua b/tex/context/base/mkiv/libs-imp-sqlite.lmt index 5d38986f3..5d38986f3 100644 --- a/tex/context/base/mkiv/libs-imp-sqlite.lua +++ b/tex/context/base/mkiv/libs-imp-sqlite.lmt diff --git a/tex/context/base/mkiv/libs-imp-zint.lua b/tex/context/base/mkiv/libs-imp-zint.lmt index 2c346ae7d..2c346ae7d 100644 --- a/tex/context/base/mkiv/libs-imp-zint.lua +++ b/tex/context/base/mkiv/libs-imp-zint.lmt diff --git a/tex/context/base/mkiv/libs-imp-zint.mkxl b/tex/context/base/mkiv/libs-imp-zint.mkxl index 72ce8157e..fbea52888 100644 --- a/tex/context/base/mkiv/libs-imp-zint.mkxl +++ b/tex/context/base/mkiv/libs-imp-zint.mkxl @@ -22,7 +22,7 @@ %D There is a bit more code than needed as we want to be able to %D feed names. -\registerctxluafile{libs-imp-zint}{} +\registerctxluafile{libs-imp-zint}{autosuffix} \unprotect diff --git a/tex/context/base/mkiv/libs-ini.lua b/tex/context/base/mkiv/libs-ini.lua index 5fc8ded98..7f1645b44 100644 --- a/tex/context/base/mkiv/libs-ini.lua +++ b/tex/context/base/mkiv/libs-ini.lua @@ -13,10 +13,10 @@ if not modules then modules = { } end modules ['libs-ini'] = { -- is doing. local type, unpack = type, unpack +local find = string.find -- here we implement the resolver -local type = type local nameonly = file.nameonly local joinfile = file.join @@ -196,3 +196,19 @@ end -- } -- end -- } + +local dofile = dofile +local savedrequire = require + +function require(name,version) + if find(name,"%.lua$") or find(name,"%.lmt$") then + local m = dofile(findfile(name)) + if m then + package.loaded[name] = m + return m + end + else + return savedrequire(name) + end +end + diff --git a/tex/context/base/mkiv/libs-ini.mkxl b/tex/context/base/mkiv/libs-ini.mkxl index 18163beed..e04c7c193 100644 --- a/tex/context/base/mkiv/libs-ini.mkxl +++ b/tex/context/base/mkiv/libs-ini.mkxl @@ -11,17 +11,18 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\registerctxluafile{libs-ini}{} +\registerctxluafile{libs-ini}{} % shared with mkiv -\registerctxluafile{libs-imp-curl}{} -\registerctxluafile{libs-imp-ghostscript}{} -\registerctxluafile{libs-imp-graphicsmagick}{} +\registerctxluafile{libs-imp-curl}{autosuffix} +\registerctxluafile{libs-imp-ghostscript}{autosuffix} +\registerctxluafile{libs-imp-graphicsmagick}{autosuffix} % These are loaded on demand: -% \registerctxluafile{libs-imp-mysql}{} -% \registerctxluafile{libs-imp-sqlite}{} -% \registerctxluafile{libs-imp-postgress}{} +% \registerctxluafile{libs-imp-mysql}{autosuffix} +% \registerctxluafile{libs-imp-sqlite}{autosuffix} +% \registerctxluafile{libs-imp-postgress}{autosuffix} +% \registerctxluafile{libs-imp-kpse}{autosuffix} \unprotect diff --git a/tex/context/base/mkiv/lpdf-ano.lua b/tex/context/base/mkiv/lpdf-ano.lua index c04ada151..a120ff2f4 100644 --- a/tex/context/base/mkiv/lpdf-ano.lua +++ b/tex/context/base/mkiv/lpdf-ano.lua @@ -712,7 +712,8 @@ function codeinjections.prerollreference(actions) -- share can become option local bs, bc = pdfborder() main = pdfdictionary { Subtype = pdf_link, - Border = bs, + -- Border = bs, + Border = pdfshareobjectreference(bs), C = bc, H = (not actions.highlight and pdf_n) or nil, A = pdfshareobjectreference(main), diff --git a/tex/context/base/mkiv/lpdf-col.lua b/tex/context/base/mkiv/lpdf-col.lua index c586300e5..d3b612593 100644 --- a/tex/context/base/mkiv/lpdf-col.lua +++ b/tex/context/base/mkiv/lpdf-col.lua @@ -818,14 +818,20 @@ do end end + -- A problem is that we need to transfer back and this is kind of + -- messy so we force text mode .. i'll do a better job on that but + -- will experiment first (both engines). Virtual fonts will change + -- anyway. + backends.pdf.tables.vfspecials = allocate { -- todo: distinguish between glyph and rule color startcolor = startcolor, -- stopcolor = { "pdf", "page", "0 g 0 G Q" }, - stopcolor = { "pdf", "page", "Q" }, + stopcolor = { "pdf", "text", "Q" }, startslant = startslant, - stopslant = { "pdf", "origin", "Q" }, + -- stopslant = { "pdf", "origin", "Q" }, + stopslant = { "pdf", "text", "Q" }, } diff --git a/tex/context/base/mkiv/lpdf-emb.lua b/tex/context/base/mkiv/lpdf-emb.lmt index 0f0388af0..0f0388af0 100644 --- a/tex/context/base/mkiv/lpdf-emb.lua +++ b/tex/context/base/mkiv/lpdf-emb.lmt diff --git a/tex/context/base/mkiv/lpdf-img.lua b/tex/context/base/mkiv/lpdf-img.lmt index fc53740f6..fc53740f6 100644 --- a/tex/context/base/mkiv/lpdf-img.lua +++ b/tex/context/base/mkiv/lpdf-img.lmt diff --git a/tex/context/base/mkiv/lpdf-ini.lua b/tex/context/base/mkiv/lpdf-ini.lua index 8ece39cee..1f6dac938 100644 --- a/tex/context/base/mkiv/lpdf-ini.lua +++ b/tex/context/base/mkiv/lpdf-ini.lua @@ -445,10 +445,14 @@ do local f_key_null = formatters["/%s null"] local f_key_value = formatters["/%s %s"] - local f_key_dictionary = formatters["/%s << % t >>"] - local f_dictionary = formatters["<< % t >>"] - local f_key_array = formatters["/%s [ % t ]"] - local f_array = formatters["[ % t ]"] + -- local f_key_dictionary = formatters["/%s << % t >>"] + -- local f_dictionary = formatters["<< % t >>"] + local f_key_dictionary = formatters["/%s << %s >>"] + local f_dictionary = formatters["<< %s >>"] + -- local f_key_array = formatters["/%s [ % t ]"] + -- local f_array = formatters["[ % t ]"] + local f_key_array = formatters["/%s [ %s ]"] + local f_array = formatters["[ %s ]"] local f_key_number = formatters["/%s %N"] -- always with max 9 digits and integer is possible local f_tonumber = formatters["%N"] -- always with max 9 digits and integer is possible @@ -501,8 +505,9 @@ do if e then r[n+1] = e end + r = concat(r," ") if contentonly then - return concat(r," ") + return r elseif key then return f_key_dictionary(key,r) else @@ -550,8 +555,9 @@ do if e then r[tn+1] = e end + r = concat(r," ") if contentonly then - return concat(r, " ") + return r elseif key then return f_key_array(key,r) else diff --git a/tex/context/base/mkiv/lpdf-lmt.lua b/tex/context/base/mkiv/lpdf-lmt.lmt index 5a1a6bc44..61a194ca4 100644 --- a/tex/context/base/mkiv/lpdf-lmt.lua +++ b/tex/context/base/mkiv/lpdf-lmt.lmt @@ -32,7 +32,7 @@ if not modules then modules = { } end modules ['lpdf-lmt'] = { -- the next interface is suboptimal and will change at some time. At that moment I will -- also optimize and extend. -local type, next, unpack, tonumber = type, next, unpack, tonumber +local type, next, unpack, tonumber, rawget = type, next, unpack, tonumber, rawget local char, rep, find = string.char, string.rep, string.find local formatters, splitupstring = string.formatters, string.splitup local band, extract = bit32.band, bit32.extract @@ -61,6 +61,7 @@ local pdfgetfontobjnumber = lpdf.getfontobjnumber local pdfreserveobject = lpdf.reserveobject local pdfpagereference = lpdf.pagereference local pdfflushobject = lpdf.flushobject +local pdfsharedobject = lpdf.shareobjectreference local pdfreference = lpdf.reference local pdfdictionary = lpdf.dictionary local pdfarray = lpdf.array @@ -94,6 +95,7 @@ local getxformname, getximagename local boundingbox, shippingmode, objectnumber local tmrx, tmry, tmsx, tmsy, tmtx, tmty local cmrx, cmry, cmsx, cmsy, cmtx, cmty +local tmef local function usefont(t,k) -- a bit redundant hash local v = pdfgetfontname(k) @@ -109,6 +111,7 @@ local function reset_variables(specification) tmrx, tmry = 1.0, 1.0 tmsx, tmsy = 0.0, 0.0 tmtx, tmty = 0.0, 0.0 + tmef = 1.0 need_tm = false need_tf = false need_width = 0 @@ -145,6 +148,10 @@ local function reset_buffer() b = 0 end +local function flush_buffer() + b = 0 +end + -- fonts local fontcharacters @@ -158,6 +165,7 @@ local horizontalmode = true ----- widefontmode = true local scalefactor = 1 local threshold = 655360 +local thresfactor = 100 local tjfactor = 100 / 65536 lpdf.usedcharacters = usedcharacters @@ -174,7 +182,16 @@ local function updatefontstate(font) -- widefontmode = fontproperties.encodingbytes == 2 scalefactor = (designsize/size) * tjfactor local fthreshold = fontproperties.threshold - threshold = (fthreshold and (size * fthreshold / 100)) or 655360 + threshold = (fthreshold and (size * fthreshold / 100)) or 655360 + -- when we bolden the threshold should be smaller .. a hack .. i need to redo all this + if (fontparameters.extendfactor or 1) == 1 then + -- we're probably okay + elseif fontparameters.hshift or fontparameters.vshift then + -- we could be okay + else + -- some vf magic going on + threshold = threshold / 5 + end end -- helpers @@ -378,6 +395,8 @@ local flushcharacter do -- for it so local naturalwidth = nil + local hshift = false + local vshift = false -- local naturalwidths = setmetatableindex(function(t,font) -- local d = descriptions[font] @@ -446,6 +465,7 @@ local flushcharacter do if e then extend = extend * e end + tmef = expand tmrx = expand * extend tmsy = slant tmry = squeeze @@ -467,51 +487,11 @@ local flushcharacter do end -- naturalwidth = naturalwidths[font] + -- + hshift = fontparameters.hshift + vshift = fontparameters.vshift end - -- This only saves a little on hz because there we switch a lot of - -- instances. - - -- local lastslant, lastextend, lastsqueeze, lastformat, lastsize, lastwidth, lastmode, lastused, lastfont - - -- local function setup_fontparameters(font,factor,f,e) - -- if font ~= lastfont then - -- lastslant = fontparameters.slantfactor or 0 - -- lastextend = fontparameters.extendfactor or 1 - -- lastsqueeze = fontparameters.squeezefactor or 1 - -- lastformat = fontproperties.format - -- lastsize = fontparameters.size * bpfactor - -- if format == "opentype" or format == "type1" then - -- lastsize = lastsize * 1000 / fontparameters.units -- can we avoid this ? - -- end - -- lastwidth = fontparameters.width - -- lastmode = fontparameters.mode - -- lastused = usedfonts[font] -- cache - -- lastfont = font - -- end - -- local expand = 1 + factor / 1000000 - -- if e then - -- tmrx = expand * lastextend * e - -- else - -- tmrx = expand * lastextend - -- end - -- tmsy = lastslant - -- tmry = lastsqueeze - -- need_width = lastwidth - -- need_mode = lastmode - -- f_cur = lastfont - -- f_pdf = lastused - -- cur_factor = factor - -- cur_f = f - -- cur_e = e - -- tj_delta = 0 - -- if f then - -- fs = lastsize * f - -- else - -- fs = lastsize - -- end - -- end - local f_width = formatters["%.6N w"] local f_mode = formatters["%i Tr"] -- can be hash local f_font = formatters["/F%i %.6N Tf"] -- can be hash @@ -519,10 +499,12 @@ local flushcharacter do local s_width = "0 w" local s_mode = "0 Tr" + local width_factor = 72.27 / 72000.0 + local function set_font() -- if need_width and need_width ~= 0 then if need_width ~= 0 then - b = b + 1 ; buffer[b] = f_width(bpfactor * need_width / 1000) + b = b + 1 ; buffer[b] = f_width(width_factor*need_width) done_width = true elseif done_width then b = b + 1 ; buffer[b] = s_width @@ -576,7 +558,13 @@ local flushcharacter do return v end) - local trace_threshold = false trackers.register("backends.pdf.threshold", function(v) trace_threshold = v end) + -- local trace_threshold = false trackers.register("backends.pdf.threshold", function(v) trace_threshold = v end) + + -- local f_skip = formatters["%.2N"] + + -- I will redo this mess ... we no longer have the mkiv pdf generator that we used in + -- luatex (a precursor to lmtx and also for comparison) but only in lmtx now so ... + -- time to move on I guess. flushcharacter = function(current,pos_h,pos_v,pos_r,font,char,data,f,e,factor) -- ,naturalwidth,width) if need_tf or font ~= f_cur or f_pdf ~= f_pdf_cur or fs ~= fs_cur or mode == "page" then @@ -612,6 +600,10 @@ local flushcharacter do end end end + + if hshift then pos_h = pos_h + hshift end + if vshift then pos_v = pos_v - vshift end + if need_tm then pdf_goto_textmode() set_textmatrix(pos_h,pos_v) @@ -634,7 +626,7 @@ local flushcharacter do begin_charmode() end - cw = cw + naturalwidth[char] * tmrx + cw = cw + naturalwidth[char] * tmef local index = data.index or char @@ -756,6 +748,7 @@ local flushliteral do -- pdf_set_pos(pdf_h,pdf_v) end b = b + 1 ; buffer[b] = str + flush_buffer() end end end) @@ -901,7 +894,7 @@ end local flushedxforms = { } -- actually box resources but can also be direct local localconverter = nil -- will be set -local flushrule, flushsimplerule, flushimage, flushgroup do +local flushrule, flushsimplerule, flushspecialrule, flushimage, flushgroup do local rulecodes = nodes.rulecodes local newrule = nodes.pool.rule @@ -936,6 +929,9 @@ local flushrule, flushsimplerule, flushimage, flushgroup do local f_o = formatters["[] 0 d 0 J 0 0 %.6N %.6N re S"] local f_w = formatters["[] 0 d 0 J %.6N w 0 0 %.6N %.6N re S"] + local f_b = formatters["%.6N w 0 %.6N %.6N %.6N re f"] + local f_f = formatters["[] 0 d 0 J %.6N w %.6N %.6N %.6N %.6N re S"] + -- Historically the index is an object which is kind of bad. local boxresources, n = { }, 0 @@ -1265,6 +1261,10 @@ local flushrule, flushsimplerule, flushimage, flushgroup do -- For the moment we need this hack because the engine checks the 'image' -- command in virtual fonts (so we use lua instead). + -- + -- These will be replaced by a new more advanced one ... some day ... or + -- never because the next are like the other engines and compensate for + -- small sizes which is needed for inaccurate viewers. flushrule = function(current,pos_h,pos_v,pos_r,size_h,size_v,subtype) @@ -1346,6 +1346,30 @@ local flushrule, flushsimplerule, flushimage, flushgroup do b = b + 1 ; buffer[b] = s_e end + flushspecialrule = function(pos_h,pos_v,pos_r,width,height,depth,line,outline) + pdf_goto_pagemode() + + b = b + 1 ; buffer[b] = s_b + + local width = bpfactor * width + local height = bpfactor * height + local depth = bpfactor * depth + local total = height + depth + local line = bpfactor * line + local half = line / 2 + local rule + + if outline then + rule = f_f(line,half,-depth+half,width-line,total-line) + else + rule = f_b(line,-depth,width,total) + end + pdf_set_pos_temp(pos_h,pos_v) + + b = b + 1 ; buffer[b] = rule + b = b + 1 ; buffer[b] = s_e + end + end --- basics @@ -1661,7 +1685,8 @@ local finalize do pageattributes.Contents = pdfreference(contentsobj) pageattributes.Resources = pageresources -- pageattributes.Resources = pdfreference(pdfflushobject(pageresources)) - pageattributes.MediaBox = bbox + -- pageattributes.MediaBox = bbox + pageattributes.MediaBox = pdfsharedobject(bbox) pageattributes.Parent = nil -- precalculate pageattributes.Group = nil -- todo @@ -1671,11 +1696,15 @@ local finalize do lpdf.finalizepage(true) - if relocated then - if pageattributes.TrimBox then pageattributes.TrimBox = box end - if pageattributes.CropBox then pageattributes.CropBox = box end - if pageattributes.BleedBox then pageattributes.BleedBox = box end - end + -- if relocated then + -- if pageattributes.TrimBox then pageattributes.TrimBox = box end + -- if pageattributes.CropBox then pageattributes.CropBox = box end + -- if pageattributes.BleedBox then pageattributes.BleedBox = box end + -- end + + if pageattributes.TrimBox then pageattributes.TrimBox = relocated and pdfsharedobject(box or pageattributes.TrimBox ) end + if pageattributes.CropBox then pageattributes.CropBox = relocated and pdfsharedobject(box or pageattributes.CropBox ) end + if pageattributes.BleedBox then pageattributes.BleedBox = relocated and pdfsharedobject(box or pageattributes.BleedBox) end else @@ -1711,6 +1740,7 @@ local finalize do } end if xformtype == 0 or xformtype == 2 or xformtype == 3 then + -- can be shared too wrapper.Matrix = pdfarray { 1, 0, 0, 1, 0, 0 } end @@ -2184,6 +2214,8 @@ local openfile, closefile do local inmemory = false local close = false + -- local removefile = os.remove + openfile = function(filename) if inmemory then local n = 0 @@ -2218,6 +2250,14 @@ local openfile, closefile do flush = m.write or m.__index.write close = m.close or m.__index.close end + -- + flush_buffer = function() + if b > 0 then + flush(f,concat(buffer,"",1,b)) + b = 0 + end + end + local v = f_pdf(majorversion,minorversion) -- local b = "%\xCC\xD5\xC1\xD4\xC5\xD8\xD0\xC4\xC6\010" -- LUATEXPDF (+128) local b = "%\xC3\xCF\xCE\xD4\xC5\xD8\xD4\xD0\xC4\xC6\010" -- CONTEXTPDF (+128) @@ -2244,7 +2284,7 @@ local openfile, closefile do f:close() end end - removefile(abort) + os.remove(abort) else local xrefoffset = offset local lastfree = 0 @@ -2682,10 +2722,6 @@ end) do - local isfile = lfs.isfile - local removefile = os.remove - local renamefile = os.rename - -- local copyfile = file.copy -- local addsuffix = file.addsuffix local texgetbox = tex.getbox @@ -2770,6 +2806,7 @@ do fontchar = flushfontchar, rule = flushrule, simplerule = flushsimplerule, + specialrule = flushspecialrule, pushorientation = pushorientation, poporientation = poporientation, -- diff --git a/tex/context/base/mkiv/lpdf-vfc.lmt b/tex/context/base/mkiv/lpdf-vfc.lmt new file mode 100644 index 000000000..65b863203 --- /dev/null +++ b/tex/context/base/mkiv/lpdf-vfc.lmt @@ -0,0 +1,40 @@ +if not modules then modules = { } end modules ['lpdf-vfc'] = { + version = 1.001, + comment = "companion to lpdf-ini.mkiv", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files" +} + +local setmetatableindex = table.setmetatableindex + +local defaultline = 16384 +local vfspecials = backends.pdf.tables.vfspecials + +vfspecials.backgrounds = setmetatableindex(function(t,h) + local v = setmetatableindex(function(t,d) + local v = setmetatableindex(function(t,w) + local v = { "frame", w, h, d, defaultline, true, true } + t[w] = v + return v + end) + t[d] = v + return v + end) + t[h] = v + return v +end) + +vfspecials.outlines = setmetatableindex(function(t,h) + local v = setmetatableindex(function(t,d) + local v = setmetatableindex(function(t,w) + local v = { "frame", w, h, d, defaultline, false, true } + t[w] = v + return v + end) + t[d] = v + return v + end) + t[h] = v + return v +end) diff --git a/tex/context/base/mkiv/lpdf-vfc.lua b/tex/context/base/mkiv/lpdf-vfc.lua new file mode 100644 index 000000000..5c1937ab9 --- /dev/null +++ b/tex/context/base/mkiv/lpdf-vfc.lua @@ -0,0 +1,50 @@ +if not modules then modules = { } end modules ['lpdf-vfc'] = { + version = 1.001, + comment = "companion to lpdf-ini.mkiv", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files" +} + +local setmetatableindex = table.setmetatableindex +local formatters = string.formatters + +local bp = number.dimenfactors.bp +local r = 16384 * bp +local f_1 = formatters["%.6F w 0 %.6F %.6F %.6F re f"] +local f_2 = formatters["[] 0 d 0 J %.6F w %.6F %.6F %.6F %.6F re S"] + +local vfspecials = backends.pdf.tables.vfspecials + +vfspecials.backgrounds = setmetatableindex(function(t,h) + local h = h * bp + local v = setmetatableindex(function(t,d) + local d = d * bp + local v = setmetatableindex(function(t,w) + local v = { "pdf", "origin", f_1(r,-d,w*bp,h+d) } + t[w] = v + return v + end) + t[d] = v + return v + end) + t[h] = v + return v +end) + +vfspecials.outlines = setmetatableindex(function(t,h) + local h = h * bp + local v = setmetatableindex(function(t,d) + local d = d * bp + local v = setmetatableindex(function(t,w) + -- the frame goes through the boundingbox + local v = { "pdf", "origin", f_2(r,r/2,-d+r/2,w*bp-r,h+d-r) } + t[w] = v + return v + end) + t[d] = v + return v + end) + t[h] = v + return v +end) diff --git a/tex/context/base/mkiv/mlib-ctx.mkiv b/tex/context/base/mkiv/mlib-ctx.mkiv index 61b02ad88..7fb567746 100644 --- a/tex/context/base/mkiv/mlib-ctx.mkiv +++ b/tex/context/base/mkiv/mlib-ctx.mkiv @@ -13,6 +13,7 @@ \writestatus{loading}{MetaPost Library Graphics / Initializations} +\registerctxluafile{mlib-fio}{} \registerctxluafile{mlib-run}{} \registerctxluafile{mlib-ctx}{} \registerctxluafile{mlib-lua}{autosuffix} diff --git a/tex/context/base/mkiv/mlib-ctx.mkxl b/tex/context/base/mkiv/mlib-ctx.mkxl index 8069f5932..88f26c9ac 100644 --- a/tex/context/base/mkiv/mlib-ctx.mkxl +++ b/tex/context/base/mkiv/mlib-ctx.mkxl @@ -13,6 +13,7 @@ \writestatus{loading}{MetaPost Library Graphics / Initializations} +\registerctxluafile{mlib-fio}{autosuffix} \registerctxluafile{mlib-run}{} \registerctxluafile{mlib-ctx}{} \registerctxluafile{mlib-lua}{autosuffix} diff --git a/tex/context/base/mkiv/mlib-fio.lmt b/tex/context/base/mkiv/mlib-fio.lmt new file mode 100644 index 000000000..4290537dd --- /dev/null +++ b/tex/context/base/mkiv/mlib-fio.lmt @@ -0,0 +1,191 @@ +if not modules then modules = { } end modules ['mlib-run'] = { + version = 1.001, + comment = "companion to mlib-ctx.mkiv", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files", +} + +local type = type +local find = string.find +local concat = table.concat + +local trace_terminal = false trackers.register("metapost.terminal", function(v) trace_terminal = v end) + +local report_metapost = logs.reporter("metapost") +local report_terminal = logs.reporter("metapost","terminal") +local report_logger = logs.reporter("metapost","log") +local report_error = logs.reporter("metapost","error") + +mplib.realtimelogging = false + +local l, nl, dl = { }, 0, false +local t, nt, dt = { }, 0, false +local e, ne, de = { }, 0, false + +local function logger(target,str) + if target == 1 then + -- log + elseif target == 2 or target == 3 then + -- term + if str == "\n" then + mplib.realtimelogging = true + if nl > 0 then + report_logger(concat(l,"",1,nl)) + nl, dl = 0, false + elseif not dl then + report_logger("") + dl = true + end + else + nl = nl + 1 + l[nl] = str + end + elseif target == 4 then + report_error(str) + end +end + +local finders = { } +mplib.finders = finders -- also used in meta-lua.lua + +local new_instance = mplib.new + +local function validftype(ftype) + if ftype == "mp" then + return "mp" + else + return nil + end +end + +finders.file = function(specification,name,mode,ftype) + return resolvers.findfile(name,validftype(ftype)) +end + +local findtexfile = resolvers.findtexfile +local opentexfile = resolvers.opentexfile +local splitlines = string.splitlines + +local function writetoterminal(terminaldata,maxterm,d) + local t = type(d) + local n = 0 + if t == "string" then + d = splitlines(d) + n = #d + for i=1,#d do + maxterm = maxterm + 1 + terminaldata[maxterm] = d[i] + end + elseif t == "table" then + for i=1,#d do + local l = d[i] + if find(l,"[\n\r]") then + local s = splitlines(l) + local m = #s + for i=1,m do + maxterm = maxterm + 1 + terminaldata[maxterm] = s[i] + end + n = n + m + else + maxterm = maxterm + 1 + terminaldata[maxterm] = d[i] + n = 1 + end + end + end + if trace_terminal then + report_metapost("writing %i lines, in cache %s",n,maxterm) + end + return maxterm +end + +local function readfromterminal(terminaldata,maxterm,nowterm) + if nowterm >= maxterm then + terminaldata[nowterm] = false + maxterm = 0 + nowterm = 0 + if trace_terminal then + report_metapost("resetting, maxcache %i",#terminaldata) + end + return maxterm, nowterm, nil + else + if nowterm > 0 then + terminaldata[nowterm] = false + end + nowterm = nowterm + 1 + local s = terminaldata[nowterm] + if trace_terminal then + report_metapost("reading line %i: %s",nowterm,s) + end + return maxterm, nowterm, s + end +end + +local function fileopener() + + -- these can go into the table itself + + local terminaldata = { } + local maxterm = 0 + local nowterm = 0 + + local terminal = { + name = "terminal", + close = function() + -- terminal = { } + -- maxterm = 0 + -- nowterm = 0 + end, + reader = function() + local line + maxterm, nowterm, line = readfromterminal(terminaldata,maxterm,nowterm) + return line + end, + writer = function(d) + maxterm = writetoterminal(terminaldata,maxterm,d) + end, + } + + return function(name,mode,kind) + if name == "terminal" then + -- report_metapost("opening terminal") + return terminal + elseif mode == "w" then + local f = io.open(name,"wb") + if f then + -- report_metapost("opening file %a for writing",full) + return { + name = full, + writer = function(s) return f:write(s) end, -- io.write(f,s) + close = function() f:close() end, + } + end + else + local full = findtexfile(name,validftype(ftype)) + if full then + -- report_metapost("opening file %a for reading",full) + return opentexfile(full) + end + end + end + +end + +local function finder(name,mode,kind) + return findtexfile(name,kind) +end + +function mplib.new(specification) + local openfile = fileopener() + specification.find_file = finder + specification.run_logger = logger + specification.open_file = openfile + specification.interaction = "silent" + specification.halt_on_error = true + local instance = new_instance(specification) + return instance, openfile("terminal") +end + +mplib.finder = finder diff --git a/tex/context/base/mkiv/mlib-fio.lua b/tex/context/base/mkiv/mlib-fio.lua new file mode 100644 index 000000000..51c88eb22 --- /dev/null +++ b/tex/context/base/mkiv/mlib-fio.lua @@ -0,0 +1,85 @@ +if not modules then modules = { } end modules ['mlib-run'] = { + version = 1.001, + comment = "companion to mlib-ctx.mkiv", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files", +} + +local concat = table.concat +local mplib = mplib + +local report_logger = logs.reporter("metapost log") +local report_error = logs.reporter("metapost error") + +local l, nl, dl = { }, 0, false +local t, nt, dt = { }, 0, false +local e, ne, de = { }, 0, false + +mplib.realtimelogging = false + +local function logger(target,str) + if target == 1 then + -- log + elseif target == 2 or target == 3 then + -- term + if str == "\n" then + mplib.realtimelogging = true + if nl > 0 then + report_logger(concat(l,"",1,nl)) + nl, dl = 0, false + elseif not dl then + report_logger("") + dl = true + end + else + nl = nl + 1 + l[nl] = str + end + elseif target == 4 then + report_error(str) + end +end + +local finders = { } +mplib.finders = finders -- also used in meta-lua.lua + +local new_instance = mplib.new + +local function validftype(ftype) + if ftype == "mp" then + return "mp" + else + return nil + end +end + +finders.file = function(specification,name,mode,ftype) + return resolvers.findfile(name,validftype(ftype)) +end + +local function i_finder(name,mode,ftype) -- fake message for mpost.map and metafun.mpvi + local specification = url.hashed(name) + local finder = finders[specification.scheme] or finders.file + local found = finder(specification,name,mode,validftype(ftype)) + return found +end + +local function o_finder(name,mode,ftype) + return name +end + +o_finder = sandbox.register(o_finder,sandbox.filehandlerone,"mplib output finder") + +local function finder(name,mode,ftype) + return (mode == "w" and o_finder or i_finder)(name,mode,validftype(ftype)) +end + +function mplib.new(specification) + specification.find_file = finder + specification.run_logger = logger + return new_instance(specification) +end + +mplib.finder = finder + diff --git a/tex/context/base/mkiv/mlib-lua.lmt b/tex/context/base/mkiv/mlib-lua.lmt index ed65b9401..30fc2ff63 100644 --- a/tex/context/base/mkiv/mlib-lua.lmt +++ b/tex/context/base/mkiv/mlib-lua.lmt @@ -45,6 +45,12 @@ scan.transform = function(t) return scan_transform (currentmpx,t) end scan.path = function(t) return scan_path (currentmpx,t) end scan.pen = function(t) return scan_pen (currentmpx,t) end +local solve_path = mplib.solve_path + +mp.solve = function(...) + return solve_path(currentmpx,...) +end + local inject_path = mplib.inject_path local inject_numeric = mplib.inject_numeric local inject_pair = mplib.inject_pair @@ -56,7 +62,7 @@ local inject_cmykcolor = mplib.inject_cmykcolor local inject_transform = mplib.inject_transform local inject_whatever = mplib.inject_whatever -inject.path = function(t,cycle,curled) return inject_path (currentmpx,t,cycle,curled) end +------.path = function(t,cycle,curled) return inject_path (currentmpx,t,cycle,curled) end inject.numeric = function(n) return inject_numeric (currentmpx,n) end inject.pair = function(x,y) return inject_pair (currentmpx,x,y) end inject.boolean = function(b) return inject_boolean (currentmpx,b) end @@ -67,6 +73,47 @@ inject.cmykcolor = function(c,m,y,k) return inject_cmykcolor(currentmpx, inject.transform = function(x,y,xx,xy,yx,yy) return inject_transform(currentmpx,x,y,xx,xy,yx,yy) end inject.whatever = function(...) return inject_whatever (currentmpx,...) end +local function same(p,n) + local f = p[1] + local l = p[n] + local nf = #f + local nl = #l + if nf == nl then + for i=1,nf do + if f[i] ~= l[i] then + return false + end + end + return true + end + return false +end + +-- local p = mp.scan.path() +-- mp.inject.path(p,true,true) + +function inject.path(p,close,connector) + local curled = false + local n = #p + if p.close then + close = true + end + if n > 1 then + -- [ ../true | --/false | nil/auto ] + if connector == nil or connector == "auto" then + connector = #p[1] > 2 + end + if connector == false or connector == "--" then + curled = true + elseif connector == true or connector == ".." then + if close and not same(p,n) then + p[n+1] = p[1] + end + end + end + return inject_path(currentmpx,p,curled,close) +end + -- bonus: scan .number = scan .numeric diff --git a/tex/context/base/mkiv/mlib-run.lua b/tex/context/base/mkiv/mlib-run.lua index 6962340c5..5aa9c78d0 100644 --- a/tex/context/base/mkiv/mlib-run.lua +++ b/tex/context/base/mkiv/mlib-run.lua @@ -34,14 +34,11 @@ local find, striplines = string.find, utilities.strings.striplines local concat, insert, remove = table.concat, table.insert, table.remove local emptystring = string.is_empty -local P = lpeg.P local trace_graphics = false trackers.register("metapost.graphics", function(v) trace_graphics = v end) local trace_tracingall = false trackers.register("metapost.tracingall", function(v) trace_tracingall = v end) -local trace_terminal = false trackers.register("metapost.terminal", function(v) trace_terminal = v end) local report_metapost = logs.reporter("metapost") -local report_terminal = logs.reporter("metapost","terminal") local texerrormessage = logs.texerrormessage local starttiming = statistics.starttiming @@ -60,9 +57,9 @@ metapost.exectime = metapost.exectime or { } -- hack metapost.nofruns = 0 local mpxformats = { } -local mpxterminals = { } local nofformats = 0 local mpxpreambles = { } +local mpxterminals = { } local mpxextradata = { } -- The flatten hack is needed because the library currently barks on \n\n and the @@ -112,234 +109,6 @@ function metapost.resetlastlog() metapost.lastlog = "" end ------ mpbasepath = lpeg.instringchecker(lpeg.append { "/metapost/context/", "/metapost/base/" }) -local mpbasepath = lpeg.instringchecker(P("/metapost/") * (P("context") + P("base")) * P("/")) - --- mplib has no real io interface so we have a different mechanism than --- tex (as soon as we have more control, we will use the normal code) --- --- for some reason mp sometimes calls this function twice which is inefficient --- but we cannot catch this - -local realtimelogging do - - -- begin of logger code - - local report_logger = logs.reporter("metapost log") - local report_error = logs.reporter("metapost error") - - local l, nl, dl = { }, 0, false - local t, nt, dt = { }, 0, false - local e, ne, de = { }, 0, false - - local function logger(target,str) - if target == 1 then - -- log - elseif target == 2 or target == 3 then - -- term - if str == "\n" then - realtimelogging = true - if nl > 0 then - report_logger(concat(l,"",1,nl)) - nl, dl = 0, false - elseif not dl then - report_logger("") - dl = true - end - else - nl = nl + 1 - l[nl] = str - end - elseif target == 4 then - report_error(str) - end - end - - -- end of logger code - - -- begin of logger code - - local finders = { } - mplib.finders = finders -- also used in meta-lua.lua - - local new_instance = mplib.new - - local function validftype(ftype) - if ftype == "mp" then - return "mp" - else - return nil - end - end - - finders.file = function(specification,name,mode,ftype) - return resolvers.findfile(name,validftype(ftype)) - end - - -- end of finder code - - if CONTEXTLMTXMODE > 0 then - - local findtexfile = resolvers.findtexfile - local opentexfile = resolvers.opentexfile - local splitlines = string.splitlines - - local function writetoterminal(terminaldata,maxterm,d) - local t = type(d) - local n = 0 - if t == "string" then - d = splitlines(d) - n = #d - for i=1,#d do - maxterm = maxterm + 1 - terminaldata[maxterm] = d[i] - end - elseif t == "table" then - for i=1,#d do - local l = d[i] - if find(l,"[\n\r]") then - local s = splitlines(l) - local m = #s - for i=1,m do - maxterm = maxterm + 1 - terminaldata[maxterm] = s[i] - end - n = n + m - else - maxterm = maxterm + 1 - terminaldata[maxterm] = d[i] - n = 1 - end - end - end - if trace_terminal then - report_metapost("writing %i lines, in cache %s",n,maxterm) - end - return maxterm - end - - local function readfromterminal(terminaldata,maxterm,nowterm) - if nowterm >= maxterm then - terminaldata[nowterm] = false - maxterm = 0 - nowterm = 0 - if trace_terminal then - report_metapost("resetting, maxcache %i",#terminaldata) - end - return maxterm, nowterm, nil - else - if nowterm > 0 then - terminaldata[nowterm] = false - end - nowterm = nowterm + 1 - local s = terminaldata[nowterm] - if trace_terminal then - report_metapost("reading line %i: %s",nowterm,s) - end - return maxterm, nowterm, s - end - end - - local function fileopener() - - -- these can go into the table itself - - local terminaldata = { } - local maxterm = 0 - local nowterm = 0 - - local terminal = { - name = "terminal", - close = function() - -- terminal = { } - -- maxterm = 0 - -- nowterm = 0 - end, - reader = function() - local line - maxterm, nowterm, line = readfromterminal(terminaldata,maxterm,nowterm) - return line - end, - writer = function(d) - maxterm = writetoterminal(terminaldata,maxterm,d) - end, - } - - return function(name,mode,kind) - if name == "terminal" then - -- report_metapost("opening terminal") - return terminal - elseif mode == "w" then - local f = io.open(name,"wb") - if f then - -- report_metapost("opening file %a for writing",full) - return { - name = full, - writer = function(s) return f:write(s) end, -- io.write(f,s) - close = function() f:close() end, - } - end - else - local full = findtexfile(name,validftype(ftype)) - if full then - -- report_metapost("opening file %a for reading",full) - return opentexfile(full) - end - end - end - - end - - local function finder(name,mode,kind) - return findtexfile(name,kind) - end - - function mplib.new(specification) - local openfile = fileopener() - specification.find_file = finder - specification.run_logger = logger - specification.open_file = openfile - specification.interaction = "silent" - specification.halt_on_error = true - local instance = new_instance(specification) - mpxterminals[instance] = openfile("terminal") - return instance - end - - mplib.finder = finder - - else - - local function i_finder(name,mode,ftype) -- fake message for mpost.map and metafun.mpvi - local specification = url.hashed(name) - local finder = finders[specification.scheme] or finders.file - local found = finder(specification,name,mode,validftype(ftype)) - return found - end - - local function o_finder(name,mode,ftype) - return name - end - - o_finder = sandbox.register(o_finder,sandbox.filehandlerone,"mplib output finder") - - local function finder(name,mode,ftype) - return (mode == "w" and o_finder or i_finder)(name,mode,validftype(ftype)) - end - - function mplib.new(specification) - specification.find_file = finder - specification.run_logger = logger - return new_instance(specification) - end - - mplib.finder = finder - - end - - -end - local new_instance = mplib.new local find_file = mplib.finder @@ -349,7 +118,7 @@ function metapost.reporterror(result) return true elseif result.status == 0 then return false - elseif realtimelogging then + elseif mplib.realtimelogging then return false -- we already reported else local t = result.term @@ -414,7 +183,7 @@ function metapost.load(name,method) end end method = method and methods[method] or "scaled" - local mpx = new_instance { + local mpx, terminal = new_instance { ini_version = true, math_mode = method, run_script = metapost.runscript, @@ -430,6 +199,7 @@ function metapost.load(name,method) if not mpx then result = { status = 99, error = "out of memory"} else + mpxterminals[mpx] = terminal -- pushing permits advanced features metapost.pushscriptrunner(mpx) result = executempx(mpx,f_preamble(file.addsuffix(name,"mp"),seed)) @@ -567,17 +337,17 @@ function metapost.reset(mpx) if mpxformats[mpx] then local instance = mpxformats[mpx] instance:finish() - mpxterminals[instance] = nil - mpxextradata[mpx] = nil - mpxformats [mpx] = nil + mpxterminals[mpx] = nil + mpxextradata[mpx] = nil + mpxformats [mpx] = nil end else for name, instance in next, mpxformats do if instance == mpx then mpx:finish() + mpxterminals[mpx] = nil mpxextradata[mpx] = nil mpxformats [mpx] = nil - mpxterminals[mpx] = nil break end end diff --git a/tex/context/base/mkiv/mlib-scn.lmt b/tex/context/base/mkiv/mlib-scn.lmt index 5655c507d..4c6c15a89 100644 --- a/tex/context/base/mkiv/mlib-scn.lmt +++ b/tex/context/base/mkiv/mlib-scn.lmt @@ -71,6 +71,7 @@ local injectpair = injectors.pair local injecttriplet = injectors.color local injectquadruple = injectors.cmykcolor local injecttransform = injectors.transform +local injectpath = injectors.path local report = logs.reporter("metapost") @@ -96,26 +97,6 @@ local tokenscanners = nil local scanset = nil local scanparameters = nil -local injectpath = mp.path - -do -- todo: this will become an overload - - local flush = mp.path - local inject = injectors.path -- work in progress - - injectpath = function(p,connector,close) - if #p > 1 then - if connector == true or connector == ".." then - return inject(p,false,close or p.close) - elseif connector == "--" then - return inject(p,true,close or p.close) - end - end - return flush(p,connector,close) - end - -end - scanset = function() -- can be optimized, we now read twice scantoken() if scantoken(true) == rightbrace_code then diff --git a/tex/context/base/mkiv/mult-def.lua b/tex/context/base/mkiv/mult-def.lua index 174a50cc6..dd10cca3e 100644 --- a/tex/context/base/mkiv/mult-def.lua +++ b/tex/context/base/mkiv/mult-def.lua @@ -75,7 +75,7 @@ return { ["cs"]="Kap", ["de"]="Kap", ["en"]="Cap", - ["fr"]="Cap", + ["fr"]="PetitesCap", ["it"]="Cap", ["nl"]="Kap", ["pe"]="Cap", @@ -85,7 +85,7 @@ return { ["cs"]="Kaps", ["de"]="Kaps", ["en"]="Caps", - ["fr"]="Caps", + ["fr"]="PetitesCaps", ["it"]="Caps", ["nl"]="Kaps", ["pe"]="Caps", @@ -145,7 +145,7 @@ return { ["cs"]="oref", ["de"]="ueber", ["en"]="about", - ["fr"]="concernant", + ["fr"]="apropos", ["it"]="intorno", ["nl"]="about", ["pe"]="درمورد", @@ -155,13 +155,18 @@ return { ["cs"]="prizpusobvzhled", ["de"]="passelayoutan", ["en"]="adaptlayout", - ["fr"]="adaptedisposition", + ["fr"]="adaptermiseenpage", ["it"]="adattalayout", ["nl"]="paslayoutaan", ["pe"]="تنظیمطرحبندی", ["ro"]="adapteazaaspect", }, ["adding"]={}, + ["alignment"]={ + ["en"]="alignment", + ["fr"]="alignement", + ["nl"]="uitlijnen", + }, ["arg"]={ ["cs"]="arg", ["de"]="arg", @@ -176,7 +181,7 @@ return { ["cs"]="pref", ["de"]="bei", ["en"]="at", - ["fr"]="a", + ["fr"]="en", ["it"]="al", ["nl"]="op", ["pe"]="در", @@ -186,7 +191,7 @@ return { ["cs"]="atleftmargin", ["de"]="atleftmargin", ["en"]="atleftmargin", - ["fr"]="atleftmargin", + ["fr"]="enmargegauche", ["it"]="atleftmargin", ["nl"]="oplinkermarge", ["pe"]="درحاشیهچپ", @@ -196,7 +201,7 @@ return { ["cs"]="nastrane", ["de"]="aufseite", ["en"]="atpage", - ["fr"]="alapage", + ["fr"]="enpage", ["it"]="apagina", ["nl"]="oppagina", ["pe"]="درصفحه", @@ -206,7 +211,7 @@ return { ["cs"]="atrightmargin", ["de"]="atrightmargin", ["en"]="atrightmargin", - ["fr"]="atrightmargin", + ["fr"]="enmargedroite", ["it"]="atrightmargin", ["nl"]="oprechtermarge", ["pe"]="درحاشیهراست", @@ -226,7 +231,7 @@ return { ["cs"]="odsazenizleva", ["de"]="rumpfweite", ["en"]="backspace", - ["fr"]="retourarriere", + ["fr"]="retourarrière", ["it"]="spaziodietro", ["nl"]="rugwit", ["pe"]="فاصلهپشت", @@ -236,7 +241,7 @@ return { ["cs"]="cernalinka", ["de"]="rechteck", ["en"]="blackrule", - ["fr"]="lignenoire", + ["fr"]="traitepais", ["it"]="lineanera", ["nl"]="blokje", ["pe"]="خطسیاه", @@ -246,7 +251,7 @@ return { ["cs"]="cernelinky", ["de"]="rechtecke", ["en"]="blackrules", - ["fr"]="lignesnoires", + ["fr"]="traitsepais", ["it"]="lineenere", ["nl"]="blokjes", ["pe"]="خطهایسیاه", @@ -256,7 +261,7 @@ return { ["cs"]="preskoc", ["de"]="blanko", ["en"]="blank", - ["fr"]="vide", + ["fr"]="vierge", ["it"]="rigovuoto", ["nl"]="blanko", ["pe"]="خالی", @@ -276,7 +281,7 @@ return { ["cs"]="vzdalenostspodku", ["de"]="abstandunten", ["en"]="bottomdistance", - ["fr"]="distanceinf", + ["fr"]="distancebas", ["it"]="distanzafondo", ["nl"]="onderafstand", ["pe"]="فاصلهپایین", @@ -286,7 +291,7 @@ return { ["cs"]="vyskaspodku", ["de"]="hoeheunten", ["en"]="bottomheight", - ["fr"]="hauteurinf", + ["fr"]="hauteurbas", ["it"]="altezzafondo", ["nl"]="onderhoogte", ["pe"]="ارتفاعپایین", @@ -296,7 +301,7 @@ return { ["cs"]="bottomspace", ["de"]="bottomspace", ["en"]="bottomspace", - ["fr"]="espaceinf", + ["fr"]="espacebas", ["it"]="spaziofondo", ["nl"]="bodemwit", ["pe"]="فضایپایین", @@ -306,7 +311,7 @@ return { ["cs"]="spodek", ["de"]="but", ["en"]="but", - ["fr"]="but", + ["fr"]="mais", ["it"]="fondo", ["nl"]="but", ["pe"]="اما", @@ -326,7 +331,7 @@ return { ["cs"]="bypassblocks", ["de"]="bypassblocks", ["en"]="bypassblocks", - ["fr"]="sauteblocs", + ["fr"]="eviteblocs", ["it"]="saltablocchi", ["nl"]="passeerblokken", ["pe"]="عبوربلوکها", @@ -366,7 +371,7 @@ return { ["cs"]="orez", ["de"]="ausschnitt", ["en"]="clip", - ["fr"]="clip", + ["fr"]="decouper", ["it"]="clip", ["nl"]="clip", ["pe"]="گیره", @@ -376,7 +381,7 @@ return { ["cs"]="klonujpole", ["de"]="klonierefeld", ["en"]="clonefield", - ["fr"]="clonechamp", + ["fr"]="clonerchamp", ["it"]="clonacampo", ["nl"]="kloonveld", ["pe"]="میدانشبیهسازی", @@ -426,7 +431,7 @@ return { ["cs"]="porovnejskupinubarev", ["de"]="vergleichefarbengruppe", ["en"]="comparecolorgroup", - ["fr"]="comparegroupecouleur", + ["fr"]="comparergroupecouleur", ["it"]="confrontagruppocolori", ["nl"]="vergelijkkleurgroep", ["pe"]="مقایسهگروهرنگ", @@ -436,7 +441,7 @@ return { ["cs"]="porovnejpaletu", ["de"]="vergleichepalette", ["en"]="comparepalet", - ["fr"]="comparepalette", + ["fr"]="comparerpalette", ["it"]="confrontatavolozza", ["nl"]="vergelijkpalet", ["pe"]="لوحمقایسه", @@ -446,7 +451,7 @@ return { ["cs"]="completepagenumber", ["de"]="completepagenumber", ["en"]="completepagenumber", - ["fr"]="completenumeropage", + ["fr"]="numeropagecomplet", ["it"]="numeropaginacompleto", ["nl"]="volledigepaginanummer", ["pe"]="شمارهصفحهکامل", @@ -456,7 +461,7 @@ return { ["cs"]="completeregister", ["de"]="completeregister", ["en"]="completeregister", - ["fr"]="completeregistre", + ["fr"]="registrecomplet", ["it"]="completeregister", ["nl"]="volledigregister", ["pe"]="ثبتکامل", @@ -476,7 +481,7 @@ return { ["cs"]="konvertujcislo", ["de"]="konvertierezahl", ["en"]="convertnumber", - ["fr"]="convertitnumero", + ["fr"]="convertirnumero", ["it"]="convertinumero", ["nl"]="converteernummer", ["pe"]="شمارهمبدل", @@ -486,7 +491,7 @@ return { ["cs"]="kopirujpole", ["de"]="kopierefeld", ["en"]="copyfield", - ["fr"]="copitchamp", + ["fr"]="copierchamp", ["it"]="copiacampo", ["nl"]="copieerveld", ["pe"]="میدانکپی", @@ -496,7 +501,7 @@ return { ["cs"]="korekcebilehomista", ["de"]="korrigierezwischenraum", ["en"]="correctwhitespace", - ["fr"]="corrigeespaceblanc", + ["fr"]="corrigerespaceblanc", ["it"]="correggispaziobianco", ["nl"]="corrigeerwitruimte", ["pe"]="فضایسفیدصحیح", @@ -526,7 +531,7 @@ return { ["cs"]="parovastrana", ["de"]="doppelseite", ["en"]="couplepage", - ["fr"]="pagedouble", + ["fr"]="couplepage", ["it"]="accoppiapagina", ["nl"]="koppelpagina", ["pe"]="صفحهزوج", @@ -576,7 +581,7 @@ return { ["cs"]="aktualnicislonadpisu", ["de"]="heutigeskopfnummer", ["en"]="currentheadnumber", - ["fr"]="numerotetecourant", + ["fr"]="numerotetecourante", ["it"]="numerotestacorrente", ["nl"]="huidigekopnummer", ["pe"]="شمارهسرجاری", @@ -586,7 +591,7 @@ return { ["cs"]="cutspace", ["de"]="cutspace", ["en"]="cutspace", - ["fr"]="cutspace", + ["fr"]="espacecoupe", ["it"]="cutspace", ["nl"]="snijwit", ["pe"]="فضایبرش", @@ -626,7 +631,7 @@ return { ["cs"]="definuj", ["de"]="definieren", ["en"]="define", - ["fr"]="definit", + ["fr"]="définir", ["it"]="definisci", ["nl"]="definieer", ["pe"]="تعریف", @@ -636,7 +641,7 @@ return { ["cs"]="definujakcent", ["de"]="definiereakzent", ["en"]="defineaccent", - ["fr"]="definitaccent", + ["fr"]="définiraccent", ["it"]="definisciaccento", ["nl"]="definieeraccent", ["pe"]="تعریفلهجه", @@ -646,7 +651,7 @@ return { ["cs"]="definujpreskok", ["de"]="definiereblanko", ["en"]="defineblank", - ["fr"]="definitvide", + ["fr"]="définirvierge", ["it"]="definiscirigovuoto", ["nl"]="definieerblanko", ["pe"]="تعریفخالی", @@ -656,7 +661,7 @@ return { ["cs"]="definujblok", ["de"]="definiereblock", ["en"]="defineblock", - ["fr"]="definitbloc", + ["fr"]="définirbloc", ["it"]="definisciblocco", ["nl"]="definieerblok", ["pe"]="تعریفبلوک", @@ -666,7 +671,7 @@ return { ["cs"]="definujzakladnifont", ["de"]="definierefliesstext", ["en"]="definebodyfont", - ["fr"]="definitpolicecorps", + ["fr"]="définirpolicedecorps", ["it"]="definiscifontdeltesto", ["nl"]="definieerkorps", ["pe"]="تعریفقلممتن", @@ -676,7 +681,7 @@ return { ["cs"]="definujprostredizakladnihofontu", ["de"]="definierefliesstextumgebung", ["en"]="definebodyfontenvironment", - ["fr"]="definitenvironnementpolicecorps", + ["fr"]="définirenvironnementpolicedecorps", ["it"]="definisciambientefontdeltesto", ["nl"]="definieerkorpsomgeving", ["pe"]="تعریفمحیطقلمبدنه", @@ -686,7 +691,7 @@ return { ["cs"]="definujbuffer", ["de"]="definierepuffer", ["en"]="definebuffer", - ["fr"]="definitbuffer", + ["fr"]="définirtampon", ["it"]="definiscibuffer", ["nl"]="definieerbuffer", ["pe"]="تعریفبافر", @@ -696,7 +701,7 @@ return { ["cs"]="definujznak", ["de"]="definierezeichen", ["en"]="definecharacter", - ["fr"]="definicaractere", + ["fr"]="définircaractere", ["it"]="definiscicarattere", ["nl"]="definieerkarakter", ["pe"]="تعریفحرف", @@ -706,7 +711,7 @@ return { ["cs"]="definujbarvu", ["de"]="definierefarbe", ["en"]="definecolor", - ["fr"]="definitcouleur", + ["fr"]="définircouleur", ["it"]="definiscicolore", ["nl"]="definieerkleur", ["pe"]="تعریفرنگ", @@ -716,7 +721,7 @@ return { ["cs"]="definujskupinubarev", ["de"]="definierefarbengruppe", ["en"]="definecolorgroup", - ["fr"]="definitgroupecouleur", + ["fr"]="définirgroupecouleur", ["it"]="definiscigruppocolori", ["nl"]="definieerkleurgroep", ["pe"]="تعریفگروهرنگ", @@ -726,7 +731,7 @@ return { ["cs"]="definecolumnbreak", ["de"]="definecolumnbreak", ["en"]="definecolumnbreak", - ["fr"]="definitsautdecolonne", + ["fr"]="définirsautdecolonne", ["it"]="definecolumnbreak", ["nl"]="definieerkolomovergang", ["pe"]="تعریفشکستنستون", @@ -736,7 +741,7 @@ return { ["cs"]="definecolumnset", ["de"]="definecolumnset", ["en"]="definecolumnset", - ["fr"]="definitjeucolonne", + ["fr"]="définirjeucolonnes", ["it"]="definiscigruppocolonne", ["nl"]="definieerkolomgroep", ["pe"]="تعریفمجموعهستون", @@ -746,7 +751,7 @@ return { ["cs"]="definecombination", ["de"]="definecombination", ["en"]="definecombination", - ["fr"]="definecombination", + ["fr"]="définircombinaison", ["it"]="definecombination", ["nl"]="definieercombinatie", ["pe"]="تعریفترکیب", @@ -756,7 +761,7 @@ return { ["cs"]="definujkombinovanyseznam", ["de"]="definierezusammengestellteliste", ["en"]="definecombinedlist", - ["fr"]="definitlisteimbriquee", + ["fr"]="définirlistecombinee", ["it"]="definiscielencocombinato", ["nl"]="definieersamengesteldelijst", ["pe"]="تعریفلیستترکیبی", @@ -766,7 +771,7 @@ return { ["cs"]="definujprikaz", ["de"]="definierebefehl", ["en"]="definecommand", - ["fr"]="definitcommande", + ["fr"]="définircommande", ["it"]="definiscicomando", ["nl"]="definieercommando", ["pe"]="تعریففرمان", @@ -776,7 +781,7 @@ return { ["cs"]="definujkonverzi", ["de"]="definierekonversion", ["en"]="defineconversion", - ["fr"]="definitconversion", + ["fr"]="définirconversion", ["it"]="definisciconversione", ["nl"]="definieerconversie", ["pe"]="تعریفتبدیل", @@ -786,7 +791,7 @@ return { ["cs"]="definujpopis", ["de"]="definierebeschreibung", ["en"]="definedescription", - ["fr"]="definitdescription", + ["fr"]="définirdescription", ["it"]="definiscidescrizione", ["nl"]="doordefinieren", ["pe"]="تعریفشرح", @@ -796,7 +801,7 @@ return { ["cs"]="definujvycet", ["de"]="definierenummerierung", ["en"]="defineenumeration", - ["fr"]="definitenumeration", + ["fr"]="définirénumération", ["it"]="definiscienumerazione", ["nl"]="doornummeren", ["pe"]="تعریفشمارهبندی", @@ -806,7 +811,7 @@ return { ["cs"]="definujpole", ["de"]="definierefeld", ["en"]="definefield", - ["fr"]="definitchamp", + ["fr"]="définirchamp", ["it"]="definiscicampo", ["nl"]="definieerveld", ["pe"]="تعریفمیدان", @@ -816,7 +821,7 @@ return { ["cs"]="definujzasobnikpoli", ["de"]="definierefeldstapel", ["en"]="definefieldstack", - ["fr"]="definitpilechamp", + ["fr"]="définirpilechamp", ["it"]="definiscistackcampi", ["nl"]="definieerveldstapel", ["pe"]="تعریفتودهمیدان", @@ -826,7 +831,7 @@ return { ["cs"]="definujobrazeksymbol", ["de"]="definiereabbsymbol", ["en"]="definefiguresymbol", - ["fr"]="definitsymbolefigure", + ["fr"]="définirfiguresymbole", ["it"]="definiscifigurasimbolo", ["nl"]="definieerfiguursymbool", ["pe"]="تعریفنمادشکل", @@ -836,7 +841,7 @@ return { ["cs"]="definujplvouciobjekt", ["de"]="definieregleitobjekt", ["en"]="definefloat", - ["fr"]="definitflottant", + ["fr"]="définirflottant", ["it"]="definiscioggettomobile", ["nl"]="definieerplaatsblok", ["pe"]="تعریفشناور", @@ -846,7 +851,7 @@ return { ["cs"]="definujfont", ["de"]="definiereschrift", ["en"]="definefont", - ["fr"]="definitpolice", + ["fr"]="définirpolice", ["it"]="definiscifont", ["nl"]="definieerfont", ["pe"]="تعریفقلم", @@ -856,7 +861,7 @@ return { ["cs"]="definujstylfontu", ["de"]="definiereschriftstil", ["en"]="definefontstyle", - ["fr"]="definitstylepolice", + ["fr"]="définirstylepolice", ["it"]="definiscistilefont", ["nl"]="definieerfontstijl", ["pe"]="تعریفسبکقلم", @@ -866,7 +871,7 @@ return { ["cs"]="definujsynonumumfontu", ["de"]="defineschriftsynonym", ["en"]="definefontsynonym", - ["fr"]="definitsynonymepolice", + ["fr"]="définirsynonymepolice", ["it"]="definiscisinonimofont", ["nl"]="definieerfontsynoniem", ["pe"]="تعریفمترادفقلم", @@ -876,7 +881,7 @@ return { ["cs"]="definujoramovani", ["de"]="definiereumrahmt", ["en"]="defineframed", - ["fr"]="defineframed", + ["fr"]="définirencadre", ["it"]="definisciincorniciato", ["nl"]="definieeromlijnd", ["pe"]="تعریفقالبی", @@ -886,7 +891,7 @@ return { ["cs"]="definujoramovanytext", ["de"]="definiereumrahmtertext", ["en"]="defineframedtext", - ["fr"]="defineframedtext", + ["fr"]="définirtexteencadre", ["it"]="definiscitestoincorniciato", ["nl"]="definieerkadertekst", ["pe"]="تعریفمتنقالبی", @@ -896,7 +901,7 @@ return { ["cs"]="definujhbox", ["de"]="definierehbox", ["en"]="definehbox", - ["fr"]="definithbox", + ["fr"]="définirhbox", ["it"]="definiscihbox", ["nl"]="definieerhbox", ["pe"]="تعریفجعبهافقی", @@ -906,7 +911,7 @@ return { ["cs"]="definujnadpis", ["de"]="definiereueberschrift", ["en"]="definehead", - ["fr"]="definittete", + ["fr"]="définirtete", ["it"]="definiscitesta", ["nl"]="definieerkop", ["pe"]="تعریفسر", @@ -914,13 +919,14 @@ return { }, ["defineindentedtext"]={ ["en"]="defineindentedtext", + ["fr"]="définirtexteindente", ["nl"]="definieeringesprongentext", }, ["defineinmargin"]={ ["cs"]="defineinmargin", ["de"]="defineinmargin", ["en"]="defineinmargin", - ["fr"]="definitdansmarge", + ["fr"]="définirdansmarge", ["it"]="defineinmargin", ["nl"]="definieerinmarge", ["pe"]="تعریفدرونحاشیه", @@ -930,7 +936,7 @@ return { ["cs"]="definujinterakcnimenu", ["de"]="definiereinteraktionsmenue", ["en"]="defineinteractionmenu", - ["fr"]="definitmenuinteraction", + ["fr"]="définirmenuinteraction", ["it"]="definiscimenuinterazione", ["nl"]="definieerinteractiemenu", ["pe"]="تعریفمنویپانل", @@ -940,7 +946,7 @@ return { ["cs"]="defineitemgroup", ["de"]="defineitemgroup", ["en"]="defineitemgroup", - ["fr"]="defineitemgroup", + ["fr"]="définirgroupedéléments", ["it"]="defineitemgroup", ["nl"]="definieeritemgroep", ["pe"]="تعریفگروهآیتم", @@ -950,7 +956,7 @@ return { ["cs"]="definujpopisek", ["de"]="definierelabel", ["en"]="definelabel", - ["fr"]="definitetiquette", + ["fr"]="définiretiquette", ["it"]="definiscietichetta", ["nl"]="doorlabelen", ["pe"]="تعریفبرچسب", @@ -960,7 +966,7 @@ return { ["cs"]="definelayer", ["de"]="definelayer", ["en"]="definelayer", - ["fr"]="definitcalque", + ["fr"]="définircalque", ["it"]="definelayer", ["nl"]="definieerlayer", ["pe"]="تعریفلایه", @@ -970,7 +976,7 @@ return { ["cs"]="definelayout", ["de"]="definelayout", ["en"]="definelayout", - ["fr"]="definitdisposition", + ["fr"]="définirmiseenpage", ["it"]="definiscilayout", ["nl"]="definieerlayout", ["pe"]="تعریفطرحبندی", @@ -980,7 +986,7 @@ return { ["cs"]="definujseznam", ["de"]="definiereliste", ["en"]="definelist", - ["fr"]="definitliste", + ["fr"]="définirliste", ["it"]="definiscielenco", ["nl"]="definieerlijst", ["pe"]="تعریفلیست", @@ -990,7 +996,7 @@ return { ["cs"]="definujlogo", ["de"]="definierelogo", ["en"]="definelogo", - ["fr"]="definitlogo", + ["fr"]="définirlogo", ["it"]="definiscilogo", ["nl"]="definieerbeeldmerk", ["pe"]="تعریفآرم", @@ -1000,7 +1006,7 @@ return { ["cs"]="definujhlavnipole", ["de"]="definierehauptfeld", ["en"]="definemainfield", - ["fr"]="definitchampprincipal", + ["fr"]="définirchampprincipal", ["it"]="definiscicampoprincipale", ["nl"]="definieerhoofdveld", ["pe"]="تعریفمیداناصلی", @@ -1010,7 +1016,7 @@ return { ["cs"]="definujupravu", ["de"]="definiereumbruch", ["en"]="definemakeup", - ["fr"]="definitmakeup", + ["fr"]="définircomposition", ["it"]="definiscimakeup", ["nl"]="definieeropmaak", ["pe"]="تعریفآرایش", @@ -1020,7 +1026,7 @@ return { ["cs"]="definujznaceni", ["de"]="definierebeschriftung", ["en"]="definemarking", - ["fr"]="definitmarquage", + ["fr"]="définirmarquage", ["it"]="definiscimarcatura", ["nl"]="definieermarkering", ["pe"]="تعریفنشانهگذاری", @@ -1030,7 +1036,7 @@ return { ["cs"]="definemathalignment", ["de"]="definemathalignment", ["en"]="definemathalignment", - ["fr"]="definemathalignment", + ["fr"]="définiralignementmath", ["it"]="definemathalignment", ["nl"]="definieerwiskundeuitlijnen", ["pe"]="تعریفتنظیمریاضی", @@ -1040,7 +1046,7 @@ return { ["cs"]="definujvystup", ["de"]="defineoutput", ["en"]="defineoutput", - ["fr"]="definitsortie", + ["fr"]="définirsortie", ["it"]="definiscioutput", ["nl"]="definieeruitvoer", ["pe"]="تعریفخروجی", @@ -1050,7 +1056,7 @@ return { ["cs"]="definujprekryv", ["de"]="definiereoverlay", ["en"]="defineoverlay", - ["fr"]="definitrevetement", + ["fr"]="définirsuperposition", ["it"]="definiscisovrapposizione", ["nl"]="definieeroverlay", ["pe"]="تعریفپوشش", @@ -1060,7 +1066,7 @@ return { ["cs"]="definepagebreak", ["de"]="definepagebreak", ["en"]="definepagebreak", - ["fr"]="definitsautdepage", + ["fr"]="définirsautdepage", ["it"]="definepagebreak", ["nl"]="definieerpaginaovergang", ["pe"]="تعریفشکستصفحه", @@ -1070,7 +1076,7 @@ return { ["cs"]="definujpaletu", ["de"]="definierepalette", ["en"]="definepalet", - ["fr"]="definitpalette", + ["fr"]="définirpalette", ["it"]="definiscitavolozza", ["nl"]="definieerpalet", ["pe"]="تعریفلوح", @@ -1080,7 +1086,7 @@ return { ["cs"]="definujvelikostpapiru", ["de"]="definierepapierformat", ["en"]="definepapersize", - ["fr"]="definittaillepapier", + ["fr"]="définirtaillepapier", ["it"]="definiscidimensionicarta", ["nl"]="definieerpapierformaat", ["pe"]="تعریفاندازهبرگ", @@ -1090,7 +1096,7 @@ return { ["cs"]="definujodstavce", ["de"]="definiereabsaetze", ["en"]="defineparagraphs", - ["fr"]="definitparagraphes", + ["fr"]="définirparagraphes", ["it"]="definiscicapoversi", ["nl"]="definieeralineas", ["pe"]="تعریفپاراگرافها", @@ -1100,7 +1106,7 @@ return { ["cs"]="defineplacement", ["de"]="defineplacement", ["en"]="defineplacement", - ["fr"]="defineplacement", + ["fr"]="définirplacement", ["it"]="defineplacement", ["nl"]="definieerplaats", ["pe"]="تعریفجانشانی", @@ -1110,7 +1116,7 @@ return { ["cs"]="definujprofil", ["de"]="definiereprofil", ["en"]="defineprofile", - ["fr"]="definitprofil", + ["fr"]="définirprofil", ["it"]="definisciprofilo", ["nl"]="definieerprofiel", ["pe"]="تعریفپروفایل", @@ -1120,7 +1126,7 @@ return { ["cs"]="definujprogram", ["de"]="definiereprogramme", ["en"]="defineprogram", - ["fr"]="definitprogramme", + ["fr"]="définirprogramme", ["it"]="definisciprogramma", ["nl"]="definieerprogramma", ["pe"]="تعریفبرنامه", @@ -1130,7 +1136,7 @@ return { ["cs"]="definerawfont", ["de"]="definerawfont", ["en"]="definerawfont", - ["fr"]="definitpolicebrute", + ["fr"]="définirpolicebrute", ["it"]="definiscifontgrezzo", ["nl"]="definerawfont", ["pe"]="تعریفقلمخام", @@ -1140,7 +1146,7 @@ return { ["cs"]="definujodkaz", ["de"]="definierereferenz", ["en"]="definereference", - ["fr"]="definitreference", + ["fr"]="définirreference", ["it"]="definisciriferimento", ["nl"]="definieerreferentie", ["pe"]="تعریفمرجع", @@ -1150,7 +1156,7 @@ return { ["cs"]="definujformatodkazu", ["de"]="definierereferenzformat", ["en"]="definereferenceformat", - ["fr"]="definitformatreference", + ["fr"]="définirformatrereference", ["it"]="definisciformatoriferimento", ["nl"]="definieerreferentieformaat", ["pe"]="تعریفشمایلمرجع", @@ -1160,7 +1166,7 @@ return { ["cs"]="definujseznamodkazu", ["de"]="definierereferenzliste", ["en"]="definereferencelist", - ["fr"]="definitlistereference", + ["fr"]="définirlistereference", ["it"]="definiscilistariferimenti", ["nl"]="definieerreferentielijst", ["pe"]="تعریفلیستمرجع", @@ -1170,7 +1176,7 @@ return { ["cs"]="definujrejstrik", ["de"]="definiereregister", ["en"]="defineregister", - ["fr"]="definitregistre", + ["fr"]="définirregistre", ["it"]="definisciregistro", ["nl"]="definieerregister", ["pe"]="تعریفثبت", @@ -1180,7 +1186,7 @@ return { ["cs"]="definerule", ["de"]="definerule", ["en"]="definerule", - ["fr"]="definitregle", + ["fr"]="définirtrait", ["it"]="definiscilinea", ["nl"]="definieerlijn", ["pe"]="تعریفخطحائل", @@ -1190,7 +1196,7 @@ return { ["cs"]="definujsekci", ["de"]="definiereabschnitt", ["en"]="definesection", - ["fr"]="definitsection", + ["fr"]="définirsection", ["it"]="definiscisezione", ["nl"]="definieersectie", ["pe"]="تعریفبخش", @@ -1200,7 +1206,7 @@ return { ["cs"]="definujbloksekce", ["de"]="definiereabschnittsblock", ["en"]="definesectionblock", - ["fr"]="definitblocsection", + ["fr"]="définirblocsection", ["it"]="definiscibloccosezione", ["nl"]="definieersectieblok", ["pe"]="تعریفبلوکبخش", @@ -1210,7 +1216,7 @@ return { ["cs"]="definujtrideni", ["de"]="definieresortieren", ["en"]="definesorting", - ["fr"]="definittri", + ["fr"]="définirtri", ["it"]="definisciordinamento", ["nl"]="definieersorteren", ["pe"]="تعریفترتیب", @@ -1220,7 +1226,7 @@ return { ["cs"]="definujstartstop", ["de"]="definierestartstop", ["en"]="definestartstop", - ["fr"]="definitdemarrestoppe", + ["fr"]="définirdébutfin", ["it"]="definisciiniziatermina", ["nl"]="definieerstartstop", ["pe"]="تعریفشروعپایان", @@ -1230,7 +1236,7 @@ return { ["cs"]="definujstyl", ["de"]="definierestil", ["en"]="definestyle", - ["fr"]="definitstyle", + ["fr"]="définirstyle", ["it"]="definiscistile", ["nl"]="definieerletter", ["pe"]="تعریفسبک", @@ -1240,7 +1246,7 @@ return { ["cs"]="definujpodpole", ["de"]="definieresubfeld", ["en"]="definesubfield", - ["fr"]="definitsouschamp", + ["fr"]="définirsouschamp", ["it"]="definiscisottocampo", ["nl"]="definieersubveld", ["pe"]="تعریفزیرمیدان", @@ -1250,7 +1256,7 @@ return { ["cs"]="definujsymbol", ["de"]="definieresymbol", ["en"]="definesymbol", - ["fr"]="definitsymbole", + ["fr"]="définirsymbole", ["it"]="definiscisimbolo", ["nl"]="definieersymbool", ["pe"]="تعریفنماد", @@ -1260,7 +1266,7 @@ return { ["cs"]="definujsynonyma", ["de"]="definieresynonyme", ["en"]="definesynonyms", - ["fr"]="definitsynonymes", + ["fr"]="définirsynonymes", ["it"]="definiscisinonimi", ["nl"]="definieersynoniemen", ["pe"]="تعریفمترادفها", @@ -1270,7 +1276,7 @@ return { ["cs"]="definujsablonutabulky", ["de"]="definieretabellenvorlage", ["en"]="definetabletemplate", - ["fr"]="definittrametableau", + ["fr"]="définirgabarittable", ["it"]="definiscimodellotabella", ["nl"]="definieertabelvorm", ["pe"]="تعریفالگویجدول", @@ -1280,7 +1286,7 @@ return { ["cs"]="definujtabelaci", ["de"]="definieretabulator", ["en"]="definetabulate", - ["fr"]="definittabulation", + ["fr"]="définirtabulation", ["it"]="definiscitabulato", ["nl"]="definieertabulatie", ["pe"]="تعریفجدولبندی", @@ -1290,7 +1296,7 @@ return { ["cs"]="definujtext", ["de"]="definieretext", ["en"]="definetext", - ["fr"]="definittexte", + ["fr"]="définirtexte", ["it"]="definiscitesto", ["nl"]="definieertekst", ["pe"]="تعریفمتن", @@ -1298,13 +1304,14 @@ return { }, ["definetextbackground"]={ ["en"]="definetextbackground", + ["fr"]="définirtextearriereplan", ["nl"]="definieertekstachtergrond", }, ["definetextposition"]={ ["cs"]="definetextposition", ["de"]="definetextposition", ["en"]="definetextposition", - ["fr"]="definitpositiontexte", + ["fr"]="définirpositiontexte", ["it"]="definisciposizionetesto", ["nl"]="definieertekstpositie", ["pe"]="تعریفمکانمتن", @@ -1314,7 +1321,7 @@ return { ["cs"]="definetextvariable", ["de"]="definetextvariable", ["en"]="definetextvariable", - ["fr"]="definitvariabletexte", + ["fr"]="définirvariabletexte", ["it"]="definiscivariabiletesto", ["nl"]="definieertekstvariabele", ["pe"]="تعریفمتغیرمتن", @@ -1324,7 +1331,7 @@ return { ["cs"]="definetype", ["de"]="definetype", ["en"]="definetype", - ["fr"]="definittype", + ["fr"]="définirtranscrire", ["it"]="definiscitype", ["nl"]="definieertype", ["pe"]="تعریفتایپ", @@ -1334,7 +1341,7 @@ return { ["cs"]="definujopis", ["de"]="definieretippen", ["en"]="definetyping", - ["fr"]="definitdactylo", + ["fr"]="définirtranscription", ["it"]="definiscityping", ["nl"]="definieertypen", ["pe"]="تعریفتایپکردن", @@ -1344,7 +1351,7 @@ return { ["cs"]="definujverzi", ["de"]="definiereversion", ["en"]="defineversion", - ["fr"]="definitversion", + ["fr"]="définirversion", ["it"]="definisciversion", ["nl"]="definieerversie", ["pe"]="تعریفنسخه", @@ -1354,7 +1361,7 @@ return { ["cs"]="stanovcislonadpisu", ["de"]="bestimmekopfnummer", ["en"]="determineheadnumber", - ["fr"]="determinenumerotete", + ["fr"]="determinernumerotete", ["it"]="determinanumerotesta", ["nl"]="bepaalkopnummer", ["pe"]="تعیینشمارهسر", @@ -1364,7 +1371,7 @@ return { ["cs"]="stanovcharakteristickuseznamu", ["de"]="bestimmelistencharakeristika", ["en"]="determinelistcharacteristics", - ["fr"]="determinecaracteristiqueliste", + ["fr"]="determinercaracteristiquesliste", ["it"]="determinacarattersticheelenco", ["nl"]="bepaallijstkenmerken", ["pe"]="تعیینمشخصاتلیست", @@ -1374,7 +1381,7 @@ return { ["cs"]="urcicharakteristikurejstriku", ["de"]="bestimmeregistercharakteristika", ["en"]="determineregistercharacteristics", - ["fr"]="determinecaracteristiquesregistre", + ["fr"]="determinercaracteristiquesregistre", ["it"]="determinacaratteristicheregistro", ["nl"]="bepaalregisterkenmerken", ["pe"]="تعیینمشخصاتثبت", @@ -1394,7 +1401,7 @@ return { ["cs"]="zablokujinterakcnimenu", ["de"]="inaktiviereinteraktionsmenue", ["en"]="disableinteractionmenu", - ["fr"]="inhibemenuinteraction", + ["fr"]="desactivermenuinteraction", ["it"]="disabilitamenuinterazione", ["nl"]="blokkeerinteractiemenu", ["pe"]="ازکارانداختنمنویپانل", @@ -1414,7 +1421,7 @@ return { ["cs"]="zadnytest", ["de"]="keintest", ["en"]="donttest", - ["fr"]="sanstest", + ["fr"]="sanstester", ["it"]="notest", ["nl"]="geentest", ["pe"]="امتحاننکن", @@ -1444,7 +1451,7 @@ return { ["cs"]="emptylines", ["de"]="emptylines", ["en"]="emptylines", - ["fr"]="emptylines", + ["fr"]="lignesvide", ["it"]="emptylines", ["nl"]="legeregels", ["pe"]="خطهاخالی", @@ -1454,7 +1461,7 @@ return { ["cs"]="prostredi", ["de"]="umgebung", ["en"]="environment", - ["fr"]="environement", + ["fr"]="environnement", ["it"]="ambiente", ["nl"]="omgeving", ["pe"]="محیط", @@ -1504,7 +1511,7 @@ return { ["cs"]="vyplnovepole", ["de"]="ausfuellfeld", ["en"]="fillinfield", - ["fr"]="remplitchamp", + ["fr"]="champarenseigner", ["it"]="camporiempimento", ["nl"]="invulveld", ["pe"]="درجدرمیدان", @@ -1514,7 +1521,7 @@ return { ["cs"]="vyplnovyradek", ["de"]="gefuelltezeile", ["en"]="fillinline", - ["fr"]="remplitligne", + ["fr"]="lignearenseigner", ["it"]="rigariempimento", ["nl"]="invulregel", ["pe"]="درجدرخط", @@ -1524,7 +1531,7 @@ return { ["cs"]="vyplnovelinky", ["de"]="gefuelltesrechteck", ["en"]="fillinrules", - ["fr"]="remplitlignesreglees", + ["fr"]="traitsarenseigner", ["it"]="lineeriempimento", ["nl"]="invullijnen", ["pe"]="درجدرخطها", @@ -1534,7 +1541,7 @@ return { ["cs"]="vyplnenytext", ["de"]="ausfuelltext", ["en"]="fillintext", - ["fr"]="remplittexte", + ["fr"]="textearenseigner", ["it"]="testoriempimento", ["nl"]="invultekst", ["pe"]="درجدرمتن", @@ -1544,7 +1551,7 @@ return { ["cs"]="prizpusobivepole", ["de"]="passendfeld", ["en"]="fitfield", - ["fr"]="ajustechamp", + ["fr"]="adapterchamp", ["it"]="adattacampo", ["nl"]="passendveld", ["pe"]="پرکردنمیدان", @@ -1574,7 +1581,7 @@ return { ["cs"]="dodrzujprofil", ["de"]="folgeprofil", ["en"]="followprofile", - ["fr"]="suivantprofil", + ["fr"]="suivreprofile", ["it"]="seguiprofilo", ["nl"]="volgprofiel", ["pe"]="پیرویپروفایل", @@ -1584,7 +1591,7 @@ return { ["cs"]="dodrzujverziprofilu", ["de"]="folgeprofilversion", ["en"]="followprofileversion", - ["fr"]="suivantversionprofil", + ["fr"]="suivreversionprofil", ["it"]="seguiversioneprofilo", ["nl"]="volgprofielversie", ["pe"]="پیروینسخهپروفایل", @@ -1594,7 +1601,7 @@ return { ["cs"]="dodrzujverzi", ["de"]="folgeversion", ["en"]="followversion", - ["fr"]="suivantversion", + ["fr"]="suivreversion", ["it"]="seguiversione", ["nl"]="volgversie", ["pe"]="پیروینسخه", @@ -1624,7 +1631,7 @@ return { ["cs"]="poznamkapodcarou", ["de"]="fussnote", ["en"]="footnote", - ["fr"]="notepdp", + ["fr"]="notebdp", ["it"]="notapdp", ["nl"]="voetnoot", ["pe"]="پانوشت", @@ -1634,7 +1641,7 @@ return { ["cs"]="footnotetext", ["de"]="footnotetext", ["en"]="footnotetext", - ["fr"]="textenotepdp", + ["fr"]="textenotebdp", ["it"]="testonotapdp", ["nl"]="voetnoottekst", ["pe"]="متنپانوشت", @@ -1644,7 +1651,7 @@ return { ["cs"]="forceblocks", ["de"]="forceblocks", ["en"]="forceblocks", - ["fr"]="forceblocs", + ["fr"]="forcerblocs", ["it"]="forzablocchi", ["nl"]="forceerblokken", ["pe"]="اجباربلوکها", @@ -1674,7 +1681,7 @@ return { ["cs"]="oramovani", ["de"]="umrahmt", ["en"]="framed", - ["fr"]="framed", + ["fr"]="encadre", ["it"]="incorniciato", ["nl"]="omlijnd", ["pe"]="قالبی", @@ -1694,7 +1701,7 @@ return { ["cs"]="ziskejbuffer", ["de"]="holepuffer", ["en"]="getbuffer", - ["fr"]="prendbuffer", + ["fr"]="obtenirtampon", ["it"]="prendibuffer", ["nl"]="haalbuffer", ["pe"]="دریافتبافر", @@ -1704,7 +1711,7 @@ return { ["cs"]="ziskejznaceni", ["de"]="holebeschriftung", ["en"]="getmarking", - ["fr"]="obtientmarquage", + ["fr"]="obtenirmarquage", ["it"]="prendimarcatura", ["nl"]="haalmarkering", ["pe"]="دریافتنشانه", @@ -1714,7 +1721,7 @@ return { ["cs"]="getnumber", ["de"]="getnumber", ["en"]="getnumber", - ["fr"]="getnumber", + ["fr"]="obtenirnumero", ["it"]="getnumber", ["nl"]="haalnummer", ["pe"]="دریافتشماره", @@ -1724,7 +1731,7 @@ return { ["cs"]="jdidolu", ["de"]="nachunten", ["en"]="godown", - ["fr"]="vaenbas", + ["fr"]="allerenbas", ["it"]="vaigiu", ["nl"]="omlaag", ["pe"]="بروپایین", @@ -1734,7 +1741,7 @@ return { ["cs"]="jdina", ["de"]="zu", ["en"]="goto", - ["fr"]="va", + ["fr"]="allera", ["it"]="vaia", ["nl"]="naar", ["pe"]="بروبه", @@ -1744,7 +1751,7 @@ return { ["cs"]="jdinabox", ["de"]="zurbox", ["en"]="gotobox", - ["fr"]="vaalaboite", + ["fr"]="alleraboite", ["it"]="vaiabox", ["nl"]="naarbox", ["pe"]="بروبهجعبه", @@ -1754,7 +1761,7 @@ return { ["cs"]="jdinastranu", ["de"]="zurseite", ["en"]="gotopage", - ["fr"]="vaalapage", + ["fr"]="allerapage", ["it"]="vaiapagina", ["nl"]="naarpagina", ["pe"]="بروبهصفحه", @@ -1794,7 +1801,7 @@ return { ["cs"]="vlasovalinka", ["de"]="haarlinie", ["en"]="hairline", - ["fr"]="ligneh", + ["fr"]="ligneavectrait", ["it"]="capello", ["nl"]="haarlijn", ["pe"]="خطمو", @@ -1804,7 +1811,7 @@ return { ["cs"]="nadpis", ["de"]="kopf", ["en"]="head", - ["fr"]="tete", + ["fr"]="tête", ["it"]="testa", ["nl"]="kop", ["pe"]="سر", @@ -1814,7 +1821,7 @@ return { ["cs"]="vzdalenostzahlavi", ["de"]="kopfzeilenabstand", ["en"]="headerdistance", - ["fr"]="distanceentete", + ["fr"]="distanceentête", ["it"]="distanzaintestazione", ["nl"]="hoofdafstand", ["pe"]="فاصلهسربرگ", @@ -1824,7 +1831,7 @@ return { ["cs"]="vyskazahlavi", ["de"]="kopfzeilenhoehe", ["en"]="headerheight", - ["fr"]="hauteurentete", + ["fr"]="hauteurentête", ["it"]="altezzaintestazione", ["nl"]="hoofdhoogte", ["pe"]="ارتفاعسربرگ", @@ -1854,7 +1861,7 @@ return { ["cs"]="headsym", ["de"]="headsym", ["en"]="headsym", - ["fr"]="headsym", + ["fr"]="symtete", ["it"]="headsym", ["nl"]="kopsym", ["pe"]="نمادسر", @@ -1874,7 +1881,7 @@ return { ["cs"]="schovejbloky", ["de"]="verbergebloecke", ["en"]="hideblocks", - ["fr"]="cacheblocs", + ["fr"]="cacherblocs", ["it"]="nascondiblocchi", ["nl"]="verbergblokken", ["pe"]="بلوکهاپنهان", @@ -1884,7 +1891,7 @@ return { ["cs"]="vysoky", ["de"]="hoch", ["en"]="high", - ["fr"]="haut", + ["fr"]="exposant", ["it"]="ap", ["nl"]="hoog", ["pe"]="بلند", @@ -1894,7 +1901,7 @@ return { ["cs"]="hl", ["de"]="hl", ["en"]="hl", - ["fr"]="hl", + ["fr"]="lh", ["it"]="hl", ["nl"]="hl", ["pe"]="خا", @@ -1904,7 +1911,7 @@ return { ["cs"]="immediatebetweenlist", ["de"]="immediatebetweenlist", ["en"]="immediatebetweenlist", - ["fr"]="immediatebetweenlist", + ["fr"]="immediatemententreliste", ["it"]="immediatebetweenlist", ["nl"]="directtussenlijst", ["pe"]="فوریبینلیست", @@ -1914,7 +1921,7 @@ return { ["cs"]="immediatetolist", ["de"]="immediatetolist", ["en"]="immediatetolist", - ["fr"]="immediatetolist", + ["fr"]="immediatementalister", ["it"]="immediatetolist", ["nl"]="directnaarlijst", ["pe"]="فوریبهلیست", @@ -1934,7 +1941,7 @@ return { ["cs"]="zvysujicicislo", ["de"]="nummererhoehen", ["en"]="incrementnumber", - ["fr"]="incrementenumero", + ["fr"]="incrementernumero", ["it"]="incrementanumero", ["nl"]="verhoognummer", ["pe"]="شمارهافزایش", @@ -1944,7 +1951,7 @@ return { ["cs"]="odsazovani", ["de"]="einziehen", ["en"]="indenting", - ["fr"]="composeenalinea", + ["fr"]="indentation", ["it"]="rientro", ["nl"]="inspringen", ["pe"]="تورفتگی", @@ -1954,7 +1961,7 @@ return { ["cs"]="zaramovani", ["de"]="imumriss", ["en"]="inframed", - ["fr"]="inframed", + ["fr"]="dansencadre", ["it"]="circondato", ["nl"]="inlijnd", ["pe"]="درقالبی", @@ -1964,7 +1971,7 @@ return { ["cs"]="plnezneni", ["de"]="volleswort", ["en"]="infull", - ["fr"]="infull", + ["fr"]="encomplet", ["it"]="perlungo", ["nl"]="voluit", ["pe"]="درپر", @@ -1974,7 +1981,7 @@ return { ["cs"]="ininner", ["de"]="ininner", ["en"]="ininner", - ["fr"]="ininner", + ["fr"]="dansinterieur", ["it"]="ininner", ["nl"]="inbinnen", ["pe"]="درداخلی", @@ -2014,7 +2021,7 @@ return { ["cs"]="vradku", ["de"]="inzeile", ["en"]="inline", - ["fr"]="alaligne", + ["fr"]="enligne", ["it"]="inriga", ["nl"]="inregel", ["pe"]="درخط", @@ -2034,7 +2041,7 @@ return { ["cs"]="mazaramovani", ["de"]="immaumrise", ["en"]="inmaframed", - ["fr"]="inmframed", + ["fr"]="dansencadremath", ["it"]="inmaframed", ["nl"]="inwilijnd", ["pe"]="inmframed", @@ -2044,7 +2051,7 @@ return { ["cs"]="inneredgedistance", ["de"]="inneredgedistance", ["en"]="inneredgedistance", - ["fr"]="inneredgedistance", + ["fr"]="distancebordinterieur", ["it"]="inneredgedistance", ["nl"]="binnenrandafstand", ["pe"]="فاصلهلبهداخلی", @@ -2054,7 +2061,7 @@ return { ["cs"]="inneredgewidth", ["de"]="inneredgewidth", ["en"]="inneredgewidth", - ["fr"]="inneredgewidth", + ["fr"]="largeurbordinterieur", ["it"]="inneredgewidth", ["nl"]="binnenrandbreedte", ["pe"]="عرضلبهداخلی", @@ -2064,7 +2071,7 @@ return { ["cs"]="innermargindistance", ["de"]="innermargindistance", ["en"]="innermargindistance", - ["fr"]="innermargindistance", + ["fr"]="distancemargeinterieure", ["it"]="innermargindistance", ["nl"]="binnenmargeafstand", ["pe"]="فاصلهحاشیهداخلی", @@ -2074,7 +2081,7 @@ return { ["cs"]="innermarginwidth", ["de"]="innermarginwidth", ["en"]="innermarginwidth", - ["fr"]="innermarginwidth", + ["fr"]="largeurmargeinterieure", ["it"]="innermarginwidth", ["nl"]="binnenmargebreedte", ["pe"]="عرضحاشیهداخلی", @@ -2094,7 +2101,7 @@ return { ["cs"]="inouter", ["de"]="inouter", ["en"]="inouter", - ["fr"]="inouter", + ["fr"]="dansexterieur", ["it"]="inouter", ["nl"]="inbuiten", ["pe"]="درخارجی", @@ -2134,7 +2141,7 @@ return { ["cs"]="instalacejazyka", ["de"]="installieresprache", ["en"]="installlanguage", - ["fr"]="installelangue", + ["fr"]="installerlangue", ["it"]="installalingua", ["nl"]="installeertaal", ["pe"]="نصبزبان", @@ -2174,7 +2181,7 @@ return { ["cs"]="polozka", ["de"]="pos", ["en"]="item", - ["fr"]="element", + ["fr"]="élément", ["it"]="elemento", ["nl"]="som", ["pe"]="آیتم", @@ -2184,7 +2191,7 @@ return { ["cs"]="polozky", ["de"]="posten", ["en"]="items", - ["fr"]="elements", + ["fr"]="éléments", ["it"]="elementi", ["nl"]="items", ["pe"]="آیتمها", @@ -2194,7 +2201,7 @@ return { ["cs"]="pol", ["de"]="its", ["en"]="its", - ["fr"]="el", + ["fr"]="els", ["it"]="el", ["nl"]="its", ["pe"]="its", @@ -2204,7 +2211,7 @@ return { ["cs"]="zachovejbloky", ["de"]="behaltebloecke", ["en"]="keepblocks", - ["fr"]="gardeblocs", + ["fr"]="conserverblocs", ["it"]="tieniblocchi", ["nl"]="handhaafblokken", ["pe"]="حفظبلوکها", @@ -2234,7 +2241,7 @@ return { ["cs"]="textpopisku", ["de"]="labeltext", ["en"]="labeltext", - ["fr"]="labeltexte", + ["fr"]="texteetiquette", ["it"]="testoetichetta", ["nl"]="labeltekst", ["pe"]="متنبرچسب", @@ -2310,6 +2317,11 @@ return { ["pe"]="پا", ["ro"]="leg", }, + ["linecorrection"]={ + ["en"]="linecorrection", + ["fr"]="correctionligne", + ["nl"]="regelcorrectie", + }, ["linewidth"]={ ["cs"]="tloustkacary", ["de"]="liniendicke", @@ -2334,7 +2346,7 @@ return { ["cs"]="delkaseznamu", ["de"]="listenlaenge", ["en"]="listlength", - ["fr"]="llongueurliste", + ["fr"]="longueurtexte", ["it"]="lunghezzaelenco", ["nl"]="lijstlengte", ["pe"]="طوللیست", @@ -2344,7 +2356,7 @@ return { ["cs"]="listsymbol", ["de"]="listsymbol", ["en"]="listsymbol", - ["fr"]="listesymbole", + ["fr"]="symboleliste", ["it"]="listsymbol", ["nl"]="lijstsymbool", ["pe"]="نمادلیست", @@ -2360,11 +2372,16 @@ return { ["pe"]="عرضلیست", ["ro"]="latimelista", }, + ["localfootnotes"]={ + ["en"]="localfootnotes", + ["fr"]="notesbdplocales", + ["nl"]="lokalevoetnoten", + }, ["logfields"]={ ["cs"]="zaznamovepole", ["de"]="registrierefelder", ["en"]="logfields", - ["fr"]="logchamp", + ["fr"]="logchamps", ["it"]="logcampi", ["nl"]="registreervelden", ["pe"]="میدانهایگزارش", @@ -2374,7 +2391,7 @@ return { ["cs"]="nivy", ["de"]="tiho", ["en"]="lohi", - ["fr"]="baha", + ["fr"]="inex", ["it"]="pedap", ["nl"]="laho", ["pe"]="پابا", @@ -2384,7 +2401,7 @@ return { ["cs"]="nizky", ["de"]="tief", ["en"]="low", - ["fr"]="bas", + ["fr"]="indice", ["it"]="ped", ["nl"]="laag", ["pe"]="پایین", @@ -2414,7 +2431,7 @@ return { ["cs"]="vyskasazby", ["de"]="satzhoehe", ["en"]="makeupheight", - ["fr"]="hauteurmakeup", + ["fr"]="hauteurcomposition", ["it"]="altezzamakeup", ["nl"]="zethoogte", ["pe"]="ارتفاعآرایش", @@ -2424,7 +2441,7 @@ return { ["cs"]="sirkasazby", ["de"]="satzbreite", ["en"]="makeupwidth", - ["fr"]="largeurmakeup", + ["fr"]="largeurcomposition", ["it"]="ampiezzamakeup", ["nl"]="zetbreedte", ["pe"]="عرضآرایش", @@ -2434,12 +2451,17 @@ return { ["cs"]="okr", ["de"]="mar", ["en"]="mar", - ["fr"]="mar", + ["fr"]="rem", ["it"]="mar", ["nl"]="mar", ["pe"]="حاش", ["ro"]="mar", }, + ["marginblock"]={ + ["en"]="marginblock", + ["fr"]="blocmarginal", + ["nl"]="margeblok", + }, ["margindistance"]={ ["cs"]="vzdalenostmarginalie", ["de"]="marginalafstand", @@ -2454,7 +2476,7 @@ return { ["cs"]="marginalnilinka", ["de"]="marginallinie", ["en"]="marginrule", - ["fr"]="margereglee", + ["fr"]="traitmarge", ["it"]="lineamargine", ["nl"]="kantlijn", ["pe"]="خطحاشیه", @@ -2514,7 +2536,7 @@ return { ["cs"]="oznacverzi", ["de"]="beschrifteversion", ["en"]="markversion", - ["fr"]="marquageversion", + ["fr"]="marquerversion", ["it"]="marcaversione", ["nl"]="markeerversie", ["pe"]="نسخهنشانه", @@ -2524,7 +2546,7 @@ return { ["cs"]="matematika", ["de"]="mathematik", ["en"]="mathematics", - ["fr"]="mathematique", + ["fr"]="mathematics", ["it"]="matematica", ["nl"]="wiskunde", ["pe"]="ریاضی", @@ -2544,7 +2566,7 @@ return { ["cs"]="maoramovani", ["de"]="maumrise", ["en"]="maframed", - ["fr"]="mframed", + ["fr"]="encadremath", ["it"]="maframed", ["nl"]="wilijnd", ["pe"]="mframed", @@ -2564,7 +2586,7 @@ return { ["cs"]="zrcadlit", ["de"]="spiegeln", ["en"]="mirror", - ["fr"]="reflete", + ["fr"]="refleter", ["it"]="riflessione", ["nl"]="spiegel", ["pe"]="آینه", @@ -2584,7 +2606,7 @@ return { ["cs"]="moveformula", ["de"]="moveformula", ["en"]="moveformula", - ["fr"]="deplaceformule", + ["fr"]="deplacerformule", ["it"]="spostaformula", ["nl"]="verplaatsformule", ["pe"]="انتقالفرمول", @@ -2594,7 +2616,7 @@ return { ["cs"]="premistinamrizku", ["de"]="amgitterneuausrichten", ["en"]="moveongrid", - ["fr"]="deplacesurgrille", + ["fr"]="deplacersurgrille", ["it"]="spostaagriglia", ["nl"]="verplaatsopgrid", ["pe"]="انتقالبهتوری", @@ -2604,7 +2626,7 @@ return { ["cs"]="movesidefloat", ["de"]="movesidefloat", ["en"]="movesidefloat", - ["fr"]="movesidefloat", + ["fr"]="deplacerflottantcote", ["it"]="movesidefloat", ["nl"]="verplaatszijblok", ["pe"]="انتقالکنارشناور", @@ -2614,7 +2636,7 @@ return { ["cs"]="navigating", ["de"]="navigating", ["en"]="navigating", - ["fr"]="navigating", + ["fr"]="navigation", ["it"]="navigating", ["nl"]="navigerend", ["pe"]="هدایت", @@ -2634,7 +2656,7 @@ return { ["cs"]="zadnezahlaviaupati", ["de"]="keinekopfundfusszeilen", ["en"]="noheaderandfooterlines", - ["fr"]="sanslignesenteteetpdp", + ["fr"]="sansentêtenipdp", ["it"]="nientelineintestazionepdp", ["nl"]="geenhoofdenvoetregels", ["pe"]="بدونخطسروتهبرگ", @@ -2644,7 +2666,7 @@ return { ["cs"]="zadneodsazovani", ["de"]="nichteinziehen", ["en"]="noindenting", - ["fr"]="sansalinea", + ["fr"]="sansindentation", ["it"]="nienterientro", ["nl"]="nietinspringen", ["pe"]="بدونتورفتگی", @@ -2674,7 +2696,7 @@ return { ["cs"]="zadnedalsibloky", ["de"]="keinebloeckemehr", ["en"]="nomoreblocks", - ["fr"]="pasplusdeblocs", + ["fr"]="sansplusdeblocs", ["it"]="bastablocchi", ["nl"]="geenblokkenmeer", ["pe"]="بدونبلوکهایبیشتر", @@ -2684,7 +2706,7 @@ return { ["cs"]="zadnedalsisoubory", ["de"]="keinedateienmehr", ["en"]="nomorefiles", - ["fr"]="pasplusdefichiers", + ["fr"]="sansplusdefichiers", ["it"]="bastafile", ["nl"]="geenfilesmeer", ["pe"]="بدونفایلهایبیشتر", @@ -2694,7 +2716,7 @@ return { ["cs"]="nop", ["de"]="nop", ["en"]="nop", - ["fr"]="nop", + ["fr"]="san", ["it"]="nop", ["nl"]="nop", ["pe"]="منفی", @@ -2724,7 +2746,7 @@ return { ["cs"]="zadnehorniadolniradky", ["de"]="keinzeilenobenundunten", ["en"]="notopandbottomlines", - ["fr"]="sanslignessupetinf", + ["fr"]="sansligneshautetbas", ["it"]="nientelineecimafondo", ["nl"]="geenbovenenonderregels", ["pe"]="بدونخطبالاوپایین", @@ -2734,7 +2756,7 @@ return { ["cs"]="nokap", ["de"]="nokap", ["en"]="nocap", - ["fr"]="nocap", + ["fr"]="paspetitescaps", ["it"]="nocap", ["nl"]="nokap", ["pe"]="سرپوشکوچکنه", @@ -2774,7 +2796,7 @@ return { ["cs"]="outeredgedistance", ["de"]="outeredgedistance", ["en"]="outeredgedistance", - ["fr"]="outeredgedistance", + ["fr"]="distancebordexterieur", ["it"]="outeredgedistance", ["nl"]="buitenrandafstand", ["pe"]="فاصلهلبهخارجی", @@ -2784,7 +2806,7 @@ return { ["cs"]="outeredgewidth", ["de"]="outeredgewidth", ["en"]="outeredgewidth", - ["fr"]="outeredgewidth", + ["fr"]="largeurbordexterieur", ["it"]="outeredgewidth", ["nl"]="buitenrandbreedte", ["pe"]="عرضلبهخارجی", @@ -2794,7 +2816,7 @@ return { ["cs"]="outermargindistance", ["de"]="outermargindistance", ["en"]="outermargindistance", - ["fr"]="outermargindistance", + ["fr"]="distancemargeexterieure", ["it"]="outermargindistance", ["nl"]="buitenmargeafstand", ["pe"]="فاصلهحاشیهخارجی", @@ -2804,7 +2826,7 @@ return { ["cs"]="outermarginwidth", ["de"]="outermarginwidth", ["en"]="outermarginwidth", - ["fr"]="outermarginwidth", + ["fr"]="largeurmargeexterieure", ["it"]="outermarginwidth", ["nl"]="buitenmargebreedte", ["pe"]="عرضحاشیهخارجی", @@ -2814,7 +2836,7 @@ return { ["cs"]="zhustene", ["de"]="kleinerdurchschuss", ["en"]="packed", - ["fr"]="groupe", + ["fr"]="sansespaceentreitem", ["it"]="impaccato", ["nl"]="opelkaar", ["pe"]="فشرده", @@ -2834,7 +2856,7 @@ return { ["cs"]="pagedepth", ["de"]="pagedepth", ["en"]="pagedepth", - ["fr"]="pagedepth", + ["fr"]="profondeurpage", ["it"]="pagedepth", ["nl"]="paginadiepte", ["pe"]="عمقصفحه", @@ -2854,7 +2876,7 @@ return { ["cs"]="pageoffset", ["de"]="pageoffset", ["en"]="pageoffset", - ["fr"]="pageoffset", + ["fr"]="decalagepage", ["it"]="pageoffset", ["nl"]="paginaoffset", ["pe"]="آفستصفحه", @@ -2904,7 +2926,7 @@ return { ["cs"]="umistizalozky", ["de"]="platzierebookmarks", ["en"]="placebookmarks", - ["fr"]="placemarquespages", + ["fr"]="placermarquepages", ["it"]="mettisegnalibro", ["nl"]="plaatsbookmarks", ["pe"]="درجچوبخط", @@ -2914,7 +2936,7 @@ return { ["cs"]="umistikombinovanyseznam", ["de"]="platzierezusammengestellteliste", ["en"]="placecombinedlist", - ["fr"]="placelisteinmbriquee", + ["fr"]="placerlistecombinee", ["it"]="mettielencocombinato", ["nl"]="plaatssamengesteldelijst", ["pe"]="درجلیستمختلط", @@ -2924,7 +2946,7 @@ return { ["cs"]="placefloat", ["de"]="placefloat", ["en"]="placefloat", - ["fr"]="placeflottant", + ["fr"]="placerflottant", ["it"]="placefloat", ["nl"]="plaatsplaatsblok", ["pe"]="درجشناور", @@ -2934,7 +2956,7 @@ return { ["cs"]="umistipoznamkypodcarou", ["de"]="platzierefussnoten", ["en"]="placefootnotes", - ["fr"]="placenotespdp", + ["fr"]="placernotesbdp", ["it"]="mettinotepdp", ["nl"]="plaatsvoetnoten", ["pe"]="درجپانوشتها", @@ -2944,7 +2966,7 @@ return { ["cs"]="umistirovnici", ["de"]="platziereformel", ["en"]="placeformula", - ["fr"]="placeformule", + ["fr"]="placerformule", ["it"]="mettiformula", ["nl"]="plaatsformule", ["pe"]="درجفرمول", @@ -2954,7 +2976,7 @@ return { ["cs"]="placeheadnumber", ["de"]="placeheadnumber", ["en"]="placeheadnumber", - ["fr"]="placenumerotete", + ["fr"]="placernumerotete", ["it"]="posizionanumerotesta", ["nl"]="plaatskopnummer", ["pe"]="درجشمارهسر", @@ -2964,7 +2986,7 @@ return { ["cs"]="placeheadtext", ["de"]="placeheadtext", ["en"]="placeheadtext", - ["fr"]="placetextetete", + ["fr"]="placertextetete", ["it"]="posizionatestotesta", ["nl"]="plaatskoptekst", ["pe"]="درجمتنسر", @@ -2974,7 +2996,7 @@ return { ["cs"]="umistilegendu", ["de"]="platzierelegende", ["en"]="placelegend", - ["fr"]="placelegende", + ["fr"]="placerlegende", ["it"]="mettilegenda", ["nl"]="plaatslegenda", ["pe"]="درجراهنما", @@ -2984,7 +3006,7 @@ return { ["cs"]="umistiseznam", ["de"]="platziereliste", ["en"]="placelist", - ["fr"]="placeliste", + ["fr"]="placerliste", ["it"]="mettielenco", ["nl"]="plaatslijst", ["pe"]="درجلیست", @@ -2992,13 +3014,14 @@ return { }, ["placelistofsynonyms"]={ ["en"]="placelistofsynonyms", + ["fr"]="placerlistedesynonymes", ["nl"]="plaatslijstmetsynoniemen", }, ["placelocalfootnotes"]={ ["cs"]="umistilokalnipoznamkypodcarou", ["de"]="platzierelokalefussnoten", ["en"]="placelocalfootnotes", - ["fr"]="placenotespdplocales", + ["fr"]="placernotesbdplocales", ["it"]="mettinotepdplocali", ["nl"]="plaatslokalevoetnoten", ["pe"]="درجپانوشتهایموضعی", @@ -3008,7 +3031,7 @@ return { ["cs"]="umistiloga", ["de"]="platzierelogo", ["en"]="placelogos", - ["fr"]="placelogos", + ["fr"]="placerlogo", ["it"]="mettiloghi", ["nl"]="plaatsbeeldmerken", ["pe"]="درجآرمها", @@ -3018,7 +3041,7 @@ return { ["cs"]="umistinamrizku", ["de"]="amgitterausrichten", ["en"]="placeongrid", - ["fr"]="placesurgrille", + ["fr"]="placersurgrille", ["it"]="mettiingriglia", ["nl"]="plaatsopgrid", ["pe"]="درجدرتوری", @@ -3028,7 +3051,7 @@ return { ["cs"]="umistinadsebe", ["de"]="platziereuntereinander", ["en"]="placeontopofeachother", - ["fr"]="placelesunsaudessusdesautres", + ["fr"]="placerlunaudessusdelautre", ["it"]="mettiunosullaltro", ["nl"]="plaatsonderelkaar", ["pe"]="درجدربالاییکدیگر", @@ -3038,7 +3061,7 @@ return { ["cs"]="placepagenumber", ["de"]="placepagenumber", ["en"]="placepagenumber", - ["fr"]="placenumeropage", + ["fr"]="placernumeropage", ["it"]="mettinumeropagina", ["nl"]="plaatspaginanummer", ["pe"]="درجشمارهصفحه", @@ -3048,7 +3071,7 @@ return { ["cs"]="placerawlist", ["de"]="placerawlist", ["en"]="placerawlist", - ["fr"]="placerawlist", + ["fr"]="placerlistebrute", ["it"]="placerawlist", ["nl"]="plaatsruwelijst", ["pe"]="درجلیستخام", @@ -3058,7 +3081,7 @@ return { ["cs"]="placereferencelist", ["de"]="placereferencelist", ["en"]="placereferencelist", - ["fr"]="placelistereference", + ["fr"]="placerlistereference", ["it"]="placereferencelist", ["nl"]="plaatsreferentielijst", ["pe"]="درجلیستمرجع", @@ -3068,7 +3091,7 @@ return { ["cs"]="umistirejstrik", ["de"]="platziereregister", ["en"]="placeregister", - ["fr"]="placeregistre", + ["fr"]="placerregistre", ["it"]="mettiregistro", ["nl"]="plaatsregister", ["pe"]="درجثبت", @@ -3078,7 +3101,7 @@ return { ["cs"]="placerule", ["de"]="placerule", ["en"]="placerule", - ["fr"]="placeregle", + ["fr"]="placertrait", ["it"]="mettilinea", ["nl"]="plaatslijn", ["pe"]="درجخط", @@ -3088,7 +3111,7 @@ return { ["cs"]="umistivedlesebe", ["de"]="platzierenebeneinander", ["en"]="placesidebyside", - ["fr"]="placecoteacote", + ["fr"]="placercoteacote", ["it"]="mettifiancoafianco", ["nl"]="plaatsnaastelkaar", ["pe"]="درجکناربهکنار", @@ -3098,7 +3121,7 @@ return { ["cs"]="umistipodrovnici", ["de"]="platziereunterformel", ["en"]="placesubformula", - ["fr"]="placesousformule", + ["fr"]="placersousformule", ["it"]="mettisottoformula", ["nl"]="plaatssubformule", ["pe"]="درجزیرفرمول", @@ -3108,7 +3131,7 @@ return { ["cs"]="placetextvariable", ["de"]="placetextvariable", ["en"]="placetextvariable", - ["fr"]="placevariabletexte", + ["fr"]="placervariabletexte", ["it"]="mettivariabiletesto", ["nl"]="plaatstekstvariabele", ["pe"]="درجمتغیرمتن", @@ -3128,7 +3151,7 @@ return { ["cs"]="positiontext", ["de"]="positiontext", ["en"]="positiontext", - ["fr"]="positionnetexte", + ["fr"]="texteposition", ["it"]="posizionatesto", ["nl"]="positioneertekst", ["pe"]="مکانمتن", @@ -3138,7 +3161,7 @@ return { ["cs"]="vyskatiskpapiru", ["de"]="printpapierhoehe", ["en"]="printpaperheight", - ["fr"]="hauteureditionpapier", + ["fr"]="hauteurpapierimpression", ["it"]="altezzacartastampa", ["nl"]="printpapierhoogte", ["pe"]="چاپارتفاعبرگ", @@ -3148,7 +3171,7 @@ return { ["cs"]="sirkatiskpapiru", ["de"]="printpapierbreite", ["en"]="printpaperwidth", - ["fr"]="largeureditionpapier", + ["fr"]="largeurpapierimpression", ["it"]="ampiezzacartastampa", ["nl"]="printpapierbreedte", ["pe"]="چاپعرضبرگ", @@ -3158,7 +3181,7 @@ return { ["cs"]="zpracujbloky", ["de"]="bearbeitebloecke", ["en"]="processblocks", - ["fr"]="traiteblocs", + ["fr"]="traiterblocs", ["it"]="elaborablocchi", ["nl"]="verwerkblokken", ["pe"]="بلوکهایپردازش", @@ -3168,7 +3191,7 @@ return { ["cs"]="zpracujstranu", ["de"]="bearbeiteseite", ["en"]="processpage", - ["fr"]="traitepage", + ["fr"]="traiterpage", ["it"]="elaborapagina", ["nl"]="verwerkpagina", ["pe"]="صفحهپردازش", @@ -3248,7 +3271,7 @@ return { ["cs"]="opakovat", ["de"]="wiederholen", ["en"]="redo", - ["fr"]="refait", + ["fr"]="refaire", ["it"]="rifai", ["nl"]="herhaal", ["pe"]="انجامدوباره", @@ -3278,7 +3301,7 @@ return { ["cs"]="odkaz", ["de"]="verweis", ["en"]="referral", - ["fr"]="recommandation", + ["fr"]="redirection", ["it"]="referral", ["nl"]="kenmerk", ["pe"]="رجوع", @@ -3288,7 +3311,7 @@ return { ["cs"]="odkaznadatum", ["de"]="verweisdatum", ["en"]="referraldate", - ["fr"]="daterecommandation", + ["fr"]="dateredirection", ["it"]="datareferral", ["nl"]="kenmerkdatum", ["pe"]="تاریخرجوع", @@ -3298,7 +3321,7 @@ return { ["cs"]="odkazujici", ["de"]="referieren", ["en"]="referring", - ["fr"]="faitreference", + ["fr"]="fairereference", ["it"]="referring", ["nl"]="refereer", ["pe"]="مراجعه", @@ -3308,7 +3331,7 @@ return { ["cs"]="oznaceni", ["de"]="bemerkung", ["en"]="remark", - ["fr"]="commentaire", + ["fr"]="remarque", ["it"]="commento", ["nl"]="toelichting", ["pe"]="توجه", @@ -3348,7 +3371,7 @@ return { ["cs"]="resettextcontent", ["de"]="resettextcontent", ["en"]="resettextcontent", - ["fr"]="resettextcontent", + ["fr"]="raztexte", ["it"]="resettextcontent", ["nl"]="resettekstinhoud", ["pe"]="بازنشانیمتن", @@ -3418,7 +3441,7 @@ return { ["cs"]="otocit", ["de"]="drehen", ["en"]="rotate", - ["fr"]="oriente", + ["fr"]="tourner", ["it"]="ruota", ["nl"]="roteer", ["pe"]="دوران", @@ -3426,13 +3449,14 @@ return { }, ["savebuffer"]={ ["en"]="savebuffer", + ["fr"]="enregistrertampon", ["nl"]="bewaarbuffer", }, ["scale"]={ ["cs"]="meritko", ["de"]="format", ["en"]="scale", - ["fr"]="echelle", + ["fr"]="mettrealechelle", ["it"]="scala", ["nl"]="schaal", ["pe"]="مقیاس", @@ -3452,7 +3476,7 @@ return { ["cs"]="vyberbloky", ["de"]="waehlebloeckeaus", ["en"]="selectblocks", - ["fr"]="selectionneblocs", + ["fr"]="selectionnerblocs", ["it"]="selezionablocchi", ["nl"]="selecteerblokken", ["pe"]="انتخاببلوکها", @@ -3462,7 +3486,7 @@ return { ["cs"]="vyberpapir", ["de"]="waehlepapieraus", ["en"]="selectpaper", - ["fr"]="selectionnepapier", + ["fr"]="selectionnerpapier", ["it"]="selezionacarta", ["nl"]="selecteerpapier", ["pe"]="انتخاببرگ", @@ -3472,7 +3496,7 @@ return { ["cs"]="vyberverzi", ["de"]="waehleversionaus", ["en"]="selectversion", - ["fr"]="selectionneversion", + ["fr"]="selectionnerversion", ["it"]="selezionaversione", ["nl"]="selecteerversie", ["pe"]="انتخابنسخه", @@ -3482,7 +3506,7 @@ return { ["cs"]="setnumber", ["de"]="setnumber", ["en"]="setnumber", - ["fr"]="affectenumero", + ["fr"]="reglernumero", ["it"]="setnumber", ["nl"]="setnummer", ["pe"]="تعیینشماره", @@ -3492,7 +3516,7 @@ return { ["cs"]="settextcontent", ["de"]="settext", ["en"]="settextcontent", - ["fr"]="settext", + ["fr"]="reglercontenutexte", ["it"]="settext", ["nl"]="steltekstinhoudin", ["pe"]="تعیینمحتوایمتن", @@ -3502,7 +3526,7 @@ return { ["cs"]="settextvariable", ["de"]="settextvariable", ["en"]="settextvariable", - ["fr"]="affectevariabletexte", + ["fr"]="reglervariabletexte", ["it"]="setvariabiletesto", ["nl"]="kentekstvariabeletoe", ["pe"]="تعیینمتغیرمتن", @@ -3512,7 +3536,7 @@ return { ["cs"]="nastavzarovnani", ["de"]="stelleausrichtungein", ["en"]="setupalign", - ["fr"]="reglealignement", + ["fr"]="configureraligner", ["it"]="impostaallineamento", ["nl"]="steluitlijnenin", ["pe"]="بارگذاریتنظیم", @@ -3522,7 +3546,7 @@ return { ["cs"]="setupanswerarea", ["de"]="setupanswerarea", ["en"]="setupanswerarea", - ["fr"]="setupanswerarea", + ["fr"]="configurerzonereponse", ["it"]="setupanswerarea", ["nl"]="stelantwoordgebiedin", ["pe"]="setupanswerarea", @@ -3532,7 +3556,7 @@ return { ["cs"]="nastavusporadani", ["de"]="stelleanordnenein", ["en"]="setuparranging", - ["fr"]="reglearrangement", + ["fr"]="configurerarrangement", ["it"]="impostaparranging", ["nl"]="stelarrangerenin", ["pe"]="بارگذاریترتیب", @@ -3542,7 +3566,7 @@ return { ["cs"]="nastavpozadi", ["de"]="stellehintergrundein", ["en"]="setupbackground", - ["fr"]="reglearriereplan", + ["fr"]="configurerarriereplan", ["it"]="impostasfondo", ["nl"]="stelachtergrondin", ["pe"]="بارگذاریپسزمینه", @@ -3552,7 +3576,7 @@ return { ["cs"]="nastavpozadi", ["de"]="stellehintergruendeein", ["en"]="setupbackgrounds", - ["fr"]="reglearriereplans", + ["fr"]="configurerarriereplans", ["it"]="impostasfondi", ["nl"]="stelachtergrondenin", ["pe"]="بارگذاریپسزمینهها", @@ -3562,7 +3586,7 @@ return { ["cs"]="nastavcernelinky", ["de"]="stellerechteckein", ["en"]="setupblackrules", - ["fr"]="reglelignesnoires", + ["fr"]="configurertraitsepais", ["it"]="impostalineenere", ["nl"]="stelblokjesin", ["pe"]="بارگذاریخطهایسیاه", @@ -3572,7 +3596,7 @@ return { ["cs"]="nastavpreskok", ["de"]="stelleblankoein", ["en"]="setupblank", - ["fr"]="definitvide", + ["fr"]="configurervierge", ["it"]="impostarigovuoto", ["nl"]="stelblankoin", ["pe"]="بارگذاریخالی", @@ -3582,7 +3606,7 @@ return { ["cs"]="nastavblok", ["de"]="stelleblockein", ["en"]="setupblock", - ["fr"]="reglebloc", + ["fr"]="configurerbloc", ["it"]="impostablocco", ["nl"]="stelblokin", ["pe"]="بارگذاریبلوک", @@ -3592,7 +3616,7 @@ return { ["cs"]="nastavzakladnifont", ["de"]="stellefliesstextein", ["en"]="setupbodyfont", - ["fr"]="reglepolicecorps", + ["fr"]="configurerpolicedecorps", ["it"]="impostafontdeltesto", ["nl"]="stelkorpsin", ["pe"]="بارگذاریقلممتن", @@ -3602,7 +3626,7 @@ return { ["cs"]="nastavprostredizakladnihofontu", ["de"]="stellefliesstextumgebungein", ["en"]="setupbodyfontenvironment", - ["fr"]="regleenvironnementpolicecorps", + ["fr"]="configurerenvironnementpolicedecorps", ["it"]="impostaambientefontdeltesto", ["nl"]="stelkorpsomgevingin", ["pe"]="بارگذاریمحیطقلممتن", @@ -3612,7 +3636,7 @@ return { ["cs"]="nastavspodek", ["de"]="stelleuntenein", ["en"]="setupbottom", - ["fr"]="regleinf", + ["fr"]="configurerbas", ["it"]="impostafondo", ["nl"]="stelonderin", ["pe"]="بارگذاریپایین", @@ -3622,7 +3646,7 @@ return { ["cs"]="nastavdolnitexty", ["de"]="stelletextuntenein", ["en"]="setupbottomtexts", - ["fr"]="regletextesinf", + ["fr"]="configurertextesbas", ["it"]="impostatestifondo", ["nl"]="stelondertekstenin", ["pe"]="بارگذاریمتنپایین", @@ -3632,7 +3656,7 @@ return { ["cs"]="nastavbuffer", ["de"]="stellepufferein", ["en"]="setupbuffer", - ["fr"]="reglebuffer", + ["fr"]="configurertampon", ["it"]="impostabuffer", ["nl"]="stelbufferin", ["pe"]="بارگذاریبافر", @@ -3642,7 +3666,7 @@ return { ["cs"]="nastavtlacitka", ["de"]="stelleknopfein", ["en"]="setupbuttons", - ["fr"]="regleboutons", + ["fr"]="configurerboutons", ["it"]="impostapulsanti", ["nl"]="stelbuttonsin", ["pe"]="بارگذاریدکمهها", @@ -3652,7 +3676,7 @@ return { ["cs"]="nastavkapitalky", ["de"]="stelleversalienein", ["en"]="setupcapitals", - ["fr"]="reglecapitales", + ["fr"]="configurercapitales", ["it"]="impostamaiuscole", ["nl"]="stelkapitalenin", ["pe"]="setupcapitals", @@ -3662,7 +3686,7 @@ return { ["cs"]="nastavpopisek", ["de"]="stellebildunterschriftein", ["en"]="setupcaption", - ["fr"]="regleintitule", + ["fr"]="configurerintitule", ["it"]="impostacaption", ["nl"]="stelblokkopjein", ["pe"]="بارگذاریشرح", @@ -3672,7 +3696,7 @@ return { ["cs"]="nastavpopisky", ["de"]="stellebilderunterschriftein", ["en"]="setupcaptions", - ["fr"]="regleintitules", + ["fr"]="configurerintitules", ["it"]="impostacaptions", ["nl"]="stelblokkopjesin", ["pe"]="بارگذاریشرحها", @@ -3682,7 +3706,7 @@ return { ["cs"]="nastavorez", ["de"]="stelleausschnittein", ["en"]="setupclipping", - ["fr"]="regleclipping", + ["fr"]="configurerdecoupage", ["it"]="impostaclippling", ["nl"]="stelclipin", ["pe"]="بارگذاریچیدن", @@ -3692,7 +3716,7 @@ return { ["cs"]="nastavbarvu", ["de"]="stellefarbeein", ["en"]="setupcolor", - ["fr"]="reglecouleur", + ["fr"]="configurercouleur", ["it"]="impostacolore", ["nl"]="stelkleurin", ["pe"]="بارگذاریرنگ", @@ -3702,7 +3726,7 @@ return { ["cs"]="nastavbarvy", ["de"]="stellefarbenein", ["en"]="setupcolors", - ["fr"]="reglecouleurs", + ["fr"]="configurercouleurs", ["it"]="impostacolori", ["nl"]="stelkleurenin", ["pe"]="بارگذاریرنگها", @@ -3712,7 +3736,7 @@ return { ["cs"]="nastavsloupce", ["de"]="stellespaltenein", ["en"]="setupcolumns", - ["fr"]="reglecolonnes", + ["fr"]="configurercolonnes", ["it"]="impostacolonne", ["nl"]="stelkolommenin", ["pe"]="بارگذاریستونها", @@ -3722,7 +3746,7 @@ return { ["cs"]="setupcolumnset", ["de"]="setupcolumnset", ["en"]="setupcolumnset", - ["fr"]="reglejeucolonne", + ["fr"]="configurerjeucolonnes", ["it"]="impostagruppocolonne", ["nl"]="stelkolomgroepin", ["pe"]="بارگذاریمجموعهستون", @@ -3732,7 +3756,7 @@ return { ["cs"]="setupcolumnsetlines", ["de"]="setupcolumnsetlines", ["en"]="setupcolumnsetlines", - ["fr"]="setupcolumnsetlines", + ["fr"]="configurerlignesjeucolonnes", ["it"]="setupcolumnsetlines", ["nl"]="stelkolomgroepregelsin", ["pe"]="بارگذاریخطهایمجموعهستون", @@ -3742,7 +3766,7 @@ return { ["cs"]="setupcolumnsetstart", ["de"]="setupcolumnsetstart", ["en"]="setupcolumnsetstart", - ["fr"]="setupcolumnsetstart", + ["fr"]="configurerfinjeucolonnes", ["it"]="setupcolumnsetstart", ["nl"]="stelkolomgroepstartin", ["pe"]="بارگذاریشروعمجموعهستون", @@ -3752,7 +3776,7 @@ return { ["cs"]="nastavspojeni", ["de"]="stellekombinationein", ["en"]="setupcombinations", - ["fr"]="reglecombinaisons", + ["fr"]="configurercombinaisons", ["it"]="impostacombinazioni", ["nl"]="stelcombinatiesin", ["pe"]="بارگذاریترکیبها", @@ -3762,7 +3786,7 @@ return { ["cs"]="nastavkombinovanyseznam", ["de"]="stellezusammengestelltelisteein", ["en"]="setupcombinedlist", - ["fr"]="reglelisteimbriquee", + ["fr"]="configurerlistecombinee", ["it"]="impostaelencocombinato", ["nl"]="stelsamengesteldelijstin", ["pe"]="بارگذاریلیستترکیبی", @@ -3772,45 +3796,47 @@ return { ["cs"]="nastavkomentar", ["de"]="stellekommentarein", ["en"]="setupcomment", - ["fr"]="reglecommentaire", + ["fr"]="configurercommentaire", ["it"]="impostacommento", ["nl"]="stelcommentaarin", ["pe"]="بارگذاریتوضیح", ["ro"]="seteazacomentariu", }, + ["setupdescription"]={ + ["en"]="setupdescription", + ["fr"]="configurerdescription", + ["nl"]="steldoordefinierenin", + }, ["setupdescriptions"]={ ["cs"]="nastavpopisy", ["de"]="definierebeschreibungen", ["en"]="setupdescriptions", - ["fr"]="regledescriptions", + ["fr"]="configurerdescriptions", ["it"]="impostadescrizioni", ["nl"]="steldoordefinierenin", ["pe"]="بارگذاریشرح", ["ro"]="seteazadescriere", }, - ["setupdescription"]={ - ["en"]="setupdescription", - ["nl"]="steldoordefinierenin", + ["setupenumeration"]={ + ["en"]="setupenumeration", + ["fr"]="configurerénumération", + ["nl"]="steldoornummerenin", }, ["setupenumerations"]={ ["cs"]="nastavvycty", ["de"]="stellebeschreibungein", ["en"]="setupenumerations", - ["fr"]="regleenumerations", + ["fr"]="configurerénumérations", ["it"]="impostaenumerazioni", ["nl"]="steldoornummerenin", ["pe"]="بارگذاریشمارهگذاریها", ["ro"]="seteazaenumerare", }, - ["setupenumeration"]={ - ["en"]="setupenumeration", - ["nl"]="steldoornummerenin", - }, ["setupexternalfigures"]={ ["cs"]="nastavexterniobrazy", ["de"]="stelleexterneabbildungenein", ["en"]="setupexternalfigures", - ["fr"]="reglefiguresexternes", + ["fr"]="configurerfiguresexterne", ["it"]="impostafigureesterne", ["nl"]="stelexternefigurenin", ["pe"]="بارگذاریشکلهایخارجی", @@ -3820,7 +3846,7 @@ return { ["cs"]="nastavpole", ["de"]="stellefeldein", ["en"]="setupfield", - ["fr"]="reglechamp", + ["fr"]="configurerchamp", ["it"]="impostacampo", ["nl"]="stelveldin", ["pe"]="بارگذاریمیدان", @@ -3830,7 +3856,7 @@ return { ["cs"]="nastavvsechnapole", ["de"]="stellefelderin", ["en"]="setupfields", - ["fr"]="reglechamps", + ["fr"]="configurerchamps", ["it"]="impostacampi", ["nl"]="stelveldenin", ["pe"]="بارگذاریمیدانها", @@ -3840,7 +3866,7 @@ return { ["cs"]="nastavvyplnoveradky", ["de"]="stellegefuelltezeileein", ["en"]="setupfillinlines", - ["fr"]="regleremplitligne", + ["fr"]="configurerlignesarenseigner", ["it"]="impostarigheriempimento", ["nl"]="stelinvulregelsin", ["pe"]="بارگذاریپرکردنخطها", @@ -3850,7 +3876,7 @@ return { ["cs"]="nastavvyplnovelinky", ["de"]="stellegefuelltesrechteckein", ["en"]="setupfillinrules", - ["fr"]="regleremplitlignesreglees", + ["fr"]="configurertraitsarenseigner", ["it"]="impostalineeriempimento", ["nl"]="stelinvullijnenin", ["pe"]="بارگذاریدرجدرخطها", @@ -3860,7 +3886,7 @@ return { ["cs"]="nastavplvouciobjekt", ["de"]="stellegleitobjektein", ["en"]="setupfloat", - ["fr"]="regleflottant", + ["fr"]="configurerflottant", ["it"]="impostaoggettomobile", ["nl"]="stelplaatsblokin", ["pe"]="بارگذاریشناور", @@ -3870,7 +3896,7 @@ return { ["cs"]="nastavplvouciobjekty", ["de"]="stellegleitobjekteein", ["en"]="setupfloats", - ["fr"]="regleflottants", + ["fr"]="configurerflottants", ["it"]="impostaoggettimobili", ["nl"]="stelplaatsblokkenin", ["pe"]="بارگذاریشناورها", @@ -3880,7 +3906,7 @@ return { ["cs"]="nastavdeleniplvoucichobjektu", ["de"]="stelleplatziegeteiltegleitobjekt", ["en"]="setupfloatsplitting", - ["fr"]="regleseparationflottant", + ["fr"]="configurerpartageflottants", ["it"]="impostaspezzamentooggettomobile", ["nl"]="stelplaatsbloksplitsenin", ["pe"]="بارگذاریشکافتنشناورها", @@ -3890,7 +3916,7 @@ return { ["cs"]="nastavupati", ["de"]="stellefusszeileein", ["en"]="setupfooter", - ["fr"]="reglepdp", + ["fr"]="configurerpdp", ["it"]="impostapdp", ["nl"]="stelvoetin", ["pe"]="بارگذاریتهبرگ", @@ -3900,7 +3926,7 @@ return { ["cs"]="nastavtextyupati", ["de"]="stellefusszeilentextein", ["en"]="setupfootertexts", - ["fr"]="regletextespdp", + ["fr"]="configurertextespdp", ["it"]="impostatestipdp", ["nl"]="stelvoettekstenin", ["pe"]="بارگذاریمتنپانوشت", @@ -3910,7 +3936,7 @@ return { ["cs"]="nastavdefinicipoznamekpodcarou", ["de"]="stellefussnotendefinitionein", ["en"]="setupfootnotedefinition", - ["fr"]="definitnotepdp", + ["fr"]="configurerdefinitionnotebdp", ["it"]="impostadefinizionenotepdp", ["nl"]="stelvoetnootdefinitiein", ["pe"]="بارگذاریتعریفپانوشت", @@ -3920,7 +3946,7 @@ return { ["cs"]="nastavpoznamkypodcarou", ["de"]="stellefussnotenein", ["en"]="setupfootnotes", - ["fr"]="reglenotepdp", + ["fr"]="configurernotesbdp", ["it"]="impostanotepdp", ["nl"]="stelvoetnotenin", ["pe"]="بارگذاریپانوشتها", @@ -3930,55 +3956,57 @@ return { ["cs"]="setupforms", ["de"]="setupforms", ["en"]="setupforms", - ["fr"]="regleformulaires", + ["fr"]="configurerformulaires", ["it"]="impostaforms", ["nl"]="stelformulierenin", ["pe"]="بارگذاریطرح", ["ro"]="seteazaformulare", }, + ["setupformula"]={ + ["en"]="setupformula", + ["fr"]="configurerformule", + ["nl"]="stelformulein", + }, ["setupformulas"]={ ["cs"]="nastavrovnice", ["de"]="stelleformelnein", ["en"]="setupformulae", - ["fr"]="regleformules", + ["fr"]="configurerformules", ["it"]="impostaformule", ["nl"]="stelformulesin", ["pe"]="بارگذاریفرمولها", ["ro"]="seteazaformule", }, - ["setupformula"]={ - ["en"]="setupformula", - ["nl"]="stelformulein", - }, ["setupframed"]={ ["cs"]="nastavoramovani", ["de"]="stelleumrahmtein", ["en"]="setupframed", - ["fr"]="regleencadre", + ["fr"]="configurerencadre", ["it"]="impostaincorniciato", ["nl"]="stelomlijndin", ["pe"]="بارگذاریقالبی", ["ro"]="seteazainconjurat", }, + ["setupframedtext"]={ + ["en"]="setupframedtext", + ["fr"]="configurertexteencadre", + ["nl"]="stelkadertekstin", + }, ["setupframedtexts"]={ ["cs"]="nastavoramovanetexty", ["de"]="stelleumrahmtetexteein", ["en"]="setupframedtexts", - ["fr"]="setupframedtexts", + ["fr"]="configurertextesencadres", ["it"]="impostatestiincorniciati", ["nl"]="stelkadertekstenin", ["pe"]="بارگذاریمتنقالبی", ["ro"]="definestetexteinconjurate", }, - ["setupframedtext"]={ - ["en"]="setupframedtext", - ["nl"]="stelkadertekstin", - }, ["setuphead"]={ ["cs"]="nastavnadpis", ["de"]="stelleueberschriftein", ["en"]="setuphead", - ["fr"]="regletete", + ["fr"]="configurertête", ["it"]="impostatesta", ["nl"]="stelkopin", ["pe"]="بارگذاریسر", @@ -3988,7 +4016,7 @@ return { ["cs"]="nastavzahlavi", ["de"]="stellekopfzeileein", ["en"]="setupheader", - ["fr"]="regleentete", + ["fr"]="configurerentête", ["it"]="impostainstestazione", ["nl"]="stelhoofdin", ["pe"]="بارگذاریسربرگ", @@ -3998,7 +4026,7 @@ return { ["cs"]="nastavtextyzahlavi", ["de"]="stellekopfzeilentextein", ["en"]="setupheadertexts", - ["fr"]="regletextesentete", + ["fr"]="configurertextesentête", ["it"]="impostatestiintestazioni", ["nl"]="stelhoofdtekstenin", ["pe"]="بارگذاریمتنسربرگ", @@ -4008,7 +4036,7 @@ return { ["cs"]="nastavcislonadpisu", ["de"]="stellekopfzahlein", ["en"]="setupheadnumber", - ["fr"]="reglenumerotete", + ["fr"]="configurernumerotête", ["it"]="impostanumerotesta", ["nl"]="stelkopnummerin", ["pe"]="بارگذاریشمارهسر", @@ -4018,7 +4046,7 @@ return { ["cs"]="nastavnadpisy", ["de"]="stelleueberschriftenein", ["en"]="setupheads", - ["fr"]="regletetes", + ["fr"]="configurertêtes", ["it"]="impostateste", ["nl"]="stelkoppenin", ["pe"]="بارگذاریسرها", @@ -4028,7 +4056,7 @@ return { ["cs"]="nastavtexthlavicky", ["de"]="stelleueberschrifttextein", ["en"]="setupheadtext", - ["fr"]="regletextetete", + ["fr"]="configurertextêtete", ["it"]="impostatestointestazioni", ["nl"]="stelkoptekstin", ["pe"]="بارگذاریمتنسر", @@ -4038,7 +4066,7 @@ return { ["cs"]="nastavdelitko", ["de"]="stellebindestrichein", ["en"]="setuphyphenmark", - ["fr"]="reglemarquagehyphenation", + ["fr"]="configurermarquecesure", ["it"]="impostasegnosillabazione", ["nl"]="stelkoppeltekenin", ["pe"]="بارگذارینشانهشکستن", @@ -4046,13 +4074,14 @@ return { }, ["setupindentedtext"]={ ["en"]="setupindentedtext", + ["fr"]="configurertexteindente", ["nl"]="stelingesprongentextin", }, ["setupindenting"]={ ["cs"]="nastavodsazovani", ["de"]="stelleeinziehenein", ["en"]="setupindenting", - ["fr"]="reglecomposeenalinea", + ["fr"]="configurerindentation", ["it"]="impostarientro", ["nl"]="stelinspringenin", ["pe"]="بارگذاریتورفتگی", @@ -4062,7 +4091,7 @@ return { ["cs"]="nastavmarginalie", ["de"]="stelleinmarginalieein", ["en"]="setupinmargin", - ["fr"]="regledansmarge", + ["fr"]="configurerdansmarge", ["it"]="impostainmargine", ["nl"]="stelinmargein", ["pe"]="بارگذاریدرونحاشیه", @@ -4072,7 +4101,7 @@ return { ["cs"]="nastavinterakci", ["de"]="stelleinteraktionein", ["en"]="setupinteraction", - ["fr"]="regleinteraction", + ["fr"]="configurerinteraction", ["it"]="impostainterazione", ["nl"]="stelinteractiein", ["pe"]="بارگذاریپانل", @@ -4082,7 +4111,7 @@ return { ["cs"]="nastavinterakcnilistu", ["de"]="stelleinteraktionsbalkenein", ["en"]="setupinteractionbar", - ["fr"]="reglebarreinteraction", + ["fr"]="configurerbarreinteraction", ["it"]="impostabarrainterazione", ["nl"]="stelinteractiebalkin", ["pe"]="بارگذاریمیلهپانل", @@ -4092,7 +4121,7 @@ return { ["cs"]="nastavinterakcnimenu", ["de"]="stelleinteraktionsmenueein", ["en"]="setupinteractionmenu", - ["fr"]="reglemenuinteraction", + ["fr"]="configurermenuinteraction", ["it"]="impostamenuinterazione", ["nl"]="stelinteractiemenuin", ["pe"]="بارگذاریمنویپانل", @@ -4102,7 +4131,7 @@ return { ["cs"]="nastavinterakcniobrazovku", ["de"]="stelleinteraktionsbildschirmein", ["en"]="setupinteractionscreen", - ["fr"]="regleecraninteraction", + ["fr"]="configurerecraninteraction", ["it"]="impostaschermointerazione", ["nl"]="stelinteractieschermin", ["pe"]="بارگذاریپردهپانل", @@ -4112,7 +4141,7 @@ return { ["cs"]="nastavmeziradkovoumezeru", ["de"]="stellezeilenabstandein", ["en"]="setupinterlinespace", - ["fr"]="regleespacementinterligne", + ["fr"]="configurerespaceinterligne", ["it"]="impostainterlinea", ["nl"]="stelinterliniein", ["pe"]="بارگذاریفاصلهبینخط", @@ -4122,7 +4151,7 @@ return { ["cs"]="setupitemgroup", ["de"]="setupitemgroup", ["en"]="setupitemgroup", - ["fr"]="setupitemgroup", + ["fr"]="configurergroupedéléments", ["it"]="setupitemgroup", ["nl"]="stelitemgroepin", ["pe"]="بارگذاریگروهآیتم", @@ -4132,7 +4161,7 @@ return { ["cs"]="nastavvycty", ["de"]="stelleaufzaehlungenein", ["en"]="setupitemizations", - ["fr"]="reglegroupeselements", + ["fr"]="configurergroupesdéléments", ["it"]="impostaelencazioni", ["nl"]="stelopsommingenin", ["pe"]="بارگذاریگروههایآیتم", @@ -4142,7 +4171,7 @@ return { ["cs"]="nastavpolozky", ["de"]="stellepostenein", ["en"]="setupitems", - ["fr"]="regleelements", + ["fr"]="configureréléments", ["it"]="impostaelementi", ["nl"]="stelitemsin", ["pe"]="بارگذاریآیتمها", @@ -4152,7 +4181,7 @@ return { ["cs"]="nastavtextpopisku", ["de"]="stellelabeltextein", ["en"]="setuplabeltext", - ["fr"]="reglelabeltexte", + ["fr"]="configureretiquettetexte", ["it"]="impostatestoetichette", ["nl"]="stellabeltekstin", ["pe"]="باگذاریمتنبرچسب", @@ -4162,7 +4191,7 @@ return { ["cs"]="nastavjazyk", ["de"]="stellespracheein", ["en"]="setuplanguage", - ["fr"]="reglelangue", + ["fr"]="configurerlangue", ["it"]="impostalingua", ["nl"]="steltaalin", ["pe"]="بارگذاریزبان", @@ -4172,7 +4201,7 @@ return { ["cs"]="nastavvzhled", ["de"]="stellelayoutein", ["en"]="setuplayout", - ["fr"]="regledisposition", + ["fr"]="configurermiseenpage", ["it"]="impostalayout", ["nl"]="stellayoutin", ["pe"]="بارگذاریطرحبندی", @@ -4182,7 +4211,7 @@ return { ["cs"]="nastavlegendu", ["de"]="stellelegendeein", ["en"]="setuplegend", - ["fr"]="reglelegende", + ["fr"]="configurerlegende", ["it"]="impostalegenda", ["nl"]="stellegendain", ["pe"]="بارگذاریراهنما", @@ -4192,7 +4221,7 @@ return { ["cs"]="nastavcislovaniradku", ["de"]="stellezeilennumerierungein", ["en"]="setuplinenumbering", - ["fr"]="reglenumerotationligne", + ["fr"]="configurernumérotationligne", ["it"]="impostanumerazionerighe", ["nl"]="stelregelnummerenin", ["pe"]="بارگذاریشمارهگذاریخط", @@ -4202,7 +4231,7 @@ return { ["cs"]="nastavradky", ["de"]="stellezeilenein", ["en"]="setuplines", - ["fr"]="reglelignes", + ["fr"]="configurerlignes", ["it"]="impostarighe", ["nl"]="stelregelsin", ["pe"]="بارگذاریخطها", @@ -4212,7 +4241,7 @@ return { ["cs"]="nastavsirkucary", ["de"]="stellelinienbreiteein", ["en"]="setuplinewidth", - ["fr"]="regleepaisseurligne", + ["fr"]="configurerepaisseurtrait", ["it"]="impostaampiezzariga", ["nl"]="stellijndiktein", ["pe"]="بارگذاریعرضخط", @@ -4222,7 +4251,7 @@ return { ["cs"]="nastavseznam", ["de"]="stellelisteein", ["en"]="setuplist", - ["fr"]="regleliste", + ["fr"]="configurerliste", ["it"]="impostaelenco", ["nl"]="stellijstin", ["pe"]="بارگذاریلیست", @@ -4232,35 +4261,37 @@ return { ["cs"]="nastavupravu", ["de"]="stelleumbruchein", ["en"]="setupmakeup", - ["fr"]="reglemakeup", + ["fr"]="configurercomposition", ["it"]="impostamakeup", ["nl"]="stelopmaakin", ["pe"]="بارگذاریآرایش", ["ro"]="seteazamakeup", }, + ["setupmarginblock"]={ + ["en"]="setupmarginblock", + ["fr"]="configurerblocmarginal", + ["nl"]="stelmargeblokkenin", + }, ["setupmarginblocks"]={ ["cs"]="nastavmarginalniblok", ["de"]="stellemarginalblockein", ["en"]="setupmarginblocks", - ["fr"]="regleblocmarge", + ["fr"]="configurerblocmarge", ["it"]="impostablocchimargine", ["nl"]="stelmargeblokkenin", ["pe"]="بارگذاریبلوکهایحاشیه", ["ro"]="seteazablocurimarginale", }, - ["setupmarginblock"]={ - ["en"]="setupmarginblock", - ["nl"]="stelmargeblokkenin", - }, ["setupmargindata"]={ ["en"]="setupmargindata", + ["fr"]="configurerdonneesmarginales", ["nl"]="stelinmargein", }, ["setupmarginrules"]={ ["cs"]="nastavmarginalnilinky", ["de"]="stellemarginallinieein", ["en"]="setupmarginrules", - ["fr"]="reglemargereglee", + ["fr"]="configurertraitsmarge", ["it"]="impostalineemargine", ["nl"]="stelkantlijnin", ["pe"]="بارگذاریخطهایحاشیه", @@ -4270,7 +4301,7 @@ return { ["cs"]="nastavznaceni", ["de"]="stellebeschriftungein", ["en"]="setupmarking", - ["fr"]="reglemarquage", + ["fr"]="configurermarquage", ["it"]="impostamarcatura", ["nl"]="stelmarkeringin", ["pe"]="بارگذارینشانهگذاری", @@ -4280,7 +4311,7 @@ return { ["cs"]="setupmathalignment", ["de"]="setupmathalignment", ["en"]="setupmathalignment", - ["fr"]="setupmathalignment", + ["fr"]="configureralignementmath", ["it"]="setupmathalignment", ["nl"]="stelwiskundeuitlijnenin", ["pe"]="بارگذاریتنظیمریاضی", @@ -4290,7 +4321,7 @@ return { ["cs"]="nastavzuzeni", ["de"]="stelleengerein", ["en"]="setupnarrower", - ["fr"]="reglecompoetroite", + ["fr"]="configurerplusetroit", ["it"]="impostapiustretto", ["nl"]="stelsmallerin", ["pe"]="بارگذاریباریکتر", @@ -4300,7 +4331,7 @@ return { ["cs"]="setupnumber", ["de"]="setupnumber", ["en"]="setupnumber", - ["fr"]="reglenumero", + ["fr"]="configurernumero", ["it"]="impostanumerazione", ["nl"]="stelnummerin", ["pe"]="بارگذاریشماره", @@ -4310,7 +4341,7 @@ return { ["cs"]="nastavcislovani", ["de"]="stellenummerierungein", ["en"]="setupnumbering", - ["fr"]="reglenumerotation", + ["fr"]="configurernumérotation", ["it"]="impostanumerazione", ["nl"]="stelnummerenin", ["pe"]="بارگذاریشمارهگذاری", @@ -4320,7 +4351,7 @@ return { ["cs"]="nastavumisteniprotejsku", ["de"]="stellegegenueberplatzierenein", ["en"]="setupoppositeplacing", - ["fr"]="regleplacementopposition", + ["fr"]="configurerplacementopposition", ["it"]="impostaposizionamentoopposti", ["nl"]="stelnaastplaatsenin", ["pe"]="بارگذاریدرجمخالف", @@ -4330,7 +4361,7 @@ return { ["cs"]="nastavvystup", ["de"]="stelleausgabeein", ["en"]="setupoutput", - ["fr"]="reglesortie", + ["fr"]="configurersortie", ["it"]="impostaoutput", ["nl"]="steluitvoerin", ["pe"]="بارگذاریخروجی", @@ -4340,7 +4371,7 @@ return { ["cs"]="nastavkomentarstrany", ["de"]="stelleseitenkommentarein", ["en"]="setuppagecomment", - ["fr"]="reglecommentairepage", + ["fr"]="configurercommentairepage", ["it"]="impostacommentopagina", ["nl"]="stelpaginacommentaarin", ["pe"]="بارگذاریتوضیحصفحه", @@ -4350,7 +4381,7 @@ return { ["cs"]="nastavcislostrany", ["de"]="stelleseitennummerein", ["en"]="setuppagenumber", - ["fr"]="reglenumeropage", + ["fr"]="configurernumeropage", ["it"]="impostanumeropagina", ["nl"]="stelpaginanummerin", ["pe"]="بارگذاریشمارهصفحه", @@ -4360,7 +4391,7 @@ return { ["cs"]="nastavcislovanistran", ["de"]="stelleseitennummeriernungein", ["en"]="setuppagenumbering", - ["fr"]="reglenumerotationpage", + ["fr"]="configurernumérotationpage", ["it"]="impostanumerazionepagina", ["nl"]="stelpaginanummeringin", ["pe"]="بارگذاریشمارهگذاریصفحه", @@ -4370,7 +4401,7 @@ return { ["cs"]="nastavprechodstrany", ["de"]="stelleseitenuebergangein", ["en"]="setuppagetransitions", - ["fr"]="regletransitionspage", + ["fr"]="configurertransitionpage", ["it"]="impostatransizionepagina", ["nl"]="stelpaginaovergangenin", ["pe"]="بارگذاریگذارصفحه", @@ -4380,7 +4411,7 @@ return { ["cs"]="nastavpaletu", ["de"]="stellepaletteein", ["en"]="setuppalet", - ["fr"]="reglepalette", + ["fr"]="configurerpalette", ["it"]="impostatavolozza", ["nl"]="stelpaletin", ["pe"]="بارگذاریلوح", @@ -4390,7 +4421,7 @@ return { ["cs"]="setuppaper", ["de"]="setuppaper", ["en"]="setuppaper", - ["fr"]="reglepapier", + ["fr"]="configurerpapier", ["it"]="setuppaper", ["nl"]="stelpapierin", ["pe"]="بارگذاریبرگ", @@ -4400,7 +4431,7 @@ return { ["cs"]="nastavvelikostpapiru", ["de"]="stellepapierformatein", ["en"]="setuppapersize", - ["fr"]="regletaillepapier", + ["fr"]="configurertaillepapier", ["it"]="impostadimensionicarta", ["nl"]="stelpapierformaatin", ["pe"]="بارگذاریاندازهبرگ", @@ -4410,7 +4441,7 @@ return { ["cs"]="nastavcislovaniodstavcu", ["de"]="stelleabsatznummerierungein", ["en"]="setupparagraphnumbering", - ["fr"]="reglenumerotationparagraphe", + ["fr"]="configurernumérotationparagraphe", ["it"]="impostanumerazionecapoversi", ["nl"]="stelparagraafnummerenin", ["pe"]="بارگذاریشمارهگذاریپاراگراف", @@ -4420,7 +4451,7 @@ return { ["cs"]="nastavodstavce", ["de"]="stelleabsaetzeein", ["en"]="setupparagraphs", - ["fr"]="regleparagraphes", + ["fr"]="configurerparagraphe", ["it"]="impostacapoversi", ["nl"]="stelalineasin", ["pe"]="بارگذاریپاراگرافها", @@ -4430,7 +4461,7 @@ return { ["cs"]="setupplacement", ["de"]="setupplacement", ["en"]="setupplacement", - ["fr"]="setupplacement", + ["fr"]="configurerplacement", ["it"]="setupplacement", ["nl"]="stelplaatsin", ["pe"]="بارگذاریجانشانی", @@ -4440,7 +4471,7 @@ return { ["cs"]="nastavumistovani", ["de"]="stellepositionierenein", ["en"]="setuppositioning", - ["fr"]="reglepositionnement", + ["fr"]="configurerpositionnement", ["it"]="impostaposizionamento", ["nl"]="stelpositionerenin", ["pe"]="بارگذاریمکانگذاری", @@ -4450,7 +4481,7 @@ return { ["cs"]="nastavprofily", ["de"]="stelleprofilein", ["en"]="setupprofiles", - ["fr"]="regleprofils", + ["fr"]="configurerprofils", ["it"]="impostaprofili", ["nl"]="stelprofielenin", ["pe"]="بارگذاریپروفایلها", @@ -4460,7 +4491,7 @@ return { ["cs"]="nastavprogramy", ["de"]="stelleprogrammein", ["en"]="setupprograms", - ["fr"]="regleprogrammes", + ["fr"]="configurerprogrammes", ["it"]="impostaprogrammi", ["nl"]="stelprogrammasin", ["pe"]="بارگذاریبرنامهها", @@ -4470,7 +4501,7 @@ return { ["cs"]="nastavpublikace", ["de"]="stellepublikationein", ["en"]="setuppublications", - ["fr"]="reglepublications", + ["fr"]="configurerpublications", ["it"]="impostapubblicazioni", ["nl"]="stelpublicatiesin", ["pe"]="بارگذارینشرها", @@ -4480,7 +4511,7 @@ return { ["cs"]="nastavcitaci", ["de"]="stellezitierenein", ["en"]="setupquote", - ["fr"]="demarreciter", + ["fr"]="configurerciter", ["it"]="impostamenzione", ["nl"]="stelciterenin", ["pe"]="بارگذارینقل", @@ -4490,7 +4521,7 @@ return { ["cs"]="nastavseznamodkazu", ["de"]="stellereferenzlisteein", ["en"]="setupreferencelist", - ["fr"]="reglelistereference", + ["fr"]="configurerlistereference", ["it"]="impostalistariferimenti", ["nl"]="stelreferentielijstin", ["pe"]="بارگذاریلیستمرجع", @@ -4500,7 +4531,7 @@ return { ["cs"]="nastavodkazovani", ["de"]="stellereferenzierenein", ["en"]="setupreferencing", - ["fr"]="reglereferencage", + ["fr"]="configurerreferencement", ["it"]="impostariferimento", ["nl"]="stelrefererenin", ["pe"]="بارگذاریارجاع", @@ -4510,7 +4541,7 @@ return { ["cs"]="nastavrejstrik", ["de"]="stelleregisterein", ["en"]="setupregister", - ["fr"]="regleregistre", + ["fr"]="configurerregistre", ["it"]="impostaregistro", ["nl"]="stelregisterin", ["pe"]="بارگذاریثبت", @@ -4520,7 +4551,7 @@ return { ["cs"]="nastavotoceni", ["de"]="stelledrehenein", ["en"]="setuprotate", - ["fr"]="regleoriente", + ["fr"]="configurerrotation", ["it"]="impostarotazione", ["nl"]="stelroterenin", ["pe"]="بارگذاریدوران", @@ -4530,7 +4561,7 @@ return { ["cs"]="setuprule", ["de"]="setuprule", ["en"]="setuprule", - ["fr"]="regleregle", + ["fr"]="configurertrait", ["it"]="impostalinea", ["nl"]="stellijnin", ["pe"]="بارگذاریخط", @@ -4540,7 +4571,7 @@ return { ["cs"]="nastavrastr", ["de"]="stellerasterein", ["en"]="setupscreens", - ["fr"]="regleecrans", + ["fr"]="configurerecran", ["it"]="impostaschermi", ["nl"]="stelrastersin", ["pe"]="بارگذاریپردهها", @@ -4550,7 +4581,7 @@ return { ["cs"]="nastavsekci", ["de"]="stelleabschnittein", ["en"]="setupsection", - ["fr"]="reglesection", + ["fr"]="configurersection", ["it"]="impostasezione", ["nl"]="stelsectiein", ["pe"]="بارگذاریبخش", @@ -4560,7 +4591,7 @@ return { ["cs"]="nastavbloksekce", ["de"]="stelleabschnittsblockein", ["en"]="setupsectionblock", - ["fr"]="regleblocsection", + ["fr"]="configurerblocsection", ["it"]="impostabloccosezione", ["nl"]="stelsectieblokin", ["pe"]="بارگذاریبلوکبخش", @@ -4570,7 +4601,7 @@ return { ["cs"]="nastavtrideni", ["de"]="stellesortierenein", ["en"]="setupsorting", - ["fr"]="regletri", + ["fr"]="configurertri", ["it"]="impostaordinamento", ["nl"]="stelsorterenin", ["pe"]="بارگذاریترتیب", @@ -4580,7 +4611,7 @@ return { ["cs"]="nastavradkovani", ["de"]="stellespatiumein", ["en"]="setupspacing", - ["fr"]="regleespacement", + ["fr"]="configurerespacement", ["it"]="impostaspaziatura", ["nl"]="stelspatieringin", ["pe"]="بارگذاریفضاگذاری", @@ -4590,7 +4621,7 @@ return { ["cs"]="setupstartstop", ["de"]="setupstartstop", ["en"]="setupstartstop", - ["fr"]="regledemarrestoppe", + ["fr"]="configurerdébutfin", ["it"]="impostainiziatermina", ["nl"]="stelstartstopin", ["pe"]="بارگذاریشروعپایان", @@ -4600,7 +4631,7 @@ return { ["cs"]="setupstrut", ["de"]="setupstrut", ["en"]="setupstrut", - ["fr"]="reglestrut", + ["fr"]="configurerentretoise", ["it"]="impostastrut", ["nl"]="stelstrutin", ["pe"]="بارگذاریبست", @@ -4610,7 +4641,7 @@ return { ["cs"]="nastavpodcislostrany", ["de"]="stelleunterseitennummerein", ["en"]="setupsubpagenumber", - ["fr"]="reglesousnumeropage", + ["fr"]="configurernumerosouspage", ["it"]="impostanumerosottopagina", ["nl"]="stelsubpaginanummerin", ["pe"]="بارگذاریشمارهزیرصفحه", @@ -4620,7 +4651,7 @@ return { ["cs"]="nastavsadusymbolu", ["de"]="stellesymbolsetein", ["en"]="setupsymbolset", - ["fr"]="reglejeusymboles", + ["fr"]="configurerjeusymboles", ["it"]="impostasetsimboli", ["nl"]="stelsymboolsetin", ["pe"]="بارگذاریمجموعهنماد", @@ -4630,7 +4661,7 @@ return { ["cs"]="nastavsynchronizaci", ["de"]="stellesynchronisationein", ["en"]="setupsynchronization", - ["fr"]="reglesynchronisation", + ["fr"]="configurersynchronisation", ["it"]="impostasincronizzazione", ["nl"]="stelsynchronisatiein", ["pe"]="بارگذاریتطابق", @@ -4640,7 +4671,7 @@ return { ["cs"]="nastavsynchronizacnilistu", ["de"]="stellesynchronisationsbalkenein", ["en"]="setupsynchronizationbar", - ["fr"]="reglebarresynchronisation", + ["fr"]="configurerbarresynchronisation", ["it"]="impostabarrasincronizzazione", ["nl"]="stelsynchronisatiebalkin", ["pe"]="بارگذاریمیلهتطابق", @@ -4650,7 +4681,7 @@ return { ["cs"]="nastavsynonyma", ["de"]="stellesynonymein", ["en"]="setupsynonyms", - ["fr"]="reglesynonymes", + ["fr"]="configurersynonymes", ["it"]="impostasinonimi", ["nl"]="stelsynoniemenin", ["pe"]="بارگذاریمترادفها", @@ -4660,7 +4691,7 @@ return { ["cs"]="nastavsystem", ["de"]="stellesystemein", ["en"]="setupsystem", - ["fr"]="reglesysteme", + ["fr"]="configurersysteme", ["it"]="impostasistema", ["nl"]="stelsysteemin", ["pe"]="بارگذاریسیستم", @@ -4670,7 +4701,7 @@ return { ["cs"]="nastavtab", ["de"]="stelletabein", ["en"]="setuptab", - ["fr"]="regletab", + ["fr"]="configurertab", ["it"]="impostatab", ["nl"]="steltabin", ["pe"]="بارگذاریتب", @@ -4680,7 +4711,7 @@ return { ["cs"]="nastavtabulky", ["de"]="stelletabellenein", ["en"]="setuptables", - ["fr"]="regletableaux", + ["fr"]="configurertables", ["it"]="impostatabelle", ["nl"]="steltabellenin", ["pe"]="بارگذاریجدولها", @@ -4690,7 +4721,7 @@ return { ["cs"]="nastavtabelaci", ["de"]="stelletabulatorein", ["en"]="setuptabulate", - ["fr"]="regletabulation", + ["fr"]="configurertabulation", ["it"]="impostatabulato", ["nl"]="steltabulatiein", ["pe"]="بارگذاریجدولبندی", @@ -4700,7 +4731,7 @@ return { ["cs"]="nastavtext", ["de"]="stelletextein", ["en"]="setuptext", - ["fr"]="regletexte", + ["fr"]="configurertexte", ["it"]="impostatesto", ["nl"]="steltekstin", ["pe"]="بارگذاریمتن", @@ -4708,13 +4739,14 @@ return { }, ["setuptextbackground"]={ ["en"]="setuptextbackground", + ["fr"]="configurertextearriereplan", ["nl"]="steltekstachtergrondin", }, ["setuptextposition"]={ ["cs"]="setuptextposition", ["de"]="setuptextposition", ["en"]="setuptextposition", - ["fr"]="reglepositiontexte", + ["fr"]="configurerpositiontexte", ["it"]="impostaposizionetesto", ["nl"]="steltekstpositiein", ["pe"]="بارگذاریمکانمتن", @@ -4724,7 +4756,7 @@ return { ["cs"]="nastavtextovelinky", ["de"]="stelletextumrissein", ["en"]="setuptextrules", - ["fr"]="reglelignesreglestexte", + ["fr"]="configurertextetraits", ["it"]="impostalineetesto", ["nl"]="steltekstlijnenin", ["pe"]="بارگذاریخطهایمتن", @@ -4734,7 +4766,7 @@ return { ["cs"]="nastavtexttexty", ["de"]="stelletexttexteein", ["en"]="setuptexttexts", - ["fr"]="regletextestexte", + ["fr"]="configurertextestexte", ["it"]="impostatestotesti", ["nl"]="stelteksttekstenin", ["pe"]="بارگذاریمتنمتنها", @@ -4744,7 +4776,7 @@ return { ["cs"]="setuptextvariable", ["de"]="setuptextvariable", ["en"]="setuptextvariable", - ["fr"]="reglevariabletexte", + ["fr"]="configurervariabletexte", ["it"]="impostavariabiletesto", ["nl"]="steltekstvariabelein", ["pe"]="بارگذاریمتغیرمتن", @@ -4754,7 +4786,7 @@ return { ["cs"]="nastavtenkelinky", ["de"]="stelleduennerumrissein", ["en"]="setupthinrules", - ["fr"]="regletraitsfins", + ["fr"]="configurertraitsfins", ["it"]="impostalineesottili", ["nl"]="steldunnelijnenin", ["pe"]="بارگذاریخطهاینازک", @@ -4764,7 +4796,7 @@ return { ["cs"]="nastavtoleranci", ["de"]="stelletoleranzein", ["en"]="setuptolerance", - ["fr"]="regletolerance", + ["fr"]="configurertolerance", ["it"]="impostatolleranza", ["nl"]="steltolerantiein", ["pe"]="بارگذاریبردباری", @@ -4774,7 +4806,7 @@ return { ["cs"]="nastavhorejsek", ["de"]="stellenobenein", ["en"]="setuptop", - ["fr"]="reglesup", + ["fr"]="configurerhaut", ["it"]="impostacima", ["nl"]="stelbovenin", ["pe"]="بارگذاریبالا", @@ -4784,7 +4816,7 @@ return { ["cs"]="nastavhornitexty", ["de"]="stelletextobenein", ["en"]="setuptoptexts", - ["fr"]="regletextessup", + ["fr"]="configurertexteshaut", ["it"]="impostatesticima", ["nl"]="stelboventekstenin", ["pe"]="بارگذاریمتنهایبالا", @@ -4794,7 +4826,7 @@ return { ["cs"]="nastavtype", ["de"]="stelletipein", ["en"]="setuptype", - ["fr"]="regletype", + ["fr"]="configurertranscrire", ["it"]="impostatype", ["nl"]="steltypein", ["pe"]="بارگذاریتایپ", @@ -4804,7 +4836,7 @@ return { ["cs"]="nastavopis", ["de"]="stelletippenein", ["en"]="setuptyping", - ["fr"]="regledactylo", + ["fr"]="configurertranscription", ["it"]="impostatyping", ["nl"]="steltypenin", ["pe"]="بارگذاریتایپکردن", @@ -4814,7 +4846,7 @@ return { ["cs"]="nastavpodtrzeni", ["de"]="stelleunterstreichenein", ["en"]="setupunderbar", - ["fr"]="reglesouslignage", + ["fr"]="configurersouligner", ["it"]="impostasottolinea", ["nl"]="stelonderstrepenin", ["pe"]="بارگذاریمیلهزیر", @@ -4824,7 +4856,7 @@ return { ["cs"]="nastavurl", ["de"]="stelleurlein", ["en"]="setupurl", - ["fr"]="regleurl", + ["fr"]="configurerurl", ["it"]="impostaurl", ["nl"]="stelurlin", ["pe"]="setupurl", @@ -4834,7 +4866,7 @@ return { ["cs"]="nastavverze", ["de"]="stelleversionein", ["en"]="setupversions", - ["fr"]="regleversions", + ["fr"]="configurerversions", ["it"]="impostaversioni", ["nl"]="stelversiesin", ["pe"]="بارگذارینسخهها", @@ -4844,7 +4876,7 @@ return { ["cs"]="nastavbilamista", ["de"]="stellezwischenraumein", ["en"]="setupwhitespace", - ["fr"]="regleespaceblanc", + ["fr"]="configurerespaceblanc", ["it"]="impostaspaziobianco", ["nl"]="stelwitruimtein", ["pe"]="بارگذاریفضایسفید", @@ -4854,7 +4886,7 @@ return { ["cs"]="ukazzakladnifont", ["de"]="zeigefliesstext", ["en"]="showbodyfont", - ["fr"]="montrepolicecorps", + ["fr"]="montrerpolicedecorps", ["it"]="mostrafontdeltesto", ["nl"]="toonkorps", ["pe"]="نمایشقلمبدنه", @@ -4864,7 +4896,7 @@ return { ["cs"]="ukazpostredizakladnihofontu", ["de"]="zeigefliesstextumgebung", ["en"]="showbodyfontenvironment", - ["fr"]="montreenvironnementpolicecorps", + ["fr"]="montrerenvironnementpolicedecorps", ["it"]="mostraambientefontdeltesto", ["nl"]="toonkorpsomgeving", ["pe"]="نمایشمحیطقلمبدنه", @@ -4874,7 +4906,7 @@ return { ["cs"]="ukazbarvu", ["de"]="zeigefarbe", ["en"]="showcolor", - ["fr"]="montrecouleur", + ["fr"]="montrercouleur", ["it"]="mostracolore", ["nl"]="toonkleur", ["pe"]="نمایشرنگ", @@ -4884,7 +4916,7 @@ return { ["cs"]="ukazskupinubarev", ["de"]="zeigefarbengruppe", ["en"]="showcolorgroup", - ["fr"]="montregroupecouleur", + ["fr"]="montrergroupecouleur", ["it"]="mostragruppocolori", ["nl"]="toonkleurgroep", ["pe"]="نمایشگروهرنگ", @@ -4894,7 +4926,7 @@ return { ["cs"]="ukazexterniobrazy", ["de"]="zeigeexterneabbildungen", ["en"]="showexternalfigures", - ["fr"]="montrefiguresexternes", + ["fr"]="montrerfiguresexternes", ["it"]="mostrafiguresterne", ["nl"]="toonexternefiguren", ["pe"]="نمایششکلهایخارجی", @@ -4904,7 +4936,7 @@ return { ["cs"]="ukazpole", ["de"]="zeigefelder", ["en"]="showfields", - ["fr"]="montrechamps", + ["fr"]="montrerchamps", ["it"]="mostracampi", ["nl"]="toonvelden", ["pe"]="نمایشمیدانها", @@ -4914,7 +4946,7 @@ return { ["cs"]="ukazramecek", ["de"]="zeigerahmen", ["en"]="showframe", - ["fr"]="montrecadre", + ["fr"]="montrermiseenpage", ["it"]="mostracornice", ["nl"]="toonkader", ["pe"]="نمایشقالب", @@ -4924,7 +4956,7 @@ return { ["cs"]="ukazmrizku", ["de"]="zeigegitter", ["en"]="showgrid", - ["fr"]="montregrille", + ["fr"]="montrergrille", ["it"]="mostragriglia", ["nl"]="toongrid", ["pe"]="نمایشتوری", @@ -4934,7 +4966,7 @@ return { ["cs"]="ukazvzhled", ["de"]="zeigelayout", ["en"]="showlayout", - ["fr"]="montredisposition", + ["fr"]="montrermiseenpage", ["it"]="mostralyout", ["nl"]="toonlayout", ["pe"]="نمایشطرحبندی", @@ -4944,7 +4976,7 @@ return { ["cs"]="ukazupravu", ["de"]="zeigeumbruch", ["en"]="showmakeup", - ["fr"]="montremakeup", + ["fr"]="montrercomposition", ["it"]="mostramakeup", ["nl"]="toonopmaak", ["pe"]="نمایشآرایش", @@ -4954,7 +4986,7 @@ return { ["cs"]="ukazpaletu", ["de"]="zeigepalette", ["en"]="showpalet", - ["fr"]="montrepalette", + ["fr"]="montrerpalette", ["it"]="mostratavolozza", ["nl"]="toonpalet", ["pe"]="نمایشلوح", @@ -4964,7 +4996,7 @@ return { ["cs"]="ukazvytisk", ["de"]="zeigedruck", ["en"]="showprint", - ["fr"]="montreedition", + ["fr"]="montrerimpression", ["it"]="mostrastampa", ["nl"]="toonprint", ["pe"]="نمایشچاپ", @@ -4974,7 +5006,7 @@ return { ["cs"]="ukaznastaveni", ["de"]="zeigeeinstellungen", ["en"]="showsetups", - ["fr"]="montrereglages", + ["fr"]="montrerconfigurations", ["it"]="mostraimpostazioni", ["nl"]="tooninstellingen", ["pe"]="نمایشبارگذاریها", @@ -4984,7 +5016,7 @@ return { ["cs"]="ukazpodpery", ["de"]="zeigestruts", ["en"]="showstruts", - ["fr"]="montrestruts", + ["fr"]="montrerentretoises", ["it"]="mostrastruts", ["nl"]="toonstruts", ["pe"]="نمایشبستها", @@ -4994,7 +5026,7 @@ return { ["cs"]="ukazsadusymbolu", ["de"]="showsymbolset", ["en"]="showsymbolset", - ["fr"]="montrejeusymboles", + ["fr"]="montrerjeusymboles", ["it"]="mostrasetsimboli", ["nl"]="toonsymboolset", ["pe"]="نمایشمجموعهعلامت", @@ -5004,7 +5036,7 @@ return { ["cs"]="kap", ["de"]="kap", ["en"]="cap", - ["fr"]="cap", + ["fr"]="petitescap", ["it"]="cap", ["nl"]="kap", ["pe"]="cap", @@ -5044,7 +5076,7 @@ return { ["cs"]="rozdelplvouciobjekt", ["de"]="teilegleitobjekt", ["en"]="splitfloat", - ["fr"]="separeflottant", + ["fr"]="flottantpartage", ["it"]="spezzaoggettomobile", ["nl"]="splitsplaatsblok", ["pe"]="شکافتنشناور", @@ -5054,21 +5086,17 @@ return { ["cs"]="startzarovnavani", ["de"]="startausrichtung", ["en"]="startalignment", - ["fr"]="demarrealignement", + ["fr"]="débutalignement", ["it"]="iniziaallineamento", ["nl"]="startuitlijnen", ["pe"]="شروعتنظیم", ["ro"]="startaliniere", }, - ["alignment"]={ - ["en"]="alignment", - ["nl"]="uitlijnen", - }, ["startbackground"]={ ["cs"]="startpozadi", ["de"]="starthintergrund", ["en"]="startbackground", - ["fr"]="demarrearriereplan", + ["fr"]="débutarriereplan", ["it"]="iniziasfondo", ["nl"]="startachtergrond", ["pe"]="شروعپسزمینه", @@ -5078,7 +5106,7 @@ return { ["cs"]="startkodovani", ["de"]="startkodierung", ["en"]="startcoding", - ["fr"]="demarrecodage", + ["fr"]="débutcodage", ["it"]="iniziacodifica", ["nl"]="startcodering", ["pe"]="شروعکد", @@ -5088,7 +5116,7 @@ return { ["cs"]="startbarva", ["de"]="startfarbe", ["en"]="startcolor", - ["fr"]="demarrecouleur", + ["fr"]="débutcouleur", ["it"]="iniziacolore", ["nl"]="startkleur", ["pe"]="شروعرنگ", @@ -5098,7 +5126,7 @@ return { ["cs"]="startcolumnmakeup", ["de"]="startcolumnmakeup", ["en"]="startcolumnmakeup", - ["fr"]="startcolumnmakeup", + ["fr"]="débutcompositioncolonne", ["it"]="startcolumnmakeup", ["nl"]="startkolomopmaak", ["pe"]="شروعآرایشستون", @@ -5108,7 +5136,7 @@ return { ["cs"]="startsloupce", ["de"]="startspalten", ["en"]="startcolumns", - ["fr"]="demarrecolonnes", + ["fr"]="débutcolonnes", ["it"]="iniziacolonne", ["nl"]="startkolommen", ["pe"]="شروعستونها", @@ -5118,7 +5146,7 @@ return { ["cs"]="startcolumnset", ["de"]="startcolumnset", ["en"]="startcolumnset", - ["fr"]="demarrejeucolonne", + ["fr"]="débutjeucolonnes", ["it"]="iniziagruppocolonne", ["nl"]="startkolomgroep", ["pe"]="شروعمجموعهستون", @@ -5128,7 +5156,7 @@ return { ["cs"]="startspojeni", ["de"]="startkombination", ["en"]="startcombination", - ["fr"]="demarrecombinaison", + ["fr"]="débutcombinaison", ["it"]="iniziacombinazione", ["nl"]="startcombinatie", ["pe"]="شروعترکیب", @@ -5138,7 +5166,7 @@ return { ["cs"]="startkomponenta", ["de"]="startkomponente", ["en"]="startcomponent", - ["fr"]="demarrecomposant", + ["fr"]="débutcomposant", ["it"]="iniziacomponente", ["nl"]="startonderdeel", ["pe"]="شروعمولفه", @@ -5148,7 +5176,7 @@ return { ["cs"]="startdokument", ["de"]="startdokument", ["en"]="startdocument", - ["fr"]="demarredocument", + ["fr"]="débutdocument", ["it"]="iniziadocumento", ["nl"]="startdocument", ["pe"]="شروعنوشتار", @@ -5158,7 +5186,7 @@ return { ["cs"]="startprostredi", ["de"]="startumgebung", ["en"]="startenvironment", - ["fr"]="demarreenvironement", + ["fr"]="débutenvironnement", ["it"]="iniziaambiente", ["nl"]="startomgeving", ["pe"]="شروعمحیط", @@ -5168,7 +5196,7 @@ return { ["cs"]="startobraz", ["de"]="startabbildung", ["en"]="startfigure", - ["fr"]="demarrefigure", + ["fr"]="débutfigure", ["it"]="iniziafigura", ["nl"]="startfiguur", ["pe"]="شروعشکل", @@ -5176,13 +5204,14 @@ return { }, ["startframed"]={ ["en"]="startframed", + ["fr"]="débutencadre", ["nl"]="startomlijnd", }, ["startglobal"]={ ["cs"]="startglobalni", ["de"]="startglobal", ["en"]="startglobal", - ["fr"]="demarreglobal", + ["fr"]="débutglobal", ["it"]="iniziaglobale", ["nl"]="startglobaal", ["pe"]="شروعسراسری", @@ -5192,7 +5221,7 @@ return { ["cs"]="startradek", ["de"]="startzeile", ["en"]="startline", - ["fr"]="demarreligne", + ["fr"]="débutligneref", ["it"]="iniziariga", ["nl"]="startregel", ["pe"]="شروعخط", @@ -5202,21 +5231,17 @@ return { ["cs"]="startkorekceradku", ["de"]="startzeilenkorrektur", ["en"]="startlinecorrection", - ["fr"]="demarrecorrectionligne", + ["fr"]="débutcorrectionligne", ["it"]="iniziacorrezioneriga", ["nl"]="startregelcorrectie", ["pe"]="شروعتصحیحخط", ["ro"]="startcorectielinie", }, - ["linecorrection"]={ - ["en"]="linecorrection", - ["nl"]="regelcorrectie", - }, ["startlinenumbering"]={ ["cs"]="startcislovaniradku", ["de"]="startzeilennumerierung", ["en"]="startlinenumbering", - ["fr"]="demarrenumerotationligne", + ["fr"]="débutnumérotationligne", ["it"]="inizianumerazionerighe", ["nl"]="startregelnummeren", ["pe"]="شروعشمارهگذاریخط", @@ -5226,7 +5251,7 @@ return { ["cs"]="startradky", ["de"]="startzeilen", ["en"]="startlines", - ["fr"]="demarrelignes", + ["fr"]="débutlignes", ["it"]="iniziarighe", ["nl"]="startregels", ["pe"]="شروعخطها", @@ -5236,7 +5261,7 @@ return { ["cs"]="startlokalni", ["de"]="startlokal", ["en"]="startlocal", - ["fr"]="demarrelocal", + ["fr"]="débutlocal", ["it"]="inizialocale", ["nl"]="startlokaal", ["pe"]="شروعموضعی", @@ -5246,21 +5271,17 @@ return { ["cs"]="startlokalnipoznamkypodcarou", ["de"]="startlokalefussnoten", ["en"]="startlocalfootnotes", - ["fr"]="demarrenotespdplocales", + ["fr"]="débutnotesbdplocal", ["it"]="inizianotepdplocali", ["nl"]="startlokalevoetnoten", ["pe"]="شروعپانوشتهایموضعی", ["ro"]="startnotesubsollocale", }, - ["localfootnotes"]={ - ["en"]="localfootnotes", - ["nl"]="lokalevoetnoten", - }, ["startmakeup"]={ ["cs"]="startuprava", ["de"]="startumbruch", ["en"]="startmakeup", - ["fr"]="demarremakeup", + ["fr"]="débutcomposition", ["it"]="iniziamakeup", ["nl"]="startopmaak", ["pe"]="شروعآرایش", @@ -5270,21 +5291,17 @@ return { ["cs"]="startmarginalniblok", ["de"]="startmarginalblock", ["en"]="startmarginblock", - ["fr"]="demarreblocmarge", + ["fr"]="débutblocmarge", ["it"]="iniziabloccomargine", ["nl"]="startmargeblok", ["pe"]="شروعبلوکحاشیه", ["ro"]="startblocmarginal", }, - ["marginblock"]={ - ["en"]="marginblock", - ["nl"]="margeblok", - }, ["startmarginrule"]={ ["cs"]="startmarginalnilinka", ["de"]="startmarginallinie", ["en"]="startmarginrule", - ["fr"]="demarremargereglee", + ["fr"]="débuttraitmarge", ["it"]="inizialineamargine", ["nl"]="startkantlijn", ["pe"]="شروعخطحاشیه", @@ -5294,7 +5311,7 @@ return { ["cs"]="startzuzeni", ["de"]="startenger", ["en"]="startnarrower", - ["fr"]="demarrecompoetroite", + ["fr"]="débutplusetroit", ["it"]="iniziapiustretto", ["nl"]="startsmaller", ["pe"]="شروعباریکتر", @@ -5304,7 +5321,7 @@ return { ["cs"]="startprotejsek", ["de"]="startgegenueber", ["en"]="startopposite", - ["fr"]="demarreopposition", + ["fr"]="débutopposition", ["it"]="iniziaopposto", ["nl"]="startnaast", ["pe"]="شروعمخالف", @@ -5314,7 +5331,7 @@ return { ["cs"]="startprekryv", ["de"]="startoverlay", ["en"]="startoverlay", - ["fr"]="demarrerevetement", + ["fr"]="débutsuperposition", ["it"]="iniziasovrapposizione", ["nl"]="startoverlay", ["pe"]="شروعپوشش", @@ -5324,7 +5341,7 @@ return { ["cs"]="startprehled", ["de"]="startueberblick", ["en"]="startoverview", - ["fr"]="demarrevuedensemble", + ["fr"]="débutvuedensemble", ["it"]="iniziaoverview", ["nl"]="startoverzicht", ["pe"]="شروعبازبینی", @@ -5334,7 +5351,7 @@ return { ["cs"]="startzhustene", ["de"]="startkleinerdurchschuss", ["en"]="startpacked", - ["fr"]="demarregroupe", + ["fr"]="débutemballage", ["it"]="iniziaimpaccato", ["nl"]="startopelkaar", ["pe"]="شروعفشرده", @@ -5344,7 +5361,7 @@ return { ["cs"]="startumistovani", ["de"]="startpositionieren", ["en"]="startpositioning", - ["fr"]="demarrepositionnement", + ["fr"]="débutpositionnement", ["it"]="iniziaposizionamento", ["nl"]="startpositioneren", ["pe"]="شروعمکانگذاری", @@ -5354,7 +5371,7 @@ return { ["cs"]="startprodukt", ["de"]="startprodukt", ["en"]="startproduct", - ["fr"]="demarreproduit", + ["fr"]="débutproduit", ["it"]="iniziaprodotto", ["nl"]="startprodukt", ["pe"]="شروعتولید", @@ -5364,7 +5381,7 @@ return { ["cs"]="startprofil", ["de"]="startprofil", ["en"]="startprofile", - ["fr"]="demarreprofil", + ["fr"]="débutprofil", ["it"]="iniziaprofilo", ["nl"]="startprofiel", ["pe"]="شروعپروفایل", @@ -5374,7 +5391,7 @@ return { ["cs"]="startprojekt", ["de"]="startprojekt", ["en"]="startproject", - ["fr"]="demarreprojet", + ["fr"]="débutprojet", ["it"]="iniziaprogetto", ["nl"]="startprojekt", ["pe"]="شروعپروژه", @@ -5384,7 +5401,7 @@ return { ["cs"]="startcitace", ["de"]="startzitat", ["en"]="startquotation", - ["fr"]="demarrecitation", + ["fr"]="débutcitation", ["it"]="iniziacitazione", ["nl"]="startcitaat", ["pe"]="شروعنقلقول", @@ -5394,7 +5411,7 @@ return { ["cs"]="startrastr", ["de"]="startraster", ["en"]="startraster", - ["fr"]="demarreraster", + ["fr"]="débutraster", ["it"]="iniziaraster", ["nl"]="startraster", ["pe"]="startraster", @@ -5404,7 +5421,7 @@ return { ["cs"]="startsadasymbolu", ["de"]="startsymbolset", ["en"]="startsymbolset", - ["fr"]="demarrejeusymboles", + ["fr"]="débutjeusymboles", ["it"]="iniziasetsimboli", ["nl"]="startsymboolset", ["pe"]="شروعمجموعهنماد", @@ -5414,7 +5431,7 @@ return { ["cs"]="startsynchronizace", ["de"]="startsynchronisation", ["en"]="startsynchronization", - ["fr"]="demarresynchronisation", + ["fr"]="débutsynchronisation", ["it"]="iniziasincronizzazione", ["nl"]="startsynchronisatie", ["pe"]="شروعتطابق", @@ -5424,7 +5441,7 @@ return { ["cs"]="starttabulka", ["de"]="starttabelle", ["en"]="starttable", - ["fr"]="demarretableau", + ["fr"]="débuttable", ["it"]="iniziatabella", ["nl"]="starttabel", ["pe"]="شروعجدول", @@ -5434,7 +5451,7 @@ return { ["cs"]="starttabulky", ["de"]="starttabellen", ["en"]="starttables", - ["fr"]="demarretableaux", + ["fr"]="débuttables", ["it"]="iniziatabelle", ["nl"]="starttabellen", ["pe"]="شروعجدولها", @@ -5444,7 +5461,7 @@ return { ["cs"]="starttext", ["de"]="starttext", ["en"]="starttext", - ["fr"]="demarretexte", + ["fr"]="débuttexte", ["it"]="iniziatesto", ["nl"]="starttekst", ["pe"]="شروعمتن", @@ -5452,17 +5469,14 @@ return { }, ["starttextbackground"]={ ["en"]="starttextbackground", + ["fr"]="débuttextearriereplan", ["nl"]="starttekstachtergrond", }, - ["textbackground"]={ - ["en"]="textbackground", - ["nl"]="tekstachtergrond", - }, ["starttextrule"]={ ["cs"]="starttextovalinka", ["de"]="starttextlinie", ["en"]="starttextrule", - ["fr"]="demarreligneregleetexte", + ["fr"]="débuttextetrait", ["it"]="inizialineatesto", ["nl"]="starttekstlijn", ["pe"]="شروعخطمتن", @@ -5472,7 +5486,7 @@ return { ["cs"]="startnezhustene", ["de"]="startgrosserdurchschuss", ["en"]="startunpacked", - ["fr"]="demarredegroupe", + ["fr"]="débutdesemballage", ["it"]="iniziaunpacked", ["nl"]="startvanelkaar", ["pe"]="شروعغیرفشرده", @@ -5482,7 +5496,7 @@ return { ["cs"]="startverze", ["de"]="startversion", ["en"]="startversion", - ["fr"]="demarreversion", + ["fr"]="débutversion", ["it"]="iniziaversione", ["nl"]="startversie", ["pe"]="شروعنسخه", @@ -5492,7 +5506,7 @@ return { ["cs"]="stopzarovnavani", ["de"]="stopausrichtung", ["en"]="stopalignment", - ["fr"]="stoppealignement", + ["fr"]="finalignement", ["it"]="terminaallineamento", ["nl"]="stopuitlijnen", ["pe"]="پایانتنظیم", @@ -5502,7 +5516,7 @@ return { ["cs"]="stoppozadi", ["de"]="stophintergrund", ["en"]="stopbackground", - ["fr"]="stoppearriereplan", + ["fr"]="finarriereplan", ["it"]="terminasfondo", ["nl"]="stopachtergrond", ["pe"]="پایانپسزمینه", @@ -5512,7 +5526,7 @@ return { ["cs"]="stopkodovani", ["de"]="stopkodierung", ["en"]="stopcoding", - ["fr"]="stoppecodage", + ["fr"]="fincodage", ["it"]="terminacodifica", ["nl"]="stopcodering", ["pe"]="پایانکد", @@ -5522,7 +5536,7 @@ return { ["cs"]="stopbarva", ["de"]="stopfarbe", ["en"]="stopcolor", - ["fr"]="stoppecouleur", + ["fr"]="fincouleur", ["it"]="terminacolore", ["nl"]="stopkleur", ["pe"]="پایانرنگ", @@ -5532,7 +5546,7 @@ return { ["cs"]="stopcolumnmakeup", ["de"]="stopcolumnmakeup", ["en"]="stopcolumnmakeup", - ["fr"]="stopcolumnmakeup", + ["fr"]="fincompositioncolonne", ["it"]="stopcolumnmakeup", ["nl"]="stopkolomopmaak", ["pe"]="پایانآرایشستون", @@ -5542,7 +5556,7 @@ return { ["cs"]="stopsloupce", ["de"]="stopspalten", ["en"]="stopcolumns", - ["fr"]="stoppecolonnes", + ["fr"]="fincolonnes", ["it"]="terminacolonne", ["nl"]="stopkolommen", ["pe"]="پایانستونها", @@ -5552,7 +5566,7 @@ return { ["cs"]="stopcolumnset", ["de"]="stopcolumnset", ["en"]="stopcolumnset", - ["fr"]="stoppejeucolonne", + ["fr"]="finjeucolonnes", ["it"]="terminagruppocolonne", ["nl"]="stopkolomgroep", ["pe"]="پایانمجموعهستون", @@ -5562,7 +5576,7 @@ return { ["cs"]="stopspojeni", ["de"]="stopkombination", ["en"]="stopcombination", - ["fr"]="stoppecombinaison", + ["fr"]="fincombinaison", ["it"]="terminacombinazione", ["nl"]="stopcombinatie", ["pe"]="پایانترکیب", @@ -5572,7 +5586,7 @@ return { ["cs"]="stopkomponenta", ["de"]="stopkomponente", ["en"]="stopcomponent", - ["fr"]="stoppecomposant", + ["fr"]="fincomposant", ["it"]="terminacomponente", ["nl"]="stoponderdeel", ["pe"]="پایانمولفه", @@ -5582,7 +5596,7 @@ return { ["cs"]="stopdokument", ["de"]="stopdokument", ["en"]="stopdocument", - ["fr"]="stoppedocument", + ["fr"]="findocument", ["it"]="terminadocumento", ["nl"]="stopdocument", ["pe"]="پایاننوشتار", @@ -5592,7 +5606,7 @@ return { ["cs"]="stopprostredi", ["de"]="stopumgebung", ["en"]="stopenvironment", - ["fr"]="stoppeenvironement", + ["fr"]="finenvironnement", ["it"]="terminaambiente", ["nl"]="stopomgeving", ["pe"]="پایانمحیط", @@ -5600,13 +5614,14 @@ return { }, ["stopframed"]={ ["en"]="stopframed", + ["fr"]="finencadre", ["nl"]="stopomlijnd", }, ["stopglobal"]={ ["cs"]="stopglobalni", ["de"]="stopglobal", ["en"]="stopglobal", - ["fr"]="stoppeglobal", + ["fr"]="finglobal", ["it"]="terminaglobale", ["nl"]="stopglobaal", ["pe"]="پایانسراسری", @@ -5616,7 +5631,7 @@ return { ["cs"]="stopradek", ["de"]="stopzeile", ["en"]="stopline", - ["fr"]="stoppeligne", + ["fr"]="finligneref", ["it"]="terminariga", ["nl"]="stopregel", ["pe"]="پایانخط", @@ -5626,7 +5641,7 @@ return { ["cs"]="stopkorekceradku", ["de"]="stopzeilenkorrektur", ["en"]="stoplinecorrection", - ["fr"]="stoppecorrectionligne", + ["fr"]="fincorrectionligne", ["it"]="terminacorrezioneriga", ["nl"]="stopregelcorrectie", ["pe"]="پایانتصحیحخط", @@ -5636,7 +5651,7 @@ return { ["cs"]="stopcislovaniradku", ["de"]="stopzeilennumerierung", ["en"]="stoplinenumbering", - ["fr"]="stoppenumerotationligne", + ["fr"]="finnumérotationligne", ["it"]="terminanumerazionerighe", ["nl"]="stopregelnummeren", ["pe"]="پایانشمارهگذاریخط", @@ -5646,7 +5661,7 @@ return { ["cs"]="stopradky", ["de"]="stopzeilen", ["en"]="stoplines", - ["fr"]="stoppelignes", + ["fr"]="finlignes", ["it"]="terminarighe", ["nl"]="stopregels", ["pe"]="پایانخطها", @@ -5656,7 +5671,7 @@ return { ["cs"]="stoplokalni", ["de"]="stoplokal", ["en"]="stoplocal", - ["fr"]="stoppelocal", + ["fr"]="finlocal", ["it"]="terminalocale", ["nl"]="stoplokaal", ["pe"]="پایانموضعی", @@ -5666,7 +5681,7 @@ return { ["cs"]="stoplokalnipoznamkypodcarou", ["de"]="stoplokalefussnoten", ["en"]="stoplocalfootnotes", - ["fr"]="stoppenotespdplocales", + ["fr"]="finnotesbdplocal", ["it"]="terminanotepdplocali", ["nl"]="stoplokalevoetnoten", ["pe"]="پایانپانوشتهایموضعی", @@ -5676,7 +5691,7 @@ return { ["cs"]="stopuprava", ["de"]="stopumbruch", ["en"]="stopmakeup", - ["fr"]="stoppemakeup", + ["fr"]="fincomposition", ["it"]="terminamakeup", ["nl"]="stopopmaak", ["pe"]="پایانآرایش", @@ -5686,7 +5701,7 @@ return { ["cs"]="stopmarginalniblok", ["de"]="stopmarginalblock", ["en"]="stopmarginblock", - ["fr"]="stoppeblocmarge", + ["fr"]="finblocmarge", ["it"]="terminabloccomargine", ["nl"]="stopmargeblok", ["pe"]="پایانبلوکحاشیه", @@ -5696,7 +5711,7 @@ return { ["cs"]="stopmarginalnilinka", ["de"]="stopmarginallinie", ["en"]="stopmarginrule", - ["fr"]="stoppemargereglee", + ["fr"]="fintraitmarge", ["it"]="terminalineamargine", ["nl"]="stopkantlijn", ["pe"]="پایانخطحاشیه", @@ -5706,7 +5721,7 @@ return { ["cs"]="stopzuzeni", ["de"]="stopenger", ["en"]="stopnarrower", - ["fr"]="stopcompoetroite", + ["fr"]="finplusetroit", ["it"]="terminapiustretto", ["nl"]="stopsmaller", ["pe"]="پایاننازکتر", @@ -5716,7 +5731,7 @@ return { ["cs"]="stopprotejsek", ["de"]="stopgegenueber", ["en"]="stopopposite", - ["fr"]="stoppeopposition", + ["fr"]="finopposition", ["it"]="terminaopposto", ["nl"]="stopnaast", ["pe"]="پایانمخالف", @@ -5726,7 +5741,7 @@ return { ["cs"]="stopprekryv", ["de"]="stopoverlay", ["en"]="stopoverlay", - ["fr"]="stopperevetement", + ["fr"]="finsuperposition", ["it"]="terminasovrapposizione", ["nl"]="stopoverlay", ["pe"]="پایانپوشش", @@ -5736,7 +5751,7 @@ return { ["cs"]="stopprehled", ["de"]="stopueberblick", ["en"]="stopoverview", - ["fr"]="stoppevuedensemble", + ["fr"]="finvuedensemble", ["it"]="terminaoverview", ["nl"]="stopoverzicht", ["pe"]="پایانبازبینی", @@ -5746,7 +5761,7 @@ return { ["cs"]="stopzhustene", ["de"]="stopkleinerdurchschuss", ["en"]="stoppacked", - ["fr"]="stoppegroupe", + ["fr"]="finemballage", ["it"]="terminaimpaccato", ["nl"]="stopopelkaar", ["pe"]="پایانفشرده", @@ -5756,7 +5771,7 @@ return { ["cs"]="stopumistovani", ["de"]="stoppositionieren", ["en"]="stoppositioning", - ["fr"]="stoppepositionnement", + ["fr"]="finpositionnement", ["it"]="terminaposizionamento", ["nl"]="stoppositioneren", ["pe"]="پایانمکانگذاری", @@ -5766,7 +5781,7 @@ return { ["cs"]="stopprodukt", ["de"]="stopprodukt", ["en"]="stopproduct", - ["fr"]="stoppeproduit", + ["fr"]="finproduit", ["it"]="terminaprodotto", ["nl"]="stopprodukt", ["pe"]="پایانتولید", @@ -5776,7 +5791,7 @@ return { ["cs"]="stopprofil", ["de"]="stopprofil", ["en"]="stopprofile", - ["fr"]="stoppeprofil", + ["fr"]="finprofil", ["it"]="terminaprofili", ["nl"]="stopprofiel", ["pe"]="پایانپروفایل", @@ -5786,7 +5801,7 @@ return { ["cs"]="stopprojekt", ["de"]="stopprojekt", ["en"]="stopproject", - ["fr"]="stoppeprojet", + ["fr"]="finprojet", ["it"]="terminaprogetto", ["nl"]="stopprojekt", ["pe"]="پایانپروژه", @@ -5796,7 +5811,7 @@ return { ["cs"]="stopcitace", ["de"]="stopzitat", ["en"]="stopquotation", - ["fr"]="stoppecitation", + ["fr"]="fincitation", ["it"]="terminacitazione", ["nl"]="stopcitaat", ["pe"]="پایاننقلقول", @@ -5806,7 +5821,7 @@ return { ["cs"]="stoprastr", ["de"]="stopraster", ["en"]="stopraster", - ["fr"]="stopperaster", + ["fr"]="finraster", ["it"]="terminaraster", ["nl"]="stopraster", ["pe"]="stopraster", @@ -5816,7 +5831,7 @@ return { ["cs"]="stopsynchronizace", ["de"]="stopsynchronisation", ["en"]="stopsynchronization", - ["fr"]="stoppesynchronisation", + ["fr"]="finsynchronisation", ["it"]="terminasincronizzazione", ["nl"]="stopsynchronisatie", ["pe"]="پایانتطابق", @@ -5826,7 +5841,7 @@ return { ["cs"]="stoptabulka", ["de"]="stoptabelle", ["en"]="stoptable", - ["fr"]="stoppetableau", + ["fr"]="fintable", ["it"]="terminatabella", ["nl"]="stoptabel", ["pe"]="پایانجدول", @@ -5836,7 +5851,7 @@ return { ["cs"]="stoptabulky", ["de"]="stoptabellen", ["en"]="stoptables", - ["fr"]="stoppetableaux", + ["fr"]="fintables", ["it"]="terminatabelle", ["nl"]="stoptabellen", ["pe"]="پایانجدولها", @@ -5846,7 +5861,7 @@ return { ["cs"]="stoptext", ["de"]="stoptext", ["en"]="stoptext", - ["fr"]="stoppetexte", + ["fr"]="fintexte", ["it"]="terminatesto", ["nl"]="stoptekst", ["pe"]="پایانمتن", @@ -5854,13 +5869,14 @@ return { }, ["stoptextbackground"]={ ["en"]="stoptextbackground", + ["fr"]="fintextearriereplan", ["nl"]="stoptekstachtergrond", }, ["stoptextrule"]={ ["cs"]="stoptextovalinka", ["de"]="stoptextlinie", ["en"]="stoptextrule", - ["fr"]="stoppeligneregleetexte", + ["fr"]="fintextetrait", ["it"]="terminalineatesto", ["nl"]="stoptekstlijn", ["pe"]="پایانخطمتن", @@ -5870,7 +5886,7 @@ return { ["cs"]="stopnezhustene", ["de"]="stopgrosserdurchschuss", ["en"]="stopunpacked", - ["fr"]="stoppedegroupe", + ["fr"]="findesemballage", ["it"]="terminaunpacked", ["nl"]="stopvanelkaar", ["pe"]="پایانغیرفشرده", @@ -5880,7 +5896,7 @@ return { ["cs"]="stopverze", ["de"]="stopversion", ["en"]="stopversion", - ["fr"]="stoppeversion", + ["fr"]="finversion", ["it"]="terminaversioni", ["nl"]="stopversie", ["pe"]="پایاننسخه", @@ -5910,7 +5926,7 @@ return { ["cs"]="subpagenumber", ["de"]="subpagenumber", ["en"]="subpagenumber", - ["fr"]="sousnumeropage", + ["fr"]="numerosouspage", ["it"]="subpagenumber", ["nl"]="subpaginanummer", ["pe"]="شمارهزیرصفحه", @@ -5920,7 +5936,7 @@ return { ["cs"]="prepninazakladnifont", ["de"]="wechselezumfliesstext", ["en"]="switchtobodyfont", - ["fr"]="changepolicecorps", + ["fr"]="passerapolicedecorps", ["it"]="cambiaafontdeltesto", ["nl"]="switchnaarkorps", ["pe"]="تغییربهقلمبدنه", @@ -5930,7 +5946,7 @@ return { ["cs"]="switchtorawfont", ["de"]="switchtorawfont", ["en"]="switchtorawfont", - ["fr"]="changepolicebrute", + ["fr"]="passerapolicebrute", ["it"]="passaafontgrezzo", ["nl"]="switchtorawfont", ["pe"]="تغییربهقلمخام", @@ -5958,6 +5974,7 @@ return { }, ["symoffset"]={ ["en"]="symoffset", + ["fr"]="decalagesym", ["nl"]="symoffset", }, ["synchronizationbar"]={ @@ -5974,7 +5991,7 @@ return { ["cs"]="synchronizovat", ["de"]="synchronisieren", ["en"]="synchronize", - ["fr"]="synchronise", + ["fr"]="synchroniser", ["it"]="sincronizza", ["nl"]="synchroniseer", ["pe"]="تطابق", @@ -5994,7 +6011,7 @@ return { ["cs"]="testcolumn", ["de"]="testcolumn", ["en"]="testcolumn", - ["fr"]="testcolumn", + ["fr"]="testcolonne", ["it"]="testcolumn", ["nl"]="testkolom", ["pe"]="ستونامتحان", @@ -6020,6 +6037,11 @@ return { ["pe"]="تک", ["ro"]="tex", }, + ["textbackground"]={ + ["en"]="textbackground", + ["fr"]="textearriereplan", + ["nl"]="tekstachtergrond", + }, ["textheight"]={ ["cs"]="vyskatextu", ["de"]="texthoehe", @@ -6044,7 +6066,7 @@ return { ["cs"]="textovalinka", ["de"]="textlinie", ["en"]="textrule", - ["fr"]="ligneregleetexte", + ["fr"]="traittexte", ["it"]="lineatesto", ["nl"]="tekstlijn", ["pe"]="خطمتن", @@ -6094,7 +6116,7 @@ return { ["cs"]="bublinkovanapoveda", ["de"]="tooltip", ["en"]="tooltip", - ["fr"]="suggestion", + ["fr"]="infobulle", ["it"]="tooltip", ["nl"]="suggestie", ["pe"]="tooltip", @@ -6104,7 +6126,7 @@ return { ["cs"]="vzdalenosthorejsku", ["de"]="abstandoben", ["en"]="topdistance", - ["fr"]="distancesup", + ["fr"]="distancehaut", ["it"]="distanzacima", ["nl"]="bovenafstand", ["pe"]="فاصلهبالا", @@ -6114,7 +6136,7 @@ return { ["cs"]="vyskahorejsku", ["de"]="hoeheoben", ["en"]="topheight", - ["fr"]="hauteursup", + ["fr"]="hauteurhaut", ["it"]="altezzacima", ["nl"]="bovenhoogte", ["pe"]="ارتفاعبالا", @@ -6124,7 +6146,7 @@ return { ["cs"]="odsazenishora", ["de"]="kopfweite", ["en"]="topspace", - ["fr"]="espacesup", + ["fr"]="espacehaut", ["it"]="spaziocima", ["nl"]="kopwit", ["pe"]="فضایبالا", @@ -6164,7 +6186,7 @@ return { ["cs"]="pis", ["de"]="tip", ["en"]="typ", - ["fr"]="typ", + ["fr"]="transcrireaveccesure", ["it"]="typ", ["nl"]="typ", ["pe"]="typ", @@ -6174,7 +6196,7 @@ return { ["cs"]="opis", ["de"]="tippen", ["en"]="type", - ["fr"]="dactylographier", + ["fr"]="transcrire", ["it"]="type", ["nl"]="type", ["pe"]="تایپ", @@ -6184,7 +6206,7 @@ return { ["cs"]="typebuffer", ["de"]="tippepuffer", ["en"]="typebuffer", - ["fr"]="tapebuffer", + ["fr"]="transcriretampon", ["it"]="typebuffer", ["nl"]="typebuffer", ["pe"]="تایپبافر", @@ -6194,7 +6216,7 @@ return { ["cs"]="opissoubor", ["de"]="tippedatei", ["en"]="typefile", - ["fr"]="fichierdactylo", + ["fr"]="transcrirefichier", ["it"]="typefile", ["nl"]="typefile", ["pe"]="تایپپرونده", @@ -6204,7 +6226,7 @@ return { ["cs"]="vyznam", ["de"]="bedeutung", ["en"]="unitmeaning", - ["fr"]="sensunite", + ["fr"]="significationunite", ["it"]="nomeunita", ["nl"]="betekenis", ["pe"]="معنیواحد", @@ -6224,7 +6246,7 @@ return { ["cs"]="uzijJSscripts", ["de"]="verwendeJSscript", ["en"]="useJSscripts", - ["fr"]="utiliseJSscripts", + ["fr"]="utiliserJSscript", ["it"]="usaJSscripts", ["nl"]="gebruikJSscripts", ["pe"]="useJSscripts", @@ -6234,7 +6256,7 @@ return { ["cs"]="uzijURL", ["de"]="verwendeURL", ["en"]="useURL", - ["fr"]="utiliseURL", + ["fr"]="utiliserURL", ["it"]="usaURL", ["nl"]="gebruikURL", ["pe"]="useURL", @@ -6244,7 +6266,7 @@ return { ["cs"]="useXMLfilter", ["de"]="useXMLfilter", ["en"]="useXMLfilter", - ["fr"]="useXMLfilter", + ["fr"]="utiliserfiltreXML", ["it"]="useXMLfilter", ["nl"]="gebruikXMLfilter", ["pe"]="useXMLfilter", @@ -6254,7 +6276,7 @@ return { ["cs"]="uzijbloky", ["de"]="verwendebloecke", ["en"]="useblocks", - ["fr"]="utiliseblocs", + ["fr"]="utiliserblocs", ["it"]="usablocco", ["nl"]="gebruikblokken", ["pe"]="استفادهبلوکها", @@ -6264,7 +6286,7 @@ return { ["cs"]="uzijprikazy", ["de"]="verwendebefehl", ["en"]="usecommands", - ["fr"]="utilisecommandes", + ["fr"]="utilisercommandes", ["it"]="usacomandi", ["nl"]="gebruikcommandos", ["pe"]="استفادهفرمانها", @@ -6274,7 +6296,7 @@ return { ["cs"]="uzijkodovani", ["de"]="benutzekodierung", ["en"]="useencoding", - ["fr"]="utiliseencodage", + ["fr"]="utilisercodage", ["it"]="usacodifica", ["nl"]="usecodering", ["pe"]="استفادهرمزینه", @@ -6284,7 +6306,7 @@ return { ["cs"]="uzijexternidokument", ["de"]="verwendeexteresdokument", ["en"]="useexternaldocument", - ["fr"]="utilisedocumentexterne", + ["fr"]="utiliserdocumentexterne", ["it"]="usadocumentoesterno", ["nl"]="gebruikexterndocument", ["pe"]="استفادهنوشتارخارجی", @@ -6294,7 +6316,7 @@ return { ["cs"]="uzijexterniobraz", ["de"]="verwendeexterneabbildung", ["en"]="useexternalfigure", - ["fr"]="utilisefigureexterne", + ["fr"]="utiliserfigureexterne", ["it"]="usafiguraesterna", ["nl"]="gebruikexternfiguur", ["pe"]="استفادهشکلخارجی", @@ -6304,7 +6326,7 @@ return { ["cs"]="uzijexternisoubor", ["de"]="verwendeexternedatei", ["en"]="useexternalfile", - ["fr"]="utilisefichierexterne", + ["fr"]="utiliserfichierexterne", ["it"]="usafileesterno", ["nl"]="gebruikexternefile", ["pe"]="استفادهپروندهخارجی", @@ -6314,7 +6336,7 @@ return { ["cs"]="uzijexternisoubory", ["de"]="verwendeexternedateien", ["en"]="useexternalfiles", - ["fr"]="utilisefichiersexternes", + ["fr"]="utiliserfichiersexternes", ["it"]="usafileesterni", ["nl"]="gebruikexternefiles", ["pe"]="استفادهپروندههایخارجی", @@ -6324,7 +6346,7 @@ return { ["cs"]="uzijexternizvuk", ["de"]="verwendeexternestonstueck", ["en"]="useexternalsoundtrack", - ["fr"]="utilisepsiteaudioexterne", + ["fr"]="utilisersonexterne", ["it"]="usacolonnasonoraesterna", ["nl"]="gebruikexterngeluidsfragment", ["pe"]="استفادهقطعهموزیکخارجی", @@ -6334,7 +6356,7 @@ return { ["cs"]="uzijmodul", ["de"]="verwendemodul", ["en"]="usemodule", - ["fr"]="utilisemodule", + ["fr"]="utilisermodule", ["it"]="usamodulo", ["nl"]="gebruikmodule", ["pe"]="استفادهمدول", @@ -6344,7 +6366,7 @@ return { ["cs"]="uzijmoduly", ["de"]="verwendemodule", ["en"]="usemodules", - ["fr"]="utilisemodules", + ["fr"]="utilisermodules", ["it"]="usamoduli", ["nl"]="gebruikmodules", ["pe"]="استفادهمدولها", @@ -6354,7 +6376,7 @@ return { ["cs"]="uzijadresar", ["de"]="benutzeverzeichnis", ["en"]="usedirectory", - ["fr"]="utilisechemin", + ["fr"]="utiliserchemin", ["it"]="usacartella", ["nl"]="gebruikpad", ["pe"]="استفادهمسیر", @@ -6364,7 +6386,7 @@ return { ["cs"]="uzijodkazy", ["de"]="verwendereferenzen", ["en"]="usereferences", - ["fr"]="utilisereferences", + ["fr"]="utiliserreferences", ["it"]="usariferimenti", ["nl"]="gebruikreferenties", ["pe"]="استفادهمرجعها", @@ -6374,7 +6396,7 @@ return { ["cs"]="uzijspeciality", ["de"]="benutzespezielles", ["en"]="usespecials", - ["fr"]="utilisespecialites", + ["fr"]="utiliserspeciaux", ["it"]="usaspecialita", ["nl"]="gebruikspecials", ["pe"]="استفادهویژگیها", @@ -6384,7 +6406,7 @@ return { ["cs"]="uzijsymbol", ["de"]="verwendesymbole", ["en"]="usesymbols", - ["fr"]="utilisesymboles", + ["fr"]="utilisersymboles", ["it"]="usasimboli", ["nl"]="gebruiksymbolen", ["pe"]="استفادهنمادها", @@ -6394,7 +6416,7 @@ return { ["cs"]="usetypescript", ["de"]="usetypescript", ["en"]="usetypescript", - ["fr"]="usetypescript", + ["fr"]="utiliserscriptdepolices", ["it"]="usetypescript", ["nl"]="gebruiktypescript", ["pe"]="استفادهدستخطتایپ", @@ -6404,6 +6426,7 @@ return { ["cs"]="usetypescriptfile", ["de"]="usetypescriptfile", ["en"]="usetypescriptfile", + ["fr"]="utiliserfichierscriptdepolices", ["it"]="usetypescriptfile", ["nl"]="gebruiktypescriptfile", ["pe"]="استفادهپروندهدستخطتایپ", @@ -6413,7 +6436,7 @@ return { ["cs"]="uzijurl", ["de"]="verwendeurl", ["en"]="useurl", - ["fr"]="utiliseurl", + ["fr"]="utiliserurl", ["it"]="usaurl", ["nl"]="gebruikurl", ["pe"]="useurl", @@ -6433,7 +6456,7 @@ return { ["cs"]="vl", ["de"]="vl", ["en"]="vl", - ["fr"]="vl", + ["fr"]="lv", ["it"]="vl", ["nl"]="vl", ["pe"]="خع", @@ -6463,7 +6486,7 @@ return { ["cs"]="slovovpravo", ["de"]="wortrechts", ["en"]="wordright", - ["fr"]="motdroit", + ["fr"]="ecrireadroite", ["it"]="paroladestra", ["nl"]="woordrechts", ["pe"]="کلمهراست", @@ -6473,7 +6496,7 @@ return { ["cs"]="zapismeziseznam", ["de"]="schreibezwischenliste", ["en"]="writebetweenlist", - ["fr"]="ecritentreliste", + ["fr"]="ecrireentreliste", ["it"]="scrividentroelenco", ["nl"]="schrijftussenlijst", ["pe"]="بنویسبینلیست", @@ -6483,7 +6506,7 @@ return { ["cs"]="zapisdoseznamu", ["de"]="schreibezurliste", ["en"]="writetolist", - ["fr"]="ecritdansliste", + ["fr"]="ecriredansliste", ["it"]="scriviinelenco", ["nl"]="schrijfnaarlijst", ["pe"]="بنویسدرلیست", @@ -6493,7 +6516,7 @@ return { ["cs"]="zapisdoseznamuodkazu", ["de"]="schreibezurreferenzliste", ["en"]="writetoreferencelist", - ["fr"]="ecritdanslistereference", + ["fr"]="ecriredanslistereference", ["it"]="scriviinlistariferimenti", ["nl"]="schrijfnaarreferentielijst", ["pe"]="بنویسدرلیستمرجع", @@ -6503,7 +6526,7 @@ return { ["cs"]="zapisdorejstriku", ["de"]="schreibezumregister", ["en"]="writetoregister", - ["fr"]="ecritregistre", + ["fr"]="ecriredansregistre", ["it"]="scriviinregistro", ["nl"]="schrijfnaarregister", ["pe"]="بنویسدرثبت", @@ -6511,10 +6534,6 @@ return { }, }, ["constants"]={ - ["fractions"]={ - ["en"]="fractions", - ["nl"]="breuken", - }, ["action"]={ ["cs"]="akce", ["de"]="aktion", @@ -6539,7 +6558,7 @@ return { ["cs"]="po", ["de"]="nach", ["en"]="after", - ["fr"]="apres", + ["fr"]="après", ["it"]="dopo", ["nl"]="na", ["pe"]="بعداز", @@ -6549,7 +6568,7 @@ return { ["cs"]="pohlavicce", ["de"]="nachkopf", ["en"]="afterhead", - ["fr"]="aprestete", + ["fr"]="aprèstête", ["it"]="dopotesta", ["nl"]="kopna", ["pe"]="بعدازسر", @@ -6559,7 +6578,7 @@ return { ["cs"]="klavesapo", ["de"]="nachtaste", ["en"]="afterkey", - ["fr"]="aprescle", + ["fr"]="aprèsclé", ["it"]="dopotasto", ["nl"]="natoets", ["pe"]="بعدازکلید", @@ -6567,13 +6586,14 @@ return { }, ["aftersection"]={ ["en"]="aftersection", + ["fr"]="aprèssection", ["nl"]="nasectie", }, ["align"]={ ["cs"]="zarovnani", ["de"]="ausrichtung", ["en"]="align", - ["fr"]="alignement", + ["fr"]="aligner", ["it"]="allinea", ["nl"]="uitlijnen", ["pe"]="تنظیم", @@ -6583,42 +6603,47 @@ return { ["cs"]="aligncharacter", ["de"]="aligncharacter", ["en"]="aligncharacter", - ["fr"]="caracterealigne", + ["fr"]="alignersurcaractere", ["it"]="allineacarattere", ["nl"]="karakteruitlijnen", ["pe"]="حرفتنظیم", ["ro"]="aliniazacaracter", }, - ["alignmentleftwidth"]={ - ["en"]="alignmentleftwidth", - }, - ["alignmentrightwidth"]={ - ["en"]="alignmentrightwidth", - }, - ["alignmentleftsample"]={ - ["en"]="alignmentleftsample", - }, - ["alignmentrightsample"]={ - ["en"]="alignmentrightsample", - }, ["alignmentcharacter"]={ ["cs"]="alignmentcharacter", ["de"]="alignmentcharacter", ["en"]="alignmentcharacter", - ["fr"]="alignementcaractere", + ["fr"]="caracterealignement", ["it"]="carattereallineamento", ["nl"]="uitlijnkarakter", ["pe"]="حرفتنظیمکردن", ["ro"]="alierecaracter", }, + ["alignmentleftsample"]={ + ["en"]="alignmentleftsample", + ["fr"]="echantillongauchealignement", + }, + ["alignmentleftwidth"]={ + ["en"]="alignmentleftwidth", + ["fr"]="largeurgauchealignement", + }, + ["alignmentrightsample"]={ + ["en"]="alignmentrightsample", + ["fr"]="echantillondroitealignement", + }, + ["alignmentrightwidth"]={ + ["en"]="alignmentrightwidth", + ["fr"]="largeurdroitealignement", + }, ["alignsymbol"]={ ["en"]="alignsymbol", + ["fr"]="alignersursymbol", }, ["aligntitle"]={ ["cs"]="zarovnejtitul", ["de"]="titelausrichten", ["en"]="aligntitle", - ["fr"]="alignementtitre", + ["fr"]="alignersurtitre", ["it"]="allineatitolo", ["nl"]="titeluitlijnen", ["pe"]="عنوانتنظیم", @@ -6628,22 +6653,25 @@ return { ["cs"]="alternativa", ["de"]="alternative", ["en"]="alternative", - ["fr"]="alternative", + ["fr"]="variante", ["it"]="alternativa", ["nl"]="variant", ["pe"]="جایگزین", ["ro"]="alternativ", }, - ["stylealternative"]={ - ["en"]="stylealternative", - ["nl"]="stylevariant", - }, ["anchor"]={ ["en"]="anchor", + ["fr"]="ancre", ["nl"]="anker", }, + ["anchoring"]={ + ["en"]="anchoring", + ["fr"]="ancrage", + ["nl"]="verankering", + }, ["andtext"]={ ["en"]="andtext", + ["fr"]="ettexte", }, ["apa"]={ ["cs"]="apa", @@ -6657,6 +6685,7 @@ return { }, ["arguments"]={ ["en"]="arguments", + ["fr"]="arguments", ["nl"]="argumenten", }, ["arrow"]={ @@ -6671,24 +6700,29 @@ return { }, ["artauthor"]={ ["en"]="artauthor", + ["fr"]="artauteur", }, ["artauthoretaldisplay"]={ ["en"]="artauthoretaldisplay", + ["fr"]="artauteuretalaffichage", }, ["artauthoretallimit"]={ ["en"]="artauthoretallimit", + ["fr"]="artauteuretallimite", }, ["artauthoretaltext"]={ ["en"]="artauthoretaltext", + ["fr"]="artauteuretaltexte", }, ["artoffset"]={ ["en"]="artoffset", + ["fr"]="artdecalage", }, ["at"]={ ["cs"]="u", ["de"]="bei", ["en"]="at", - ["fr"]="a", + ["fr"]="en", ["it"]="ad", ["nl"]="op", ["pe"]="در", @@ -6706,15 +6740,19 @@ return { }, ["authorconversion"]={ ["en"]="authorconversion", + ["fr"]="auteurconversion", }, ["authoretaldisplay"]={ ["en"]="authoretaldisplay", + ["fr"]="auteuretalaffichage", }, ["authoretallimit"]={ ["en"]="authoretallimit", + ["fr"]="auteuretallimite", }, ["authoretaltext"]={ ["en"]="authoretaltext", + ["fr"]="auteuretaltexte", }, ["auto"]={ ["cs"]="auto", @@ -6728,13 +6766,14 @@ return { }, ["autocase"]={ ["en"]="autocase", + ["fr"]="autocase", ["nl"]="autocase", }, ["autofile"]={ ["cs"]="autofile", ["de"]="autofile", ["en"]="autofile", - ["fr"]="autofile", + ["fr"]="autofichier", ["it"]="autofile", ["nl"]="autofile", ["pe"]="پروندهخودکار", @@ -6754,7 +6793,7 @@ return { ["cs"]="autohang", ["de"]="autohang", ["en"]="autohang", - ["fr"]="autohang", + ["fr"]="autosuspendre", ["it"]="autohang", ["nl"]="autohang", ["pe"]="آویزانخودکار", @@ -6764,7 +6803,7 @@ return { ["cs"]="autostrut", ["de"]="autostrut", ["en"]="autostrut", - ["fr"]="autostrut", + ["fr"]="autoentretoise", ["it"]="autostrut", ["nl"]="autostrut", ["pe"]="بستخودکار", @@ -6782,10 +6821,12 @@ return { }, ["availableheight"]={ ["en"]="availableheight", + ["fr"]="hauteurdisponible", ["nl"]="beschikbarehoogte", }, ["availablewidth"]={ ["en"]="availablewidth", + ["fr"]="largeurdisponible", ["nl"]="beschikbarebreedte", }, ["axis"]={ @@ -6870,13 +6911,14 @@ return { }, ["backreference"]={ ["en"]="backreference", + ["fr"]="retroreference", ["nl"]="terugreferentie", }, ["backspace"]={ ["cs"]="zpetnamezera", ["de"]="rumpfspatium", ["en"]="backspace", - ["fr"]="retour", + ["fr"]="espacearrière", ["it"]="backspace", ["nl"]="rugwit", ["pe"]="فضایپس", @@ -6886,7 +6928,7 @@ return { ["cs"]="rovnovaha", ["de"]="ausgleichen", ["en"]="balance", - ["fr"]="equilibre", + ["fr"]="equilibrer", ["it"]="bilanciamento", ["nl"]="balanceren", ["pe"]="تعادل", @@ -6914,13 +6956,14 @@ return { }, ["beforesection"]={ ["en"]="beforesection", + ["fr"]="avantsection", ["nl"]="voorsectie", }, ["bet"]={ ["cs"]="bet", ["de"]="bet", ["en"]="bet", - ["fr"]="bet", + ["fr"]="suj", ["it"]="bet", ["nl"]="bet", ["pe"]="bet", @@ -6928,12 +6971,13 @@ return { }, ["bidi"]={ ["en"]="bidi", + ["fr"]="bidi", }, ["big"]={ ["cs"]="velky", ["de"]="gross", ["en"]="big", - ["fr"]="grand", + ["fr"]="important", ["it"]="grande", ["nl"]="groot", ["pe"]="بزرگ", @@ -6943,7 +6987,7 @@ return { ["cs"]="prazdny", ["de"]="blanko", ["en"]="blank", - ["fr"]="vide", + ["fr"]="vierge", ["it"]="rigovuoto", ["nl"]="blanko", ["pe"]="خالی", @@ -6951,12 +6995,13 @@ return { }, ["bleedoffset"]={ ["en"]="bleedoffset", + ["fr"]="decalagefuite", }, ["blockway"]={ ["cs"]="dobloku", ["de"]="blockauf", ["en"]="blockway", - ["fr"]="blockway", + ["fr"]="faconbloc", ["it"]="blockway", ["nl"]="blokwijze", ["pe"]="راهبلوک", @@ -6966,7 +7011,7 @@ return { ["cs"]="zakladnifont", ["de"]="fliesstext", ["en"]="bodyfont", - ["fr"]="policecorps", + ["fr"]="policedecorps", ["it"]="fonttesto", ["nl"]="korps", ["pe"]="قلمبدنه", @@ -6974,24 +7019,31 @@ return { }, ["boffset"]={ ["en"]="boffset", + ["fr"]="decalageb", }, ["boldfeatures"]={ ["en"]="boldfeatures", + ["fr"]="fonctionnalitesgras", }, ["boldfont"]={ ["en"]="boldfont", + ["fr"]="policegras", }, ["bolditalicfeatures"]={ ["en"]="bolditalicfeatures", + ["fr"]="fonctionnalitesgrasitalique", }, ["bolditalicfont"]={ ["en"]="bolditalicfont", + ["fr"]="policegrasitalique", }, ["boldslantedfeatures"]={ ["en"]="boldslantedfeatures", + ["fr"]="fonctionnalitesgrasincline", }, ["boldslantedfont"]={ ["en"]="boldslantedfont", + ["fr"]="policegrasincline", }, ["bookmark"]={ ["cs"]="zalozka", @@ -7007,7 +7059,7 @@ return { ["cs"]="spodek", ["de"]="unten", ["en"]="bottom", - ["fr"]="inf", + ["fr"]="bas", ["it"]="fondo", ["nl"]="onder", ["pe"]="پایین", @@ -7015,19 +7067,22 @@ return { }, ["bottomafter"]={ ["en"]="bottomafter", + ["fr"]="basaprès", }, ["bottombefore"]={ ["en"]="bottombefore", + ["fr"]="basavant", }, ["bottomcommand"]={ ["en"]="bottomcommand", + ["fr"]="commandebas", ["nl"]="ondercommando", }, ["bottomdistance"]={ ["cs"]="vzdalenostspodku", ["de"]="abstandunten", ["en"]="bottomdistance", - ["fr"]="distanceinf", + ["fr"]="distancebas", ["it"]="distanzafondo", ["nl"]="onderafstand", ["pe"]="فاصلهپایین", @@ -7037,7 +7092,7 @@ return { ["cs"]="ramecekdole", ["de"]="untenrahmen", ["en"]="bottomframe", - ["fr"]="cadreinf", + ["fr"]="cadrebas", ["it"]="cornicefondo", ["nl"]="onderkader", ["pe"]="قالبپایین", @@ -7047,7 +7102,7 @@ return { ["cs"]="offsetspodku", ["de"]="untenoffset", ["en"]="bottomoffset", - ["fr"]="decalageinf", + ["fr"]="decalagebas", ["it"]="offsetfondo", ["nl"]="onderoffset", ["pe"]="آفستپایین", @@ -7057,7 +7112,7 @@ return { ["cs"]="bottomspace", ["de"]="bottomspace", ["en"]="bottomspace", - ["fr"]="espaceinf", + ["fr"]="espacebas", ["it"]="spaziofondo", ["nl"]="bodemwit", ["pe"]="فضایپایین", @@ -7067,7 +7122,7 @@ return { ["cs"]="statusspodku", ["de"]="untenstatus", ["en"]="bottomstate", - ["fr"]="etatinf", + ["fr"]="etatbas", ["it"]="statofondo", ["nl"]="onderstatus", ["pe"]="وضعیتپایین", @@ -7075,17 +7130,19 @@ return { }, ["break"]={ ["en"]="break", + ["fr"]="saut", ["nl"]="break", }, ["buffer"]={ ["en"]="buffer", + ["fr"]="tampon", ["nl"]="buffer", }, ["cache"]={ ["cs"]="cache", ["de"]="cache", ["en"]="cache", - ["fr"]="cache", + ["fr"]="memoirecache", ["it"]="cache", ["nl"]="cache", ["pe"]="میانگیر", @@ -7103,13 +7160,14 @@ return { }, ["category"]={ ["en"]="category", + ["fr"]="categorie", ["nl"]="categorie", }, ["ccommand"]={ ["cs"]="cprikaz", ["de"]="cbefehl", ["en"]="ccommand", - ["fr"]="ccommande", + ["fr"]="commandec", ["it"]="ccomando", ["nl"]="ccommando", ["pe"]="فرمان", @@ -7117,12 +7175,15 @@ return { }, ["character"]={ ["en"]="character", + ["fr"]="caractere", }, ["characters"]={ ["en"]="characters", + ["fr"]="caracteres", }, ["check"]={ ["en"]="check", + ["fr"]="verifier", }, ["click"]={ ["cs"]="klik", @@ -7158,7 +7219,7 @@ return { ["cs"]="clipoffset", ["de"]="clipoffset", ["en"]="clipoffset", - ["fr"]="clipoffset", + ["fr"]="decalagedecoupe", ["it"]="clipoffset", ["nl"]="clipoffset", ["pe"]="آفستکلیپ", @@ -7168,7 +7229,7 @@ return { ["cs"]="zavriakci", ["de"]="schliessenaktion", ["en"]="closeaction", - ["fr"]="actionfermeture", + ["fr"]="fermeraction", ["it"]="azionechiudi", ["nl"]="sluitactie", ["pe"]="بستنکنش", @@ -7178,7 +7239,7 @@ return { ["cs"]="closecommand", ["de"]="closecommand", ["en"]="closecommand", - ["fr"]="closecommand", + ["fr"]="fermercommande", ["it"]="closecommand", ["nl"]="sluitcommando", ["pe"]="بستنفرمان", @@ -7186,13 +7247,14 @@ return { }, ["closepage"]={ ["en"]="closepage", + ["fr"]="fermerpage", ["nl"]="sluitpagina", }, ["closepageaction"]={ ["cs"]="akcezavrenistranky", ["de"]="closepageaction", ["en"]="closepageaction", - ["fr"]="actionfermeturepage", + ["fr"]="fermeractionpage", ["it"]="azionechiudipagina", ["nl"]="sluitpaginaactie", ["pe"]="بستنعملصفحه", @@ -7202,7 +7264,7 @@ return { ["cs"]="closesymbol", ["de"]="closesymbol", ["en"]="closesymbol", - ["fr"]="closesymbol", + ["fr"]="fermersymbol", ["it"]="closesymbol", ["nl"]="sluitsymbool", ["pe"]="بستننماد", @@ -7250,6 +7312,7 @@ return { }, ["comma"]={ ["en"]="comma", + ["fr"]="virgule", }, ["command"]={ ["cs"]="prikaz", @@ -7265,7 +7328,7 @@ return { ["cs"]="prikazpo", ["de"]="zumbefehl", ["en"]="commandafter", - ["fr"]="commandeapres", + ["fr"]="commandeaprès", ["it"]="comdandodopo", ["nl"]="nacommando", ["pe"]="فرمانبعداز", @@ -7293,15 +7356,19 @@ return { }, ["comment"]={ ["en"]="comment", + ["fr"]="commentaire", }, ["commentchar"]={ ["en"]="commentchar", + ["fr"]="caracommentaire", }, ["commentoffset"]={ ["en"]="commentoffset", + ["fr"]="decalagecommentaire", }, ["compact"]={ ["en"]="compact", + ["fr"]="compact", ["nl"]="compact", }, ["component"]={ @@ -7318,7 +7385,7 @@ return { ["cs"]="compoundhyphen", ["de"]="compoundhyphen", ["en"]="compoundhyphen", - ["fr"]="compoundhyphen", + ["fr"]="traitdunioncompose", ["it"]="compoundhyphen", ["nl"]="koppelteken", ["pe"]="compoundhyphen", @@ -7328,36 +7395,42 @@ return { ["cs"]="compress", ["de"]="compress", ["en"]="compress", - ["fr"]="compress", + ["fr"]="reduire", ["it"]="compress", ["nl"]="comprimeren", ["pe"]="فشردن", ["ro"]="compress", }, - ["compressseparator"]={ - ["en"]="compressseparator", - }, ["compressdistance"]={ ["en"]="compressdistance", + ["fr"]="distancereduction", }, ["compressmethod"]={ ["en"]="compressmethod", + ["fr"]="methodereduction", + }, + ["compressseparator"]={ + ["en"]="compressseparator", + ["fr"]="separateurreduction", }, ["compressstopper"]={ ["en"]="compressstopper", + ["fr"]="stoppeurreduction", }, ["concerns"]={ ["en"]="concerns", + ["fr"]="concerne", ["nl"]="betreft", }, ["connector"]={ ["en"]="connector", + ["fr"]="connecteur", }, ["continue"]={ ["cs"]="pokracovat", ["de"]="fortsetzen", ["en"]="continue", - ["fr"]="continue", + ["fr"]="continuer", ["it"]="continua", ["nl"]="doorgaan", ["pe"]="ادامه", @@ -7367,7 +7440,7 @@ return { ["cs"]="kontrastnibarva", ["de"]="kontrastfarbe", ["en"]="contrastcolor", - ["fr"]="coleurcontraste", + ["fr"]="couleurconstrast", ["it"]="colorecontrasto", ["nl"]="contrastkleur", ["pe"]="contrastcolor", @@ -7397,7 +7470,7 @@ return { ["cs"]="konverzesouboru", ["de"]="konvertieredatei", ["en"]="convertfile", - ["fr"]="conversionfichier", + ["fr"]="convertirfichier", ["it"]="convertifile", ["nl"]="converteerfile", ["pe"]="پروندهتبدیل", @@ -7405,6 +7478,7 @@ return { }, ["copies"]={ ["en"]="copies", + ["fr"]="copies", ["nl"]="kopieen", }, ["corner"]={ @@ -7431,7 +7505,7 @@ return { ["cs"]="zpusobpropojeni", ["de"]="verkopplungsart", ["en"]="couplingway", - ["fr"]="modecouplage", + ["fr"]="faconcouplage", ["it"]="modoaccoppiamento", ["nl"]="koppelwijze", ["pe"]="روشتزویج", @@ -7447,14 +7521,17 @@ return { ["pe"]="criterium", ["ro"]="criteriu", }, - ["crossreference"]={ - ["en"]="crossreference", - }, ["cropoffset"]={ ["en"]="cropoffset", + ["fr"]="decalagerecadre", + }, + ["crossreference"]={ + ["en"]="crossreference", + ["fr"]="renvoi", }, ["cssfile"]={ ["en"]="cssfile", + ["fr"]="fichiercss", }, ["current"]={ ["cs"]="aktualni", @@ -7470,7 +7547,7 @@ return { ["cs"]="cutspace", ["de"]="cutspace", ["en"]="cutspace", - ["fr"]="cutspace", + ["fr"]="espacecoupe", ["it"]="cutspace", ["nl"]="snijwit", ["pe"]="فضایبرش", @@ -7498,9 +7575,11 @@ return { }, ["database"]={ ["en"]="database", + ["fr"]="basededonnees", }, ["dataset"]={ ["en"]="dataset", + ["fr"]="jeudedonnees", }, ["date"]={ ["cs"]="datum", @@ -7512,15 +7591,11 @@ return { ["pe"]="تاریخ", ["ro"]="data", }, - ["time"]={ - ["en"]="time", - ["nl"]="tijd", - }, ["deepnumbercommand"]={ ["cs"]="deepnumbercommand", ["de"]="deepnumbercommand", ["en"]="deepnumbercommand", - ["fr"]="deepnumbercommand", + ["fr"]="commandeprofondenumero", ["it"]="deepnumbercommand", ["nl"]="diepnummercommando", ["pe"]="فرمانشمارهعمیق", @@ -7530,7 +7605,7 @@ return { ["cs"]="deeptextcommand", ["de"]="deeptextcommand", ["en"]="deeptextcommand", - ["fr"]="deeptextcommand", + ["fr"]="commandeprofondetexte", ["it"]="deeptextcommand", ["nl"]="dieptekstcommando", ["pe"]="فرمانمتنعمیق", @@ -7550,7 +7625,7 @@ return { ["cs"]="prodleva", ["de"]="wartezeit", ["en"]="delay", - ["fr"]="delai", + ["fr"]="retard", ["it"]="attesa", ["nl"]="wachttijd", ["pe"]="تاخیر", @@ -7606,6 +7681,10 @@ return { ["pe"]="نمایش", ["ro"]="display", }, + ["displaythreshold"]={ + ["en"]="displaythreshold", + ["fr"]="seuilaffichage", + }, ["distance"]={ ["cs"]="vzdalenost", ["de"]="abstand", @@ -7618,6 +7697,7 @@ return { }, ["domain"]={ ["en"]="domain", + ["fr"]="domaine", }, ["dot"]={ ["cs"]="tecka", @@ -7641,12 +7721,13 @@ return { }, ["down"]={ ["en"]="down", + ["fr"]="enbas", }, ["dummy"]={ ["cs"]="dummy", ["de"]="dummy", ["en"]="dummy", - ["fr"]="dummy", + ["fr"]="factice", ["it"]="dummy", ["nl"]="dummy", ["pe"]="مصنوعی", @@ -7694,15 +7775,19 @@ return { }, ["editor"]={ ["en"]="editor", + ["fr"]="editeur", }, ["editoretaldisplay"]={ ["en"]="editoretaldisplay", + ["fr"]="editeurealaffichage", }, ["editoretallimit"]={ ["en"]="editoretallimit", + ["fr"]="editeureallimite", }, ["editoretaltext"]={ ["en"]="editoretaltext", + ["fr"]="editeurealtexte", }, ["empty"]={ ["cs"]="prazdne", @@ -7716,17 +7801,19 @@ return { }, ["entities"]={ ["en"]="entities", + ["fr"]="entitees", ["nl"]="entities", }, ["entries"]={ ["en"]="entries", + ["fr"]="entrees", ["nl"]="ingangen", }, ["equalheight"]={ ["cs"]="equalheight", ["de"]="equalheight", ["en"]="equalheight", - ["fr"]="equalheight", + ["fr"]="hauteuregale", ["it"]="equalheight", ["nl"]="equalheight", ["pe"]="ارتفاعیکسان", @@ -7736,7 +7823,7 @@ return { ["cs"]="equalwidth", ["de"]="equalwidth", ["en"]="equalwidth", - ["fr"]="equalwidth", + ["fr"]="margeuregale", ["it"]="equalwidth", ["nl"]="equalwidth", ["pe"]="عرضیکسان", @@ -7746,7 +7833,7 @@ return { ["cs"]="escape", ["de"]="escape", ["en"]="escape", - ["fr"]="escape", + ["fr"]="echappatoire", ["it"]="escape", ["nl"]="escape", ["pe"]="فرار", @@ -7754,15 +7841,19 @@ return { }, ["etaldisplay"]={ ["en"]="etaldisplay", + ["fr"]="etalaffichage", }, ["etallimit"]={ ["en"]="etallimit", + ["fr"]="etallimite", }, ["etaloption"]={ ["en"]="etaloption", + ["fr"]="etaloption", }, ["etaltext"]={ ["en"]="etaltext", + ["fr"]="etalttexte", }, ["evenmargin"]={ ["cs"]="sudamarginalie", @@ -7776,9 +7867,11 @@ return { }, ["exact"]={ ["en"]="exact", + ["fr"]="exact", }, ["exitoffset"]={ ["en"]="exitoffset", + ["fr"]="decalagesortie", }, ["expansion"]={ ["cs"]="expanzen", @@ -7792,6 +7885,7 @@ return { }, ["export"]={ ["en"]="export", + ["fr"]="exporter", ["nl"]="exporteer", }, ["extras"]={ @@ -7818,7 +7912,7 @@ return { ["cs"]="fallback", ["de"]="fallback", ["en"]="fallback", - ["fr"]="fallback", + ["fr"]="repli", ["it"]="fallback", ["nl"]="terugval", ["pe"]="عقبریختن", @@ -7836,12 +7930,15 @@ return { }, ["features"]={ ["en"]="features", + ["fr"]="fonctionnalites", }, ["fences"]={ ["en"]="fences", + ["fr"]="barrieres", }, ["field"]={ ["en"]="field", + ["fr"]="champ", ["nl"]="veld", }, ["fieldbackgroundcolor"]={ @@ -7878,7 +7975,7 @@ return { ["cs"]="offsetpole", ["de"]="feldoffset", ["en"]="fieldoffset", - ["fr"]="offsetchamp", + ["fr"]="decalagechamp", ["it"]="offsetcampo", ["nl"]="veldoffset", ["pe"]="آفستمیدان", @@ -7896,21 +7993,27 @@ return { }, ["filler"]={ ["en"]="filler", + ["fr"]="remplisseur", }, ["filter"]={ ["en"]="filter", + ["fr"]="filtre", }, ["filtercommand"]={ ["en"]="filtercommand", + ["fr"]="commandefiltre", }, ["finalnamesep"]={ ["en"]="finalnamesep", + ["fr"]="sepnomfinal", }, ["finalpagesep"]={ ["en"]="finalpagesep", + ["fr"]="seppagefinale", }, ["finalpubsep"]={ ["en"]="finalpubsep", + ["fr"]="seppubfinale", }, ["first"]={ ["cs"]="prvni", @@ -7924,6 +8027,7 @@ return { }, ["firstnamesep"]={ ["en"]="firstnamesep", + ["fr"]="seppremiernom", }, ["firstpage"]={ ["cs"]="prvnistranka", @@ -7955,6 +8059,11 @@ return { ["pe"]="تمرکزدرون", ["ro"]="focusin", }, + ["focusoffset"]={ + ["en"]="focusoffset", + ["fr"]="decalagefocus", + ["nl"]="focusoffset", + }, ["focusout"]={ ["cs"]="focusout", ["de"]="focusout", @@ -7965,10 +8074,6 @@ return { ["pe"]="تمرکزبیرون", ["ro"]="focusout", }, - ["focusoffset"]={ - ["en"]="focusoffset", - ["nl"]="focusoffset", - }, ["footer"]={ ["cs"]="upati", ["de"]="fusszeile", @@ -7983,7 +8088,7 @@ return { ["cs"]="vzdalenostupati", ["de"]="fusszeilenabstand", ["en"]="footerdistance", - ["fr"]="dsitancepdp", + ["fr"]="distancepdp", ["it"]="distanzapdp", ["nl"]="voetafstand", ["pe"]="فاصلهتهبرگ", @@ -8003,7 +8108,7 @@ return { ["cs"]="sila", ["de"]="zwinge", ["en"]="force", - ["fr"]="force", + ["fr"]="forcer", ["it"]="forza", ["nl"]="forceer", ["pe"]="اجبار", @@ -8039,6 +8144,11 @@ return { ["pe"]="شمایل", ["ro"]="format", }, + ["fractions"]={ + ["en"]="fractions", + ["fr"]="fractions", + ["nl"]="breuken", + }, ["frame"]={ ["cs"]="ramecek", ["de"]="rahmen", @@ -8111,6 +8221,7 @@ return { }, ["freeregion"]={ ["en"]="freeregion", + ["fr"]="regionlibre", ["nl"]="vrijgebied", }, ["from"]={ @@ -8125,15 +8236,17 @@ return { }, ["functioncolor"]={ ["en"]="functioncolor", + ["fr"]="couleurfonction", }, ["functionstyle"]={ ["en"]="functionstyle", + ["fr"]="stylefonction", }, ["get"]={ ["cs"]="ziskat", ["de"]="hole", ["en"]="get", - ["fr"]="obtient", + ["fr"]="obtenir", ["it"]="prendi", ["nl"]="haal", ["pe"]="بگیر", @@ -8151,6 +8264,7 @@ return { }, ["goodies"]={ ["en"]="goodies", + ["fr"]="friandises", }, ["grid"]={ ["cs"]="mrizka", @@ -8164,15 +8278,17 @@ return { }, ["group"]={ ["en"]="group", + ["fr"]="groupe", }, ["groupsuffix"]={ ["en"]="groupsuffix", + ["fr"]="suffixegroupe", }, ["hang"]={ ["cs"]="zaveseni", ["de"]="haengend", ["en"]="hang", - ["fr"]="suspend", + ["fr"]="suspendre", ["it"]="sospendi", ["nl"]="hang", ["pe"]="بیاویز", @@ -8180,10 +8296,12 @@ return { }, ["hcompact"]={ ["en"]="hcompact", + ["fr"]="compacth", ["nl"]="hcomprimeer", }, ["headalign"]={ ["en"]="headalign", + ["fr"]="alignertete", ["nl"]="kopuitlijnen", }, ["headcolor"]={ @@ -8216,15 +8334,11 @@ return { ["pe"]="تبدیلسر", ["ro"]="conversietitlu", }, - ["headseparator"]={ - ["en"]="headseparator", - ["nl"]="kopscheider", - }, ["header"]={ ["cs"]="zahlavi", ["de"]="kopfzeile", ["en"]="header", - ["fr"]="entete", + ["fr"]="entête", ["it"]="intestazione", ["nl"]="hoofd", ["pe"]="سربرگ", @@ -8234,7 +8348,7 @@ return { ["cs"]="vzdalenostzahlavi", ["de"]="kopfzeilenabstand", ["en"]="headerdistance", - ["fr"]="distanceentete", + ["fr"]="distanceentête", ["it"]="distanzaintestazione", ["nl"]="hoofdafstand", ["pe"]="فاصلهسربرگ", @@ -8244,7 +8358,7 @@ return { ["cs"]="statuszahlavi", ["de"]="kopfzeilenstatus", ["en"]="headerstate", - ["fr"]="etatentete", + ["fr"]="etatentête", ["it"]="statointestazione", ["nl"]="hoofdstatus", ["pe"]="وضعیتسربرگ", @@ -8270,6 +8384,11 @@ return { ["pe"]="شمارهسر", ["ro"]="numartitlu", }, + ["headseparator"]={ + ["en"]="headseparator", + ["fr"]="separateurtete", + ["nl"]="kopscheider", + }, ["headstyle"]={ ["cs"]="stylhlavicky", ["de"]="kopfstil", @@ -8294,25 +8413,17 @@ return { ["cs"]="hfaktor", ["de"]="hfaktor", ["en"]="hfactor", - ["fr"]="facteurhauteur", + ["fr"]="facteurh", ["it"]="hfactor", ["nl"]="hfactor", ["pe"]="عاملارتفاع", ["ro"]="hfactor", }, - ["vfactor"]={ - ["cs"]="vfaktor", - ["de"]="vfaktor", - ["en"]="vfactor", - ["it"]="vfactor", - ["nl"]="vfactor", - ["ro"]="vfactor", - }, ["hfil"]={ ["cs"]="hfil", ["de"]="hfil", ["en"]="hfil", - ["fr"]="hfil", + ["fr"]="remplissageh", ["it"]="hfil", ["nl"]="hfil", ["pe"]="پرکردنارتفاع", @@ -8320,32 +8431,33 @@ return { }, ["hidenumber"]={ ["en"]="hidenumber", - }, - ["horizontal"]={ - ["cs"]="horizontalne", - ["de"]="horizontal", - ["en"]="horizontal", - ["fr"]="horizontale", - ["it"]="orizzontale", - ["nl"]="horizontaal", - ["pe"]="افقی", - ["ro"]="orizontal", + ["fr"]="cachernumero", }, ["hoffset"]={ ["cs"]="hoffset", ["de"]="hoffset", ["en"]="hoffset", - ["fr"]="decalagehauteur", + ["fr"]="decalageh", ["it"]="hoffset", ["nl"]="hoffset", ["pe"]="آفستا", ["ro"]="hoffset", }, + ["horizontal"]={ + ["cs"]="horizontalne", + ["de"]="horizontal", + ["en"]="horizontal", + ["fr"]="horizontal", + ["it"]="orizzontale", + ["nl"]="horizontaal", + ["pe"]="افقی", + ["ro"]="orizontal", + }, ["horoffset"]={ ["cs"]="horoffset", ["de"]="rumpfabstand", ["en"]="horoffset", - ["fr"]="horoffset", + ["fr"]="decalagehor", ["it"]="horoffset", ["nl"]="rugoffset", ["pe"]="آفستافق", @@ -8355,7 +8467,7 @@ return { ["cs"]="hyphen", ["de"]="hyphen", ["en"]="hyphen", - ["fr"]="hyphen", + ["fr"]="traitdunion", ["it"]="hyphen", ["nl"]="hyphen", ["pe"]="شکستن", @@ -8363,12 +8475,13 @@ return { }, ["hyphens"]={ ["en"]="hyphens", + ["fr"]="traitsdunion", }, ["icommand"]={ ["cs"]="iprikaz", ["de"]="ibefehl", ["en"]="icommand", - ["fr"]="icommande", + ["fr"]="commandei", ["it"]="icomando", ["nl"]="icommando", ["pe"]="icommand", @@ -8376,12 +8489,13 @@ return { }, ["ignore"]={ ["en"]="ignore", + ["fr"]="ignorer", }, ["in"]={ ["cs"]="v", ["de"]="in", ["en"]="in", - ["fr"]="in", + ["fr"]="dans", ["it"]="in", ["nl"]="in", ["pe"]="درون", @@ -8401,7 +8515,7 @@ return { ["cs"]="zvysit", ["de"]="erhoehen", ["en"]="increment", - ["fr"]="incremente", + ["fr"]="incrementer", ["it"]="incremento", ["nl"]="verhoog", ["pe"]="افزایش", @@ -8411,7 +8525,7 @@ return { ["cs"]="zvysujicicislo", ["de"]="nummererhoehen", ["en"]="incrementnumber", - ["fr"]="incrementenumero", + ["fr"]="incrementernumero", ["it"]="incrementanumero", ["nl"]="verhoognummer", ["pe"]="شمارهافزایش", @@ -8421,7 +8535,7 @@ return { ["cs"]="odsazovani", ["de"]="einziehen", ["en"]="indenting", - ["fr"]="composeenalinea", + ["fr"]="indentation", ["it"]="rientro", ["nl"]="inspringen", ["pe"]="تورفتگی", @@ -8431,7 +8545,7 @@ return { ["cs"]="odsadpristi", ["de"]="ziehefolgendeein", ["en"]="indentnext", - ["fr"]="indentesuivant", + ["fr"]="indenterauuivant", ["it"]="rientrasuccessivo", ["nl"]="springvolgendein", ["pe"]="متنتورفته", @@ -8439,6 +8553,7 @@ return { }, ["index"]={ ["en"]="index", + ["fr"]="index", }, ["indicator"]={ ["cs"]="indikator", @@ -8452,6 +8567,11 @@ return { }, ["initialsep"]={ ["en"]="initialsep", + ["fr"]="sepinitial", + }, + ["inlinethreshold"]={ + ["en"]="inlinethreshold", + ["fr"]="seuilenligne", }, ["inner"]={ ["cs"]="vnitrni", @@ -8485,13 +8605,16 @@ return { }, ["insidesection"]={ ["en"]="insidesection", + ["fr"]="auseinsection", ["nl"]="binnensectie", }, ["instance"]={ ["en"]="instance", + ["fr"]="instance", }, ["intent"]={ ["en"]="intent", + ["fr"]="intention", }, ["interaction"]={ ["cs"]="interakce", @@ -8515,19 +8638,22 @@ return { }, ["internalgrid"]={ ["en"]="internalgrid", + ["fr"]="grilleinterieure", ["nl"]="interngrid", }, ["italicfeatures"]={ ["en"]="italicfeatures", + ["fr"]="fonctionnalitesitalique", }, ["italicfont"]={ ["en"]="italicfont", + ["fr"]="policeitalique", }, ["itemalign"]={ ["cs"]="itemalign", ["de"]="itemalign", ["en"]="itemalign", - ["fr"]="itemalign", + ["fr"]="alignerelem", ["it"]="itemalign", ["nl"]="itemuitlijnen", ["pe"]="تنظیمآیتم", @@ -8537,7 +8663,7 @@ return { ["cs"]="polozky", ["de"]="posten", ["en"]="items", - ["fr"]="elements", + ["fr"]="élément", ["it"]="elementi", ["nl"]="items", ["pe"]="آیتمها", @@ -8545,21 +8671,25 @@ return { }, ["joiners"]={ ["en"]="joiners", + ["fr"]="joins", }, ["journalconversion"]={ ["en"]="journalconversion", + ["fr"]="conversionjournal", }, ["juniorsep"]={ ["en"]="juniorsep", + ["fr"]="sepjunior", }, ["keeptogether"]={ ["en"]="keeptogether", + ["fr"]="conserverensemble", }, ["ken"]={ ["cs"]="ken", ["de"]="ken", ["en"]="ken", - ["fr"]="ken", + ["fr"]="rep", ["it"]="ken", ["nl"]="ken", ["pe"]="ken", @@ -8569,7 +8699,7 @@ return { ["cs"]="keyexpansion", ["de"]="keyexpansion", ["en"]="keyexpansion", - ["fr"]="keyexpansion", + ["fr"]="expansioncle", ["it"]="keyexpansion", ["nl"]="sleutelexpansie", ["pe"]="گسترشکلید", @@ -8577,13 +8707,14 @@ return { }, ["keys"]={ ["en"]="keys", + ["fr"]="cles", ["nl"]="sleutels", }, ["keyword"]={ ["cs"]="keyword", ["de"]="keyword", ["en"]="keyword", - ["fr"]="motcle", + ["fr"]="motclé", ["it"]="parolachiave", ["nl"]="trefwoord", ["pe"]="کلیدواژه", @@ -8599,29 +8730,36 @@ return { ["pe"]="برچسب", ["ro"]="eticheta", }, + ["labelalternative"]={ + ["en"]="labelalternative", + ["fr"]="varianteetiquette", + ["nl"]="labelvariant", + }, + ["labelcolor"]={ + ["en"]="labelcolor", + ["fr"]="couleuretiquette", + ["nl"]="labelkleur", + }, ["labeloffset"]={ ["en"]="labeloffset", - }, - ["labelalternative"]={ - ["en"]="labelalternative", - ["nl"]="labelvariant", + ["fr"]="decalageetiquette", }, ["labelstyle"]={ - ["en"]="labelstyle", - ["nl"]="labelletter", - }, - ["labelcolor"]={ - ["en"]="labelcolor", - ["nl"]="labelkleur", + ["en"]="labelstyle", + ["fr"]="styleetiquette", + ["nl"]="labelletter", }, ["language"]={ ["en"]="language", + ["fr"]="langue", }, ["last"]={ ["en"]="last", + ["fr"]="dernier", }, ["lastnamesep"]={ ["en"]="lastnamesep", + ["fr"]="sepderniernom", }, ["lastpage"]={ ["cs"]="poslednistrana", @@ -8635,12 +8773,15 @@ return { }, ["lastpagesep"]={ ["en"]="lastpagesep", + ["fr"]="sepdernierepage", }, ["lastpubsep"]={ ["en"]="lastpubsep", + ["fr"]="sepdernierepub", }, ["layout"]={ ["en"]="layout", + ["fr"]="miseenpage", ["nl"]="layout", }, ["left"]={ @@ -8667,7 +8808,7 @@ return { ["cs"]="leftcompoundhyphen", ["de"]="leftcompoundhyphen", ["en"]="leftcompoundhyphen", - ["fr"]="leftcompoundhyphen", + ["fr"]="traitdunioncomposegauche", ["it"]="leftcompoundhyphen", ["nl"]="linkerkoppelteken", ["pe"]="leftcompoundhyphen", @@ -8707,7 +8848,7 @@ return { ["cs"]="lefthyphen", ["de"]="lefthyphen", ["en"]="lefthyphen", - ["fr"]="lefthyphen", + ["fr"]="traitduniongauche", ["it"]="lefthyphen", ["nl"]="lefthyphen", ["pe"]="شکستچپ", @@ -8763,6 +8904,10 @@ return { ["pe"]="نقلچپ", ["ro"]="minicitatstanga", }, + ["leftsample"]={ + ["en"]="leftsample", + ["fr"]="echantillongauche", + }, ["leftsentence"]={ ["cs"]="vetavlevo", ["de"]="linkersatz", @@ -8777,7 +8922,7 @@ return { ["cs"]="leftspeech", ["de"]="leftspeech", ["en"]="leftspeech", - ["fr"]="leftspeech", + ["fr"]="discoursgauche", ["it"]="leftspeech", ["nl"]="linkeruitspraak", ["pe"]="سخنرانیچپ", @@ -8787,7 +8932,7 @@ return { ["cs"]="stylvlevo", ["de"]="linkerstil", ["en"]="leftstyle", - ["fr"]="leftstyle", + ["fr"]="stylegauche", ["it"]="stilesinistra", ["nl"]="linkerletter", ["pe"]="سبکچپ", @@ -8825,9 +8970,11 @@ return { }, ["leftwords"]={ ["en"]="leftwords", + ["fr"]="motsgauche", }, ["less"]={ ["en"]="less", + ["fr"]="moins", ["nl"]="minder", }, ["level"]={ @@ -8854,7 +9001,7 @@ return { ["cs"]="limittext", ["de"]="limittext", ["en"]="limittext", - ["fr"]="limittext", + ["fr"]="textelimite", ["it"]="limittext", ["nl"]="limiettekst", ["pe"]="مرزمتن", @@ -8932,6 +9079,7 @@ return { }, ["loffset"]={ ["en"]="loffset", + ["fr"]="decalagel", }, ["logo"]={ ["cs"]="logo", @@ -8957,7 +9105,7 @@ return { ["cs"]="barvaznacky", ["de"]="beschrfarbe", ["en"]="marcolor", - ["fr"]="couleurmarquage", + ["fr"]="couleurrem", ["it"]="coloremarcatura", ["nl"]="markleur", ["pe"]="رنگحاش", @@ -8987,7 +9135,7 @@ return { ["cs"]="textovahrana", ["de"]="marginalkante", ["en"]="marginedge", - ["fr"]="bordmarge", + ["fr"]="margebord", ["it"]="bordomargine", ["nl"]="kantlijn", ["pe"]="لبهحاشیه", @@ -8997,7 +9145,7 @@ return { ["cs"]="textmarginalnihookraje", ["de"]="marginalkantetext", ["en"]="marginedgetext", - ["fr"]="textebordmarge", + ["fr"]="textemargebord", ["it"]="testobordomargine", ["nl"]="kantlijntekst", ["pe"]="متنلبهحاشیه", @@ -9015,6 +9163,7 @@ return { }, ["mark"]={ ["en"]="mark", + ["fr"]="marque", ["nl"]="kernmerk", }, ["marking"]={ @@ -9031,7 +9180,7 @@ return { ["cs"]="stylsnacky", ["de"]="beschrstil", ["en"]="marstyle", - ["fr"]="stylemarquage", + ["fr"]="stylerem", ["it"]="stilemarcatura", ["nl"]="marletter", ["pe"]="سبکحاش", @@ -9039,16 +9188,20 @@ return { }, ["mask"]={ ["en"]="mask", + ["fr"]="masque", ["nl"]="masker", }, ["mathclass"]={ ["en"]="mathclass", + ["fr"]="classemath", }, ["mathlimits"]={ ["en"]="mathlimits", + ["fr"]="limitesmath", }, ["mathstyle"]={ ["en"]="mathstyle", + ["fr"]="stylemath", }, ["max"]={ ["cs"]="max", @@ -9062,6 +9215,7 @@ return { }, ["maxdepth"]={ ["en"]="maxdepth", + ["fr"]="profondeurmax", }, ["maxheight"]={ ["cs"]="maxvyska", @@ -9085,6 +9239,7 @@ return { }, ["maybeyear"]={ ["en"]="maybeyear", + ["fr"]="anneepeutetre", }, ["menu"]={ ["cs"]="menu", @@ -9116,47 +9271,51 @@ return { ["pe"]="میان", ["ro"]="mijloc", }, - ["middlecommand"]={ - ["en"]="middlecommand", - ["nl"]="middencommando", - }, ["middlecolor"]={ ["en"]="middlecolor", + ["fr"]="couleurmilieu", ["nl"]="middenkleur", }, - ["middlestyle"]={ - ["en"]="middlestyle", - ["nl"]="middenletter", - }, - ["middlewidth"]={ - ["en"]="middlewidth", - ["nl"]="middenbreedte", + ["middlecommand"]={ + ["en"]="middlecommand", + ["fr"]="commandemilieu", + ["nl"]="middencommando", }, ["middlespeech"]={ ["cs"]="middlespeech", ["de"]="middlespeech", ["en"]="middlespeech", - ["fr"]="middlespeech", + ["fr"]="discoursmilieu", ["it"]="middlespeech", ["nl"]="middenuitspraak", ["pe"]="سخنرانیمیانی", ["ro"]="middlespeech", }, + ["middlestyle"]={ + ["en"]="middlestyle", + ["fr"]="stylemilieu", + ["nl"]="middenletter", + }, ["middletext"]={ ["cs"]="strednitext", ["de"]="mittigertext", ["en"]="middletext", - ["fr"]="textecentre", + ["fr"]="textemilieu", ["it"]="testocentro", ["nl"]="middentekst", ["pe"]="متنمیانی", ["ro"]="textmijloc", }, + ["middlewidth"]={ + ["en"]="middlewidth", + ["fr"]="largeurmilieu", + ["nl"]="middenbreedte", + }, ["midsentence"]={ ["cs"]="midsentence", ["de"]="midsentence", ["en"]="midsentence", - ["fr"]="midsentence", + ["fr"]="milieuphrase", ["it"]="midsentence", ["nl"]="middenzin", ["pe"]="جملهمیانی", @@ -9206,7 +9365,7 @@ return { ["cs"]="moffset", ["de"]="moffset", ["en"]="moffset", - ["fr"]="moffset", + ["fr"]="decalagem", ["it"]="moffset", ["nl"]="moffset", ["pe"]="moffset", @@ -9214,26 +9373,32 @@ return { }, ["monthconversion"]={ ["en"]="monthconversion", + ["fr"]="conversionmois", ["nl"]="maandconversie", }, ["more"]={ ["en"]="more", + ["fr"]="plus", ["nl"]="meer", }, ["mpdepth"]={ ["en"]="mpdepth", + ["fr"]="profondeurmp", ["nl"]="mpdiepte", }, ["mpheight"]={ ["en"]="mpheight", + ["fr"]="hauteurmp", ["nl"]="mphoogte", }, ["mpoffset"]={ ["en"]="mpoffset", + ["fr"]="decalagemp", ["nl"]="mpoffset", }, ["mpwidth"]={ ["en"]="mpwidth", + ["fr"]="largeurmp", ["nl"]="mpbreedte", }, ["n"]={ @@ -9258,12 +9423,13 @@ return { }, ["namesep"]={ ["en"]="namesep", + ["fr"]="sepnom", }, ["nbottom"]={ ["cs"]="nspodek", ["de"]="nunten", ["en"]="nbottom", - ["fr"]="ninf", + ["fr"]="nbas", ["it"]="nfondo", ["nl"]="nonder", ["pe"]="nbottom", @@ -9291,15 +9457,19 @@ return { }, ["nextleft"]={ ["en"]="nextleft", + ["fr"]="suivantgauche", }, ["nextleftquotation"]={ ["en"]="nextleftquotation", + ["fr"]="citationgauchesuivante", }, ["nextright"]={ ["en"]="nextright", + ["fr"]="suivantdroite", }, ["nextrightquotation"]={ ["en"]="nextrightquotation", + ["fr"]="citationdroitesuivante", }, ["nl"]={ ["cs"]="nl", @@ -9343,10 +9513,12 @@ return { }, ["note"]={ ["en"]="note", + ["fr"]="note", ["nl"]="noot", }, ["notes"]={ ["en"]="notes", + ["fr"]="notes", ["nl"]="noten", }, ["nr"]={ @@ -9373,7 +9545,7 @@ return { ["cs"]="nvrsek", ["de"]="noben", ["en"]="ntop", - ["fr"]="nsup", + ["fr"]="nhaut", ["it"]="ncima", ["nl"]="nboven", ["pe"]="ntop", @@ -9391,6 +9563,7 @@ return { }, ["numberalign"]={ ["en"]="numberalign", + ["fr"]="alignernumero", ["nl"]="nummeruitlijnen", }, ["numbercolor"]={ @@ -9415,15 +9588,17 @@ return { }, ["numberconversion"]={ ["en"]="numberconversion", + ["fr"]="conversionnumero", }, ["numberconversionset"]={ ["en"]="numberconversionset", + ["fr"]="jeuconversionnumero", }, ["numberdistance"]={ ["cs"]="numberdistance", ["de"]="numberdistance", ["en"]="numberdistance", - ["fr"]="numberdistance", + ["fr"]="distancenumero", ["it"]="numberdistance", ["nl"]="nummerafstand", ["pe"]="فاصلهشماره", @@ -9433,7 +9608,7 @@ return { ["cs"]="cislovani", ["de"]="nummerierung", ["en"]="numbering", - ["fr"]="numerotation", + ["fr"]="numérotation", ["it"]="numerazione", ["nl"]="nummeren", ["pe"]="شمارهگذاری", @@ -9441,18 +9616,21 @@ return { }, ["numberorder"]={ ["en"]="numberorder", + ["fr"]="ordrenumero", }, ["numberprefix"]={ ["en"]="numberprefix", + ["fr"]="prefixenumero", }, ["numbersegments"]={ ["en"]="numbersegments", + ["fr"]="segmentsnumero", }, ["numberseparator"]={ ["cs"]="oddelovaccisla", ["de"]="nummernseperator", ["en"]="numberseparator", - ["fr"]="separateurnumbero", + ["fr"]="separateurnumero", ["it"]="separatorenumero", ["nl"]="nummerscheider", ["pe"]="جداکنندهشماره", @@ -9460,15 +9638,24 @@ return { }, ["numberseparatorset"]={ ["en"]="numberseparatorset", + ["fr"]="jeuseparateurnumero", }, ["numberset"]={ ["en"]="numberset", + ["fr"]="jeunumero", }, ["numberstarter"]={ ["en"]="numberstarter", + ["fr"]="demarreurnumero", }, ["numberstopper"]={ ["en"]="numberstopper", + ["fr"]="stoppeurnumero", + }, + ["numberstrut"]={ + ["en"]="numberstrut", + ["fr"]="entretoisenumero", + ["nl"]="nummerstrut", }, ["numberstyle"]={ ["cs"]="stylcisla", @@ -9484,7 +9671,7 @@ return { ["cs"]="numberwidth", ["de"]="numberwidth", ["en"]="numberwidth", - ["fr"]="numberwidth", + ["fr"]="largeurnumero", ["it"]="numberwidth", ["nl"]="nummerbreedte", ["pe"]="عرضشماره", @@ -9534,7 +9721,7 @@ return { ["cs"]="lichyokraj", ["de"]="ungeraderand", ["en"]="oddmargin", - ["fr"]="margepaire", + ["fr"]="margeimpaire", ["it"]="marginedispari", ["nl"]="onevenmarge", ["pe"]="حاشیهفرد", @@ -9544,7 +9731,7 @@ return { ["cs"]="offset", ["de"]="offset", ["en"]="offset", - ["fr"]="offset", + ["fr"]="decalage", ["it"]="offset", ["nl"]="offset", ["pe"]="آفست", @@ -9554,7 +9741,7 @@ return { ["cs"]="otevriakci", ["de"]="oeffenaktion", ["en"]="openaction", - ["fr"]="actionouverture", + ["fr"]="actionouvrir", ["it"]="azioneapri", ["nl"]="openactie", ["pe"]="عملباز", @@ -9562,13 +9749,14 @@ return { }, ["openpage"]={ ["en"]="openpage", + ["fr"]="ouvrirpage", ["nl"]="openpagina", }, ["openpageaction"]={ ["cs"]="akceotevrenistranky", ["de"]="openpageaction", ["en"]="openpageaction", - ["fr"]="actionouverturepage", + ["fr"]="actionouvrirpage", ["it"]="azioneapripagina", ["nl"]="openpaginaactie", ["pe"]="عملصفحهباز", @@ -9576,9 +9764,11 @@ return { }, ["openup"]={ ["en"]="openup", + ["fr"]="ouverture", }, ["opticalsize"]={ ["en"]="opticalsize", + ["fr"]="tailleoptique", }, ["option"]={ ["cs"]="volba", @@ -9592,12 +9782,9 @@ return { }, ["order"]={ ["en"]="order", + ["fr"]="ordre", ["nl"]="volgorde", }, - ["anchoring"]={ - ["en"]="anchoring", - ["nl"]="verankering", - }, ["orientation"]={ ["cs"]="orientation", ["de"]="orientation", @@ -9610,6 +9797,7 @@ return { }, ["otherstext"]={ ["en"]="otherstext", + ["fr"]="texteautres", }, ["outermargin"]={ ["cs"]="outermargin", @@ -9625,17 +9813,21 @@ return { ["cs"]="overprint", ["de"]="overprint", ["en"]="overprint", - ["fr"]="overprint", + ["fr"]="surimpression", ["it"]="overprint", ["nl"]="overprint", ["pe"]="overprint", ["ro"]="overprint", }, + ["ownerpassword"]={ + ["en"]="ownerpassword", + ["fr"]="motdepasseproprietaire", + }, ["ownnumber"]={ ["cs"]="vlastnicislo", ["de"]="eigenenummer", ["en"]="ownnumber", - ["fr"]="numeroproprio", + ["fr"]="numeropropre", ["it"]="numeroproprio", ["nl"]="eigennummer", ["pe"]="شمارهخود", @@ -9643,6 +9835,7 @@ return { }, ["packcriterium"]={ ["en"]="packcriterium", + ["fr"]="criterepack", ["nl"]="opelkaarcriterium", }, ["page"]={ @@ -9659,7 +9852,7 @@ return { ["cs"]="hranicestranky", ["de"]="seitenbegrenzung", ["en"]="pageboundaries", - ["fr"]="limitespage", + ["fr"]="frontierespage", ["it"]="limitipagina", ["nl"]="paginaovergangen", ["pe"]="مرزهایصفحه", @@ -9677,6 +9870,7 @@ return { }, ["pagecolormodel"]={ ["en"]="pagecolormodel", + ["fr"]="modelecouleurpage", ["nl"]="paginakleurmodel", }, ["pagecommand"]={ @@ -9691,18 +9885,23 @@ return { }, ["pageconnector"]={ ["en"]="pageconnector", + ["fr"]="connecteurpage", }, ["pageconversion"]={ ["en"]="pageconversion", + ["fr"]="conversionpage", }, ["pageconversionset"]={ ["en"]="pageconversionset", + ["fr"]="jeuconversionpage", }, ["pageleft"]={ ["en"]="pageleft", + ["fr"]="pagegauche", }, ["pagemethod"]={ ["en"]="pagemethod", + ["fr"]="methodepage", ["nl"]="paginamethode", }, ["pagenumber"]={ @@ -9717,48 +9916,63 @@ return { }, ["pageprefix"]={ ["en"]="pageprefix", + ["fr"]="prefixepage", }, ["pageprefixconnector"]={ ["en"]="pageprefixconnector", + ["fr"]="connecteurprefixepage", }, ["pageprefixconversion"]={ ["en"]="pageprefixconversion", + ["fr"]="conversionprefixepage", }, ["pageprefixconversionset"]={ ["en"]="pageprefixconversionset", + ["fr"]="jeuconversionprefixepage", }, ["pageprefixsegments"]={ ["en"]="pageprefixsegments", + ["fr"]="segmentsprefixepage", }, ["pageprefixseparatorset"]={ ["en"]="pageprefixseparatorset", + ["fr"]="jeuseparateurprefixepage", }, ["pageprefixset"]={ ["en"]="pageprefixset", + ["fr"]="jeuprefixepage", }, ["pageprefixstarter"]={ ["en"]="pageprefixstarter", + ["fr"]="demarreurprefixepage", }, ["pageprefixstopper"]={ ["en"]="pageprefixstopper", + ["fr"]="stoppeurprefixpage", }, ["pageright"]={ ["en"]="pageright", + ["fr"]="pagedroite", }, ["pagesegments"]={ ["en"]="pagesegments", + ["fr"]="segmentspage", }, ["pagesep"]={ ["en"]="pagesep", + ["fr"]="seppage", }, ["pageseparatorset"]={ ["en"]="pageseparatorset", + ["fr"]="jeuseparateurpage", }, ["pageset"]={ ["en"]="pageset", + ["fr"]="jeupage", }, ["pagestarter"]={ ["en"]="pagestarter", + ["fr"]="demarreurpage", }, ["pagestate"]={ ["cs"]="pagestate", @@ -9772,6 +9986,7 @@ return { }, ["pagestopper"]={ ["en"]="pagestopper", + ["fr"]="stoppeurpage", }, ["pagestyle"]={ ["cs"]="stylstranky", @@ -9815,12 +10030,13 @@ return { }, ["period"]={ ["en"]="period", + ["fr"]="periode", }, ["place"]={ ["cs"]="umistit", ["de"]="platziere", ["en"]="place", - ["fr"]="place", + ["fr"]="placer", ["it"]="metti", ["nl"]="plaatsen", ["pe"]="بگذار", @@ -9830,7 +10046,7 @@ return { ["cs"]="umistihlavicku", ["de"]="setzekopf", ["en"]="placehead", - ["fr"]="placetete", + ["fr"]="placertete", ["it"]="mettitesta", ["nl"]="plaatskop", ["pe"]="بگذارسر", @@ -9840,7 +10056,7 @@ return { ["cs"]="predelmista", ["de"]="setzetrenner", ["en"]="placestopper", - ["fr"]="emplacementstopper", + ["fr"]="placerstoppeur", ["it"]="mettistopper", ["nl"]="plaatsafsluiter", ["pe"]="بگذارایست", @@ -9868,33 +10084,41 @@ return { }, ["prefixconnector"]={ ["en"]="prefixconnector", + ["fr"]="connecteurprefixe", }, ["prefixconversion"]={ ["en"]="prefixconversion", + ["fr"]="conversionprefixe", }, ["prefixconversionset"]={ ["en"]="prefixconversionset", + ["fr"]="jeuconversionprefixe", }, ["prefixsegments"]={ ["en"]="prefixsegments", + ["fr"]="segmentsprefixe", }, ["prefixseparatorset"]={ ["en"]="prefixseparatorset", + ["fr"]="jeuseparateurprefixe", }, ["prefixset"]={ ["en"]="prefixset", + ["fr"]="jeuprefixe", }, ["prefixstarter"]={ ["en"]="prefixstarter", + ["fr"]="demarreurprefixe", }, ["prefixstopper"]={ ["en"]="prefixstopper", + ["fr"]="stoppeurprefixe", }, ["preset"]={ ["cs"]="prednastaveni", ["de"]="voreinstellung", ["en"]="preset", - ["fr"]="prereglage", + ["fr"]="preregler", ["it"]="preimpostato", ["nl"]="preset", ["pe"]="preset", @@ -9904,7 +10128,7 @@ return { ["cs"]="nahled", ["de"]="vorschau", ["en"]="preview", - ["fr"]="previsualisation", + ["fr"]="apercu", ["it"]="anteprima", ["nl"]="preview", ["pe"]="پیشدید", @@ -9932,13 +10156,14 @@ return { }, ["print"]={ ["en"]="print", + ["fr"]="imprimer", ["nl"]="print", }, ["printable"]={ ["cs"]="tisknutelne", ["de"]="druckbar", ["en"]="printable", - ["fr"]="editable", + ["fr"]="imprimable", ["it"]="stampabile", ["nl"]="printbaar", ["pe"]="قابلچاپ", @@ -9948,7 +10173,7 @@ return { ["cs"]="process", ["de"]="process", ["en"]="process", - ["fr"]="process", + ["fr"]="traiter", ["it"]="process", ["nl"]="proces", ["pe"]="پردازش", @@ -9956,15 +10181,19 @@ return { }, ["profile"]={ ["en"]="profile", + ["fr"]="profil", }, ["properties"]={ ["en"]="properties", + ["fr"]="proprietes", }, ["pubsep"]={ ["en"]="pubsep", + ["fr"]="seppub", }, ["quotechar"]={ ["en"]="quotechar", + ["fr"]="caracitation", }, ["radius"]={ ["cs"]="polomer", @@ -9988,6 +10217,7 @@ return { }, ["range"]={ ["en"]="range", + ["fr"]="gamme", ["nl"]="bereik", }, ["reduction"]={ @@ -10012,6 +10242,7 @@ return { }, ["refcommand"]={ ["en"]="refcommand", + ["fr"]="commanderef", }, ["reference"]={ ["cs"]="odkaz", @@ -10025,15 +10256,17 @@ return { }, ["referencemethod"]={ ["en"]="referencemethod", + ["fr"]="methodereference", }, ["referenceprefix"]={ ["en"]="referenceprefix", + ["fr"]="prefixereference", }, ["referencing"]={ ["cs"]="odkazujici", ["de"]="referieren", ["en"]="referencing", - ["fr"]="referencing", + ["fr"]="referencement", ["it"]="referencing", ["nl"]="refereren", ["pe"]="مراجعه", @@ -10041,13 +10274,14 @@ return { }, ["region"]={ ["en"]="region", + ["fr"]="region", ["nl"]="gebied", }, ["regionin"]={ ["cs"]="oblastuvnitr", ["de"]="regionin", ["en"]="regionin", - ["fr"]="entreregion", + ["fr"]="regiondedans", ["it"]="entraregione", ["nl"]="gebiedin", ["pe"]="ناحیهدرون", @@ -10057,7 +10291,7 @@ return { ["cs"]="oblastvne", ["de"]="regionaus", ["en"]="regionout", - ["fr"]="regionexterieure", + ["fr"]="regiondehors", ["it"]="esciregione", ["nl"]="gebieduit", ["pe"]="ناحیهبیرون", @@ -10065,21 +10299,25 @@ return { }, ["register"]={ ["en"]="register", + ["fr"]="registre", }, ["regularfeatures"]={ ["en"]="regularfeatures", + ["fr"]="fonctionnalitesordinaires", }, ["regularfont"]={ ["en"]="regularfont", + ["fr"]="policereordinaire", }, ["renderingsetup"]={ ["en"]="renderingsetup", + ["fr"]="configurationrendu", }, ["repeat"]={ ["cs"]="opakovat", ["de"]="wiederholen", ["en"]="repeat", - ["fr"]="repete", + ["fr"]="repeter", ["it"]="ripeti", ["nl"]="herhaal", ["pe"]="تکرار", @@ -10089,7 +10327,7 @@ return { ["cs"]="reset", ["de"]="reset", ["en"]="reset", - ["fr"]="reset", + ["fr"]="raz", ["it"]="reset", ["nl"]="reset", ["pe"]="بازنشانی", @@ -10117,12 +10355,13 @@ return { }, ["resources"]={ ["en"]="resources", + ["fr"]="ressources", }, ["reverse"]={ ["cs"]="reverse", ["de"]="reverse", ["en"]="reverse", - ["fr"]="inverse", + ["fr"]="inverser", ["it"]="invertito", ["nl"]="omgekeerd", ["pe"]="برعکس", @@ -10138,6 +10377,10 @@ return { ["pe"]="راست", ["ro"]="dreapta", }, + ["rightchars"]={ + ["en"]="rightchars", + ["fr"]="caracteresdroite", + }, ["rightcolor"]={ ["cs"]="barvavpravo", ["de"]="rechterfarbe", @@ -10152,7 +10395,7 @@ return { ["cs"]="rightcompoundhyphen", ["de"]="rightcompoundhyphen", ["en"]="rightcompoundhyphen", - ["fr"]="rightcompoundhyphen", + ["fr"]="traitdunioncomposedroite", ["it"]="rightcompoundhyphen", ["nl"]="rechterkoppelteken", ["pe"]="rightcompoundhyphen", @@ -10182,7 +10425,7 @@ return { ["cs"]="ramecekvpravo", ["de"]="rechterrahmen", ["en"]="rightframe", - ["fr"]="cadredroit", + ["fr"]="cadredroite", ["it"]="cornicedestra", ["nl"]="rechterkader", ["pe"]="قالبراست", @@ -10192,7 +10435,7 @@ return { ["cs"]="righthyphen", ["de"]="righthyphen", ["en"]="righthyphen", - ["fr"]="righthyphen", + ["fr"]="traitduniondroite", ["it"]="righthyphen", ["nl"]="righthyphen", ["pe"]="righthyphen", @@ -10222,7 +10465,7 @@ return { ["cs"]="pravyoffset", ["de"]="rechterabstand", ["en"]="rightoffset", - ["fr"]="rightoffset", + ["fr"]="decalagedroite", ["it"]="offsetdestro", ["nl"]="rechteroffset", ["pe"]="آفستراست", @@ -10248,6 +10491,10 @@ return { ["pe"]="نقلراست", ["ro"]="minicitatdreapta", }, + ["rightsample"]={ + ["en"]="rightsample", + ["fr"]="echantillondroite", + }, ["rightsentence"]={ ["cs"]="vetavpravo", ["de"]="rechtersatz", @@ -10262,7 +10509,7 @@ return { ["cs"]="rightspeech", ["de"]="rightspeech", ["en"]="rightspeech", - ["fr"]="rightspeech", + ["fr"]="discoursdroite", ["it"]="rightspeech", ["nl"]="rechteruitspraak", ["pe"]="سخنرانیراست", @@ -10292,7 +10539,7 @@ return { ["cs"]="textvpravo", ["de"]="rechtertext", ["en"]="righttext", - ["fr"]="textedroit", + ["fr"]="textedroite", ["it"]="testodestro", ["nl"]="rechtertekst", ["pe"]="متنراست", @@ -10310,12 +10557,11 @@ return { }, ["rightwords"]={ ["en"]="rightwords", - }, - ["rightchars"]={ - ["en"]="rightchars", + ["fr"]="motsdroite", }, ["roffset"]={ ["en"]="roffset", + ["fr"]="decalager", }, ["rotation"]={ ["cs"]="rotace", @@ -10331,7 +10577,7 @@ return { ["cs"]="linka", ["de"]="linie", ["en"]="rule", - ["fr"]="ligne", + ["fr"]="trait", ["it"]="linea", ["nl"]="lijn", ["pe"]="خط", @@ -10341,7 +10587,7 @@ return { ["cs"]="barvalinky", ["de"]="linienfarbe", ["en"]="rulecolor", - ["fr"]="couleurligne", + ["fr"]="couleurtrait", ["it"]="colorelinea", ["nl"]="lijnkleur", ["pe"]="رنگخط", @@ -10349,13 +10595,14 @@ return { }, ["rulecommand"]={ ["en"]="rulecommand", + ["fr"]="commandetrait", ["nl"]="lijncommando", }, ["rulethickness"]={ ["cs"]="tloustkalinky", ["de"]="liniendicke", ["en"]="rulethickness", - ["fr"]="epaisseurligne", + ["fr"]="epaisseurtrait", ["it"]="spessorelinea", ["nl"]="lijndikte", ["pe"]="ضخامتخط", @@ -10371,12 +10618,6 @@ return { ["pe"]="همانصفحه", ["ro"]="aceeasipagina", }, - ["leftsample"]={ - ["en"]="leftsample", - }, - ["rightsample"]={ - ["en"]="rightsample", - }, ["sample"]={ ["cs"]="vzor", ["de"]="muster", @@ -10389,9 +10630,11 @@ return { }, ["samplesize"]={ ["en"]="samplesize", + ["fr"]="tailleechantillon", }, ["saveinlist"]={ ["en"]="saveinlist", + ["fr"]="enregistrerdansliste", }, ["scale"]={ ["cs"]="meritko", @@ -10407,7 +10650,7 @@ return { ["cs"]="rozsah", ["de"]="bereich", ["en"]="scope", - ["fr"]="scope", + ["fr"]="perimetre", ["it"]="scope", ["nl"]="scope", ["pe"]="طرح", @@ -10435,12 +10678,15 @@ return { }, ["sectionblock"]={ ["en"]="sectionblock", + ["fr"]="blocsection", }, ["sectionconversion"]={ ["en"]="sectionconversion", + ["fr"]="conversionsection", }, ["sectionconversionset"]={ ["en"]="sectionconversionset", + ["fr"]="jeuconversionsection", }, ["sectionnumber"]={ ["cs"]="cislooddilu", @@ -10454,21 +10700,27 @@ return { }, ["sectionresetset"]={ ["en"]="sectionresetset", + ["fr"]="jeurazsection", }, ["sectionsegments"]={ ["en"]="sectionsegments", + ["fr"]="segmentssection", }, ["sectionseparatorset"]={ ["en"]="sectionseparatorset", + ["fr"]="jeuseparateursection", }, ["sectionset"]={ ["en"]="sectionset", + ["fr"]="jeusection", }, ["sectionstarter"]={ ["en"]="sectionstarter", + ["fr"]="demarreursection", }, ["sectionstopper"]={ ["en"]="sectionstopper", + ["fr"]="stoppeursection", }, ["separator"]={ ["cs"]="oddelovac", @@ -10482,28 +10734,30 @@ return { }, ["separatorcolor"]={ ["en"]="separatorcolor", + ["fr"]="couleurseparateur", ["nl"]="scheiderkleur", }, ["separatorstyle"]={ ["en"]="separatorstyle", + ["fr"]="styleseparateur", ["nl"]="scheiderletter", }, ["set"]={ ["cs"]="set", ["de"]="set", ["en"]="set", - ["fr"]="set", + ["fr"]="regler", ["it"]="set", ["nl"]="set", ["pe"]="قراربده", ["ro"]="set", }, ["setups"]={ - ["comment"]="no translations", ["en"]="setups", }, ["shrink"]={ ["en"]="shrink", + ["fr"]="retrecir", ["nl"]="krimp", }, ["side"]={ @@ -10520,7 +10774,7 @@ return { ["cs"]="sidealign", ["de"]="sidealign", ["en"]="sidealign", - ["fr"]="sidealign", + ["fr"]="alignercote", ["it"]="sidealign", ["nl"]="zijuitlijnen", ["pe"]="تنظیمکنار", @@ -10530,7 +10784,7 @@ return { ["cs"]="sidemethod", ["de"]="sidemethod", ["en"]="sidemethod", - ["fr"]="sidemethod", + ["fr"]="methodecote", ["it"]="sidemethod", ["nl"]="zijmethode", ["pe"]="روشکنار", @@ -10540,7 +10794,7 @@ return { ["cs"]="bocnimezeraza", ["de"]="nebennachspatium", ["en"]="sidespaceafter", - ["fr"]="espacelateralapres", + ["fr"]="espacelatéralaprès", ["it"]="spaziolateraledopo", ["nl"]="zijnawit", ["pe"]="فضایکناریبعد", @@ -10558,15 +10812,12 @@ return { }, ["sidespaceinbetween"]={ ["en"]="sidespaceinbetween", + ["fr"]="espacelateralentre", ["nl"]="zijtussenwit", }, - ["spaceafterside"]={ - ["en"]="spaceafterside", - ["nl"]="witnazij", - }, - ["spacebeforeside"]={ - ["en"]="spacebeforeside", - ["nl"]="witvoorzij", + ["sidethreshold"]={ + ["en"]="sidethreshold", + ["fr"]="seuilcote", }, ["sign"]={ ["cs"]="znak", @@ -10578,11 +10829,16 @@ return { ["pe"]="علامت", ["ro"]="semn", }, + ["simplecommand"]={ + ["en"]="simplecommand", + ["fr"]="commandesimple", + ["nl"]="simpelcommando", + }, ["size"]={ ["cs"]="velikost", ["de"]="groesse", ["en"]="size", - ["fr"]="dimension", + ["fr"]="taille", ["it"]="dimensione", ["nl"]="formaat", ["pe"]="اندازه", @@ -10590,9 +10846,11 @@ return { }, ["slantedfeatures"]={ ["en"]="slantedfeatures", + ["fr"]="fonctionnalitesincline", }, ["slantedfont"]={ ["en"]="slantedfont", + ["fr"]="policeinclinee", }, ["small"]={ ["cs"]="male", @@ -10606,22 +10864,26 @@ return { }, ["smallcapsfeatures"]={ ["en"]="smallcapsfeatures", + ["fr"]="fonctionnalitespetitescaps", }, ["smallcapsfont"]={ ["en"]="smallcapsfont", + ["fr"]="policepetitescaps", }, ["solution"]={ ["en"]="solution", + ["fr"]="solution", ["nl"]="oplossing", }, ["sort"]={ ["en"]="sort", + ["fr"]="trier", }, ["sorttype"]={ ["cs"]="sorttype", ["de"]="sorttype", ["en"]="sorttype", - ["fr"]="sorttype", + ["fr"]="modetri", ["it"]="sorttype", ["nl"]="sortering", ["pe"]="ترتیبتایپ", @@ -10631,7 +10893,7 @@ return { ["cs"]="zdroj", ["de"]="quelle", ["en"]="source", - ["fr"]="origine", + ["fr"]="source", ["it"]="origine", ["nl"]="bron", ["pe"]="منبع", @@ -10651,12 +10913,17 @@ return { ["cs"]="mezeraza", ["de"]="nachspatium", ["en"]="spaceafter", - ["fr"]="espaceapres", + ["fr"]="espaceaprès", ["it"]="spaziodopo", ["nl"]="nawit", ["pe"]="فضابعداز", ["ro"]="spatiudupa", }, + ["spaceafterside"]={ + ["en"]="spaceafterside", + ["fr"]="espaceaprèscoté", + ["nl"]="witnazij", + }, ["spacebefore"]={ ["cs"]="mezerapred", ["de"]="vorspatium", @@ -10667,11 +10934,16 @@ return { ["pe"]="فضاقبلاز", ["ro"]="spatiuinainte", }, + ["spacebeforeside"]={ + ["en"]="spacebeforeside", + ["fr"]="espaceavantcote", + ["nl"]="witvoorzij", + }, ["spaceinbetween"]={ ["cs"]="spaceinbetween", ["de"]="spaceinbetween", ["en"]="spaceinbetween", - ["fr"]="spaceinbetween", + ["fr"]="espaceentre", ["it"]="spaceinbetween", ["nl"]="tussenwit", ["pe"]="فضادربین", @@ -10689,12 +10961,13 @@ return { }, ["specification"]={ ["en"]="specification", + ["fr"]="specification", }, ["split"]={ ["cs"]="split", ["de"]="split", ["en"]="split", - ["fr"]="split", + ["fr"]="partager", ["it"]="separa", ["nl"]="splitsen", ["pe"]="شکافتن", @@ -10704,7 +10977,7 @@ return { ["cs"]="splitcolor", ["de"]="splitcolor", ["en"]="splitcolor", - ["fr"]="splitcolor", + ["fr"]="couleurpartage", ["it"]="splitcolor", ["nl"]="splitskleur", ["pe"]="شکافتنرنگ", @@ -10714,7 +10987,7 @@ return { ["cs"]="splitmethod", ["de"]="splitmethod", ["en"]="splitmethod", - ["fr"]="splitmethod", + ["fr"]="methodepartage", ["it"]="splitmethod", ["nl"]="splitsmethode", ["pe"]="روششکافتن", @@ -10724,7 +10997,7 @@ return { ["cs"]="splitoffset", ["de"]="splitoffset", ["en"]="splitoffset", - ["fr"]="splitoffset", + ["fr"]="decalagepartage", ["it"]="splitoffset", ["nl"]="splitsoffset", ["pe"]="شکافتنآفست", @@ -10734,7 +11007,7 @@ return { ["cs"]="spot", ["de"]="spot", ["en"]="spot", - ["fr"]="spot", + ["fr"]="tondirect", ["it"]="spot", ["nl"]="spot", ["pe"]="لکه", @@ -10744,7 +11017,7 @@ return { ["cs"]="stack", ["de"]="stack", ["en"]="stack", - ["fr"]="stack", + ["fr"]="pile", ["it"]="stack", ["nl"]="stapel", ["pe"]="توده", @@ -10752,13 +11025,14 @@ return { }, ["stackname"]={ ["en"]="stackname", + ["fr"]="nompile", ["nl"]="stapelnaam", }, ["start"]={ ["cs"]="start", ["de"]="start", ["en"]="start", - ["fr"]="demarre", + ["fr"]="début", ["it"]="inizia", ["nl"]="start", ["pe"]="شروع", @@ -10766,13 +11040,14 @@ return { }, ["starter"]={ ["en"]="starter", + ["fr"]="demarreur", ["nl"]="opener", }, ["state"]={ ["cs"]="status", ["de"]="status", ["en"]="state", - ["fr"]="etat", + ["fr"]="état", ["it"]="stato", ["nl"]="status", ["pe"]="وضعیت", @@ -10782,7 +11057,7 @@ return { ["cs"]="krok", ["de"]="schritt", ["en"]="step", - ["fr"]="pas", + ["fr"]="etape", ["it"]="passo", ["nl"]="stap", ["pe"]="گام", @@ -10792,7 +11067,7 @@ return { ["cs"]="stop", ["de"]="stop", ["en"]="stop", - ["fr"]="stoppe", + ["fr"]="fin", ["it"]="termina", ["nl"]="stop", ["pe"]="پایان", @@ -10802,7 +11077,7 @@ return { ["cs"]="predel", ["de"]="abschnitttrenner", ["en"]="stopper", - ["fr"]="taquet", + ["fr"]="stoppeur", ["it"]="stopper", ["nl"]="afsluiter", ["pe"]="ایست", @@ -10812,7 +11087,7 @@ return { ["cs"]="natahnout", ["de"]="strecken", ["en"]="stretch", - ["fr"]="etire", + ["fr"]="etirer", ["it"]="dilata", ["nl"]="rek", ["pe"]="کشیدن", @@ -10820,25 +11095,18 @@ return { }, ["strip"]={ ["en"]="strip", + ["fr"]="bande", }, ["strut"]={ ["cs"]="strut", ["de"]="strut", ["en"]="strut", - ["fr"]="strut", + ["fr"]="entretoise", ["it"]="strut", ["nl"]="strut", ["pe"]="بست", ["ro"]="strut", }, - ["numberstrut"]={ - ["en"]="numberstrut", - ["nl"]="nummerstrut", - }, - ["titlestrut"]={ - ["en"]="titlestrut", - ["nl"]="titelstrut", - }, ["style"]={ ["cs"]="pismeno", ["de"]="stil", @@ -10849,6 +11117,11 @@ return { ["pe"]="سبک", ["ro"]="stil", }, + ["stylealternative"]={ + ["en"]="stylealternative", + ["fr"]="variantestyle", + ["nl"]="stylevariant", + }, ["sub"]={ ["cs"]="pod", ["de"]="unter", @@ -10873,7 +11146,7 @@ return { ["cs"]="suffix", ["de"]="suffix", ["en"]="suffix", - ["fr"]="suffix", + ["fr"]="suffixe", ["it"]="suffix", ["nl"]="suffix", ["pe"]="پسوند", @@ -10881,23 +11154,29 @@ return { }, ["suffixseparator"]={ ["en"]="suffixseparator", + ["fr"]="separateursuffixe", ["nl"]="suffixscheider", }, ["suffixstopper"]={ ["en"]="suffixstopper", + ["fr"]="stoppeursuffixe", ["nl"]="suffixafsluiter", }, ["surnamefirstnamesep"]={ ["en"]="surnamefirstnamesep", + ["fr"]="sepnomfamilleprenom", }, ["surnameinitialsep"]={ ["en"]="surnameinitialsep", + ["fr"]="sepnomfamilleinitial", }, ["surnamesep"]={ ["en"]="surnamesep", + ["fr"]="seprenom", }, ["svgstyle"]={ ["en"]="svgstyle", + ["fr"]="stylesvg", }, ["sx"]={ ["cs"]="sx", @@ -10923,7 +11202,7 @@ return { ["cs"]="symzarovnani", ["de"]="symausrichtung", ["en"]="symalign", - ["fr"]="symalignement", + ["fr"]="alignersym", ["it"]="symallinea", ["nl"]="symuitlijnen", ["pe"]="تنظیمنماد", @@ -10941,6 +11220,7 @@ return { }, ["symbolcommand"]={ ["en"]="symbolcommand", + ["fr"]="commandesymbole", }, ["symbolset"]={ ["cs"]="sadasymbolu", @@ -10996,7 +11276,7 @@ return { ["cs"]="synonymcommand", ["de"]="synonymbefehl", ["en"]="synonymcommand", - ["fr"]="synonymcommand", + ["fr"]="commandesynonyme", ["it"]="synonymcommand", ["nl"]="synoniemcommando", ["pe"]="synonymcommand", @@ -11034,6 +11314,7 @@ return { }, ["textalign"]={ ["en"]="textalign", + ["fr"]="alignertexte", }, ["textcolor"]={ ["cs"]="barvatextu", @@ -11099,7 +11380,7 @@ return { ["cs"]="textmethod", ["de"]="textmethod", ["en"]="textmethod", - ["fr"]="textmethod", + ["fr"]="methodetexte", ["it"]="textmethod", ["nl"]="tekstmethode", ["pe"]="روشمتن", @@ -11157,15 +11438,12 @@ return { }, ["threshold"]={ ["en"]="threshold", + ["fr"]="seuil", }, - ["sidethreshold"]={ - ["en"]="sidethreshold", - }, - ["displaythreshold"]={ - ["en"]="displaythreshold", - }, - ["inlinethreshold"]={ - ["en"]="inlinethreshold", + ["time"]={ + ["en"]="time", + ["fr"]="temps", + ["nl"]="tijd", }, ["title"]={ ["cs"]="titul", @@ -11187,15 +11465,11 @@ return { ["pe"]="رنگعنوان", ["ro"]="culoaretitlu", }, - ["simplecommand"]={ - ["en"]="simplecommand", - ["nl"]="simpelcommando", - }, ["titlecommand"]={ ["cs"]="titlecommand", ["de"]="titlecommand", ["en"]="titlecommand", - ["fr"]="titlecommand", + ["fr"]="commandetitre", ["it"]="titlecommand", ["nl"]="titelcommando", ["pe"]="فرمانعنوان", @@ -11215,7 +11489,7 @@ return { ["cs"]="titleleft", ["de"]="titleleft", ["en"]="titleleft", - ["fr"]="titleleft", + ["fr"]="gauchetitre", ["it"]="titleleft", ["nl"]="titellinks", ["pe"]="عنوانچپ", @@ -11225,12 +11499,17 @@ return { ["cs"]="titleright", ["de"]="titleright", ["en"]="titleright", - ["fr"]="titleright", + ["fr"]="droitetitre", ["it"]="titleright", ["nl"]="titelrechts", ["pe"]="عنوانراست", ["ro"]="titleright", }, + ["titlestrut"]={ + ["en"]="titlestrut", + ["fr"]="entretoisetitre", + ["nl"]="titelstrut", + }, ["titlestyle"]={ ["cs"]="styltitulek", ["de"]="titelstil", @@ -11253,6 +11532,7 @@ return { }, ["toffset"]={ ["en"]="toffset", + ["fr"]="decalaget", }, ["tolerance"]={ ["cs"]="tolerance", @@ -11268,7 +11548,7 @@ return { ["cs"]="vrsek", ["de"]="oben", ["en"]="top", - ["fr"]="sup", + ["fr"]="haut", ["it"]="cima", ["nl"]="boven", ["pe"]="بالا", @@ -11276,13 +11556,14 @@ return { }, ["topcommand"]={ ["en"]="topcommand", + ["fr"]="commandehaut", ["nl"]="bovencommando", }, ["topdistance"]={ ["cs"]="vzdalenostvrsku", ["de"]="obenabstand", ["en"]="topdistance", - ["fr"]="distancesup", + ["fr"]="distancehaut", ["it"]="distanzacima", ["nl"]="bovenafstand", ["pe"]="فاصلهبالا", @@ -11292,7 +11573,7 @@ return { ["cs"]="rameceknahore", ["de"]="obenrahmen", ["en"]="topframe", - ["fr"]="cadresup", + ["fr"]="cadrehaut", ["it"]="cornicecima", ["nl"]="bovenkader", ["pe"]="قالبراست", @@ -11302,7 +11583,7 @@ return { ["cs"]="offsetvrsku", ["de"]="obenoffset", ["en"]="topoffset", - ["fr"]="decalagesup", + ["fr"]="decalagehaut", ["it"]="offsetcima", ["nl"]="bovenoffset", ["pe"]="آفستبالا", @@ -11312,7 +11593,7 @@ return { ["cs"]="svrchnimezera", ["de"]="kopfspatium", ["en"]="topspace", - ["fr"]="espacesup", + ["fr"]="espacehaut", ["it"]="spaziocima", ["nl"]="kopwit", ["pe"]="فضایبالا", @@ -11322,7 +11603,7 @@ return { ["cs"]="statusvrsku", ["de"]="statusoben", ["en"]="topstate", - ["fr"]="etatsup", + ["fr"]="etathaut", ["it"]="statocima", ["nl"]="bovenstatus", ["pe"]="وضعیتبالا", @@ -11330,22 +11611,26 @@ return { }, ["totalnumber"]={ ["en"]="totalnumber", + ["fr"]="nombretotal", }, ["transform"]={ - ["en"]="transform", - ["nl"]="transformatie", + ["en"]="transform", + ["fr"]="transformer", + ["nl"]="transformatie", }, ["translate"]={ ["en"]="translate", + ["fr"]="traduire", }, ["trimoffset"]={ ["en"]="trimoffset", + ["fr"]="decalagecoupe", }, ["type"]={ ["cs"]="typ", ["de"]="typ", ["en"]="type", - ["fr"]="type", + ["fr"]="transcrire", ["it"]="type", ["nl"]="type", ["pe"]="تایپ", @@ -11373,12 +11658,13 @@ return { }, ["up"]={ ["en"]="up", + ["fr"]="enhaut", }, ["urlalternative"]={ ["cs"]="urlalternativa", ["de"]="urlalternative", ["en"]="urlalternative", - ["fr"]="alternativeurl", + ["fr"]="varianteurl", ["it"]="alternativaurl", ["nl"]="urlvariant", ["pe"]="urlalternative", @@ -11394,6 +11680,10 @@ return { ["pe"]="urlspace", ["ro"]="spatiuurl", }, + ["userpassword"]={ + ["en"]="userpassword", + ["fr"]="motdepasseutilisateur", + }, ["validate"]={ ["cs"]="validovat", ["de"]="validieren", @@ -11406,13 +11696,14 @@ return { }, ["values"]={ ["en"]="values", + ["fr"]="valeurs", ["nl"]="waarden", }, ["vcommand"]={ ["cs"]="vprikaz", ["de"]="vbefehl", ["en"]="vcommand", - ["fr"]="vcommande", + ["fr"]="commandev", ["it"]="vcomando", ["nl"]="vcommando", ["pe"]="vcommand", @@ -11420,37 +11711,48 @@ return { }, ["vcompact"]={ ["en"]="vcompact", + ["fr"]="compactv", ["nl"]="vcomprimeer", }, ["vector"]={ ["en"]="vector", + ["fr"]="vecteur", ["nl"]="vector", }, + ["veroffset"]={ + ["cs"]="offsethlavicky", + ["de"]="kopfoffset", + ["en"]="veroffset", + ["fr"]="decalagever", + ["it"]="veroffset", + ["nl"]="kopoffset", + ["pe"]="آفستعم", + ["ro"]="veroffset", + }, ["vertical"]={ ["cs"]="vertikalne", ["de"]="vertikal", ["en"]="vertical", - ["fr"]="verticale", + ["fr"]="vertical", ["it"]="verticale", ["nl"]="vertikaal", ["pe"]="عمودی", ["ro"]="vertical", }, - ["veroffset"]={ - ["cs"]="offsethlavicky", - ["de"]="kopfoffset", - ["en"]="veroffset", - ["fr"]="veroffset", - ["it"]="veroffset", - ["nl"]="kopoffset", - ["pe"]="آفستعم", - ["ro"]="veroffset", + ["vfactor"]={ + ["cs"]="vfaktor", + ["de"]="vfaktor", + ["en"]="vfactor", + ["fr"]="facteurv", + ["it"]="vfactor", + ["nl"]="vfactor", + ["ro"]="vfactor", }, ["vfil"]={ ["cs"]="vfil", ["de"]="vfil", ["en"]="vfil", - ["fr"]="vfil", + ["fr"]="remplissagev", ["it"]="vfil", ["nl"]="vfil", ["pe"]="vfil", @@ -11458,12 +11760,13 @@ return { }, ["viewerprefix"]={ ["en"]="viewerprefix", + ["fr"]="prefixevisualisateur", }, ["voffset"]={ ["cs"]="voffset", ["de"]="voffset", ["en"]="voffset", - ["fr"]="voffset", + ["fr"]="decalagev", ["it"]="voffset", ["nl"]="voffset", ["pe"]="آفستع", @@ -11471,12 +11774,13 @@ return { }, ["vonsep"]={ ["en"]="vonsep", + ["fr"]="sepvon", }, ["way"]={ ["cs"]="zpusob", ["de"]="art", ["en"]="way", - ["fr"]="mode", + ["fr"]="maniere", ["it"]="modo", ["nl"]="wijze", ["pe"]="راه", @@ -11486,7 +11790,7 @@ return { ["cs"]="sfaktor", ["de"]="bfaktor", ["en"]="wfactor", - ["fr"]="facteurlargeur", + ["fr"]="facteurw", ["it"]="wfactor", ["nl"]="bfactor", ["pe"]="wfactor", @@ -11514,12 +11818,18 @@ return { }, ["words"]={ ["en"]="words", + ["fr"]="mots", + }, + ["xanchor"]={ + ["en"]="xanchor", + ["fr"]="ancrex", + ["nl"]="xanker", }, ["xfactor"]={ ["cs"]="xfaktor", ["de"]="xfaktor", ["en"]="xfactor", - ["fr"]="xfactor", + ["fr"]="facteurx", ["it"]="xfactor", ["nl"]="xfactor", ["pe"]="فاکتورایکس", @@ -11527,6 +11837,7 @@ return { }, ["xhtml"]={ ["en"]="xhtml", + ["fr"]="xhtml", }, ["xmax"]={ ["cs"]="xmax", @@ -11540,16 +11851,13 @@ return { }, ["xmlsetup"]={ ["en"]="xmlsetup", - }, - ["xanchor"]={ - ["en"]="xanchor", - ["nl"]="xanker", + ["fr"]="configurationxml", }, ["xoffset"]={ ["cs"]="xoffset", ["de"]="xoffset", ["en"]="xoffset", - ["fr"]="xoffset", + ["fr"]="decalagex", ["it"]="xoffset", ["nl"]="xoffset", ["pe"]="آفستایکس", @@ -11559,7 +11867,7 @@ return { ["cs"]="xmeritko", ["de"]="xformat", ["en"]="xscale", - ["fr"]="xscale", + ["fr"]="echellex", ["it"]="xscale", ["nl"]="xschaal", ["pe"]="مقیاسایکس", @@ -11569,17 +11877,22 @@ return { ["cs"]="xkrok", ["de"]="xschritt", ["en"]="xstep", - ["fr"]="xstep", + ["fr"]="etapex", ["it"]="xstep", ["nl"]="xstap", ["pe"]="گامایکس", ["ro"]="xstep", }, + ["yanchor"]={ + ["en"]="yanchor", + ["fr"]="ancrey", + ["nl"]="yanker", + }, ["yfactor"]={ ["cs"]="yfaktor", ["de"]="yfaktor", ["en"]="yfactor", - ["fr"]="yfactor", + ["fr"]="facteury", ["it"]="yfactor", ["nl"]="yfactor", ["pe"]="فاکتوروای", @@ -11595,15 +11908,11 @@ return { ["pe"]="ymax", ["ro"]="ymax", }, - ["yanchor"]={ - ["en"]="yanchor", - ["nl"]="yanker", - }, ["yoffset"]={ ["cs"]="yoffset", ["de"]="yoffset", ["en"]="yoffset", - ["fr"]="yoffset", + ["fr"]="decalagey", ["it"]="yoffset", ["nl"]="yoffset", ["pe"]="آفستوای", @@ -11613,7 +11922,7 @@ return { ["cs"]="ymeritko", ["de"]="yformat", ["en"]="yscale", - ["fr"]="yscale", + ["fr"]="echelley", ["it"]="yscale", ["nl"]="yschaal", ["pe"]="مقیاسوای", @@ -11623,25 +11932,19 @@ return { ["cs"]="ykrok", ["de"]="yschritt", ["en"]="ystep", - ["fr"]="ystep", + ["fr"]="etapey", ["it"]="ystep", ["nl"]="ystap", ["pe"]="گاموای", ["ro"]="ystep", }, - ["ownerpassword"]={ - ["en"]="ownerpassword", - }, - ["userpassword"]={ - ["en"]="userpassword", - }, }, ["elements"]={ ["answerlines"]={ ["cs"]="answerlines", ["de"]="answerlines", ["en"]="answerlines", - ["fr"]="answerlines", + ["fr"]="lignesreponse", ["it"]="answerlines", ["nl"]="antwoordregels", ["pe"]="answerlines", @@ -11651,7 +11954,7 @@ return { ["cs"]="answerspace", ["de"]="answerspace", ["en"]="answerspace", - ["fr"]="answerspace", + ["fr"]="espacereponse", ["it"]="answerspace", ["nl"]="antwoordruimte", ["pe"]="answerspace", @@ -11661,7 +11964,7 @@ return { ["cs"]="zacatek", ["de"]="anfang", ["en"]="begin", - ["fr"]="debut", + ["fr"]="commencer", ["it"]="inizio", ["nl"]="beginvan", ["pe"]="عنصرها", @@ -11671,7 +11974,7 @@ return { ["cs"]="uplny", ["de"]="vollende", ["en"]="complete", - ["fr"]="complete", + ["fr"]="complet", ["it"]="completo", ["nl"]="volledige", ["pe"]="کامل", @@ -11701,7 +12004,7 @@ return { ["cs"]="konec", ["de"]="ende", ["en"]="end", - ["fr"]="fin", + ["fr"]="terminer", ["it"]="fine", ["nl"]="eindvan", ["pe"]="انتها", @@ -11721,7 +12024,7 @@ return { ["cs"]="ziskat", ["de"]="get", ["en"]="get", - ["fr"]="obtient", + ["fr"]="obtenir", ["it"]="prendi", ["nl"]="haal", ["pe"]="بگیر", @@ -11731,7 +12034,7 @@ return { ["cs"]="zvysit", ["de"]="erhoehen", ["en"]="increment", - ["fr"]="incremente", + ["fr"]="incrementer", ["it"]="incrementa", ["nl"]="verhoog", ["pe"]="افزایش", @@ -11761,7 +12064,7 @@ return { ["cs"]="nacist", ["de"]="laden", ["en"]="load", - ["fr"]="charge", + ["fr"]="charger", ["it"]="carica", ["nl"]="laad", ["pe"]="بارگذاشتن", @@ -11781,7 +12084,7 @@ return { ["cs"]="zlom", ["de"]="umbruch", ["en"]="makeup", - ["fr"]="makeup", + ["fr"]="composition", ["it"]="makeup", ["nl"]="opmaak", ["pe"]="آرایش", @@ -11801,7 +12104,7 @@ return { ["cs"]="umisti", ["de"]="platziere", ["en"]="place", - ["fr"]="place", + ["fr"]="placer", ["it"]="metti", ["nl"]="plaats", ["pe"]="مکان", @@ -11841,7 +12144,7 @@ return { ["cs"]="viz", ["de"]="sieh", ["en"]="see", - ["fr"]="voit", + ["fr"]="voir", ["it"]="vedi", ["nl"]="zie", ["pe"]="ببینید", @@ -11851,7 +12154,7 @@ return { ["cs"]="nastaveni", ["de"]="stelle", ["en"]="setup", - ["fr"]="regle", + ["fr"]="configurer", ["it"]="imposta", ["nl"]="stel", ["pe"]="بارگذاری", @@ -11861,7 +12164,7 @@ return { ["cs"]="start", ["de"]="start", ["en"]="start", - ["fr"]="demarre", + ["fr"]="début", ["it"]="inizia", ["nl"]="start", ["pe"]="شروع", @@ -11871,7 +12174,7 @@ return { ["cs"]="stop", ["de"]="stop", ["en"]="stop", - ["fr"]="stoppe", + ["fr"]="fin", ["it"]="termina", ["nl"]="stop", ["pe"]="پایان", @@ -11891,23 +12194,777 @@ return { ["cs"]="opis", ["de"]="type", ["en"]="type", - ["fr"]="type", + ["fr"]="transcrire", ["it"]="type", ["nl"]="type", ["pe"]="تایپ", ["ro"]="type", }, }, - ["variables"]={ - ["aside"]={ - ["en"]="aside", + ["setupstrings"]={ + ["cd:angle-l"]={ + ["en"]="<<...>>", }, - ["ordinal"]={ - ["en"]="ordinal", + ["cd:angle-s"]={ + ["en"]="<<...>>", }, - ["Ordinal"]={ - ["en"]="Ordinal", + ["cd:apply-l"]={ + ["en"]="[..,..=>..,..]", + }, + ["cd:apply-s"]={ + ["en"]="[..=>..]", + }, + ["cd:assignment-l"]={ + ["en"]="[..,..=..,..]", + ["lua"]="{ ..,..=..,.. } ", + }, + ["cd:assignment-s"]={ + ["en"]="[..=..]", + ["lua"]="{ ..=.. } ", + }, + ["cd:assignmentbraces-l"]={ + ["en"]="{..,..=..,..}", + }, + ["cd:assignmentbraces-s"]={ + ["en"]="{..=..}", + }, + ["cd:assignmentbrackets-l"]={ + ["en"]="[..,..=..,..]", + ["lua"]="{ ..,..=..,.. } ", + }, + ["cd:assignmentbrackets-s"]={ + ["en"]="[..=..]", + ["lua"]="{ ..=.. } ", + }, + ["cd:assignmentparentheses-l"]={ + ["en"]="(..,..=..,..)", + }, + ["cd:assignmentparentheses-s"]={ + ["en"]="(..=..)", + }, + ["cd:braces-l"]={ + ["en"]="{...,...}", + ["lua"]=".. ... ..", + }, + ["cd:braces-s"]={ + ["en"]="{...}", + ["lua"]="\"...\"", + }, + ["cd:brackets-l"]={ + ["en"]="[...,...]", + ["lua"]="{..., ...}", + }, + ["cd:brackets-s"]={ + ["en"]="[...]", + ["lua"]="{ ... }", + }, + ["cd:buffer"]={ + ["cs"]="buffer", + ["de"]="buffer", + ["en"]="buffer", + ["fr"]="tampon", + ["it"]="buffer", + ["nl"]="buffer", + ["ro"]="buffer", + }, + ["cd:case-l"]={ + ["en"]="\\case ", + }, + ["cd:case-s"]={ + ["en"]="\\case ", + }, + ["cd:category"]={ + ["cs"]="category", + ["de"]="category", + ["en"]="category", + ["fr"]="categorie", + ["it"]="category", + ["nl"]="category", + ["ro"]="category", + }, + ["cd:character"]={ + ["cs"]="character", + ["de"]="character", + ["en"]="character", + ["fr"]="caractere", + ["it"]="character", + ["nl"]="karakter", + ["ro"]="character", + }, + ["cd:color"]={ + ["cs"]="color", + ["de"]="color", + ["en"]="color", + ["fr"]="couleur", + ["it"]="color", + ["nl"]="kleur", + ["ro"]="color", + }, + ["cd:column"]={ + ["cs"]="column", + ["de"]="column", + ["en"]="column", + ["fr"]="colonne", + ["it"]="column", + ["nl"]="kolom", + ["ro"]="column", + }, + ["cd:command"]={ + ["cs"]="Befehl", + ["de"]="Befehl", + ["en"]="command", + ["fr"]="commande", + ["it"]="Befehl", + ["nl"]="commando", + ["ro"]="Befehl", + }, + ["cd:content"]={ + ["cs"]="content", + ["de"]="content", + ["en"]="content", + ["fr"]="contenu", + ["it"]="content", + ["nl"]="inhoud", + ["ro"]="content", + }, + ["cd:content-l"]={ + ["en"]="{.. ... ..}", + ["lua"]="\".. ... ..\"", + }, + ["cd:content-s"]={ + ["en"]="{...}", + ["lua"]="\"...\"", + }, + ["cd:csname"]={ + ["cs"]="csname", + ["de"]="csname", + ["en"]="csname", + ["fr"]="nomsc", + ["it"]="csname", + ["nl"]="naam", + ["ro"]="csname", + }, + ["cd:csname-l"]={ + ["en"]="\\...", + }, + ["cd:csname-s"]={ + ["en"]="\\...", + }, + ["cd:delimiter"]={ + ["cs"]="delimiter", + ["de"]="delimiter", + ["en"]="delimiter", + ["fr"]="delimiteur", + ["it"]="delimiter", + ["nl"]="delimiter", + ["ro"]="delimiter", + }, + ["cd:destination"]={ + ["cs"]="destination", + ["de"]="destination", + ["en"]="destination", + ["fr"]="destination", + ["it"]="destination", + ["nl"]="bestemming", + ["ro"]="destination", + }, + ["cd:destination-l"]={ + ["en"]="[..,{..[ref,..]},..]", + }, + ["cd:destination-s"]={ + ["en"]="[{..[ref]}]", + }, + ["cd:dimension"]={ + ["cs"]="Dimension", + ["de"]="Dimension", + ["en"]="dimension", + ["fr"]="dimension", + ["it"]="Dimension", + ["nl"]="maat", + ["ro"]="Dimension", + }, + ["cd:displaymath"]={ + ["cs"]="formula", + ["de"]="formula", + ["en"]="formula", + ["fr"]="affichemath", + ["it"]="formula", + ["nl"]="formule", + ["ro"]="formula", + }, + ["cd:displaymath-l"]={ + ["en"]="$$...$$", + }, + ["cd:displaymath-s"]={ + ["en"]="$$...$$", + }, + ["cd:else-l"]={ + ["en"]="\\else ", + }, + ["cd:else-s"]={ + ["en"]="\\else ", + }, + ["cd:false"]={ + ["cs"]="false", + ["de"]="false", + ["en"]="false", + ["fr"]="faux", + ["it"]="false", + ["nl"]="false", + ["ro"]="false", + }, + ["cd:fi-l"]={ + ["en"]="\\fi ", + }, + ["cd:fi-s"]={ + ["en"]="\\fi ", + }, + ["cd:file"]={ + ["cs"]="file", + ["de"]="file", + ["en"]="file", + ["fr"]="fichier", + ["it"]="file", + ["nl"]="file", + ["ro"]="file", + }, + ["cd:file-l"]={ + ["en"]=" ... ", + }, + ["cd:file-s"]={ + ["en"]=" ... ", + }, + ["cd:first"]={ + ["cs"]="first", + ["de"]="first", + ["en"]="first", + ["fr"]="premier", + ["it"]="first", + ["nl"]="eerste", + ["ro"]="first", + }, + ["cd:font"]={ + ["cs"]="font", + ["de"]="font", + ["en"]="font", + ["fr"]="police", + ["it"]="font", + ["nl"]="font", + ["ro"]="font", + }, + ["cd:formula"]={ + ["cs"]="Formel", + ["de"]="Formel", + ["en"]="formula", + ["fr"]="formule", + ["it"]="Formel", + ["nl"]="formule", + ["ro"]="Formel", + }, + ["cd:identifier"]={ + ["cs"]="Name", + ["de"]="Name", + ["en"]="identifier", + ["fr"]="identifiant", + ["it"]="Name", + ["nl"]="naam", + ["ro"]="Name", + }, + ["cd:if-l"]={ + ["en"]="\\if... ", + }, + ["cd:if-s"]={ + ["en"]="\\if... ", + }, + ["cd:index"]={ + ["cs"]="entry", + ["de"]="entry", + ["en"]="entry", + ["fr"]="index", + ["it"]="entry", + ["nl"]="ingang", + ["ro"]="entry", + }, + ["cd:index-l"]={ + ["en"]="{..+...+..}", + }, + ["cd:index-s"]={ + ["en"]="{...}", + }, + ["cd:inherits"]={ + ["cs"]="inherits", + ["de"]="inherits", + ["en"]="inherits", + ["fr"]="heritede", + ["it"]="inherits", + ["nl"]="erft", + ["ro"]="inherits", + }, + ["cd:inlinemath-l"]={ + ["en"]="$...$", + }, + ["cd:inlinemath-s"]={ + ["en"]="$...$", + }, + ["cd:key"]={ + ["cs"]="key", + ["de"]="key", + ["en"]="key", + ["fr"]="cle", + ["it"]="key", + ["nl"]="parameter", + ["ro"]="key", + }, + ["cd:language"]={ + ["cs"]="sprache", + ["de"]="sprache", + ["en"]="language", + ["fr"]="langage", + ["it"]="sprache", + ["nl"]="taal", + ["ro"]="sprache", + }, + ["cd:last"]={ + ["cs"]="last", + ["de"]="last", + ["en"]="last", + ["fr"]="dernier", + ["it"]="last", + ["nl"]="laatste", + ["ro"]="last", + }, + ["cd:list"]={ + ["cs"]="Liste", + ["de"]="Liste", + ["en"]="list", + ["fr"]="liste", + ["it"]="Liste", + ["nl"]="lijst", + ["ro"]="Liste", + }, + ["cd:lpath"]={ + ["cs"]="lpath", + ["de"]="lpath", + ["en"]="lpath", + ["fr"]="cheminl", + ["it"]="lpath", + ["nl"]="lpath", + ["ro"]="lpath", + }, + ["cd:luafunction"]={ + ["cs"]="luafunction", + ["de"]="luafunction", + ["en"]="luafunction", + ["fr"]="fonctionlua", + ["it"]="luafunction", + ["nl"]="luafunction", + ["ro"]="luafunction", + }, + ["cd:macro-l"]={ + ["en"]="\\... ", + }, + ["cd:macro-s"]={ + ["en"]="\\... ", + }, + ["cd:mark"]={ + ["cs"]="Beschriftung", + ["de"]="Beschriftung", + ["en"]="mark", + ["fr"]="marque", + ["it"]="Beschriftung", + ["nl"]="markering", + ["ro"]="Beschriftung", + }, + ["cd:marking"]={ + ["cs"]="marking", + ["de"]="marking", + ["en"]="marking", + ["fr"]="marquage", + ["it"]="marking", + ["nl"]="markering", + ["ro"]="marking", + }, + ["cd:math"]={ + ["cs"]="formula", + ["de"]="formula", + ["en"]="formula", + ["fr"]="math", + ["it"]="formula", + ["nl"]="formule", + ["ro"]="formula", + }, + ["cd:math-l"]={ + ["en"]="$...$", + }, + ["cd:math-s"]={ + ["en"]="$...$", + }, + ["cd:matrix"]={ + ["cs"]="n*m", + ["de"]="n*m", + ["en"]="n*m", + ["fr"]="matrice", + ["it"]="n*m", + ["nl"]="n*m", + ["ro"]="n*m", + }, + ["cd:name"]={ + ["cs"]="Name", + ["de"]="Name", + ["en"]="name", + ["fr"]="nom", + ["it"]="Name", + ["nl"]="naam", + ["ro"]="Name", + }, + ["cd:noargument-l"]={ + ["en"]="\\...", + }, + ["cd:noargument-s"]={ + ["en"]="\\...", + }, + ["cd:node"]={ + ["cs"]="node", + ["de"]="node", + ["en"]="node", + ["fr"]="noeud", + ["it"]="node", + ["nl"]="node", + ["ro"]="node", + }, + ["cd:none-l"]={ + ["en"]=".. ... ..", + }, + ["cd:none-s"]={ + ["en"]="...", + }, + ["cd:nothing"]={ + ["cs"]="empty", + ["de"]="empty", + ["en"]="empty", + ["fr"]="rien", + ["it"]="empty", + ["nl"]="leeg", + ["ro"]="empty", + }, + ["cd:nothing-l"]={ + ["en"]="...", + }, + ["cd:nothing-s"]={ + ["en"]="...", + }, + ["cd:number"]={ + ["cs"]="Nummer", + ["de"]="Nummer", + ["en"]="number", + ["fr"]="nombre", + ["it"]="Nummer", + ["nl"]="getal", + ["ro"]="Nummer", + }, + ["cd:oneargument"]={ + ["en"]="\\...#1", + }, + ["cd:optional"]={ + ["cs"]="opt", + ["de"]="opt", + ["en"]="opt", + ["fr"]="optionnel", + ["it"]="opt", + ["nl"]="opt", + ["ro"]="opt", + }, + ["cd:or-l"]={ + ["en"]="\\or ", + }, + ["cd:or-s"]={ + ["en"]="\\or ", + }, + ["cd:par-l"]={ + ["en"]="\\par ", + }, + ["cd:par-s"]={ + ["en"]="\\par ", + }, + ["cd:parenthesis-l"]={ + ["en"]="(...,...)", + }, + ["cd:parenthesis-s"]={ + ["en"]="(...)", + }, + ["cd:path"]={ + ["cs"]="path", + ["de"]="path", + ["en"]="path", + ["fr"]="chemin", + ["it"]="path", + ["nl"]="path", + ["ro"]="path", + }, + ["cd:plural"]={ + ["cs"]="plural", + ["de"]="plural", + ["en"]="plural", + ["fr"]="pluriel", + ["it"]="plural", + ["nl"]="naam", + ["ro"]="plural", + }, + ["cd:position"]={ + ["cs"]="position", + ["de"]="position", + ["en"]="position", + ["fr"]="position", + ["it"]="position", + ["nl"]="positie", + ["ro"]="position", + }, + ["cd:position-l"]={ + ["en"]="(...,...)", + }, + ["cd:position-s"]={ + ["en"]="(...)", + }, + ["cd:processor"]={ + ["cs"]="processor", + ["de"]="processor", + ["en"]="processor", + ["fr"]="processeur", + ["it"]="processor", + ["nl"]="verwerker", + ["ro"]="processor", + }, + ["cd:reference"]={ + ["cs"]="reference", + ["de"]="reference", + ["en"]="reference", + ["fr"]="reference", + ["it"]="reference", + ["nl"]="verwijzing", + ["ro"]="reference", + }, + ["cd:reference-l"]={ + ["en"]="[...,...]", + ["lua"]="{..., ...}", + }, + ["cd:reference-s"]={ + ["en"]="[...]", + ["lua"]="{ ... }", + }, + ["cd:row"]={ + ["cs"]="row", + ["de"]="row", + ["en"]="row", + ["fr"]="rang", + ["it"]="row", + ["nl"]="rij", + ["ro"]="row", + }, + ["cd:section"]={ + ["cs"]="Abschnitt", + ["de"]="Abschnitt", + ["en"]="section", + ["fr"]="section", + ["it"]="Abschnitt", + ["nl"]="sectie", + ["ro"]="Abschnitt", + }, + ["cd:sectionblock"]={ + ["cs"]="sectionblock", + ["de"]="sectionblock", + ["en"]="sectionblock", + ["fr"]="blocsection", + ["it"]="sectionblock", + ["nl"]="sectieblok", + ["ro"]="sectionblock", + }, + ["cd:see"]={ + ["cs"]="siehe", + ["de"]="siehe", + ["en"]="see", + ["fr"]="voir", + ["it"]="siehe", + ["nl"]="zie", + ["ro"]="siehe", + }, + ["cd:sep-l"]={ + ["en"]="\\", + }, + ["cd:sep-s"]={ + ["en"]="\\", + }, + ["cd:setup"]={ + ["cs"]="setup", + ["de"]="setup", + ["en"]="setup", + ["fr"]="configurer", + ["it"]="setup", + ["nl"]="setup", + ["ro"]="setup", + }, + ["cd:sign"]={ + ["en"]="[-+]", + }, + ["cd:singular"]={ + ["cs"]="singular", + ["de"]="singular", + ["en"]="singular", + ["fr"]="singulier", + ["it"]="singular", + ["nl"]="naam", + ["ro"]="singular", + }, + ["cd:style"]={ + ["cs"]="style", + ["de"]="style", + ["en"]="style", + ["fr"]="style", + ["it"]="style", + ["nl"]="letter", + ["ro"]="style", + }, + ["cd:template"]={ + ["cs"]="template", + ["de"]="template", + ["en"]="template", + ["fr"]="gabarit", + ["it"]="template", + ["nl"]="sjabloon", + ["ro"]="template", + }, + ["cd:template-l"]={ + ["en"]="[|...|...|]", + }, + ["cd:template-s"]={ + ["en"]="[|...|]", + }, + ["cd:text"]={ + ["cs"]="Text", + ["de"]="Text", + ["en"]="text", + ["fr"]="texte", + ["it"]="Text", + ["nl"]="tekst", + ["ro"]="Text", + }, + ["cd:textual-l"]={ + ["en"]=".. ... ..", + }, + ["cd:textual-s"]={ + ["en"]="...", + }, + ["cd:threearguments"]={ + ["en"]="\\...#1#2#3", + }, + ["cd:threewords-l"]={ + ["en"]="[..+..+..]", + }, + ["cd:threewords-s"]={ + ["en"]="[..+..+..]", + }, + ["cd:title"]={ + ["cs"]="Setup", + ["de"]="Setup", + ["en"]="setup", + ["fr"]="titre", + ["it"]="Setup", + ["nl"]="setup", + ["ro"]="Setup", + }, + ["cd:to-l"]={ + ["en"]="\\to ", + }, + ["cd:to-s"]={ + ["en"]="\\to ", + }, + ["cd:triplet"]={ + ["cs"]="triplet", + ["de"]="triplet", + ["en"]="triplet", + ["fr"]="triplet", + ["it"]="triplet", + ["nl"]="triplet", + ["ro"]="triplet", }, + ["cd:triplet-l"]={ + ["en"]="[x:y:z,..]", + }, + ["cd:triplet-s"]={ + ["en"]="[x:y:z]", + }, + ["cd:true"]={ + ["cs"]="true", + ["de"]="true", + ["en"]="true", + ["fr"]="vrai", + ["it"]="true", + ["nl"]="true", + ["ro"]="true", + }, + ["cd:twoarguments"]={ + ["en"]="\\...#1#2", + }, + ["cd:twowords-l"]={ + ["en"]="[..+..]", + }, + ["cd:twowords-s"]={ + ["en"]="[..+..]", + }, + ["cd:url"]={ + ["cs"]="url", + ["de"]="url", + ["en"]="url", + ["fr"]="url", + ["it"]="url", + ["nl"]="url", + ["ro"]="url", + }, + ["cd:userdata"]={ + ["cs"]="userdata", + ["de"]="userdata", + ["en"]="userdata", + ["fr"]="donneesutilisateur", + ["it"]="userdata", + ["nl"]="gebruikersdata", + ["ro"]="userdata", + }, + ["cd:value"]={ + ["cs"]="value", + ["de"]="value", + ["en"]="value", + ["fr"]="valeur", + ["it"]="value", + ["nl"]="waarde", + ["ro"]="value", + }, + ["cd:word"]={ + ["cs"]="word", + ["de"]="word", + ["en"]="word", + ["fr"]="mot", + ["it"]="word", + ["nl"]="woord", + ["ro"]="word", + }, + ["cd:word-l"]={ + ["en"]="{.. ... ..}", + ["lua"]="\".. ... ..\"", + }, + ["cd:word-s"]={ + ["en"]="{...}", + ["lua"]="\"...\"", + }, + ["cd:xmlsetup"]={ + ["cs"]="xmlsetup", + ["de"]="xmlsetup", + ["en"]="xmlsetup", + ["fr"]="configurationxml", + ["it"]="xmlsetup", + ["nl"]="xmlsetup", + ["ro"]="xmlsetup", + }, + }, + ["variables"]={ ["Addition"]={ ["cs"]="Pridavek", ["de"]="Zusatz", @@ -11920,6 +12977,7 @@ return { }, ["Alphabetic"]={ ["en"]="Alphabetic", + ["fr"]="Alphabetique", }, ["Balloon"]={ ["cs"]="Bublinka", @@ -11945,7 +13003,7 @@ return { ["cs"]="Kapitalky", ["de"]="Versalien", ["en"]="Capital", - ["fr"]="Capitale", + ["fr"]="Capitales", ["it"]="Maiuscolo", ["nl"]="Kapitaal", ["pe"]="Capital", @@ -11955,7 +13013,7 @@ return { ["cs"]="Pismeno", ["de"]="Buchstabe", ["en"]="Character", - ["fr"]="Caratere", + ["fr"]="Caractere", ["it"]="Lettera", ["nl"]="Letter", ["pe"]="Character", @@ -11975,7 +13033,7 @@ return { ["cs"]="ZavritDokument", ["de"]="SchliesseDokument", ["en"]="CloseDocument", - ["fr"]="FermeDocument", + ["fr"]="FermerDocument", ["it"]="ChiudiDocumento", ["nl"]="SluitDocument", ["pe"]="بستننوشتار", @@ -11985,7 +13043,7 @@ return { ["cs"]="UkoncitProhlizec", ["de"]="BeendeViewer", ["en"]="ExitViewer", - ["fr"]="SortVisualisateur", + ["fr"]="SortirVisualisateur", ["it"]="EsciVisualizzatore", ["nl"]="VerlaatViewer", ["pe"]="خروجنمایشگر", @@ -12005,7 +13063,7 @@ return { ["cs"]="FitHeight", ["de"]="HoehePassend", ["en"]="FitHeight", - ["fr"]="AjusteHauteur", + ["fr"]="AdapterHauteur", ["it"]="FitHeight", ["nl"]="HoogtePassend", ["pe"]="پرکردنارتفاع", @@ -12015,7 +13073,7 @@ return { ["cs"]="FitWidth", ["de"]="BreitePassend", ["en"]="FitWidth", - ["fr"]="AjusteLargeur", + ["fr"]="AdapterLargeur", ["it"]="FitWidth", ["nl"]="BreedtePassend", ["pe"]="پرکردنعرض", @@ -12025,7 +13083,7 @@ return { ["cs"]="JdiNaStranku", ["de"]="GotoPage", ["en"]="GotoPage", - ["fr"]="VaalaPage", + ["fr"]="AlleraPage", ["it"]="VaiAPagina", ["nl"]="GaNaarPagina", ["pe"]="بروبهصفحه", @@ -12055,7 +13113,7 @@ return { ["cs"]="SkryjPole", ["de"]="VerbergeFeld", ["en"]="HideField", - ["fr"]="CacheChamp", + ["fr"]="CacherChamps", ["it"]="NascondiCampo", ["nl"]="VerbergVeld", ["pe"]="پنهانمیدان", @@ -12065,7 +13123,7 @@ return { ["cs"]="HideLayer", ["de"]="HideLayer", ["en"]="HideLayer", - ["fr"]="CacheCalque", + ["fr"]="CacherCalque", ["it"]="HideLayer", ["nl"]="VerbergLaag", ["pe"]="پنهانلایه", @@ -12095,7 +13153,7 @@ return { ["cs"]="NacistFormular", ["de"]="LadeFormular", ["en"]="LoadForm", - ["fr"]="ChargeForm", + ["fr"]="ChargerFormulaire", ["it"]="CaricaForm", ["nl"]="LaadFormulier", ["pe"]="بارگذاشتنفرم", @@ -12155,12 +13213,16 @@ return { ["cs"]="OpenNamedDocument", ["de"]="OpenNamedDocument", ["en"]="OpenNamedDocument", - ["fr"]="OuvreDocumentNomme", + ["fr"]="OuvrirDocumentNomme", ["it"]="OpenNamedDocument", ["nl"]="OpenDocumentOpNaam", ["pe"]="بازکردننوشتارذخیرهشده", ["ro"]="OpenNamedDocument", }, + ["Ordinal"]={ + ["en"]="Ordinal", + ["fr"]="Ordinal", + }, ["Paragraph"]={ ["cs"]="Odstavec", ["de"]="Absatz", @@ -12185,7 +13247,7 @@ return { ["cs"]="PauseRendering", ["de"]="PauseRendering", ["en"]="PauseRendering", - ["fr"]="PauseRendering", + ["fr"]="PauseRendu", ["it"]="PauseRendering", ["nl"]="PauzeerRendering", ["pe"]="توقفتعبیر", @@ -12225,7 +13287,7 @@ return { ["cs"]="VytisknoutDokument", ["de"]="DruckeDokument", ["en"]="PrintDocument", - ["fr"]="ImprimeDocument", + ["fr"]="ImprimerDocument", ["it"]="StampaDocumento", ["nl"]="PrintDocument", ["pe"]="چاپنوشتار", @@ -12235,7 +13297,7 @@ return { ["cs"]="Query", ["de"]="Query", ["en"]="Query", - ["fr"]="Query", + ["fr"]="Interroger", ["it"]="Richiesta", ["nl"]="RaadpleegDocument", ["pe"]="پرسش", @@ -12245,7 +13307,7 @@ return { ["cs"]="QueryAgain", ["de"]="QueryAgain", ["en"]="QueryAgain", - ["fr"]="QueryAgain", + ["fr"]="InterrogerSuivant", ["it"]="RinnovaRichiesta", ["nl"]="HerhaalRaadplegen", ["pe"]="پرسشدوباره", @@ -12255,7 +13317,7 @@ return { ["cs"]="ResetFormulare", ["de"]="ZuruecksetzenFormular", ["en"]="ResetForm", - ["fr"]="RazForm", + ["fr"]="RazFormulaire", ["it"]="ReimpostaForm", ["nl"]="ResetFormulier", ["pe"]="دوبارهنشانیفرم", @@ -12265,7 +13327,7 @@ return { ["cs"]="PokracovatFilm", ["de"]="FortsetzenFilm", ["en"]="ResumeMovie", - ["fr"]="ReprendFilm", + ["fr"]="RepriseFilm", ["it"]="RiprendiFilm", ["nl"]="HervatFilm", ["pe"]="ادامهفیلم", @@ -12275,7 +13337,7 @@ return { ["cs"]="ResumeRendering", ["de"]="ResumeRendering", ["en"]="ResumeRendering", - ["fr"]="ResumeRendering", + ["fr"]="RepriseRendu", ["it"]="ResumeRendering", ["nl"]="HervatRendering", ["pe"]="ادامهتعبیر", @@ -12285,7 +13347,7 @@ return { ["cs"]="PokracovatZvuk", ["de"]="ResumeSound", ["en"]="ResumeSound", - ["fr"]="ReprendSon", + ["fr"]="RepriseSon", ["it"]="RiprendiSuono", ["nl"]="HervatGeluid", ["pe"]="ادامهصدا", @@ -12305,7 +13367,7 @@ return { ["cs"]="UlozitDokument", ["de"]="SpeichereDokument", ["en"]="SaveDocument", - ["fr"]="SauvegardeDocument", + ["fr"]="EnregistrerDocument", ["it"]="SalvaDocumento", ["nl"]="BewaarDocument", ["pe"]="ذخیرهنوشتار", @@ -12315,7 +13377,7 @@ return { ["cs"]="UlozitFormular", ["de"]="SpeicheFormular", ["en"]="SaveForm", - ["fr"]="SauvegardeForm", + ["fr"]="EnregistrerFormulaire", ["it"]="SalvaForm", ["nl"]="BewaarFormulier", ["pe"]="ذخیرهفرم", @@ -12325,7 +13387,7 @@ return { ["cs"]="SaveNamedDocument", ["de"]="SaveNamedDocument", ["en"]="SaveNamedDocument", - ["fr"]="SauvegardeDocumentNomme", + ["fr"]="EnregistrerDocumentNomme", ["it"]="SaveNamedDocument", ["nl"]="BewaarDocumentOpNaam", ["pe"]="ذخیرهنوشتاربانام", @@ -12335,7 +13397,7 @@ return { ["cs"]="HledatZnovu", ["de"]="WeiterSuchen", ["en"]="SearchAgain", - ["fr"]="RechercheSuivant", + ["fr"]="ChercherSuivant", ["it"]="CercaAncora", ["nl"]="HerhaalZoeken", ["pe"]="جستجویدوباره", @@ -12345,7 +13407,7 @@ return { ["cs"]="ProhledatDokument", ["de"]="DokumentDurchsuchen", ["en"]="SearchDocument", - ["fr"]="RechercheDocument", + ["fr"]="ChercherDocument", ["it"]="CercaDocumento", ["nl"]="DoorzoekDocument", ["pe"]="جستجوینوشتار", @@ -12355,7 +13417,7 @@ return { ["cs"]="UkazZalozky", ["de"]="ShowBookmarks", ["en"]="ShowBookmarks", - ["fr"]="ShowBookmarks", + ["fr"]="MontrerMarquepages", ["it"]="MostraSegnalibro", ["nl"]="ShowBookmarks", ["pe"]="نمایشچوبخط", @@ -12365,7 +13427,7 @@ return { ["cs"]="UkazPole", ["de"]="ZeigeFeld", ["en"]="ShowField", - ["fr"]="MontreChamp", + ["fr"]="MontrerChamp", ["it"]="MostraCampo", ["nl"]="ToonVeld", ["pe"]="نمایشمیدان", @@ -12375,7 +13437,7 @@ return { ["cs"]="UkazNahledy", ["de"]="ShowThumbs", ["en"]="ShowThumbs", - ["fr"]="ShowThumbs", + ["fr"]="MontrerVignettes", ["it"]="MostraThumbs", ["nl"]="ShowThumbs", ["pe"]="نمایششصت", @@ -12385,7 +13447,7 @@ return { ["cs"]="SpustitFilm", ["de"]="StartFilm", ["en"]="StartMovie", - ["fr"]="DemarreFilm", + ["fr"]="débutFilm", ["it"]="IniziaFilm", ["nl"]="StartFilm", ["pe"]="شروعفیلم", @@ -12395,7 +13457,7 @@ return { ["cs"]="StartRendering", ["de"]="StartRendering", ["en"]="StartRendering", - ["fr"]="StartRendering", + ["fr"]="débutRendu", ["it"]="StartRendering", ["nl"]="StartRendering", ["pe"]="شروعتعبیر", @@ -12405,7 +13467,7 @@ return { ["cs"]="StartZvuk", ["de"]="StartSound", ["en"]="StartSound", - ["fr"]="DemarreSon", + ["fr"]="débutSon", ["it"]="IniziaSuono", ["nl"]="StartGeluid", ["pe"]="شروعصدا", @@ -12415,7 +13477,7 @@ return { ["cs"]="ZastavitFilm", ["de"]="StopFilm", ["en"]="StopMovie", - ["fr"]="StoppeFilm", + ["fr"]="FinFilm", ["it"]="FermaFilm", ["nl"]="StopFilm", ["pe"]="پایانفیلم", @@ -12425,7 +13487,7 @@ return { ["cs"]="StopRendering", ["de"]="StopRendering", ["en"]="StopRendering", - ["fr"]="StopRendering", + ["fr"]="FinRendu", ["it"]="StopRendering", ["nl"]="StopRendering", ["pe"]="پایانتعبیر", @@ -12435,7 +13497,7 @@ return { ["cs"]="StopZvuk", ["de"]="StopSound", ["en"]="StopSound", - ["fr"]="StoppeSon", + ["fr"]="FinSon", ["it"]="FermaSuono", ["nl"]="StopGeluid", ["pe"]="پایانصدا", @@ -12445,7 +13507,7 @@ return { ["cs"]="PoslatFormular", ["de"]="VersendeFormular", ["en"]="SubmitForm", - ["fr"]="SoumettreForm", + ["fr"]="SoumettreFormulaire", ["it"]="MandaForm", ["nl"]="VerzendFormulier", ["pe"]="تسلیمفرم", @@ -12455,7 +13517,7 @@ return { ["cs"]="ToggleLayer", ["de"]="ToggleLayer", ["en"]="ToggleLayer", - ["fr"]="ToggleLayer", + ["fr"]="BasculerCalque", ["it"]="ToggleLayer", ["nl"]="WisselLaag", ["pe"]="تغییرلایه", @@ -12465,7 +13527,7 @@ return { ["cs"]="ZmenitProhlizec", ["de"]="WechseleViewer", ["en"]="ToggleViewer", - ["fr"]="ChangeVisualisateur", + ["fr"]="BasculerVisualisateur", ["it"]="ScambiaVisualizzatore", ["nl"]="WisselViewer", ["pe"]="تغییرنمایشگر", @@ -12485,7 +13547,7 @@ return { ["cs"]="VideLayer", ["de"]="VideLayer", ["en"]="VideLayer", - ["fr"]="VideLayer", + ["fr"]="VideCalque", ["it"]="VideLayer", ["nl"]="ToonLaag", ["pe"]="VideLayer", @@ -12575,16 +13637,12 @@ return { ["cs"]="absolutni", ["de"]="absolut", ["en"]="absolute", - ["fr"]="absolute", + ["fr"]="absolu", ["it"]="assoluto", ["nl"]="absoluut", ["pe"]="قطعی", ["ro"]="absolut", }, - ["anchor"]={ - ["en"]="anchor", - ["nl"]="anker", - }, ["action"]={ ["cs"]="akce", ["de"]="aktion", @@ -12599,7 +13657,7 @@ return { ["cs"]="po", ["de"]="nach", ["en"]="after", - ["fr"]="apres", + ["fr"]="après", ["it"]="dopo", ["nl"]="na", ["pe"]="بعداز", @@ -12617,6 +13675,7 @@ return { }, ["alphabetic"]={ ["en"]="alphabetic", + ["fr"]="Alphabetique", }, ["always"]={ ["cs"]="vzdy", @@ -12628,16 +13687,22 @@ return { ["pe"]="همواره", ["ro"]="totdeauna", }, + ["anchor"]={ + ["en"]="anchor", + ["fr"]="ancre", + ["nl"]="anker", + }, ["and"]={ ["de"]="und", ["en"]="and", + ["fr"]="et", ["nl"]="en", }, ["answerarea"]={ ["cs"]="answerarea", ["de"]="answerarea", ["en"]="answerarea", - ["fr"]="answerarea", + ["fr"]="zonereponse", ["it"]="answerarea", ["nl"]="antwoordgebied", ["pe"]="answerarea", @@ -12673,11 +13738,15 @@ return { ["pe"]="آوریل", ["ro"]="aprilie", }, + ["aside"]={ + ["en"]="aside", + ["fr"]="apart", + }, ["atleftmargin"]={ ["cs"]="atleftmargin", ["de"]="atleftmargin", ["en"]="atleftmargin", - ["fr"]="atleftmargin", + ["fr"]="enmargegauche", ["it"]="atleftmargin", ["nl"]="oplinkermarge", ["pe"]="درحاشیهچپ", @@ -12687,7 +13756,7 @@ return { ["cs"]="naokraji", ["de"]="amrand", ["en"]="atmargin", - ["fr"]="alamarge", + ["fr"]="enmarge", ["it"]="almargine", ["nl"]="opmarge", ["pe"]="درحاشیه", @@ -12697,7 +13766,7 @@ return { ["cs"]="nastrance", ["de"]="aufseite", ["en"]="atpage", - ["fr"]="alapage", + ["fr"]="enpage", ["it"]="apagina", ["nl"]="oppagina", ["pe"]="درصفحه", @@ -12707,7 +13776,7 @@ return { ["cs"]="atrightmargin", ["de"]="atrightmargin", ["en"]="atrightmargin", - ["fr"]="atrightmargin", + ["fr"]="enmargedroite", ["it"]="atrightmargin", ["nl"]="oprechtermarge", ["pe"]="درحاشیهراست", @@ -12715,13 +13784,14 @@ return { }, ["attachment"]={ ["en"]="attachment", + ["fr"]="piecejointe", ["nl"]="aanhangsel", }, ["august"]={ ["cs"]="srpen", ["de"]="august", ["en"]="august", - ["fr"]="août", + ["fr"]="aout", ["it"]="agosto", ["nl"]="augustus", ["pe"]="آگوست", @@ -12758,6 +13828,7 @@ return { }, ["autopunctuation"]={ ["en"]="autopunctuation", + ["fr"]="autoponctuation", }, ["back"]={ ["cs"]="zpet", @@ -12783,7 +13854,7 @@ return { ["cs"]="epilogy", ["de"]="epiloge", ["en"]="backmatter", - ["fr"]="epilogue", + ["fr"]="pagesdefin", ["it"]="postambolo", ["nl"]="uitleidingen", ["pe"]="پسمطلب", @@ -12803,7 +13874,7 @@ return { ["cs"]="zpetnamezera", ["de"]="rumpfspatium", ["en"]="backspace", - ["fr"]="retourarriere", + ["fr"]="retourarrière", ["it"]="backspace", ["nl"]="rugwit", ["pe"]="فضایپشت", @@ -12813,7 +13884,7 @@ return { ["cs"]="zpet", ["de"]="rueckwaerts", ["en"]="backward", - ["fr"]="retourarriere", + ["fr"]="enarriere", ["it"]="indietro", ["nl"]="achteruit", ["pe"]="عقبگرد", @@ -12821,6 +13892,7 @@ return { }, ["bbl"]={ ["en"]="bbl", + ["fr"]="bbl", }, ["before"]={ ["cs"]="pred", @@ -12834,16 +13906,18 @@ return { }, ["begin"]={ ["en"]="begin", + ["fr"]="commencer", ["nl"]="begin", }, ["bib"]={ ["en"]="bib", + ["fr"]="bib", }, ["big"]={ ["cs"]="velke", ["de"]="gross", ["en"]="big", - ["fr"]="grand", + ["fr"]="important", ["it"]="grande", ["nl"]="groot", ["pe"]="بزرگ", @@ -12853,7 +13927,7 @@ return { ["cs"]="bigbodyfont", ["de"]="bigbodyfont", ["en"]="bigbodyfont", - ["fr"]="grandepolicecorp", + ["fr"]="policedecorpsimportante", ["it"]="grossofontdeltesto", ["nl"]="grootkorps", ["pe"]="قلمبدنهبزرگ", @@ -12861,13 +13935,14 @@ return { }, ["bigger"]={ ["en"]="bigger", + ["fr"]="plusimportant", ["nl"]="groter", }, ["bigpreference"]={ ["cs"]="vysokapriorita", ["de"]="grosszuegig", ["en"]="bigpreference", - ["fr"]="grandepreference", + ["fr"]="preferenceimportante", ["it"]="grandepreferenza", ["nl"]="grotevoorkeur", ["pe"]="اولویتبزرگ", @@ -12877,7 +13952,7 @@ return { ["cs"]="prazdny", ["de"]="blanko", ["en"]="blank", - ["fr"]="vide", + ["fr"]="vierge", ["it"]="rigovuoto", ["nl"]="blanko", ["pe"]="خالی", @@ -12885,12 +13960,13 @@ return { }, ["block"]={ ["en"]="block", + ["fr"]="bloc", }, ["blockquote"]={ ["cs"]="blockquote", ["de"]="blockquote", ["en"]="blockquote", - ["fr"]="blockquote", + ["fr"]="citerbloc", ["it"]="blockquote", ["nl"]="blokcitaat", ["pe"]="نقلبلوک", @@ -12900,7 +13976,7 @@ return { ["cs"]="hlavnicasti", ["de"]="haupttexte", ["en"]="bodymatter", - ["fr"]="texteprincipal", + ["fr"]="pagescorpsdetexte", ["it"]="testiprincipali", ["nl"]="hoofdteksten", ["pe"]="مطلببدنه", @@ -12930,7 +14006,7 @@ return { ["cs"]="tucnekurzivni", ["de"]="fettitalic", ["en"]="bolditalic", - ["fr"]="italiquegras", + ["fr"]="grasitalique", ["it"]="grassettocorsivo", ["nl"]="vetitalic", ["pe"]="ایتالیکمشکی", @@ -12940,7 +14016,7 @@ return { ["cs"]="tucnesklonene", ["de"]="fettgeneigt", ["en"]="boldslanted", - ["fr"]="inclinegras", + ["fr"]="grasincline", ["it"]="grassettoinclinato", ["nl"]="vetschuin", ["pe"]="خوابیدهمشکی", @@ -12960,7 +14036,7 @@ return { ["cs"]="obe", ["de"]="beide", ["en"]="both", - ["fr"]="lesdeux", + ["fr"]="chacun", ["it"]="entrambi", ["nl"]="beide", ["pe"]="هردو", @@ -12968,12 +14044,13 @@ return { }, ["bothtext"]={ ["en"]="bothtext", + ["fr"]="textechacun", }, ["bottom"]={ ["cs"]="spodek", ["de"]="unten", ["en"]="bottom", - ["fr"]="inf", + ["fr"]="bas", ["it"]="fondo", ["nl"]="onder", ["pe"]="پایین", @@ -12981,6 +14058,7 @@ return { }, ["box"]={ ["en"]="box", + ["fr"]="boite", }, ["brief"]={ ["cs"]="brief", @@ -13006,7 +14084,7 @@ return { ["cs"]="buffer", ["de"]="puffer", ["en"]="buffer", - ["fr"]="buffer", + ["fr"]="tampon", ["it"]="buffer", ["nl"]="buffer", ["pe"]="بافر", @@ -13034,6 +14112,7 @@ return { }, ["camel"]={ ["en"]="camel", + ["fr"]="camel", }, ["cap"]={ ["cs"]="kap", @@ -13049,7 +14128,7 @@ return { ["cs"]="kapitalky", ["de"]="versalien", ["en"]="capital", - ["fr"]="capitale", + ["fr"]="capitales", ["it"]="maiuscolo", ["nl"]="kapitaal", ["pe"]="capital", @@ -13059,7 +14138,7 @@ return { ["cs"]="center", ["de"]="center", ["en"]="center", - ["fr"]="center", + ["fr"]="centrer", ["it"]="center", ["nl"]="centreer", ["pe"]="مرکز", @@ -13067,6 +14146,7 @@ return { }, ["centerlast"]={ ["en"]="centerlast", + ["fr"]="centrerdernier", }, ["chapter"]={ ["cs"]="kapitola", @@ -13100,19 +14180,24 @@ return { }, ["chemical"]={ ["en"]="chemical", + ["fr"]="chimique", }, ["chemicals"]={ ["en"]="chemicals", + ["fr"]="chimiques", }, ["chemistry"]={ ["en"]="chemistry", + ["fr"]="chimie", ["nl"]="chemie", }, ["cite"]={ ["en"]="cite", + ["fr"]="cite", }, ["closed"]={ ["en"]="closed", + ["fr"]="ferme", ["nl"]="gesloten", }, ["color"]={ @@ -13147,6 +14232,7 @@ return { }, ["combination"]={ ["en"]="combination", + ["fr"]="combinaison", ["nl"]="combinatie", }, ["command"]={ @@ -13191,9 +14277,11 @@ return { }, ["compressseparator"]={ ["en"]="compressseparator", + ["fr"]="separateurreduction", }, ["compressstopper"]={ ["en"]="compressstopper", + ["fr"]="stoppeurreduction", }, ["concept"]={ ["cs"]="koncept", @@ -13207,6 +14295,7 @@ return { }, ["construction"]={ ["en"]="construction", + ["fr"]="construction", }, ["content"]={ ["cs"]="obsah", @@ -13232,7 +14321,7 @@ return { ["cs"]="pokracovat", ["de"]="fortsetzten", ["en"]="continue", - ["fr"]="continue", + ["fr"]="continuer", ["it"]="continua", ["nl"]="verder", ["pe"]="ادامه", @@ -13240,6 +14329,7 @@ return { }, ["continued"]={ ["en"]="continued", + ["fr"]="continue", ["nl"]="vervolgd", }, ["controls"]={ @@ -13276,7 +14366,7 @@ return { ["cs"]="cutspace", ["de"]="cutspace", ["en"]="cutspace", - ["fr"]="cutspace", + ["fr"]="espacecoupe", ["it"]="cutspace", ["nl"]="snijwit", ["pe"]="فضایبرش", @@ -13284,6 +14374,7 @@ return { }, ["dataset"]={ ["en"]="dataset", + ["fr"]="jeudedonnees", }, ["date"]={ ["cs"]="datum", @@ -13387,6 +14478,7 @@ return { }, ["down"]={ ["en"]="down", + ["fr"]="enbas", ["nl"]="omlaag", }, ["each"]={ @@ -13411,10 +14503,22 @@ return { }, ["effective"]={ ["en"]="effective", + ["fr"]="effectif", ["nl"]="effectief", }, + ["eight"]={ + ["cs"]="eight", + ["de"]="acht", + ["en"]="eight", + ["fr"]="huit", + ["it"]="eight", + ["nl"]="acht", + ["pe"]="eight", + ["ro"]="eight", + }, ["embed"]={ ["en"]="embed", + ["fr"]="integrer", ["nl"]="sluitin", }, ["empty"]={ @@ -13429,30 +14533,28 @@ return { }, ["enable"]={ ["en"]="enable", + ["fr"]="activer", }, ["end"]={ ["en"]="end", + ["fr"]="terminer", ["nl"]="eind", }, ["endnote"]={ ["cs"]="endnote", ["de"]="endnote", ["en"]="endnote", - ["fr"]="notefin", + ["fr"]="noteseule", ["it"]="endnote", ["nl"]="eindnoot", ["pe"]="تهنوشت", ["ro"]="endnote", }, - ["textnote"]={ - ["en"]="textnote", - ["nl"]="tekstnoot", - }, ["enumeration"]={ ["cs"]="vycet", ["de"]="nummerierung", ["en"]="enumeration", - ["fr"]="enumeration", + ["fr"]="énumération", ["it"]="enumerazione", ["nl"]="doornummering", ["pe"]="شمارهبندی", @@ -13462,7 +14564,7 @@ return { ["cs"]="prostredi", ["de"]="umgebung", ["en"]="environment", - ["fr"]="environement", + ["fr"]="environnement", ["it"]="ambiente", ["nl"]="omgeving", ["pe"]="محیط", @@ -13480,12 +14582,13 @@ return { }, ["export"]={ ["en"]="export", + ["fr"]="exporter", }, ["external"]={ ["cs"]="externi", ["de"]="extern", ["en"]="external", - ["fr"]="external", + ["fr"]="externe", ["it"]="esterno", ["nl"]="extern", ["pe"]="خارجی", @@ -13493,6 +14596,7 @@ return { }, ["extremestretch"]={ ["en"]="extremestretch", + ["fr"]="etirementextreme", }, ["fact"]={ ["cs"]="fakt", @@ -13516,6 +14620,7 @@ return { }, ["field"]={ ["en"]="field", + ["fr"]="champ", ["nl"]="veld", }, ["figure"]={ @@ -13602,7 +14707,7 @@ return { ["cs"]="prizpusobive", ["de"]="passend", ["en"]="fit", - ["fr"]="adapte", + ["fr"]="adapter", ["it"]="adatta", ["nl"]="passend", ["pe"]="پرکردن", @@ -13618,51 +14723,11 @@ return { ["pe"]="پنج", ["ro"]="cinci", }, - ["six"]={ - ["cs"]="six", - ["de"]="sechs", - ["en"]="six", - ["fr"]="six", - ["it"]="six", - ["nl"]="zes", - ["pe"]="six", - ["ro"]="six", - }, - ["seven"]={ - ["cs"]="seven", - ["de"]="sieben", - ["en"]="seven", - ["fr"]="seven", - ["it"]="seven", - ["nl"]="zeven", - ["pe"]="seven", - ["ro"]="seven", - }, - ["eight"]={ - ["cs"]="eight", - ["de"]="acht", - ["en"]="eight", - ["fr"]="eight", - ["it"]="eight", - ["nl"]="acht", - ["pe"]="eight", - ["ro"]="eight", - }, - ["nine"]={ - ["cs"]="nine", - ["de"]="neun", - ["en"]="nine", - ["fr"]="nine", - ["it"]="nine", - ["nl"]="negen", - ["pe"]="nine", - ["ro"]="nine", - }, ["fix"]={ ["cs"]="fixuj", ["de"]="stellewiederher", ["en"]="fix", - ["fr"]="fixe", + ["fr"]="fix", ["it"]="fisso", ["nl"]="herstel", ["pe"]="ثابتکن", @@ -13702,7 +14767,7 @@ return { ["cs"]="flushinner", ["de"]="flushinner", ["en"]="flushinner", - ["fr"]="flushinner", + ["fr"]="alignerinterieur", ["it"]="flushinner", ["nl"]="lijnbinnen", ["pe"]="پمپداخلی", @@ -13712,7 +14777,7 @@ return { ["cs"]="flushleft", ["de"]="flushleft", ["en"]="flushleft", - ["fr"]="flushleft", + ["fr"]="alignergauche", ["it"]="flushleft", ["nl"]="lijnlinks", ["pe"]="پمپچپ", @@ -13722,7 +14787,7 @@ return { ["cs"]="flushouter", ["de"]="flushouter", ["en"]="flushouter", - ["fr"]="flushouter", + ["fr"]="alignerexterieur", ["it"]="flushouter", ["nl"]="lijnbuiten", ["pe"]="پمپخارجی", @@ -13732,7 +14797,7 @@ return { ["cs"]="flushright", ["de"]="flushright", ["en"]="flushright", - ["fr"]="flushright", + ["fr"]="alignerdroite", ["it"]="flushright", ["nl"]="lijnrechts", ["pe"]="پمپراست", @@ -13740,6 +14805,7 @@ return { }, ["followingpage"]={ ["en"]="followingpage", + ["fr"]="pagesuccesseur", ["nl"]="opvolgendepagina", }, ["footer"]={ @@ -13756,7 +14822,7 @@ return { ["cs"]="poznamkapodcarou", ["de"]="fussnote", ["en"]="footnote", - ["fr"]="notepdp", + ["fr"]="notebdp", ["it"]="notapdp", ["nl"]="voetnoot", ["pe"]="پانوشت", @@ -13766,7 +14832,7 @@ return { ["cs"]="sila", ["de"]="zwinge", ["en"]="force", - ["fr"]="force", + ["fr"]="forcer", ["it"]="forza", ["nl"]="forceer", ["pe"]="اجبار", @@ -13806,7 +14872,7 @@ return { ["cs"]="vpred", ["de"]="vorwaerts", ["en"]="forward", - ["fr"]="avance", + ["fr"]="enavant", ["it"]="avanti", ["nl"]="vooruit", ["pe"]="بهجلو", @@ -13822,6 +14888,10 @@ return { ["pe"]="چهار", ["ro"]="patru", }, + ["fractions"]={ + ["en"]="fractions", + ["fr"]="fractions", + }, ["frame"]={ ["cs"]="ramecek", ["de"]="rahmen", @@ -13856,7 +14926,7 @@ return { ["cs"]="prednicasti", ["de"]="einleitungen", ["en"]="frontmatter", - ["fr"]="preambule", + ["fr"]="pagesliminaires", ["it"]="preambolo", ["nl"]="inleidingen", ["pe"]="پیشمطلب", @@ -13876,7 +14946,7 @@ return { ["cs"]="fullhz", ["de"]="fullhz", ["en"]="fullhz", - ["fr"]="fullhz", + ["fr"]="hzcomplet", ["it"]="fullhz", ["nl"]="fullenhz", ["pe"]="fullhz", @@ -13966,7 +15036,7 @@ return { ["cs"]="zaveseni", ["de"]="haengend", ["en"]="hang", - ["fr"]="suspend", + ["fr"]="suspendre", ["it"]="sospendi", ["nl"]="hang", ["pe"]="بیاویز", @@ -13976,7 +15046,7 @@ return { ["cs"]="visici", ["de"]="haengend", ["en"]="hanging", - ["fr"]="suspend", + ["fr"]="suspension", ["it"]="sospeso", ["nl"]="hangend", ["pe"]="آویزان", @@ -13984,6 +15054,7 @@ return { }, ["hangingboth"]={ ["en"]="hangingboth", + ["fr"]="suspensionchacun", ["nl"]="beidehangend", }, ["head"]={ @@ -14000,12 +15071,17 @@ return { ["cs"]="zahlavi", ["de"]="kopfzeile", ["en"]="header", - ["fr"]="entete", + ["fr"]="entête", ["it"]="intestazione", ["nl"]="hoofd", ["pe"]="سربرگ", ["ro"]="antet", }, + ["headintext"]={ + ["en"]="headintext", + ["fr"]="tetedanstexte", + ["nl"]="kopintekst", + }, ["height"]={ ["cs"]="vyska", ["de"]="hoehe", @@ -14030,7 +15106,7 @@ return { ["cs"]="vyse", ["de"]="vorher", ["en"]="hencefore", - ["fr"]="precedent", + ["fr"]="precedemment", ["it"]="precedente", ["nl"]="hierboven", ["pe"]="hencefore", @@ -14050,7 +15126,7 @@ return { ["cs"]="nize", ["de"]="nachher", ["en"]="hereafter", - ["fr"]="suivant", + ["fr"]="ciapres", ["it"]="seguente", ["nl"]="hieronder", ["pe"]="ازاینبهبعد", @@ -14068,12 +15144,13 @@ return { }, ["hiddenbar"]={ ["en"]="hiddenbar", + ["fr"]="barrecachee", }, ["hiding"]={ ["cs"]="skryt", ["de"]="verbergen", ["en"]="hiding", - ["fr"]="cache", + ["fr"]="encachant", ["it"]="nascondere", ["nl"]="verbergen", ["pe"]="پنهانکردن", @@ -14083,7 +15160,7 @@ return { ["cs"]="vysoko", ["de"]="hoch", ["en"]="high", - ["fr"]="haut", + ["fr"]="exp", ["it"]="alto", ["nl"]="hoog", ["pe"]="بلند", @@ -14093,7 +15170,7 @@ return { ["cs"]="horizontalne", ["de"]="horizontal", ["en"]="horizontal", - ["fr"]="horizontale", + ["fr"]="horizontal", ["it"]="orizzontale", ["nl"]="horizontaal", ["pe"]="افقی", @@ -14103,7 +15180,7 @@ return { ["cs"]="hyphenated", ["de"]="hyphenate", ["en"]="hyphenated", - ["fr"]="hyphenated", + ["fr"]="aveccesure", ["it"]="sillabato", ["nl"]="afgebroken", ["pe"]="شکسته", @@ -14153,7 +15230,7 @@ return { ["cs"]="inherit", ["de"]="inherit", ["en"]="inherit", - ["fr"]="herite", + ["fr"]="heriter", ["it"]="inherit", ["nl"]="erf", ["pe"]="ارثبردن", @@ -14163,7 +15240,7 @@ return { ["cs"]="ininner", ["de"]="ininner", ["en"]="ininner", - ["fr"]="ininner", + ["fr"]="dansinterieur", ["it"]="ininner", ["nl"]="inbinnen", ["pe"]="درداخلی", @@ -14171,9 +15248,11 @@ return { }, ["ininneredge"]={ ["en"]="ininneredge", + ["fr"]="dansbordinterieur", }, ["ininnermargin"]={ ["en"]="ininnermargin", + ["fr"]="dansmargeinterieure", }, ["inleft"]={ ["cs"]="ivlevo", @@ -14207,6 +15286,7 @@ return { }, ["inline"]={ ["en"]="inline", + ["fr"]="enligne", }, ["inmargin"]={ ["cs"]="naokraji", @@ -14252,7 +15332,7 @@ return { ["cs"]="inother", ["de"]="inother", ["en"]="inother", - ["fr"]="inother", + ["fr"]="dansautre", ["it"]="inother", ["nl"]="inandere", ["pe"]="inother", @@ -14262,7 +15342,7 @@ return { ["cs"]="inouter", ["de"]="inouter", ["en"]="inouter", - ["fr"]="inouter", + ["fr"]="dansexterieur", ["it"]="inouter", ["nl"]="inbuiten", ["pe"]="درخارجی", @@ -14270,15 +15350,17 @@ return { }, ["inouteredge"]={ ["en"]="inouteredge", + ["fr"]="dansbordexterieur", }, ["inoutermargin"]={ ["en"]="inoutermargin", + ["fr"]="dansmargeexterieure", }, ["inright"]={ ["cs"]="ivpravo", ["de"]="imrechten", ["en"]="inright", - ["fr"]="dansdroit", + ["fr"]="dansdroite", ["it"]="indestra", ["nl"]="inrechter", ["pe"]="درونراست", @@ -14306,6 +15388,7 @@ return { }, ["integral"]={ ["en"]="integral", + ["fr"]="integrale", }, ["interaction"]={ ["cs"]="interakce", @@ -14329,12 +15412,13 @@ return { }, ["interactive"]={ ["en"]="interactive", + ["fr"]="interactif", }, ["intermezzi"]={ ["cs"]="intermezzi", ["de"]="intermezzi", ["en"]="intermezzi", - ["fr"]="intermezzi", + ["fr"]="interludes", ["it"]="intermezzi", ["nl"]="intermezzos", ["pe"]="میانپردهها", @@ -14344,7 +15428,7 @@ return { ["cs"]="intermezzo", ["de"]="intermezzo", ["en"]="intermezzo", - ["fr"]="intermezzo", + ["fr"]="interlude", ["it"]="intermezzo", ["nl"]="intermezzo", ["pe"]="میانپرده", @@ -14360,10 +15444,6 @@ return { ["pe"]="درونمتن", ["ro"]="intext", }, - ["headintext"]={ - ["en"]="headintext", - ["nl"]="kopintekst", - }, ["intro"]={ ["cs"]="uvod", ["de"]="intro", @@ -14388,7 +15468,7 @@ return { ["cs"]="kurzivnitucne", ["de"]="italicfett", ["en"]="italicbold", - ["fr"]="grasitalique", + ["fr"]="italiquegras", ["it"]="corsivograssetto", ["nl"]="italicvet", ["pe"]="مشکیایتالیک", @@ -14398,7 +15478,7 @@ return { ["cs"]="polozka", ["de"]="pos", ["en"]="item", - ["fr"]="element", + ["fr"]="élément", ["it"]="elemento", ["nl"]="som", ["pe"]="آیتم", @@ -14408,7 +15488,7 @@ return { ["cs"]="vycet", ["de"]="aufzaehlung", ["en"]="itemize", - ["fr"]="lister", + ["fr"]="détailler", ["it"]="elenco", ["nl"]="opsomming", ["pe"]="آیتمبندی", @@ -14418,7 +15498,7 @@ return { ["cs"]="pol", ["de"]="its", ["en"]="its", - ["fr"]="its", + ["fr"]="els", ["it"]="its", ["nl"]="its", ["pe"]="آیم", @@ -14438,16 +15518,12 @@ return { ["cs"]="spojeno", ["de"]="keinabstand", ["en"]="joinedup", - ["fr"]="joinedup", + ["fr"]="sansespaceentre", ["it"]="unito", ["nl"]="aansluitend", ["pe"]="متصلبالا", ["ro"]="unit", }, - ["notjoinedup"]={ - ["en"]="notjoinedup", - ["nl"]="nietaansluitend", - }, ["july"]={ ["cs"]="cervenec", ["de"]="juli", @@ -14472,7 +15548,7 @@ return { ["cs"]="drzet", ["de"]="behalte", ["en"]="keep", - ["fr"]="maintient", + ["fr"]="conserver", ["it"]="mantieni", ["nl"]="handhaaf", ["pe"]="نگهدار", @@ -14480,6 +15556,7 @@ return { }, ["kerncharacters"]={ ["en"]="kerncharacters", + ["fr"]="approchercaracteres", }, ["knockout"]={ ["cs"]="knockout", @@ -14545,7 +15622,7 @@ return { ["cs"]="lastpagenumber", ["de"]="lastpagenumber", ["en"]="lastpagenumber", - ["fr"]="derniernumeropage", + ["fr"]="numerodenierepage", ["it"]="lastpagenumber", ["nl"]="laatstepaginanummer", ["pe"]="شماهصفحهآخر", @@ -14565,7 +15642,7 @@ return { ["cs"]="layer", ["de"]="layer", ["en"]="layer", - ["fr"]="layer", + ["fr"]="calque", ["it"]="layer", ["nl"]="layer", ["pe"]="layer", @@ -14595,7 +15672,7 @@ return { ["cs"]="lefthanging", ["de"]="lefthanging", ["en"]="lefthanging", - ["fr"]="lefthanging", + ["fr"]="suspensiongauche", ["it"]="lefthanging", ["nl"]="linkshangend", ["pe"]="آویزانچپ", @@ -14615,7 +15692,7 @@ return { ["cs"]="levastranka", ["de"]="linkerseite", ["en"]="leftpage", - ["fr"]="pagegauche", + ["fr"]="surpagegauche", ["it"]="paginasinistra", ["nl"]="linkerpagina", ["pe"]="صفحهچپ", @@ -14625,7 +15702,7 @@ return { ["cs"]="lefttoright", ["de"]="lefttoright", ["en"]="lefttoright", - ["fr"]="lefttoright", + ["fr"]="gaucheadroite", ["it"]="lefttoright", ["nl"]="lefttoright", ["pe"]="lefttoright", @@ -14643,13 +15720,14 @@ return { }, ["less"]={ ["en"]="less", + ["fr"]="moins", ["nl"]="minder", }, ["lesshyphenation"]={ ["cs"]="lesshyphenation", ["de"]="lesshyphenation", ["en"]="lesshyphenation", - ["fr"]="lesshyphenation", + ["fr"]="moinsdecesure", ["it"]="lesshyphenation", ["nl"]="lesshyphenation", ["pe"]="شکستکلماتکمتر", @@ -14657,6 +15735,7 @@ return { }, ["letterspacing"]={ ["en"]="letterspacing", + ["fr"]="espacementlettre", }, ["line"]={ ["cs"]="radek", @@ -14690,6 +15769,7 @@ return { }, ["linked"]={ ["en"]="linked", + ["fr"]="lie", }, ["list"]={ ["cs"]="seznam", @@ -14715,7 +15795,7 @@ return { ["cs"]="lokalnihoprostredi", ["de"]="lokaleumgebung", ["en"]="localenvironment", - ["fr"]="environementlocal", + ["fr"]="environnementlocal", ["it"]="ambientelocale", ["nl"]="deelomgeving", ["pe"]="محیطموضعی", @@ -14745,7 +15825,7 @@ return { ["cs"]="nivy", ["de"]="hoti", ["en"]="lohi", - ["fr"]="baha", + ["fr"]="inex", ["it"]="pedap", ["nl"]="laho", ["pe"]="پابا", @@ -14753,12 +15833,13 @@ return { }, ["long"]={ ["en"]="long", + ["fr"]="long", }, ["loose"]={ ["cs"]="uvolnene", ["de"]="lose", ["en"]="loose", - ["fr"]="perte", + ["fr"]="envrac", ["it"]="lento", ["nl"]="los", ["pe"]="شل", @@ -14768,7 +15849,7 @@ return { ["cs"]="nizko", ["de"]="tief", ["en"]="low", - ["fr"]="bas", + ["fr"]="ind", ["it"]="basso", ["nl"]="laag", ["pe"]="پایین", @@ -14788,7 +15869,7 @@ return { ["cs"]="zlom", ["de"]="umbruch", ["en"]="makeup", - ["fr"]="makeup", + ["fr"]="composition", ["it"]="makeup", ["nl"]="opmaak", ["pe"]="آرایش", @@ -14798,7 +15879,7 @@ return { ["cs"]="mar", ["de"]="mar", ["en"]="mar", - ["fr"]="mar", + ["fr"]="rem", ["it"]="mar", ["nl"]="mar", ["pe"]="حاش", @@ -14828,7 +15909,7 @@ return { ["cs"]="textovahrana", ["de"]="marginalkante", ["en"]="marginedge", - ["fr"]="bordmarge", + ["fr"]="margebord", ["it"]="bordomargine", ["nl"]="kantlijn", ["pe"]="لبهحاشیه", @@ -14866,12 +15947,13 @@ return { }, ["math"]={ ["en"]="math", + ["fr"]="math", }, ["mathalignment"]={ ["cs"]="mathalignment", ["de"]="mathalignment", ["en"]="mathalignment", - ["fr"]="mathalignment", + ["fr"]="alignementmath", ["it"]="mathalignment", ["nl"]="wiskundeuitlijnen", ["pe"]="تنظیمریاضی", @@ -14881,7 +15963,7 @@ return { ["cs"]="mathcases", ["de"]="mathcases", ["en"]="mathcases", - ["fr"]="mathcases", + ["fr"]="casmath", ["it"]="mathcases", ["nl"]="mathcases", ["pe"]="حالتهایریاضی", @@ -14891,7 +15973,7 @@ return { ["cs"]="mathematika", ["de"]="mathematik", ["en"]="mathematics", - ["fr"]="mathematique", + ["fr"]="mathematics", ["it"]="matematica", ["nl"]="wiskunde", ["pe"]="ریاضی", @@ -14901,7 +15983,7 @@ return { ["cs"]="mathmatrix", ["de"]="mathmatrix", ["en"]="mathmatrix", - ["fr"]="mathmatrix", + ["fr"]="matricemath", ["it"]="mathmatrix", ["nl"]="wiskundematrix", ["pe"]="ماتریشریاضی", @@ -14919,14 +16001,17 @@ return { }, ["maxdepth"]={ ["en"]="maxdepth", + ["fr"]="profondeurmax", ["nl"]="maxdiepte", }, ["maxheight"]={ ["en"]="maxheight", + ["fr"]="hauteurmax", ["nl"]="maxhoogte", }, ["maxwidth"]={ ["en"]="maxwidth", + ["fr"]="largeurmax", ["nl"]="maxbreedte", }, ["may"]={ @@ -14981,6 +16066,7 @@ return { }, ["mindepth"]={ ["en"]="mindepth", + ["fr"]="profondeurmin", ["nl"]="mindiepte", }, ["minheight"]={ @@ -15015,6 +16101,7 @@ return { }, ["mixed"]={ ["en"]="mixed", + ["fr"]="mixte", }, ["monday"]={ ["cs"]="pondeli", @@ -15048,6 +16135,7 @@ return { }, ["mononormal"]={ ["en"]="mononormal", + ["fr"]="normalmono", }, ["month"]={ ["cs"]="mesic", @@ -15061,13 +16149,14 @@ return { }, ["more"]={ ["en"]="more", + ["fr"]="plus", ["nl"]="meer", }, ["morehyphenation"]={ ["cs"]="morehyphenation", ["de"]="morehyphenation", ["en"]="morehyphenation", - ["fr"]="morehyphenation", + ["fr"]="plusdecesure", ["it"]="morehyphenation", ["nl"]="morehyphenation", ["pe"]="شکستکلماتبیشتر", @@ -15127,7 +16216,7 @@ return { ["cs"]="dalsi", ["de"]="folgende", ["en"]="next", - ["fr"]="prochain", + ["fr"]="suivant", ["it"]="successivo", ["nl"]="volgende", ["pe"]="بعدی", @@ -15173,6 +16262,16 @@ return { ["pe"]="زیرصفحهبعدی", ["ro"]="urmatoareasubpagina", }, + ["nine"]={ + ["cs"]="nine", + ["de"]="neun", + ["en"]="nine", + ["fr"]="neuf", + ["it"]="nine", + ["nl"]="negen", + ["pe"]="nine", + ["ro"]="nine", + }, ["no"]={ ["cs"]="ne", ["de"]="nein", @@ -15187,7 +16286,7 @@ return { ["cs"]="nocheck", ["de"]="nocheck", ["en"]="nocheck", - ["fr"]="nonverifie", + ["fr"]="sansverifier", ["it"]="nocheck", ["nl"]="geencontrole", ["pe"]="بدونبررسی", @@ -15195,12 +16294,13 @@ return { }, ["nodepth"]={ ["en"]="nodepth", + ["fr"]="sansprodondeur", }, ["nofit"]={ ["cs"]="nofit", ["de"]="nofit", ["en"]="nofit", - ["fr"]="nofit", + ["fr"]="sansadapter", ["it"]="nofit", ["nl"]="nietpassend", ["pe"]="بدونپرکردن", @@ -15210,7 +16310,7 @@ return { ["cs"]="nogrid", ["de"]="nogrid", ["en"]="nogrid", - ["fr"]="nogrid", + ["fr"]="sansgrille", ["it"]="nogrid", ["nl"]="geengrid", ["pe"]="بدونتوری", @@ -15218,12 +16318,13 @@ return { }, ["noheight"]={ ["en"]="noheight", + ["fr"]="sanshauteur", }, ["nohz"]={ ["cs"]="nohz", ["de"]="nohz", ["en"]="nohz", - ["fr"]="nohz", + ["fr"]="sanshz", ["it"]="nohz", ["nl"]="geenhz", ["pe"]="nohz", @@ -15231,6 +16332,7 @@ return { }, ["noline"]={ ["en"]="noline", + ["fr"]="sansligne", }, ["nomarking"]={ ["cs"]="zadneznaceni", @@ -15244,13 +16346,14 @@ return { }, ["nomenubar"]={ ["en"]="nomenubar", + ["fr"]="sansbarremenu", ["nl"]="geenmenubalk", }, ["none"]={ ["cs"]="zadny", ["de"]="kein", ["en"]="none", - ["fr"]="rien", + ["fr"]="aucun", ["it"]="nessuno", ["nl"]="geen", ["pe"]="هیچکدام", @@ -15268,6 +16371,7 @@ return { }, ["norepeat"]={ ["en"]="norepeat", + ["fr"]="sansrepetition", }, ["normal"]={ ["cs"]="normalni", @@ -15289,6 +16393,11 @@ return { ["pe"]="بدونفضاگذاری", ["ro"]="nospacing", }, + ["nostopper"]={ + ["en"]="nostopper", + ["fr"]="sansstoppeur", + ["nl"]="geenafsluiter", + }, ["not"]={ ["cs"]="ne", ["de"]="nicht", @@ -15301,15 +16410,17 @@ return { }, ["notation"]={ ["en"]="notation", + ["fr"]="notation", }, ["note"]={ ["en"]="note", + ["fr"]="note", }, ["nothanging"]={ ["cs"]="nothanging", ["de"]="nothanging", ["en"]="nothanging", - ["fr"]="nonsuspendu", + ["fr"]="sanssuspension", ["it"]="nonsospeso", ["nl"]="niethangend", ["pe"]="بدونآویزانکردن", @@ -15319,12 +16430,17 @@ return { ["cs"]="nothyphenated", ["de"]="nothyphenated", ["en"]="nothyphenated", - ["fr"]="nothyphenated", + ["fr"]="sanscesure", ["it"]="nonsillabato", ["nl"]="nietafgebroken", ["pe"]="بدونشکست", ["ro"]="nedespsilabe", }, + ["notjoinedup"]={ + ["en"]="notjoinedup", + ["fr"]="passansespaceentre", + ["nl"]="nietaansluitend", + }, ["november"]={ ["cs"]="listopad", ["de"]="november", @@ -15339,7 +16455,7 @@ return { ["cs"]="nikde", ["de"]="nirgens", ["en"]="nowhere", - ["fr"]="nulpart", + ["fr"]="nullepart", ["it"]="danessunaparte", ["nl"]="nergens", ["pe"]="هیچحا", @@ -15399,7 +16515,7 @@ return { ["cs"]="vyp", ["de"]="aus", ["en"]="off", - ["fr"]="desactive", + ["fr"]="arret", ["it"]="disattivo", ["nl"]="uit", ["pe"]="خاموش", @@ -15409,7 +16525,7 @@ return { ["cs"]="offset", ["de"]="offset", ["en"]="offset", - ["fr"]="offset", + ["fr"]="decalage", ["it"]="offset", ["nl"]="offset", ["pe"]="آفست", @@ -15419,7 +16535,7 @@ return { ["cs"]="old", ["de"]="old", ["en"]="old", - ["fr"]="old", + ["fr"]="ancien", ["it"]="old", ["nl"]="oud", ["pe"]="قدیمی", @@ -15427,15 +16543,13 @@ return { }, ["oldstyle"]={ ["en"]="oldstyle", - }, - ["fractions"]={ - ["en"]="fractions", + ["fr"]="styleancien", }, ["on"]={ ["cs"]="zap", ["de"]="an", ["en"]="on", - ["fr"]="actif", + ["fr"]="marche", ["it"]="attivo", ["nl"]="aan", ["pe"]="روی", @@ -15455,12 +16569,16 @@ return { ["cs"]="naproti", ["de"]="gegenueber", ["en"]="opposite", - ["fr"]="opposition", + ["fr"]="enface", ["it"]="opposto", ["nl"]="naast", ["pe"]="مخالف", ["ro"]="opus", }, + ["ordinal"]={ + ["en"]="ordinal", + ["fr"]="ordinal", + }, ["outer"]={ ["cs"]="vnejsi", ["de"]="aussen", @@ -15495,7 +16613,7 @@ return { ["cs"]="nadtrzeno", ["de"]="ueberstrichen", ["en"]="overbar", - ["fr"]="overbar", + ["fr"]="surligner", ["it"]="sopralinea", ["nl"]="overstreep", ["pe"]="میلهرو", @@ -15505,7 +16623,7 @@ return { ["cs"]="nadtrzeni", ["de"]="ueberstreichen", ["en"]="overbars", - ["fr"]="overbars", + ["fr"]="surlignermots", ["it"]="sopralinee", ["nl"]="overstrepen", ["pe"]="میلههارو", @@ -15515,7 +16633,7 @@ return { ["cs"]="prekryv", ["de"]="overlay", ["en"]="overlay", - ["fr"]="revetement", + ["fr"]="superposition", ["it"]="sovrapponi", ["nl"]="overlay", ["pe"]="پوشش", @@ -15525,7 +16643,7 @@ return { ["cs"]="overprint", ["de"]="overprint", ["en"]="overprint", - ["fr"]="overprint", + ["fr"]="surimpression", ["it"]="overprint", ["nl"]="overprint", ["pe"]="overprint", @@ -15535,7 +16653,7 @@ return { ["cs"]="preskrtnuto", ["de"]="durchgestrichen", ["en"]="overstrike", - ["fr"]="surlignetout", + ["fr"]="barrer", ["it"]="sbarrato", ["nl"]="doorstreep", ["pe"]="خطزدن", @@ -15545,7 +16663,7 @@ return { ["cs"]="preskrtnuti", ["de"]="durchstreichen", ["en"]="overstrikes", - ["fr"]="surligne", + ["fr"]="barrermots", ["it"]="sbarrati", ["nl"]="doorstrepen", ["pe"]="خطزدنها", @@ -15555,7 +16673,7 @@ return { ["cs"]="zhustene", ["de"]="gepackt", ["en"]="packed", - ["fr"]="groupe", + ["fr"]="sansespaceentreitem", ["it"]="impaccato", ["nl"]="opelkaar", ["pe"]="فشرده", @@ -15635,7 +16753,7 @@ return { ["cs"]="odlozit", ["de"]="verschieben", ["en"]="postponing", - ["fr"]="postponing", + ["fr"]="report", ["it"]="posporre", ["nl"]="uitstellen", ["pe"]="تاخیر", @@ -15653,6 +16771,7 @@ return { }, ["precedingpage"]={ ["en"]="precedingpage", + ["fr"]="pageantecedent", ["nl"]="voorafgaandepagina", }, ["preference"]={ @@ -15669,7 +16788,7 @@ return { ["cs"]="nahled", ["de"]="vorschau", ["en"]="preview", - ["fr"]="previsualisation", + ["fr"]="apercu", ["it"]="anteprima", ["nl"]="preview", ["pe"]="پیشدید", @@ -15727,13 +16846,14 @@ return { }, ["print"]={ ["en"]="print", + ["fr"]="imprimer", ["nl"]="print", }, ["printable"]={ ["cs"]="tisknutelne", ["de"]="druckbar", ["en"]="printable", - ["fr"]="editable", + ["fr"]="imprimable", ["it"]="stampabile", ["nl"]="printbaar", ["pe"]="قابلچاپ", @@ -15743,7 +16863,7 @@ return { ["cs"]="process", ["de"]="process", ["en"]="process", - ["fr"]="process", + ["fr"]="traiter", ["it"]="process", ["nl"]="proces", ["pe"]="پردازش", @@ -15801,6 +16921,7 @@ return { }, ["quarterline"]={ ["en"]="quarterline", + ["fr"]="quartdeligne", ["nl"]="kwartregel", }, ["quotation"]={ @@ -15827,7 +16948,7 @@ return { ["cs"]="rozsah", ["de"]="ran", ["en"]="ran", - ["fr"]="cours", + ["fr"]="gam", ["it"]="corse", ["nl"]="ran", ["pe"]="برد", @@ -15877,7 +16998,7 @@ return { ["cs"]="znacka", ["de"]="merkmal", ["en"]="referral", - ["fr"]="referral", + ["fr"]="redirection", ["it"]="referral", ["nl"]="kenmerk", ["pe"]="مراجعه", @@ -15897,7 +17018,7 @@ return { ["cs"]="pravidelne", ["de"]="regular", ["en"]="regular", - ["fr"]="regulier", + ["fr"]="ordinaire", ["it"]="regolare", ["nl"]="regular", ["pe"]="منظم", @@ -15917,7 +17038,7 @@ return { ["cs"]="opakovat", ["de"]="wiederholen", ["en"]="repeat", - ["fr"]="repete", + ["fr"]="repeter", ["it"]="ripeti", ["nl"]="herhaal", ["pe"]="تکرار", @@ -15927,7 +17048,7 @@ return { ["cs"]="pozadovane", ["de"]="obligatorisch", ["en"]="required", - ["fr"]="recquis", + ["fr"]="requis", ["it"]="richiestp", ["nl"]="verplicht", ["pe"]="موردنیاز", @@ -15947,7 +17068,7 @@ return { ["cs"]="reverse", ["de"]="reverse", ["en"]="reverse", - ["fr"]="inverse", + ["fr"]="inverser", ["it"]="invertito", ["nl"]="omgekeerd", ["pe"]="برعکس", @@ -15977,7 +17098,7 @@ return { ["cs"]="righthanging", ["de"]="righthanging", ["en"]="righthanging", - ["fr"]="righthanging", + ["fr"]="suspensiondroite", ["it"]="righthanging", ["nl"]="rechtshangend", ["pe"]="آویزانکردنراست", @@ -15997,7 +17118,7 @@ return { ["cs"]="pravastranka", ["de"]="rechterseite", ["en"]="rightpage", - ["fr"]="pagedroite", + ["fr"]="surpagedroite", ["it"]="paginadestra", ["nl"]="rechterpagina", ["pe"]="صفحهراست", @@ -16007,7 +17128,7 @@ return { ["cs"]="righttoleft", ["de"]="righttoleft", ["en"]="righttoleft", - ["fr"]="righttoleft", + ["fr"]="droiteagauche", ["it"]="righttoleft", ["nl"]="righttoleft", ["pe"]="righttoleft", @@ -16017,7 +17138,7 @@ return { ["cs"]="antikva", ["de"]="antiqua", ["en"]="roman", - ["fr"]="roman", + ["fr"]="romain", ["it"]="roman", ["nl"]="romaan", ["pe"]="رومن", @@ -16037,7 +17158,7 @@ return { ["cs"]="otoc", ["de"]="drehe", ["en"]="rotate", - ["fr"]="oriente", + ["fr"]="tourner", ["it"]="ruota", ["nl"]="roteer", ["pe"]="دوران", @@ -16077,7 +17198,7 @@ return { ["cs"]="linka", ["de"]="linie", ["en"]="rule", - ["fr"]="regle", + ["fr"]="trait", ["it"]="linea", ["nl"]="lijn", ["pe"]="خط", @@ -16107,7 +17228,7 @@ return { ["cs"]="sanstucne", ["de"]="sansfett", ["en"]="sansbold", - ["fr"]="sansgras", + ["fr"]="sansserifbold", ["it"]="sansgrassetto", ["nl"]="sansvet", ["pe"]="مشکیسانز", @@ -16115,6 +17236,7 @@ return { }, ["sansnormal"]={ ["en"]="sansnormal", + ["fr"]="normalsans", }, ["sansserif"]={ ["cs"]="bezserifu", @@ -16160,7 +17282,7 @@ return { ["cs"]="sectionblockenvironment", ["de"]="sectionblockenvironment", ["en"]="sectionblockenvironment", - ["fr"]="environementblocsection", + ["fr"]="environnementblocsection", ["it"]="ambientebloccosezione", ["nl"]="sectieblokomgeving", ["pe"]="محیطبلوکبخش", @@ -16180,7 +17302,7 @@ return { ["cs"]="viz", ["de"]="sieh", ["en"]="see", - ["fr"]="voit", + ["fr"]="voir", ["it"]="vedi", ["nl"]="zie", ["pe"]="ببینید", @@ -16188,9 +17310,11 @@ return { }, ["selectfont"]={ ["en"]="selectfont", + ["fr"]="selectionnerpolice", }, ["separator"]={ ["en"]="separator", + ["fr"]="separateur", ["nl"]="scheider", }, ["september"]={ @@ -16215,29 +17339,40 @@ return { }, ["serifbold"]={ ["en"]="serifbold", + ["fr"]="serifgras", }, ["serifnormal"]={ ["en"]="serifnormal", + ["fr"]="serifnormal", }, ["serried"]={ ["cs"]="semknuto", ["de"]="kleinerabstand", ["en"]="serried", - ["fr"]="serried", + ["fr"]="serre", ["it"]="vicino", ["nl"]="aanelkaar", ["pe"]="تنگهم", ["ro"]="serried", }, ["setups"]={ - ["comment"]="no translations", ["en"]="setups", }, + ["seven"]={ + ["cs"]="seven", + ["de"]="sieben", + ["en"]="seven", + ["fr"]="sept", + ["it"]="seven", + ["nl"]="zeven", + ["pe"]="seven", + ["ro"]="seven", + }, ["sheet"]={ ["cs"]="sheet", ["de"]="sheet", ["en"]="sheet", - ["fr"]="sheet", + ["fr"]="feuille", ["it"]="sheet", ["nl"]="sheet", ["pe"]="ورقه", @@ -16245,24 +17380,28 @@ return { }, ["shiftdown"]={ ["en"]="shiftdown", + ["fr"]="decalerenbas", }, ["shiftup"]={ ["en"]="shiftup", + ["fr"]="decalerenhaut", }, ["short"]={ ["cs"]="short", ["de"]="kurz", ["en"]="short", - ["fr"]="short", + ["fr"]="court", ["it"]="short", ["nl"]="kort", ["ro"]="short", }, ["simplefonts"]={ ["en"]="simplefonts", + ["fr"]="policessimple", }, ["simplelist"]={ ["en"]="simplelist", + ["fr"]="listesimple", }, ["singlesided"]={ ["cs"]="jednostranne", @@ -16274,6 +17413,16 @@ return { ["pe"]="یکرو", ["ro"]="ofata", }, + ["six"]={ + ["cs"]="six", + ["de"]="sechs", + ["en"]="six", + ["fr"]="six", + ["it"]="six", + ["nl"]="zes", + ["pe"]="six", + ["ro"]="six", + }, ["slanted"]={ ["cs"]="sklonene", ["de"]="geneigt", @@ -16288,7 +17437,7 @@ return { ["cs"]="sklonenetucne", ["de"]="geneigtfett", ["en"]="slantedbold", - ["fr"]="grasincline", + ["fr"]="inclinegras", ["it"]="inclinatograssetto", ["nl"]="schuinvet", ["pe"]="مشکیخوابیده", @@ -16308,7 +17457,7 @@ return { ["cs"]="smallbodyfont", ["de"]="smallbodyfont", ["en"]="smallbodyfont", - ["fr"]="petitepolicecorps", + ["fr"]="policedecorpspetite", ["it"]="piccolofontdelcorpo", ["nl"]="kleinkorps", ["pe"]="قلمبدنهکوچک", @@ -16318,7 +17467,7 @@ return { ["cs"]="maletucne", ["de"]="kleinfett", ["en"]="smallbold", - ["fr"]="graspetit", + ["fr"]="petitgras", ["it"]="piccolograssetto", ["nl"]="kleinvet", ["pe"]="مشکیکوچک", @@ -16328,7 +17477,7 @@ return { ["cs"]="maletucnekurzivni", ["de"]="kleinfettitalic", ["en"]="smallbolditalic", - ["fr"]="italiquegraspetit", + ["fr"]="petitgrasitalique", ["it"]="piccolograssettocorsivo", ["nl"]="kleinvetitalic", ["pe"]="ایتالیکمشکیکوچک", @@ -16338,7 +17487,7 @@ return { ["cs"]="maletucnesklonene", ["de"]="kleinfettgeneigt", ["en"]="smallboldslanted", - ["fr"]="inclinegraspetit", + ["fr"]="petitgrasincline", ["it"]="piccolograssettoinclinato", ["nl"]="kleinvetschuin", ["pe"]="خوابیدهمشکیکوچک", @@ -16348,7 +17497,7 @@ return { ["cs"]="kapitalky", ["de"]="smallcaps", ["en"]="smallcaps", - ["fr"]="petitescapitales", + ["fr"]="petitescaps", ["it"]="maiuscoletto", ["nl"]="smallcaps", ["pe"]="smallcaps", @@ -16356,13 +17505,14 @@ return { }, ["smaller"]={ ["en"]="smaller", + ["fr"]="pluspetit", ["nl"]="kleiner", }, ["smallitalic"]={ ["cs"]="malekurzivni", ["de"]="kleinitalic", ["en"]="smallitalic", - ["fr"]="italiquepetit", + ["fr"]="petititalique", ["it"]="piccolocorsivo", ["nl"]="kleinitalic", ["pe"]="ایتالیککوچک", @@ -16372,7 +17522,7 @@ return { ["cs"]="malekurzivnitucne", ["de"]="kleinitalicfett", ["en"]="smallitalicbold", - ["fr"]="grasitaliquepetit", + ["fr"]="petititaliquegras", ["it"]="piccolocorsivograssetto", ["nl"]="kleinitalicvet", ["pe"]="مشکیایتالیککوچک", @@ -16382,7 +17532,7 @@ return { ["cs"]="malenormalni", ["de"]="kleinnormal", ["en"]="smallnormal", - ["fr"]="normalpetit", + ["fr"]="petitnormal", ["it"]="piccolonormale", ["nl"]="kleinnormaal", ["pe"]="نرمالکوچک", @@ -16392,7 +17542,7 @@ return { ["cs"]="malesklonene", ["de"]="kleingeneigt", ["en"]="smallslanted", - ["fr"]="inclinepetit", + ["fr"]="petitincline", ["it"]="piccoloinclinato", ["nl"]="kleinschuin", ["pe"]="خوابیدهکوچک", @@ -16402,7 +17552,7 @@ return { ["cs"]="malesklonenetucne", ["de"]="kleingeneigtfett", ["en"]="smallslantedbold", - ["fr"]="grasinclinepetit", + ["fr"]="petitinclinegras", ["it"]="piccoloinclinatograssetto", ["nl"]="kleinschuinvet", ["pe"]="مشکیخوابیدهکوچک", @@ -16412,7 +17562,7 @@ return { ["cs"]="maletype", ["de"]="kleintippen", ["en"]="smalltype", - ["fr"]="petittype", + ["fr"]="petitcaractere", ["it"]="piccolotype", ["nl"]="kleintype", ["pe"]="تایپکوچک", @@ -16440,6 +17590,7 @@ return { }, ["sorting"]={ ["en"]="sorting", + ["fr"]="tri", }, ["space"]={ ["cs"]="mezera", @@ -16475,7 +17626,7 @@ return { ["cs"]="split", ["de"]="split", ["en"]="split", - ["fr"]="split", + ["fr"]="partager", ["it"]="separa", ["nl"]="splitsen", ["pe"]="شکافتن", @@ -16485,7 +17636,7 @@ return { ["cs"]="spot", ["de"]="spot", ["en"]="spot", - ["fr"]="spot", + ["fr"]="tondirect", ["it"]="spot", ["nl"]="spot", ["pe"]="لکه", @@ -16505,7 +17656,7 @@ return { ["cs"]="start", ["de"]="start", ["en"]="start", - ["fr"]="demarre", + ["fr"]="activé", ["it"]="inizia", ["nl"]="start", ["pe"]="شروع", @@ -16513,13 +17664,14 @@ return { }, ["starter"]={ ["en"]="starter", + ["fr"]="demarreur", ["nl"]="opener", }, ["sticker"]={ ["cs"]="sticker", ["de"]="sticker", ["en"]="sticker", - ["fr"]="sticker", + ["fr"]="autocollant", ["it"]="sticker", ["nl"]="sticker", ["pe"]="دشنه", @@ -16529,7 +17681,7 @@ return { ["cs"]="stop", ["de"]="stop", ["en"]="stop", - ["fr"]="stoppe", + ["fr"]="fin", ["it"]="termina", ["nl"]="stop", ["pe"]="پایان", @@ -16539,21 +17691,17 @@ return { ["cs"]="predel", ["de"]="trenner", ["en"]="stopper", - ["fr"]="stopper", + ["fr"]="stoppeur", ["it"]="stopper", ["nl"]="afsluiter", ["pe"]="ایست", ["ro"]="stopper", }, - ["nostopper"]={ - ["en"]="nostopper", - ["nl"]="geenafsluiter", - }, ["stretch"]={ ["cs"]="natahnout", ["de"]="strecken", ["en"]="stretch", - ["fr"]="etire", + ["fr"]="etirer", ["it"]="dilata", ["nl"]="rek", ["pe"]="بکش", @@ -16561,6 +17709,7 @@ return { }, ["stretched"]={ ["en"]="stretched", + ["fr"]="etire", }, ["strict"]={ ["cs"]="striktni", @@ -16576,7 +17725,7 @@ return { ["cs"]="strong", ["de"]="strong", ["en"]="strong", - ["fr"]="strong", + ["fr"]="fort", ["it"]="strong", ["nl"]="sterk", ["pe"]="محکم", @@ -16586,7 +17735,7 @@ return { ["cs"]="strut", ["de"]="strut", ["en"]="strut", - ["fr"]="strut", + ["fr"]="entretoise", ["it"]="strut", ["nl"]="strut", ["pe"]="بست", @@ -16606,7 +17755,7 @@ return { ["cs"]="podzpet", ["de"]="unterrueckwaerts", ["en"]="subbackward", - ["fr"]="sousretourarriere", + ["fr"]="petitenarriere", ["it"]="sottoindietro", ["nl"]="subachteruit", ["pe"]="زیرعقبگرد", @@ -16616,7 +17765,7 @@ return { ["cs"]="subrovnice", ["de"]="subformel", ["en"]="subformula", - ["fr"]="subformule", + ["fr"]="sousformule", ["it"]="subformula", ["nl"]="subformule", ["pe"]="زیرفرمول", @@ -16626,7 +17775,7 @@ return { ["cs"]="podvpred", ["de"]="untervorwaerts", ["en"]="subforward", - ["fr"]="sousavance", + ["fr"]="petitenavant", ["it"]="sottoavanti", ["nl"]="subvooruit", ["pe"]="زیرجلوگرد", @@ -16654,6 +17803,7 @@ return { }, ["subs"]={ ["en"]="subs", + ["fr"]="subs", }, ["subsection"]={ ["cs"]="podsekce", @@ -16879,7 +18029,7 @@ return { ["cs"]="synchronize", ["de"]="synchronize", ["en"]="synchronize", - ["fr"]="synchronize", + ["fr"]="synchroniser", ["it"]="synchronize", ["nl"]="synchroniseer", ["pe"]="تطابق", @@ -16887,6 +18037,7 @@ return { }, ["synonym"]={ ["en"]="synonym", + ["fr"]="synonyme", }, ["system"]={ ["cs"]="system", @@ -16902,7 +18053,7 @@ return { ["cs"]="tabulka", ["de"]="tabelle", ["en"]="table", - ["fr"]="tableau", + ["fr"]="table", ["it"]="tabella", ["nl"]="tabel", ["pe"]="جدول", @@ -16932,7 +18083,7 @@ return { ["cs"]="konectabulky", ["de"]="tabellenende", ["en"]="tabletail", - ["fr"]="queuetableau", + ["fr"]="queuetable", ["it"]="codatabella", ["nl"]="tabelstaart", ["pe"]="دنبالهجدول", @@ -16942,7 +18093,7 @@ return { ["cs"]="tabelator", ["de"]="tabulator", ["en"]="tabulate", - ["fr"]="tabule", + ["fr"]="tabulation", ["it"]="tabulato", ["nl"]="tabulatie", ["pe"]="جدولبندی", @@ -16952,7 +18103,7 @@ return { ["cs"]="tabulatehead", ["de"]="tabulatehead", ["en"]="tabulatehead", - ["fr"]="tetetabule", + ["fr"]="tetetabulation", ["it"]="testatabulato", ["nl"]="tabulatiekop", ["pe"]="سرجدولبندی", @@ -16962,7 +18113,7 @@ return { ["cs"]="tabulatetail", ["de"]="tabulatetail", ["en"]="tabulatetail", - ["fr"]="queuetabule", + ["fr"]="queuetabulation", ["it"]="codatabulato", ["nl"]="tabulatiestaart", ["pe"]="دنبالهجدولبندی", @@ -16972,7 +18123,7 @@ return { ["cs"]="vysoko", ["de"]="lang", ["en"]="tall", - ["fr"]="long", + ["fr"]="grand", ["it"]="alto", ["nl"]="lang", ["pe"]="دراز", @@ -16982,7 +18133,7 @@ return { ["cs"]="strojopis", ["de"]="fernschreiber", ["en"]="teletype", - ["fr"]="teletype", + ["fr"]="caractereterminal", ["it"]="teletype", ["nl"]="teletype", ["pe"]="دورنگاره", @@ -17018,6 +18169,11 @@ return { ["pe"]="متن", ["ro"]="text", }, + ["textnote"]={ + ["en"]="textnote", + ["fr"]="notetexte", + ["nl"]="tekstnoot", + }, ["three"]={ ["cs"]="tri", ["de"]="drei", @@ -17040,6 +18196,7 @@ return { }, ["tight"]={ ["en"]="tight", + ["fr"]="resserre", ["nl"]="krap", }, ["title"]={ @@ -17056,7 +18213,7 @@ return { ["cs"]="toggle", ["de"]="toggle", ["en"]="wissel", - ["fr"]="toggle", + ["fr"]="basculer", ["it"]="toggle", ["nl"]="toggle", ["pe"]="تغییر", @@ -17076,7 +18233,7 @@ return { ["cs"]="vrsek", ["de"]="oben", ["en"]="top", - ["fr"]="sup", + ["fr"]="haut", ["it"]="cima", ["nl"]="boven", ["pe"]="بالا", @@ -17116,7 +18273,7 @@ return { ["cs"]="opis", ["de"]="tippen", ["en"]="type", - ["fr"]="type", + ["fr"]="transcrire", ["it"]="type", ["nl"]="type", ["pe"]="تایپ", @@ -17126,7 +18283,7 @@ return { ["cs"]="typing", ["de"]="tippen", ["en"]="typing", - ["fr"]="typing", + ["fr"]="transcription", ["it"]="typing", ["nl"]="typen", ["pe"]="تایپکردن", @@ -17146,7 +18303,7 @@ return { ["cs"]="podtrzeno", ["de"]="unterstrichen", ["en"]="underbar", - ["fr"]="souslignetout", + ["fr"]="souligner", ["it"]="sottolinea", ["nl"]="onderstreep", ["pe"]="میلهزیر", @@ -17156,7 +18313,7 @@ return { ["cs"]="podtrzeni", ["de"]="unterstreichen", ["en"]="underbars", - ["fr"]="sousligne", + ["fr"]="soulignermots", ["it"]="sottolinee", ["nl"]="onderstrepen", ["pe"]="میلههایزیر", @@ -17164,15 +18321,19 @@ return { }, ["understrike"]={ ["en"]="understrike", + ["fr"]="soubarrer", }, ["understrikes"]={ ["en"]="understrikes", + ["fr"]="soubarrermots", }, ["unframed"]={ ["en"]="unframed", + ["fr"]="desencadre", }, ["unicode"]={ ["en"]="unicode", + ["fr"]="unicode", }, ["unit"]={ ["cs"]="jednotka", @@ -17208,7 +18369,7 @@ return { ["cs"]="rozbalene", ["de"]="ungepackt", ["en"]="unpacked", - ["fr"]="degroupe", + ["fr"]="avecespaceentreitem", ["it"]="unpacked", ["nl"]="vanelkaar", ["pe"]="غیرفشرده", @@ -17216,6 +18377,7 @@ return { }, ["up"]={ ["en"]="up", + ["fr"]="enhaut", ["nl"]="omhoog", }, ["url"]={ @@ -17232,7 +18394,7 @@ return { ["cs"]="uzito", ["de"]="verwende", ["en"]="used", - ["fr"]="used", + ["fr"]="utilise", ["it"]="usato", ["nl"]="gebruikt", ["pe"]="استفادهشده", @@ -17252,7 +18414,7 @@ return { ["cs"]="vertikalne", ["de"]="vertikal", ["en"]="vertical", - ["fr"]="verticale", + ["fr"]="vertical", ["it"]="verticale", ["nl"]="vertikaal", ["pe"]="عمودی", @@ -17290,15 +18452,17 @@ return { }, ["vfenced"]={ ["en"]="vfenced", + ["fr"]="cloturev", }, ["vulgarfraction"]={ ["en"]="vulgarfraction", + ["fr"]="vulgarfraction", }, ["weak"]={ ["cs"]="weak", ["de"]="weak", ["en"]="weak", - ["fr"]="weak", + ["fr"]="faible", ["it"]="weak", ["nl"]="zwak", ["pe"]="هفته", @@ -17376,6 +18540,7 @@ return { }, ["words"]={ ["en"]="words", + ["fr"]="mots", }, ["xml"]={ ["cs"]="xml", @@ -17408,597 +18573,4 @@ return { ["ro"]="da", }, }, - ["setupstrings"]={ - ["cd:buffer"]={ - ["cs"]="buffer", - ["de"]="buffer", - ["en"]="buffer", - ["fr"]="buffer", - ["it"]="buffer", - ["nl"]="buffer", - ["ro"]="buffer", - }, - ["cd:category"]={ - ["cs"]="category", - ["de"]="category", - ["en"]="category", - ["fr"]="category", - ["it"]="category", - ["nl"]="category", - ["ro"]="category", - }, - ["cd:character"]={ - ["cs"]="character", - ["de"]="character", - ["en"]="character", - ["fr"]="character", - ["it"]="character", - ["nl"]="karakter", - ["ro"]="character", - }, - ["cd:color"]={ - ["cs"]="color", - ["de"]="color", - ["en"]="color", - ["fr"]="color", - ["it"]="color", - ["nl"]="kleur", - ["ro"]="color", - }, - ["cd:column"]={ - ["cs"]="column", - ["de"]="column", - ["en"]="column", - ["fr"]="column", - ["it"]="column", - ["nl"]="kolom", - ["ro"]="column", - }, - ["cd:command"]={ - ["cs"]="Befehl", - ["de"]="Befehl", - ["en"]="command", - ["fr"]="Befehl", - ["it"]="Befehl", - ["nl"]="commando", - ["ro"]="Befehl", - }, - ["cd:content"]={ - ["cs"]="content", - ["de"]="content", - ["en"]="content", - ["fr"]="content", - ["it"]="content", - ["nl"]="inhoud", - ["ro"]="content", - }, - ["cd:csname"]={ - ["cs"]="csname", - ["de"]="csname", - ["en"]="csname", - ["fr"]="csname", - ["it"]="csname", - ["nl"]="naam", - ["ro"]="csname", - }, - ["cd:delimiter"]={ - ["cs"]="delimiter", - ["de"]="delimiter", - ["en"]="delimiter", - ["fr"]="delimiter", - ["it"]="delimiter", - ["nl"]="delimiter", - ["ro"]="delimiter", - }, - ["cd:destination"]={ - ["cs"]="destination", - ["de"]="destination", - ["en"]="destination", - ["fr"]="destination", - ["it"]="destination", - ["nl"]="bestemming", - ["ro"]="destination", - }, - ["cd:dimension"]={ - ["cs"]="Dimension", - ["de"]="Dimension", - ["en"]="dimension", - ["fr"]="Dimension", - ["it"]="Dimension", - ["nl"]="maat", - ["ro"]="Dimension", - }, - ["cd:displaymath"]={ - ["cs"]="formula", - ["de"]="formula", - ["en"]="formula", - ["fr"]="formula", - ["it"]="formula", - ["nl"]="formule", - ["ro"]="formula", - }, - ["cd:false"]={ - ["cs"]="false", - ["de"]="false", - ["en"]="false", - ["fr"]="false", - ["it"]="false", - ["nl"]="false", - ["ro"]="false", - }, - ["cd:file"]={ - ["cs"]="file", - ["de"]="file", - ["en"]="file", - ["fr"]="file", - ["it"]="file", - ["nl"]="file", - ["ro"]="file", - }, - ["cd:path"]={ - ["cs"]="path", - ["de"]="path", - ["en"]="path", - ["fr"]="path", - ["it"]="path", - ["nl"]="path", - ["ro"]="path", - }, - ["cd:first"]={ - ["cs"]="first", - ["de"]="first", - ["en"]="first", - ["fr"]="first", - ["it"]="first", - ["nl"]="eerste", - ["ro"]="first", - }, - ["cd:font"]={ - ["cs"]="font", - ["de"]="font", - ["en"]="font", - ["fr"]="font", - ["it"]="font", - ["nl"]="font", - ["ro"]="font", - }, - ["cd:formula"]={ - ["cs"]="Formel", - ["de"]="Formel", - ["en"]="formula", - ["fr"]="Formel", - ["it"]="Formel", - ["nl"]="formule", - ["ro"]="Formel", - }, - ["cd:identifier"]={ - ["cs"]="Name", - ["de"]="Name", - ["en"]="identifier", - ["fr"]="Name", - ["it"]="Name", - ["nl"]="naam", - ["ro"]="Name", - }, - ["cd:index"]={ - ["cs"]="entry", - ["de"]="entry", - ["en"]="entry", - ["fr"]="entry", - ["it"]="entry", - ["nl"]="ingang", - ["ro"]="entry", - }, - ["cd:inherits"]={ - ["cs"]="inherits", - ["de"]="inherits", - ["en"]="inherits", - ["fr"]="inherits", - ["it"]="inherits", - ["nl"]="erft", - ["ro"]="inherits", - }, - ["cd:key"]={ - ["cs"]="key", - ["de"]="key", - ["en"]="key", - ["fr"]="key", - ["it"]="key", - ["nl"]="parameter", - ["ro"]="key", - }, - ["cd:language"]={ - ["cs"]="sprache", - ["de"]="sprache", - ["en"]="language", - ["fr"]="sprache", - ["it"]="sprache", - ["nl"]="taal", - ["ro"]="sprache", - }, - ["cd:last"]={ - ["cs"]="last", - ["de"]="last", - ["en"]="last", - ["fr"]="last", - ["it"]="last", - ["nl"]="laatste", - ["ro"]="last", - }, - ["cd:list"]={ - ["cs"]="Liste", - ["de"]="Liste", - ["en"]="list", - ["fr"]="Liste", - ["it"]="Liste", - ["nl"]="lijst", - ["ro"]="Liste", - }, - ["cd:lpath"]={ - ["cs"]="lpath", - ["de"]="lpath", - ["en"]="lpath", - ["fr"]="lpath", - ["it"]="lpath", - ["nl"]="lpath", - ["ro"]="lpath", - }, - ["cd:luafunction"]={ - ["cs"]="luafunction", - ["de"]="luafunction", - ["en"]="luafunction", - ["fr"]="luafunction", - ["it"]="luafunction", - ["nl"]="luafunction", - ["ro"]="luafunction", - }, - ["cd:mark"]={ - ["cs"]="Beschriftung", - ["de"]="Beschriftung", - ["en"]="mark", - ["fr"]="Beschriftung", - ["it"]="Beschriftung", - ["nl"]="markering", - ["ro"]="Beschriftung", - }, - ["cd:marking"]={ - ["cs"]="marking", - ["de"]="marking", - ["en"]="marking", - ["fr"]="marking", - ["it"]="marking", - ["nl"]="markering", - ["ro"]="marking", - }, - ["cd:math"]={ - ["cs"]="formula", - ["de"]="formula", - ["en"]="formula", - ["fr"]="formula", - ["it"]="formula", - ["nl"]="formule", - ["ro"]="formula", - }, - ["cd:matrix"]={ - ["cs"]="n*m", - ["de"]="n*m", - ["en"]="n*m", - ["fr"]="n*m", - ["it"]="n*m", - ["nl"]="n*m", - ["ro"]="n*m", - }, - ["cd:name"]={ - ["cs"]="Name", - ["de"]="Name", - ["en"]="name", - ["fr"]="Name", - ["it"]="Name", - ["nl"]="naam", - ["ro"]="Name", - }, - ["cd:node"]={ - ["cs"]="node", - ["de"]="node", - ["en"]="node", - ["fr"]="node", - ["it"]="node", - ["nl"]="node", - ["ro"]="node", - }, - ["cd:nothing"]={ - ["cs"]="empty", - ["de"]="empty", - ["en"]="empty", - ["fr"]="empty", - ["it"]="empty", - ["nl"]="leeg", - ["ro"]="empty", - }, - ["cd:number"]={ - ["cs"]="Nummer", - ["de"]="Nummer", - ["en"]="number", - ["fr"]="Nummer", - ["it"]="Nummer", - ["nl"]="getal", - ["ro"]="Nummer", - }, - ["cd:optional"]={ - ["cs"]="opt", - ["de"]="opt", - ["en"]="opt", - ["fr"]="opt", - ["it"]="opt", - ["nl"]="opt", - ["ro"]="opt", - }, - ["cd:plural"]={ - ["cs"]="plural", - ["de"]="plural", - ["en"]="plural", - ["fr"]="plural", - ["it"]="plural", - ["nl"]="naam", - ["ro"]="plural", - }, - ["cd:position"]={ - ["cs"]="position", - ["de"]="position", - ["en"]="position", - ["fr"]="position", - ["it"]="position", - ["nl"]="positie", - ["ro"]="position", - }, - ["cd:processor"]={ - ["cs"]="processor", - ["de"]="processor", - ["en"]="processor", - ["fr"]="processor", - ["it"]="processor", - ["nl"]="verwerker", - ["ro"]="processor", - }, - ["cd:reference"]={ - ["cs"]="reference", - ["de"]="reference", - ["en"]="reference", - ["fr"]="reference", - ["it"]="reference", - ["nl"]="verwijzing", - ["ro"]="reference", - }, - ["cd:row"]={ - ["cs"]="row", - ["de"]="row", - ["en"]="row", - ["fr"]="row", - ["it"]="row", - ["nl"]="rij", - ["ro"]="row", - }, - ["cd:section"]={ - ["cs"]="Abschnitt", - ["de"]="Abschnitt", - ["en"]="section", - ["fr"]="Abschnitt", - ["it"]="Abschnitt", - ["nl"]="sectie", - ["ro"]="Abschnitt", - }, - ["cd:sectionblock"]={ - ["cs"]="sectionblock", - ["de"]="sectionblock", - ["en"]="sectionblock", - ["fr"]="sectionblock", - ["it"]="sectionblock", - ["nl"]="sectieblok", - ["ro"]="sectionblock", - }, - ["cd:see"]={ - ["cs"]="siehe", - ["de"]="siehe", - ["en"]="see", - ["fr"]="siehe", - ["it"]="siehe", - ["nl"]="zie", - ["ro"]="siehe", - }, - ["cd:setup"]={ - ["cs"]="setup", - ["de"]="setup", - ["en"]="setup", - ["fr"]="setup", - ["it"]="setup", - ["nl"]="setup", - ["ro"]="setup", - }, - ["cd:singular"]={ - ["cs"]="singular", - ["de"]="singular", - ["en"]="singular", - ["fr"]="singular", - ["it"]="singular", - ["nl"]="naam", - ["ro"]="singular", - }, - ["cd:style"]={ - ["cs"]="style", - ["de"]="style", - ["en"]="style", - ["fr"]="style", - ["it"]="style", - ["nl"]="letter", - ["ro"]="style", - }, - ["cd:template"]={ - ["cs"]="template", - ["de"]="template", - ["en"]="template", - ["fr"]="template", - ["it"]="template", - ["nl"]="sjabloon", - ["ro"]="template", - }, - ["cd:text"]={ - ["cs"]="Text", - ["de"]="Text", - ["en"]="text", - ["fr"]="Text", - ["it"]="Text", - ["nl"]="tekst", - ["ro"]="Text", - }, - ["cd:title"]={ - ["cs"]="Setup", - ["de"]="Setup", - ["en"]="setup", - ["fr"]="Setup", - ["it"]="Setup", - ["nl"]="setup", - ["ro"]="Setup", - }, - ["cd:triplet"]={ - ["cs"]="triplet", - ["de"]="triplet", - ["en"]="triplet", - ["fr"]="triplet", - ["it"]="triplet", - ["nl"]="triplet", - ["ro"]="triplet", - }, - ["cd:true"]={ - ["cs"]="true", - ["de"]="true", - ["en"]="true", - ["fr"]="true", - ["it"]="true", - ["nl"]="true", - ["ro"]="true", - }, - ["cd:url"]={ - ["cs"]="url", - ["de"]="url", - ["en"]="url", - ["fr"]="url", - ["it"]="url", - ["nl"]="url", - ["ro"]="url", - }, - ["cd:userdata"]={ - ["cs"]="userdata", - ["de"]="userdata", - ["en"]="userdata", - ["fr"]="userdata", - ["it"]="userdata", - ["nl"]="gebruikersdata", - ["ro"]="userdata", - }, - ["cd:value"]={ - ["cs"]="value", - ["de"]="value", - ["en"]="value", - ["fr"]="value", - ["it"]="value", - ["nl"]="waarde", - ["ro"]="value", - }, - ["cd:word"]={ - ["cs"]="word", - ["de"]="word", - ["en"]="word", - ["fr"]="word", - ["it"]="word", - ["nl"]="woord", - ["ro"]="word", - }, - ["cd:xmlsetup"]={ - ["cs"]="xmlsetup", - ["de"]="xmlsetup", - ["en"]="xmlsetup", - ["fr"]="xmlsetup", - ["it"]="xmlsetup", - ["nl"]="xmlsetup", - ["ro"]="xmlsetup", - }, - ["cd:sign"] = { en = "[-+]" }, - ["cd:csname-s"] = { en = "\\..." }, - ["cd:csname-l"] = { en = "\\..." }, - ["cd:noargument-s"] = { en = "\\..." }, - ["cd:noargument-l"] = { en = "\\..." }, - ["cd:oneargument"] = { en = "\\...#1" }, - ["cd:twoarguments"] = { en = "\\...#1#2" }, - ["cd:threearguments"] = { en = "\\...#1#2#3" }, - ["cd:braces-s"] = { en = "{...}", lua = '"..."' }, - ["cd:braces-l"] = { en = "{...,...}", lua = '".. ... .."' }, - ["cd:brackets-s"] = { en = "[...]", lua = "{ ... }" }, - ["cd:brackets-l"] = { en = "[...,...]", lua = "{..., ...}" }, - ["cd:parenthesis-s"] = { en = "(...)" }, - ["cd:parenthesis-l"] = { en = "(...,...)" }, - ["cd:index-s"] = { en = "{...}" }, - ["cd:index-l"] = { en = "{..+...+..}" }, - ["cd:math-s"] = { en = "$...$" }, - ["cd:math-l"] = { en = "$...$" }, - ["cd:inlinemath-s"] = { en = "$...$" }, - ["cd:inlinemath-l"] = { en = "$...$" }, - ["cd:displaymath-s"] = { en = "$$...$$" }, - ["cd:displaymath-l"] = { en = "$$...$$" }, - ["cd:template-s"] = { en = "[|...|]" }, - ["cd:template-l"] = { en = "[|...|...|]" }, - ["cd:twowords-s"] = { en = "[..+..]" }, - ["cd:twowords-l"] = { en = "[..+..]" }, - ["cd:threewords-s"] = { en = "[..+..+..]" }, - ["cd:threewords-l"] = { en = "[..+..+..]" }, - ["cd:angle-s"] = { en = "<<...>>" }, - ["cd:angle-l"] = { en = "<<...>>" }, - ["cd:reference-s"] = { en = "[...]", lua = "{ ... }" }, - ["cd:reference-l"] = { en = "[...,...]", lua = "{..., ...}" }, - ["cd:position-s"] = { en = "(...)" }, - ["cd:position-l"] = { en = "(...,...)" }, - ["cd:triplet-s"] = { en = "[x:y:z]" }, - ["cd:triplet-l"] = { en = "[x:y:z,..]" }, - ["cd:word-s"] = { en = "{...}", lua = '"..."' }, - ["cd:word-l"] = { en = "{.. ... ..}", lua = '".. ... .."' }, - ["cd:content-s"] = { en = "{...}", lua = '"..."' }, - ["cd:content-l"] = { en = "{.. ... ..}", lua = '".. ... .."' }, - ["cd:textual-s"] = { en = "..." }, - ["cd:textual-l"] = { en = ".. ... .." }, - ["cd:none-s"] = { en = "..." }, - ["cd:none-l"] = { en = ".. ... .." }, - ["cd:macro-s"] = { en = "\\... " }, - ["cd:macro-l"] = { en = "\\... " }, - ["cd:to-s"] = { en = "\\to " }, - ["cd:to-l"] = { en = "\\to " }, - ["cd:destination-s"] = { en = "[{..[ref]}]" }, - ["cd:destination-l"] = { en = "[..,{..[ref,..]},..]" }, - ["cd:nothing-s"] = { en = "..." }, - ["cd:nothing-l"] = { en = "..." }, - ["cd:file-s"] = { en = " ... " }, - ["cd:file-l"] = { en = " ... " }, - ["cd:assignment-s"] = { en = "[..=..]", lua = "{ ..=.. } " }, - ["cd:assignment-l"] = { en = "[..,..=..,..]", lua = "{ ..,..=..,.. } " }, - ["cd:assignmentbraces-s"] = { en = "{..=..}" }, - ["cd:assignmentbraces-l"] = { en = "{..,..=..,..}" }, - ["cd:assignmentbrackets-s"] = { en = "[..=..]", lua = "{ ..=.. } " }, - ["cd:assignmentbrackets-l"] = { en = "[..,..=..,..]", lua = "{ ..,..=..,.. } " }, - ["cd:assignmentparentheses-s"] = { en = "(..=..)" }, - ["cd:assignmentparentheses-l"] = { en = "(..,..=..,..)" }, - ["cd:apply-s"] = { en = "[..=>..]" }, - ["cd:apply-l"] = { en = "[..,..=>..,..]" }, - ["cd:if-s"] = { en = "\\if... " }, - ["cd:if-l"] = { en = "\\if... " }, - ["cd:case-s"] = { en = "\\case " }, - ["cd:case-l"] = { en = "\\case " }, - ["cd:else-s"] = { en = "\\else " }, - ["cd:else-l"] = { en = "\\else " }, - ["cd:or-s"] = { en = "\\or " }, - ["cd:or-l"] = { en = "\\or " }, - ["cd:fi-s"] = { en = "\\fi " }, - ["cd:fi-l"] = { en = "\\fi " }, - ["cd:par-s"] = { en = "\\par " }, - ["cd:par-l"] = { en = "\\par " }, - ["cd:sep-s"] = { en = "\\" }, - ["cd:sep-l"] = { en = "\\" }, - } } diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua index b0d2bf2fc..b2abb0cc9 100644 --- a/tex/context/base/mkiv/mult-low.lua +++ b/tex/context/base/mkiv/mult-low.lua @@ -188,7 +188,7 @@ return { "sixthargumentfalse", "sixthargumenttrue", "seventhargumentfalse", "seventhargumenttrue", -- - "vkern", "hkern", + "vkern", "hkern", "vpenalty", "hpenalty", -- "doglobal", "dodoglobal", "redoglobal", "resetglobal", -- diff --git a/tex/context/base/mkiv/node-aux.lua b/tex/context/base/mkiv/node-aux.lua index 88acdf3c5..4df41d61b 100644 --- a/tex/context/base/mkiv/node-aux.lua +++ b/tex/context/base/mkiv/node-aux.lua @@ -22,7 +22,6 @@ local hlist_code = nodecodes.hlist local vlist_code = nodecodes.vlist local attributelist_code = nodecodes.attributelist -- temporary local localpar_code = nodecodes.localpar -local ligatureglyph_code = nodes.glyphcodes.ligature local nuts = nodes.nuts local tonut = nuts.tonut @@ -48,7 +47,6 @@ local setlink = nuts.setlink local setlist = nuts.setlist local setnext = nuts.setnext local setprev = nuts.setprev -local setcomponents = nuts.setcomponents local setattrlist = nuts.setattrlist local traversers = nuts.traversers @@ -382,162 +380,6 @@ function nodes.rehpack(n,...) rehpack(tonut(n),...) end -if CONTEXTLMTXMODE > 0 then - - local fastcopy = table.fastcopy - local getprop = nuts.getprop - local setprop = nuts.setprop - - local function set_components(base,list) - local t = { } - local n = 0 - while list do - local char = isglyph(list) - if char then - n = n + 1 - t[n] = char - end - list = getnext(list) - end - setprop(base,"components",n > 0 and t or false) - end - - local function get_components(base) - return getprop(base,"components") - end - - local function copy_no_components(base) - local copy = copy_node(base) - setprop(copy,"components",false) -- no metatable lookup! - return copy - end - - local function copy_only_glyphs(base) - local t = getprop(base,"components") -- also metatable - if t then - return fastcopy(t) - end - end - - local function do_count(t,marks) - local n = 0 - if t then - for i=1,#t do - local c = t[i] - if type(c) == "table" then - n = n + do_count(t,marks) - elseif not marks[c] then - n = n + 1 - else - --marks don't count - end - end - end - return n - end - - -- start is a mark and we need to keep that one - - local done = false - - local function count_components(base,marks) - local char = isglyph(base) - if char then - if getsubtype(base) == ligatureglyph_code then - if not done then - logs.report("fonts","!") - logs.report("fonts","! check count_components with mkiv !") - logs.report("fonts","!") - done = true - end - local t = getprop(base,"components") - if t then - return do_count(t,marks) - end - elseif not marks[char] then - return 1 - end - end - return 0 - end - - nuts.set_components = set_components - nuts.get_components = get_components - nuts.copy_only_glyphs = copy_only_glyphs - nuts.copy_no_components = copy_no_components - nuts.count_components = count_components - -else - - local get_components = node.direct.getcomponents - local set_components = node.direct.setcomponents - - local function copy_no_components(g,copyinjection) - local components = get_components(g) - if components then - set_components(g) - local n = copy_node(g) - if copyinjection then - copyinjection(n,g) - end - set_components(g,components) - -- maybe also upgrade the subtype but we don't use it anyway - return n - else - local n = copy_node(g) - if copyinjection then - copyinjection(n,g) - end - return n - end - end - - local function copy_only_glyphs(current) - local head = nil - local previous = nil - for n in nextglyph, current do - n = copy_node(n) - if head then - setlink(previous,n) - else - head = n - end - previous = n - end - return head - end - - -- start is a mark and we need to keep that one - - local function count_components(start,marks) - local char = isglyph(start) - if char then - if getsubtype(start) == ligatureglyph_code then - local n = 0 - local components = get_components(start) - while components do - n = n + count_components(components,marks) - components = getnext(components) - end - return n - elseif not marks[char] then - return 1 - end - end - return 0 - end - - nuts.set_components = set_components - nuts.get_components = get_components - nuts.copy_only_glyphs = copy_only_glyphs - nuts.copy_no_components = copy_no_components - nuts.count_components = count_components - -end - -nuts.setcomponents = function() report_error("unsupported: %a","setcomponents") end -nuts.getcomponents = function() report_error("unsupported: %a","getcomponents") end - do local localparcodes = nodes.localparcodes diff --git a/tex/context/base/mkiv/node-cmp.lua b/tex/context/base/mkiv/node-cmp.lmt index e9e7e266d..e9e7e266d 100644 --- a/tex/context/base/mkiv/node-cmp.lua +++ b/tex/context/base/mkiv/node-cmp.lmt diff --git a/tex/context/base/mkiv/node-gcm.lmt b/tex/context/base/mkiv/node-gcm.lmt new file mode 100644 index 000000000..2b5b24369 --- /dev/null +++ b/tex/context/base/mkiv/node-gcm.lmt @@ -0,0 +1,107 @@ +if not modules then modules = { } end modules ['node-gmc'] = { + version = 1.001, + comment = "companion to node-ini.mkiv", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files" +} + +local type, tostring = type, tostring + +local nodes = nodes +local ligature_code = nodes.glyphcodes.ligature +local nuts = nodes.nuts + +local getnext = nuts.getnext +local getsubtype = nuts.getsubtype +local copy_node = nuts.copy +local count = nuts.count +local isglyph = nuts.isglyph +local getprop = nuts.getprop +local setprop = nuts.setprop + +local fastcopy = table.fastcopy + +local report_error = logs.reporter("node-aux:error") + +local function set_components(base,list) + local t = { } + local n = 0 + while list do + local char = isglyph(list) + if char then + n = n + 1 + t[n] = char + end + list = getnext(list) + end + setprop(base,"components",n > 0 and t or false) +end + +local function get_components(base) + return getprop(base,"components") +end + +local function copy_no_components(base) + local copy = copy_node(base) + setprop(copy,"components",false) -- no metatable lookup! + return copy +end + +local function copy_only_glyphs(base) + local t = getprop(base,"components") -- also metatable + if t then + return fastcopy(t) + end +end + +local function do_count(t,marks) + local n = 0 + if t then + for i=1,#t do + local c = t[i] + if type(c) == "table" then + n = n + do_count(t,marks) + elseif not marks[c] then + n = n + 1 + else + --marks don't count + end + end + end + return n +end + +-- start is a mark and we need to keep that one + +local done = false + +local function count_components(base,marks) + local char = isglyph(base) + if char then + if getsubtype(base) == ligature_code then + if not done then + logs.report("fonts","!") + logs.report("fonts","! check count_components with mkiv !") + logs.report("fonts","!") + done = true + end + local t = getprop(base,"components") + if t then + return do_count(t,marks) + end + elseif not marks[char] then + return 1 + end + end + return 0 +end + +nuts.set_components = set_components +nuts.get_components = get_components +nuts.copy_only_glyphs = copy_only_glyphs +nuts.copy_no_components = copy_no_components +nuts.count_components = count_components + +nuts.setcomponents = function() report_error("unsupported: %a","setcomponents") end +nuts.getcomponents = function() report_error("unsupported: %a","getcomponents") end diff --git a/tex/context/base/mkiv/node-gcm.lua b/tex/context/base/mkiv/node-gcm.lua new file mode 100644 index 000000000..1085f637f --- /dev/null +++ b/tex/context/base/mkiv/node-gcm.lua @@ -0,0 +1,91 @@ +if not modules then modules = { } end modules ['node-gmc'] = { + version = 1.001, + comment = "companion to node-ini.mkiv", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files" +} + +local type, tostring = type, tostring + +local nodes = nodes +local nodecodes = nodes.nodecodes +local ligature_code = nodes.glyphcodes.ligature +local nuts = nodes.nuts + +local getnext = nuts.getnext +local getsubtype = nuts.getsubtype +local getprev = nuts.getprev +local setlink = nuts.setlink +local nextglyph = nuts.traversers.glyph +local copy_node = nuts.copy +local isglyph = nuts.isglyph + +local report_error = logs.reporter("node-aux:error") + +local get_components = node.direct.getcomponents +local set_components = node.direct.setcomponents + +local function copy_no_components(g,copyinjection) + local components = get_components(g) + if components then + set_components(g) + local n = copy_node(g) + if copyinjection then + copyinjection(n,g) + end + set_components(g,components) + -- maybe also upgrade the subtype but we don't use it anyway + return n + else + local n = copy_node(g) + if copyinjection then + copyinjection(n,g) + end + return n + end +end + +local function copy_only_glyphs(current) + local head = nil + local previous = nil + for n in nextglyph, current do + n = copy_node(n) + if head then + setlink(previous,n) + else + head = n + end + previous = n + end + return head +end + +-- start is a mark and we need to keep that one + +local function count_components(start,marks) + local char = isglyph(start) + if char then + if getsubtype(start) == ligature_code then + local n = 0 + local components = get_components(start) + while components do + n = n + count_components(components,marks) + components = getnext(components) + end + return n + elseif not marks[char] then + return 1 + end + end + return 0 +end + +nuts.set_components = set_components +nuts.get_components = get_components +nuts.copy_only_glyphs = copy_only_glyphs +nuts.copy_no_components = copy_no_components +nuts.count_components = count_components + +nuts.setcomponents = function() report_error("unsupported: %a","setcomponents") end +nuts.getcomponents = function() report_error("unsupported: %a","getcomponents") end diff --git a/tex/context/base/mkiv/node-ini.mkiv b/tex/context/base/mkiv/node-ini.mkiv index 5bf53cd2d..231a8524e 100644 --- a/tex/context/base/mkiv/node-ini.mkiv +++ b/tex/context/base/mkiv/node-ini.mkiv @@ -18,7 +18,7 @@ \newcount\filterstate \filterstate\plusone % hm, public \ifcase\contextlmtxmode \else - \registerctxluafile{node-cmp}{} + \registerctxluafile{node-cmp}{autosuffix} \fi \registerctxluafile{node-ini}{} @@ -27,6 +27,7 @@ \registerctxluafile{node-res}{} %registerctxluafile{node-ppt}{} % experimental, not used so probably useless \registerctxluafile{node-aux}{} +\registerctxluafile{node-gcm}{autosuffix} \registerctxluafile{node-tst}{} \registerctxluafile{node-tra}{} % we might split it off (module) \registerctxluafile{node-snp}{} diff --git a/tex/context/base/mkiv/pack-ori.lua b/tex/context/base/mkiv/pack-ori.lmt index a786b19ef..a786b19ef 100644 --- a/tex/context/base/mkiv/pack-ori.lua +++ b/tex/context/base/mkiv/pack-ori.lmt diff --git a/tex/context/base/mkiv/pack-ori.mkxl b/tex/context/base/mkiv/pack-ori.mkxl index 061768f94..5b2af1c4f 100644 --- a/tex/context/base/mkiv/pack-ori.mkxl +++ b/tex/context/base/mkiv/pack-ori.mkxl @@ -13,7 +13,7 @@ \writestatus{loading}{ConTeXt Packaging Macros / Anchoring} -\registerctxluafile{pack-ori}{} +\registerctxluafile{pack-ori}{autosuffix} \unprotect diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex 9c05f8372..c0a7760c0 100644 --- a/tex/context/base/mkiv/status-files.pdf +++ b/tex/context/base/mkiv/status-files.pdf diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf Binary files differindex 7f84d7523..84367c744 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkiv/supp-ran.lua b/tex/context/base/mkiv/supp-ran.lua index 08889edf3..03da4262f 100644 --- a/tex/context/base/mkiv/supp-ran.lua +++ b/tex/context/base/mkiv/supp-ran.lua @@ -80,7 +80,8 @@ end -- maybe stack local function pushrandomseed() - insert(stack,last) + -- insert(stack,last) -- doesn't work okay + insert(stack,randomseed(last) or last) if trace_random or trace_details then report_system("pushing seed %s",last) end @@ -141,10 +142,9 @@ utilities.randomizer = { implement { name = "getrandomnumber", actions = { getrandomnumber, context }, arguments = { "integer", "integer" } } implement { name = "getrandomdimen", actions = { getrandomnumber, context }, arguments = { "dimen", "dimen" } } implement { name = "getrandomfloat", actions = { getrandomnumber, context }, arguments = { "number", "number" } } ---------- { name = "getmprandomnumber", actions = { getmprandomnumber, context } } -implement { name = "setrandomseed", actions = { setrandomseed }, arguments = "integer" } -implement { name = "getrandomseed", actions = { getrandomseed, context } } -implement { name = "pushrandomseed", actions = { pushrandomseed } } -implement { name = "poprandomseed", actions = { poprandomseed } } -implement { name = "reuserandomseed", actions = { reuserandomseed } } +implement { name = "getrandomseed", actions = { getrandomseed, context } } +implement { name = "setrandomseed", actions = setrandomseed, arguments = "integer" } +implement { name = "pushrandomseed", actions = pushrandomseed, public = true, } +implement { name = "poprandomseed", actions = poprandomseed, public = true, } +implement { name = "reuserandomseed", actions = reuserandomseed, public = true, } diff --git a/tex/context/base/mkiv/supp-ran.mkiv b/tex/context/base/mkiv/supp-ran.mkiv index 79efde79c..a616dd54f 100644 --- a/tex/context/base/mkiv/supp-ran.mkiv +++ b/tex/context/base/mkiv/supp-ran.mkiv @@ -13,22 +13,31 @@ \writestatus{loading}{ConTeXt Support Macros / Random Number Generation} -%D This module is downward compatible in the sense that we've kept -%D the user interface (which uses intermediate variables). +%D This module is downward compatible in the sense that we've kept the user +%D interface (which uses intermediate variables). +%D +%D \starttyping +%D \type{new}: \dorecurse{10}{\randomnumber{1}{100} }\par +%D \setrandomseed{24}\type{set}: \dorecurse{10}{\randomnumber{1}{100} }\par +%D \setrandomseed{24}\type{set}: \dorecurse{10}{\randomnumber{1}{100} }\par +%D \setrandomseed{24}\type{set}: \dorecurse{10}{\randomnumber{1}{100} }\par +%D \pushrandomseed \type{new}: \dorecurse{10}{\randomnumber{1}{100} }\par +%D \poprandomseed \type{old}: \dorecurse{10}{\randomnumber{1}{100} }\par +%D \type{new}: \dorecurse{10}{\randomnumber{1}{100} }\par +%D \stoptyping \registerctxluafile{supp-ran}{} \unprotect - \protected\def\getrandomcount #1#2#3{#1=\clf_getrandomnumber\numexpr#2\relax\numexpr#3\relax\relax} \protected\def\getrandomdimen #1#2#3{#1=\clf_getrandomdimen\dimexpr#2\relax\dimexpr#3\relax\scaledpoint\relax} \protected\def\getrandomnumber#1#2#3{\edef#1{\clf_getrandomnumber\numexpr#2\relax\numexpr#3\relax}} \protected\def\getrandomfloat #1#2#3{\edef#1{\clf_getrandomfloat\dimexpr#2\relax\dimexpr#3\relax}} \protected\def\setrandomseed #1{\clf_setrandomseed\numexpr#1\relax} \protected\def\getrandomseed #1{\edef#1{\clf_getrandomseed}} -\protected\def\pushrandomseed {\clf_pushrandomseed} -\protected\def\poprandomseed {\clf_poprandomseed} -\protected\def\reuserandomseed {\clf_reuserandomseed} % within push/pop +%protected\def\pushrandomseed {\clf_pushrandomseed} +%protected\def\poprandomseed {\clf_poprandomseed} +%protected\def\reuserandomseed {\clf_reuserandomseed} % within push/pop \let\freezerandomseed \pushrandomseed \let\defrostrandomseed\poprandomseed @@ -36,4 +45,5 @@ \def\randomnumber #1#2{\clf_getrandomnumber\numexpr#1\relax\numexpr#2\relax} \let\mprandomnumber \clf_getmprandomnumber + \protect \endinput diff --git a/tex/context/base/mkiv/syst-aux.lua b/tex/context/base/mkiv/syst-aux.lua index 4d81c4140..05a070d30 100644 --- a/tex/context/base/mkiv/syst-aux.lua +++ b/tex/context/base/mkiv/syst-aux.lua @@ -14,7 +14,6 @@ if not modules then modules = { } end modules ['syst-aux'] = { local tonumber, next, type = tonumber, next, type local utfsub = utf.sub local P, S, R, C, Cc, Cs, Carg, lpegmatch = lpeg.P, lpeg.S, lpeg.R, lpeg.C, lpeg.Cc, lpeg.Cs, lpeg.Carg, lpeg.match -local next = next local find, formatters = string.find, string.formatters local context = context @@ -840,121 +839,3 @@ implement { public = true, actions = function() getshape("widowpenalties") end, } - -if CONTEXTLMTXMODE > 0 then - - -- This is kind of tricky and might not work for all csnames but as long as we use - -- it in a controlled way, we're okay. The engine implementation might be changed - -- a bit (no need to go through strings, but fetching a cs index and passing that - -- back also takes time). - - -- Another approach is to have the predefined stack operate use private stacks and - -- then the pop doesn't need the cs. But ... we then also need to store stuff in - -- the format so that complicates maters more than I'm willing to do. - - local insert, remove = table.insert, table.remove - - local push_macro = token.push_macro - local pop_macro = token.pop_macro - local scan_csname = token.scan_csname - - local stack = table.setmetatableindex("table") - - local report = logs.reporter("system","macrostack") - - local function pushmacro(name,global) - local s = push_macro(name,global) - if s then - insert(stack[name],s) - else - report("no macro %a",name) - insert(stack[name],false) - end - end - - local function popmacro(name) - local s = remove(stack[name]) - if s then - pop_macro(s) - else - -- error - end - end - - tokens.pushmacro = pushmacro - tokens.popmacro = popmacro - - interfaces.implement { - name = "localpushmacro", - public = true, - protected = true, - actions = function() - pushmacro(scan_csname()) - end - } - - interfaces.implement { - name = "globalpushmacro", - public = true, - protected = true, - actions = function() - pushmacro(scan_csname(),true) - end - } - - interfaces.implement { - name = "localpopmacro", - public = true, - protected = true, - actions = function() - popmacro(scan_csname()) - end - } - - interfaces.implement { - name = "globalpopmacro", - public = true, - protected = true, - actions = function() - popmacro(scan_csname()) - end - } - - interfaces.implement { - name = "showmacrostack", - public = true, - protected = true, - actions = function() - local n = scan_csname() - local s = stack[n] - local m = #s - report("%s : %i stack slots used",n,m) - for i=1,m do - report("% 3i %S",i,s[i]) - end - end - } - -end - --- For the moment here: - -if CONTEXTLMTXMODE > 0 then - - local create = token.create - local gobble = token.gobble - - implement { - name = "gobblenested", - public = true, - protected = true, - arguments = "3 strings", - actions = function(start,stop,command) - gobble(create(start),create(stop)) - if command then - context[command]() - end - end - } - -end diff --git a/tex/context/base/mkiv/syst-aux.mkiv b/tex/context/base/mkiv/syst-aux.mkiv index df74fb44f..1892605d6 100644 --- a/tex/context/base/mkiv/syst-aux.mkiv +++ b/tex/context/base/mkiv/syst-aux.mkiv @@ -12,6 +12,7 @@ %C details. \registerctxluafile{syst-aux}{} +\registerctxluafile{syst-mac}{} % A dedicated primitive \ifvoidmacro\cs == \ifx\cs\empty is some 10% faster but % probably not that noticeable in practice. An \ifvoidtoks might make sense but we diff --git a/tex/context/base/mkiv/syst-aux.mkxl b/tex/context/base/mkiv/syst-aux.mkxl index a85560989..42424dc75 100644 --- a/tex/context/base/mkiv/syst-aux.mkxl +++ b/tex/context/base/mkiv/syst-aux.mkxl @@ -12,6 +12,7 @@ %C details. \registerctxluafile{syst-aux}{} +\registerctxluafile{syst-mac}{autosuffix} %D This file is a follow up in \type {syst-aux.mkii} and \type {syst-aux.mkiv} where %D you can find some more pure \TEX\ or \LUATEX\ variants. There are quite some diff --git a/tex/context/base/mkiv/syst-ini.mkiv b/tex/context/base/mkiv/syst-ini.mkiv index acfcf7320..c978eaae5 100644 --- a/tex/context/base/mkiv/syst-ini.mkiv +++ b/tex/context/base/mkiv/syst-ini.mkiv @@ -997,8 +997,11 @@ %D Sometimes kerns make more sense than glue but we need to be in the %D right mode: -\protected\def\vkern{\ifhmode\par \fi\kern} -\protected\def\hkern{\ifvmode\dontleavehmode\fi\kern} +\protected\def\vkern {\ifhmode\par \fi\kern} +\protected\def\hkern {\ifvmode\dontleavehmode\fi\kern} + +\protected\def\vpenalty{\ifhmode\par \fi\penalty} +\protected\def\hpenalty{\ifvmode\dontleavehmode\fi\penalty} %D Again a few kind-of-extensions the core. These come from plain \TEX\ but %D are probably not used in \CONTEXT. diff --git a/tex/context/base/mkiv/syst-ini.mkxl b/tex/context/base/mkiv/syst-ini.mkxl index 1aa78f564..b3fe4374c 100644 --- a/tex/context/base/mkiv/syst-ini.mkxl +++ b/tex/context/base/mkiv/syst-ini.mkxl @@ -1009,8 +1009,11 @@ %D Sometimes kerns make more sense than glue but we need to be in the %D right mode: -\protected\def\vkern{\ifhmode\par \fi\kern} -\protected\def\hkern{\ifvmode\dontleavehmode\fi\kern} +\protected\def\vkern {\ifhmode\par \fi\kern} +\protected\def\hkern {\ifvmode\dontleavehmode\fi\kern} + +\protected\def\vpenalty{\ifhmode\par \fi\penalty} +\protected\def\hpenalty{\ifvmode\dontleavehmode\fi\penalty} %D Again a few kind-of-extensions the core. These come from plain \TEX\ but %D are probably not used in \CONTEXT. diff --git a/tex/context/base/mkiv/syst-lua.lmt b/tex/context/base/mkiv/syst-lua.lmt new file mode 100644 index 000000000..018231e30 --- /dev/null +++ b/tex/context/base/mkiv/syst-lua.lmt @@ -0,0 +1,315 @@ +if not modules then modules = { } end modules ['syst-lua'] = { + version = 1.001, + comment = "companion to syst-lua.mkiv", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files" +} + +local load, type, tonumber = load, type, tonumber +local find = string.find +local concat = table.concat +local utfchar = utf.char +local S, C, P, lpegmatch, lpegtsplitat = lpeg.S, lpeg.C, lpeg.P, lpeg.match, lpeg.tsplitat + +local xmath = xmath or math +local xcomplex = xcomplex or { } + +local scan_next = token.scan_next or token.get_next +local scan_cmdchr = token.scan_cmdchr_expanded +local scan_token = token.scan_token + +local get_csname = token.get_csname +----- get_macro = token.get_macro +----- put_next = token.put_next + +local cmd = tokens.commands +local letter_code = cmd.letter +local other_char_code = cmd.other_char +local spacer_code = cmd.spacer +local other_char_code = cmd.other_char +local relax_code = cmd.relax +local register_int_code = cmd.register_int +local internal_int_code = cmd.internal_int +local register_dimen_code = cmd.register_dimen +local internal_dimen_code = cmd.internal_dimen +local register_glue_code = cmd.register_glue +local internal_glue_code = cmd.internal_glue +local register_toks_code = cmd.register_toks +local internal_toks_code = cmd.internal_toks +local char_given_code = cmd.char_given +local math_given_code = cmd.math_given +local xmath_given_code = cmd.xmath_given +local some_item_code = cmd.some_item +----- call_code = cmd.call +----- the_code = cmd.the +----- convert_code = cmd.convert +----- lua_expandable_call_code = cmd.lua_expandable_call + +local getdimen = tex.getdimen +local getglue = tex.getglue +local getcount = tex.getcount +local gettoks = tex.gettoks +local gettex = tex.get + +local context = context +commands = commands or { } +local commands = commands +local context = context +local implement = interfaces.implement +local dimenfactors = number.dimenfactors + +local ctx_protected_cs = context.protected.cs -- more efficient +local ctx_firstoftwoarguments = context.firstoftwoarguments +local ctx_secondoftwoarguments = context.secondoftwoarguments +local ctx_firstofoneargument = context.firstofoneargument +local ctx_gobbleoneargument = context.gobbleoneargument + +implement { -- will be overloaded later + name = "writestatus", + arguments = "2 strings", + actions = logs.status, +} + +function commands.doifelse(b) + if b then + ctx_firstoftwoarguments() + else + ctx_secondoftwoarguments() + end +end + +function commands.doifelsesomething(b) + if b and b ~= "" then + ctx_firstoftwoarguments() + else + ctx_secondoftwoarguments() + end +end + +function commands.doif(b) + if b then + ctx_firstofoneargument() + else + ctx_gobbleoneargument() + end +end + +function commands.doifsomething(b) + if b and b ~= "" then + ctx_firstofoneargument() + else + ctx_gobbleoneargument() + end +end + +function commands.doifnot(b) + if b then + ctx_gobbleoneargument() + else + ctx_firstofoneargument() + end +end + +function commands.doifnotthing(b) + if b and b ~= "" then + ctx_gobbleoneargument() + else + ctx_firstofoneargument() + end +end + +commands.testcase = commands.doifelse -- obsolete + +function commands.boolcase(b) + context(b and 1 or 0) +end + +function commands.doifelsespaces(str) + if find(str,"^ +$") then + ctx_firstoftwoarguments() + else + ctx_secondoftwoarguments() + end +end + +local pattern = lpeg.patterns.validdimen + +function commands.doifelsedimenstring(str) + if lpegmatch(pattern,str) then + ctx_firstoftwoarguments() + else + ctx_secondoftwoarguments() + end +end + +local p_first = C((1-P(",")-P(-1))^0) + +implement { + name = "firstinset", + arguments = "string", + actions = function(str) context(lpegmatch(p_first,str or "")) end, + public = true, +} + +implement { + name = "ntimes", + arguments = { "string", "integer" }, + actions = { string.rep, context } +} + +implement { + name = "execute", + arguments = "string", + actions = os.execute -- wrapped in sandbox +} + +implement { + name = "doifelsesame", + arguments = "2 strings", + actions = function(a,b) + if a == b then + ctx_firstoftwoarguments() + else + ctx_secondoftwoarguments() + end + end +} + +implement { + name = "doifsame", + arguments = "2 strings", + actions = function(a,b) + if a == b then + ctx_firstofoneargument() + else + ctx_gobbleoneargument() + end + end +} + +implement { + name = "doifnotsame", + arguments = "2 strings", + actions = function(a,b) + if a == b then + ctx_gobbleoneargument() + else + ctx_firstofoneargument() + end + end +} + +-- This is a bit of a joke as I never really needed floating point expressions (okay, +-- maybe only with scaling because there one can get numbers that are too large for +-- dimensions to deal with). Of course one can write a parser in \TEX\ speak but then +-- one also needs to implement a bunch of functions. It doesn't pay of so we just +-- stick to the next gimmick. It looks inefficient but performance is actually quite +-- efficient. + +do + + local result = { "return " } + local word = { } + local r = 1 + local w = 0 + + local report = logs.reporter("system","expression") + + local function unexpected(c) + report("unexpected token %a",c) + end + + local function unexpected(c) + report("unexpected token %a",c) + end + + local function expression() + local w = 0 + local r = 1 + while true do + local n, i = scan_cmdchr() + if n == letter_code then + w = w + 1 ; word[w] = utfchar(i) + else + if w > 0 then + -- we could use a metatable for all math, complex and factors + local s = concat(word,"",1,w) + local d = dimenfactors[s] + if d then + r = r + 1 ; result[r] = "*" + r = r + 1 ; result[r] = 1/d + else + if xmath[s] then + r = r + 1 ; result[r] = "xmath." + elseif xcomplex[s] then + r = r + 1 ; result[r] = "xcomplex." + end + r = r + 1 ; result[r] = s + end + w = 0 + end + if n == other_char_code then + r = r + 1 ; result[r] = utfchar(i) + elseif n == spacer_code then + -- r = r + 1 ; result[r] = " " + elseif n == relax_code then + break + elseif n == register_int_code or n == internal_int_code then + r = r + 1 ; result[r] = getcount(i) + elseif n == register_dimen_code or n == internal_dimen_code then + r = r + 1 ; result[r] = getdimen(i) + elseif n == register_glue_code or n == n == register_dimen_code_glue_code then + r = r + 1 ; result[r] = getglue(i) + elseif n == register_toks_code or n == n == register_dimen_code_toks_code then + r = r + 1 ; result[r] = gettoks(i) + elseif n == char_given_code or n == math_given_code or n == xmath_given_code then + r = r + 1 ; result[r] = i + elseif n == some_item_code then + local n = get_csname(t) + if n then + local s = gettex(n) + if s then + r = r + 1 ; result[r] = s + else + unexpected(c) + end + else + unexpected(c) + end + -- elseif n == call_code then + -- local n = get_csname(t) + -- if n then + -- local s = get_macro(n) + -- if s then + -- r = r + 1 ; result[r] = s + -- else + -- unexpected(c) + -- end + -- else + -- unexpected(c) + -- end + -- elseif n == the_code or n == convert_code or n == lua_expandable_call_code then + -- put_next(t) + -- scan_token() -- expands + else + unexpected(c) + end + end + end + local code = concat(result,"",1,r) + local func = load(code) + if type(func) == "function" then + context(func()) + else + report("invalid lua %a",code) + end + end + + implement { + public = true, + name = "expression", + actions = expression, + } + +end diff --git a/tex/context/base/mkiv/syst-lua.lua b/tex/context/base/mkiv/syst-lua.lua index 7e44b9f08..085f75eca 100644 --- a/tex/context/base/mkiv/syst-lua.lua +++ b/tex/context/base/mkiv/syst-lua.lua @@ -6,13 +6,43 @@ if not modules then modules = { } end modules ['syst-lua'] = { license = "see context related readme files" } +local load, type, tonumber = load, type, tonumber +local concat = table.concat +local utfchar = utf.char local find = string.find local S, C, P, lpegmatch, lpegtsplitat = lpeg.S, lpeg.C, lpeg.P, lpeg.match, lpeg.tsplitat -commands = commands or { } -local commands = commands -local context = context -local implement = interfaces.implement +local xmath = xmath or math +local xcomplex = xcomplex or { } + +local cmd = tokens.commands + +local scan_next = token.scan_next or token.get_next +local scan_cmdchr = token.scan_cmdchr_expanded + +local get_command = token.get_command +local get_mode = token.get_mode +local get_index = token.get_index +local get_csname = token.get_csname +local get_macro = token.get_macro + +local put_next = token.put_next + +local scan_token = token.scan_token or token.get_token + +local getdimen = tex.getdimen +local getglue = tex.getglue +local getcount = tex.getcount +local gettoks = tex.gettoks +local gettex = tex.get + +local context = context +local dimenfactors = number.dimenfactors + +commands = commands or { } +local commands = commands +local context = context +local implement = interfaces.implement local ctx_protected_cs = context.protected.cs -- more efficient local ctx_firstoftwoarguments = context.firstoftwoarguments @@ -162,53 +192,20 @@ implement { -- stick to the next gimmick. It looks inefficient but performance is actually quite -- efficient. -local concat = table.concat -local utfchar = utf.char -local load, type, tonumber = load, type, tonumber - -local xmath = xmath or math -local xcomplex = xcomplex or { } - -local cmd = tokens.commands - -local scan_next = token.scan_next or token.get_next -local scan_cmdchr = token.scan_cmdchr_expanded - -local get_command = token.get_command -local get_mode = token.get_mode -local get_index = token.get_index -local get_csname = token.get_csname -local get_macro = token.get_macro - -local put_next = token.put_next - -local scan_token = token.scan_token - -local getdimen = tex.getdimen -local getglue = tex.getglue -local getcount = tex.getcount -local gettoks = tex.gettoks -local gettex = tex.get - -local context = context -local dimenfactors = number.dimenfactors - -local result = { "return " } -local word = { } -local r = 1 -local w = 0 - -local report = logs.reporter("system","expression") +do -local function unexpected(c) - report("unexpected token %a",c) -end + local result = { "return " } + local word = { } + local r = 1 + local w = 0 -local expression + local report = logs.reporter("system","expression") -if CONTEXTLMTXMODE == 0 then + local function unexpected(c) + report("unexpected token %a",c) + end - expression = function() + local function expression() local w = 0 local r = 1 while true do @@ -292,120 +289,10 @@ if CONTEXTLMTXMODE == 0 then end end -else - - local letter_code = cmd.letter - local other_char_code = cmd.other_char - local spacer_code = cmd.spacer - local other_char_code = cmd.other_char - local relax_code = cmd.relax - local register_int_code = cmd.register_int - local internal_int_code = cmd.internal_int - local register_dimen_code = cmd.register_dimen - local internal_dimen_code = cmd.internal_dimen - local register_glue_code = cmd.register_glue - local internal_glue_code = cmd.internal_glue - local register_toks_code = cmd.register_toks - local internal_toks_code = cmd.internal_toks - local char_given_code = cmd.char_given - local math_given_code = cmd.math_given - local xmath_given_code = cmd.xmath_given - local some_item_code = cmd.some_item - -- local call_code = cmd.call - -- local the_code = cmd.the - -- local convert_code = cmd.convert - -- local lua_expandable_call_code = cmd.lua_expandable_call - - local function unexpected(c) - report("unexpected token %a",c) - end - - expression = function() - local w = 0 - local r = 1 - while true do - local n, i = scan_cmdchr() - if n == letter_code then - w = w + 1 ; word[w] = utfchar(i) - else - if w > 0 then - -- we could use a metatable for all math, complex and factors - local s = concat(word,"",1,w) - local d = dimenfactors[s] - if d then - r = r + 1 ; result[r] = "*" - r = r + 1 ; result[r] = 1/d - else - if xmath[s] then - r = r + 1 ; result[r] = "xmath." - elseif xcomplex[s] then - r = r + 1 ; result[r] = "xcomplex." - end - r = r + 1 ; result[r] = s - end - w = 0 - end - if n == other_char_code then - r = r + 1 ; result[r] = utfchar(i) - elseif n == spacer_code then - -- r = r + 1 ; result[r] = " " - elseif n == relax_code then - break - elseif n == register_int_code or n == internal_int_code then - r = r + 1 ; result[r] = getcount(i) - elseif n == register_dimen_code or n == internal_dimen_code then - r = r + 1 ; result[r] = getdimen(i) - elseif n == register_glue_code or n == n == register_dimen_code_glue_code then - r = r + 1 ; result[r] = getglue(i) - elseif n == register_toks_code or n == n == register_dimen_code_toks_code then - r = r + 1 ; result[r] = gettoks(i) - elseif n == char_given_code or n == math_given_code or n == xmath_given_code then - r = r + 1 ; result[r] = i - elseif n == some_item_code then - local n = get_csname(t) - if n then - local s = gettex(n) - if s then - r = r + 1 ; result[r] = s - else - unexpected(c) - end - else - unexpected(c) - end - -- elseif n == call_code then - -- local n = get_csname(t) - -- if n then - -- local s = get_macro(n) - -- if s then - -- r = r + 1 ; result[r] = s - -- else - -- unexpected(c) - -- end - -- else - -- unexpected(c) - -- end - -- elseif n == the_code or n == convert_code or n == lua_expandable_call_code then - -- put_next(t) - -- scan_token() -- expands - else - unexpected(c) - end - end - end - local code = concat(result,"",1,r) - local func = load(code) - if type(func) == "function" then - context(func()) - else - report("invalid lua %a",code) - end - end + implement { + public = true, + name = "expression", + actions = expression, + } end - -implement { - public = true, - name = "expression", - actions = expression, -} diff --git a/tex/context/base/mkiv/syst-lua.mkxl b/tex/context/base/mkiv/syst-lua.mkxl index 89d5ed6dd..d04e78392 100644 --- a/tex/context/base/mkiv/syst-lua.mkxl +++ b/tex/context/base/mkiv/syst-lua.mkxl @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\registerctxluafile{syst-lua}{} +\registerctxluafile{syst-lua}{autosuffix} \unprotect diff --git a/tex/context/base/mkiv/syst-mac.lmt b/tex/context/base/mkiv/syst-mac.lmt new file mode 100644 index 000000000..6fc8df2a4 --- /dev/null +++ b/tex/context/base/mkiv/syst-mac.lmt @@ -0,0 +1,117 @@ +if not modules then modules = { } end modules ['syst-mac'] = { + version = 1.001, + comment = "companion to syst-aux.mkiv", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files" +} + +-- This is kind of tricky and might not work for all csnames but as long as we use +-- it in a controlled way, we're okay. The engine implementation might be changed +-- a bit (no need to go through strings, but fetching a cs index and passing that +-- back also takes time). + +-- Another approach is to have the predefined stack operate use private stacks and +-- then the pop doesn't need the cs. But ... we then also need to store stuff in +-- the format so that complicates maters more than I'm willing to do. + +local insert, remove = table.insert, table.remove + +local push_macro = token.push_macro +local pop_macro = token.pop_macro +local scan_csname = token.scan_csname +local create_token = token.create +local gobble_token = token.gobble + +local context = context +local implement = interfaces.implement + +local report = logs.reporter("system","macrostack") + +local stack = table.setmetatableindex("table") + +local function pushmacro(name,global) + local s = push_macro(name,global) + if s then + insert(stack[name],s) + else + report("no macro %a",name) + insert(stack[name],false) + end +end + +local function popmacro(name) + local s = remove(stack[name]) + if s then + pop_macro(s) + else + -- error + end +end + +tokens.pushmacro = pushmacro +tokens.popmacro = popmacro + +implement { + name = "localpushmacro", + public = true, + protected = true, + actions = function() + pushmacro(scan_csname()) + end +} + +implement { + name = "globalpushmacro", + public = true, + protected = true, + actions = function() + pushmacro(scan_csname(),true) + end +} + +implement { + name = "localpopmacro", + public = true, + protected = true, + actions = function() + popmacro(scan_csname()) + end +} + +implement { + name = "globalpopmacro", + public = true, + protected = true, + actions = function() + popmacro(scan_csname()) + end +} + +implement { + name = "showmacrostack", + public = true, + protected = true, + actions = function() + local n = scan_csname() + local s = stack[n] + local m = #s + report("%s : %i stack slots used",n,m) + for i=1,m do + report("% 3i %S",i,s[i]) + end + end +} + +implement { + name = "gobblenested", + public = true, + protected = true, + arguments = "3 strings", + actions = function(start,stop,command) + gobble_token(create_token(start),create_token(stop)) + if command then + context[command]() + end + end +} diff --git a/tex/context/base/mkiv/syst-mac.lua b/tex/context/base/mkiv/syst-mac.lua new file mode 100644 index 000000000..b7c36817c --- /dev/null +++ b/tex/context/base/mkiv/syst-mac.lua @@ -0,0 +1,9 @@ +if not modules then modules = { } end modules ['syst-mac'] = { + version = 1.001, + comment = "companion to syst-aux.mkiv", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files" +} + +-- empty diff --git a/tex/context/base/mkiv/toks-aux.lua b/tex/context/base/mkiv/toks-aux.lua index 1cfc13af3..cce29a32a 100644 --- a/tex/context/base/mkiv/toks-aux.lua +++ b/tex/context/base/mkiv/toks-aux.lua @@ -5,84 +5,80 @@ if not modules then modules = { } end modules ['toks-aux'] = { license = "see context related readme files" } -if CONTEXTLMTXMODE > 0 then +local type, tostring = type, tostring +local max = math.max +local formatters, gsub = string.formatters, string.gsub - local type, tostring = type, tostring - local max = math.max - local formatters, gsub = string.formatters, string.gsub - - interfaces.implement { - name = "showluatokens", - public = true, - protected = true, - actions = function() - local f0 = formatters["%s: %s"] - local nl = logs.newline - local wr = logs.writer - local t = token.peek_next() -- local t = token.scan_next() token.put_back(t) - local n = "" - local w = "" - local c = t.cmdname - if c == "left_brace" then - w = "given token list" - t = token.scan_toks(false) - elseif c == "register_toks" then - token.scan_next() - w = "token register" - n = t.csname or t.index - t = tex.gettoks(n,true) - elseif c == "internal_toks" then - token.scan_next() - w = "internal token variable" - n = t.csname or t.index - t = tex.gettoks(n,true) +interfaces.implement { + name = "showluatokens", + public = true, + protected = true, + actions = function() + local f0 = formatters["%s: %s"] + local nl = logs.newline + local wr = logs.writer + local t = token.peek_next() -- local t = token.scan_next() token.put_back(t) + local n = "" + local w = "" + local c = t.cmdname + if c == "left_brace" then + w = "given token list" + t = token.scan_toks(false) + elseif c == "register_toks" then + token.scan_next() + w = "token register" + n = t.csname or t.index + t = tex.gettoks(n,true) + elseif c == "internal_toks" then + token.scan_next() + w = "internal token variable" + n = t.csname or t.index + t = tex.gettoks(n,true) + else + if t.protected then + w = "protected control sequence" else - if t.protected then - w = "protected control sequence" - else - w = "control sequence" - end - n = token.scan_csname() - t = token.get_meaning(n,true) + w = "control sequence" end - wr(f0(w,n)) - nl() - if type(t) == "table" then - local w1 = 4 - local w2 = 1 - local w3 = 3 - local w4 = 3 - for i=1,#t do - local ti = t[i] - w1 = max(w1,#tostring(ti.id)) - w2 = max(w2,#tostring(ti.command)) - w3 = max(w3,#tostring(ti.index)) - w4 = max(w4,#ti.cmdname) - end - local f1 = formatters["%" .. w1 .. "i %" .. w2 .. "i %" .. w3 .. "i %-" .. w4 .. "s %s"] - local f2 = formatters["%" .. w1 .. "i %" .. w2 .. "i %" .. w3 .. "i %-" .. w4 .. "s"] - local f3 = formatters["%" .. w1 .. "i %" .. w2 .. "i %" .. w3 .. "i %-" .. w4 .. "s %C"] - for i=1,#t do - local ti = t[i] - local cs = ti.csname - local id = ti.id - local ix = ti.index - local cd = ti.command - local cn = gsub(ti.cmdname,"_"," ") - if cs then - wr(f1(id,cd,ix,cn,cs)) - elseif cn == "letter" or cn == "other_char" then - wr(f3(id,cd,ix,cn,ix)) - else - wr(f2(id,cd,ix,cn)) - if cn == "end_match" then - wr("-------") - end + n = token.scan_csname() + t = token.get_meaning(n,true) + end + wr(f0(w,n)) + nl() + if type(t) == "table" then + local w1 = 4 + local w2 = 1 + local w3 = 3 + local w4 = 3 + for i=1,#t do + local ti = t[i] + w1 = max(w1,#tostring(ti.id)) + w2 = max(w2,#tostring(ti.command)) + w3 = max(w3,#tostring(ti.index)) + w4 = max(w4,#ti.cmdname) + end + local f1 = formatters["%" .. w1 .. "i %" .. w2 .. "i %" .. w3 .. "i %-" .. w4 .. "s %s"] + local f2 = formatters["%" .. w1 .. "i %" .. w2 .. "i %" .. w3 .. "i %-" .. w4 .. "s"] + local f3 = formatters["%" .. w1 .. "i %" .. w2 .. "i %" .. w3 .. "i %-" .. w4 .. "s %C"] + for i=1,#t do + local ti = t[i] + local cs = ti.csname + local id = ti.id + local ix = ti.index + local cd = ti.command + local cn = gsub(ti.cmdname,"_"," ") + if cs then + wr(f1(id,cd,ix,cn,cs)) + elseif cn == "letter" or cn == "other_char" then + wr(f3(id,cd,ix,cn,ix)) + else + wr(f2(id,cd,ix,cn)) + if cn == "end_match" then + wr("-------") end end - nl() end + nl() end - } - -end + end +} diff --git a/tex/context/base/mkiv/toks-aux.mkiv b/tex/context/base/mkiv/toks-aux.mkiv index 413b1f7c8..f66b51ec5 100644 --- a/tex/context/base/mkiv/toks-aux.mkiv +++ b/tex/context/base/mkiv/toks-aux.mkiv @@ -28,7 +28,9 @@ % \showluatokens\scratchtoks % \showluatokens\everypar -\registerctxluafile{toks-aux}{} +\ifcase\contextlmtxmode \or + \registerctxluafile{toks-aux}{autosuffix} +\fi \installcorenamespace {tokenlist} diff --git a/tex/context/base/mkiv/trac-vis.lua b/tex/context/base/mkiv/trac-vis.lua index 2d2fd4092..64038dc38 100644 --- a/tex/context/base/mkiv/trac-vis.lua +++ b/tex/context/base/mkiv/trac-vis.lua @@ -388,10 +388,10 @@ local c_skip_b = "trace:m" local c_glyph = "trace:o" local c_ligature = "trace:s" local c_white = "trace:w" -local c_math = "trace:s" -local c_origin = "trace:o" -local c_discretionary = "trace:d" -local c_expansion = "trace:o" +----- c_math = "trace:s" +----- c_origin = "trace:o" +----- c_discretionary = "trace:d" +----- c_expansion = "trace:o" local c_depth = "trace:o" local c_indent = "trace:s" @@ -409,8 +409,9 @@ local c_white_d = "trace:dw" local c_math_d = "trace:dr" local c_origin_d = "trace:do" local c_discretionary_d = "trace:dd" -local c_expansion_d = "trace:do" -local c_depth_d = "trace:do" +----- c_expansion_d = "trace:do" +----- c_depth_d = "trace:do" +----- c_indent_d = "trace:ds" local function sometext(str,layer,color,textcolor,lap) -- we can just paste verbatim together .. no typesteting needed local text = hpack_string(str,usedfont) @@ -889,7 +890,7 @@ local ruledglue do local tags = { -- [userskip_code] = "US", - [gluecodes.lineskip] = "LS", + [gluecodes.lineskip] = "LI", [gluecodes.baselineskip] = "BS", [gluecodes.parskip] = "PS", [gluecodes.abovedisplayskip] = "DA", diff --git a/tex/context/modules/mkiv/m-sql.mkiv b/tex/context/modules/mkiv/m-sql.mkiv index ed9dae99a..bb62610ea 100644 --- a/tex/context/modules/mkiv/m-sql.mkiv +++ b/tex/context/modules/mkiv/m-sql.mkiv @@ -17,8 +17,8 @@ \registerctxluafile{util-sql}{} \ifcase\contextlmtxmode\else - \registerctxluafile{libs-imp-mysql}{} - \registerctxluafile{libs-imp-sqlite}{} + \registerctxluafile{libs-imp-mysql}{autosuffix} + \registerctxluafile{libs-imp-sqlite}{autosuffix} \fi \setupmodule diff --git a/tex/context/modules/mkiv/m-steps.mkvi b/tex/context/modules/mkiv/m-steps.mkvi index 873015fd6..fb2000d40 100644 --- a/tex/context/modules/mkiv/m-steps.mkvi +++ b/tex/context/modules/mkiv/m-steps.mkvi @@ -428,12 +428,16 @@ \startxmlsetups xml:step:define \xmlsetsetup {#1} - {stepchart|steptable|stepaligntable|cells|texts|stepcell|cell|text} + {stepchart|steptable|stepaligntable|cells|texts|stepcell|cell|text|br} {xml:step:*} \stopxmlsetups \xmlregistersetup{xml:step:define} +\startxmlsetups xml:step:br + \crlf +\stopxmlsetups + \startxmlsetups xml:step:stepchart \startSTEPchart[\c!category=\xmlatt{#1}{class}] \xmlflush{#1} @@ -492,9 +496,17 @@ \stopxmlsetups \startxmlsetups xml:step:text - \text - [\xmlatt{#1}{class}] - {\xmlflush{#1}} + \doifelse {\xmlatt{#1}{option}} {paragraph} { + \text + [\xmlatt{#1}{class}] + {\framed + [\c!location=\v!middle,\c!align={\v!lohi,\v!flushleft},\c!offset=0pt,\c!frame=\v!no] + {\ignorespaces\xmlflush{#1}\removeunwantedspaces}} + } { + \text + [\xmlatt{#1}{class}] + {\xmlflush{#1}} + } \stopxmlsetups \protect @@ -519,11 +531,21 @@ \startbuffer <steptable> - <cell> some cell </cell> - <text> some text </text> - <cell> some cell </cell> - <text> some text </text> - <cell> some cell </cell> + <cell> some cell A</cell> + <text> some text 1</text> + <cell> some cell B</cell> + <text> some text 2</text> + <cell> some cell C</cell> +</steptable> +\stopbuffer + +\typebuffer \processxmlbuffer + +\startbuffer +<steptable> + <cell> some cell A</cell> + <text option="paragraph"> some more<br/>text 1</text> + <cell> some cell B</cell> </steptable> \stopbuffer diff --git a/tex/context/modules/mkiv/s-system-visual.mkiv b/tex/context/modules/mkiv/s-system-visual.mkiv new file mode 100644 index 000000000..5b5107a2d --- /dev/null +++ b/tex/context/modules/mkiv/s-system-visual.mkiv @@ -0,0 +1,94 @@ +%D \module +%D [ file=s-system-visual.mkxl, +%D version=2020.07.15, +%D title=\CONTEXT\ Style File, +%D subtitle=System Visual Debugger Legend, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +\startmodule[system-visual] + +\starttexdefinition unexpanded visuallegend + \begingroup + \switchtobodyfont[10pt] + \setuptabulate[before=,after=] + \hsize24cm + \scale + [width=\textwidth] + \bgroup + \forgetall + \startboxedcolumns[n=3,strut=no] + \starttabulate[|lT|l|] + \NC L__ \NC line box \NC \NR + \NC H__ \NC horizontal box \NC \NR + \NC _T_ \NC vertical top box \NC \NR + \NC __V \NC vertical box \NC \NR + \TB + \NC VK \NC vertical kern \NC \NR + \NC HK \NC horizontal kern \NC \NR + \NC MK \NC math kern \NC \NR + \NC MK \NC margin kern \NC \NR + \NC LK \NC math list kern \NC \NR + \TB + \NC VP \NC vertical penalty \NC \NR + \NC HP \NC horizontal penalty \NC \NR + \TB + \NC LI \NC line skip \NC \NR + \NC BS \NC baseline skip \NC \NR + \NC PS \NC par skip \NC \NR + \NC DA \NC abovedisplay skip \NC \NR + \NC DB \NC belowdisplay skip \NC \NR + \NC SA \NC above display short skip \NC \NR + \NC SB \NC below display short skip \NC \NR + \NC TS \NC top skip \NC \NR + \NC ST \NC split top skip \NC \NR + \NC AS \NC tab skip \NC \NR + \NC LH \NC left hang skip \NC \NR + \NC RH \NC right hang skip \NC \NR + \NC MS \NC thin mu skip \NC \NR + \NC MM \NC med mu skip \NC \NR + \NC ML \NC thick mu skip \NC \NR + \NC IM \NC inter math skip \NC \NR + \NC MT \NC math skip \NC \NR + \NC LS \NC left skip \NC \NR + \NC RS \NC right skip \NC \NR + \NC SP \NC space skip \NC \NR + \NC XS \NC x space skip \NC \NR + \NC ZS \NC zero space skip \NC \NR + \NC PF \NC par fill skip \NC \NR + \NC IN \NC indent skip \NC \NR + \NC CS \NC correction skip \NC \NR + \NC VS \NC vertical user skip \NC \NR + \NC HS \NC horizontal user skip \NC \NR + \NC IC \NC italic correcection \NC \NR + \TB + \NC NL \NC leaders \NC \NR + \NC CL \NC c leaders \NC \NR + \NC XL \NC x leaders \NC \NR + \NC GL \NC g leaders \NC \NR + \TB + \NC M:B \NC math begin \NC \NR + \NC M:E \NC math end \NC \NR + \NC W:* \NC whatsit \NC \NR + \stoptabulate + \stopboxedcolumns + \egroup + \endgroup +\stoptexdefinition + +\stopmodule + +\continueifinputfile{s-system-visual.mkiv} + +\usemodule[article-basic] + +\startTEXpage[width=20cm,offset=5mm] + + \visuallegend + +\stopTEXpage diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 1891e73c6..050fb0bd3 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 2020-07-13 23:44 +-- merge date : 2020-07-20 10:40 do -- begin closure to overcome local limits and interference @@ -9229,6 +9229,14 @@ function constructors.scale(tfmdata,specification) targetparameters.x_height=targetx_height targetparameters.quad=targetquad targetparameters.extra_space=targetextra_space + local hshift=parameters.hshift + if hshift then + targetparameters.hshift=delta*hshift + end + local vshift=parameters.vshift + if vshift then + targetparameters.vshift=delta*vshift + end local ascender=parameters.ascender if ascender then targetparameters.ascender=delta*ascender @@ -12712,6 +12720,7 @@ function readers.loadfont(filename,n,instance) hascolor=fontdata.hascolor or false, instance=fontdata.instance, factors=fontdata.factors, + nofsubfonts=fontdata.subfonts and #fontdata.subfonts or nil, }, resources={ filename=filename, @@ -37105,6 +37114,7 @@ local function setmathcharacters(tfmdata,characters,mathparameters,dx,dy,squeeze end end end +local shiftmode=CONTEXTLMTXMODE>0 local function manipulateeffect(tfmdata) local effect=tfmdata.properties.effect if effect then @@ -37126,38 +37136,45 @@ local function manipulateeffect(tfmdata) local factor=(1+effect.factor)*factor local hfactor=(1+effect.hfactor)*hfactor local vfactor=(1+effect.vfactor)*vfactor - local vshift=vshift~=0 and upcommand[vshift] or false + if shiftmode then + parameters.hshift=hshift + parameters.vshift=vshift + else + vshift=vshift~=0 and upcommand[vshift] or false + hshift=rightcommand[hshift] + end for unicode,character in next,characters do local oldwidth=character.width local oldheight=character.height local olddepth=character.depth if oldwidth and oldwidth>0 then character.width=oldwidth+wdelta - local commands=character.commands - local hshift=rightcommand[hshift] - if vshift then - if commands then - prependcommands (commands, - hshift, - vshift - ) - else - character.commands={ - hshift, - vshift, - charcommand[unicode] - } - end - else - if commands then - prependcommands (commands, - hshift - ) + if not shiftmode then + local commands=character.commands + if vshift then + if commands then + prependcommands (commands, + hshift, + vshift + ) + else + character.commands={ + hshift, + vshift, + charcommand[unicode] + } + end else - character.commands={ - hshift, - charcommand[unicode] - } + if commands then + prependcommands (commands, + hshift + ) + else + character.commands={ + hshift, + charcommand[unicode] + } + end end end end |