3d-gussner
a01c19cade
Change backup suffix from `~` to `.bak`
2022-06-20 17:00:42 +02:00
Yuri D'Elia
0d7680dbf7
New PO-based language translation support ( #3471 )
...
* lang: Add a PO language extractor with FW metadata support
Implement a straight-to-po language extractor which supports our custom
language requirements:
- _i/_I/ISTR for text string definitions
- _T for catalog translations (with back-reference support)
- //// EOL comments with:
- MSG_ catalog entry name identifiers
- c=X r=Y annotations for screen dimensioning checks
- Crude support for commented lines
All source locations are correctly referenced in the PO, with the
metadata colleted in the comment for further processing.
Several checks are implemented already during extraction:
- Correct catalog name assignment (no duplicates)
- Metadata checks for each entry
Further checks will be implemented by directly checking the translated PO file.
Requires "polib" and "regex" python modules.
* lang: Adapt lang-check to work directly on PO/POT files
* lang: Allow lang-extract to generate stable (pre-sorted) output directly
* lang: Further extend lang-extract consistency/error checking
- Do not parse inside preprocessor conditionals
- Distinguish between references and definitions
- Warn about missing references and definitions
* lang: lang-extract: warn about incorrect PROGMEM assignments
Check that ISTR is used along with PROGMEM_I1 in an attempt to spot
useless translated catalogs.
* lang: lang-extract: Improved handling of same-line translations
Correctly reference metadata on same-line translations.
* lang: lang-extract: Handle _O as a cat-ref
https://github.com/prusa3d/Prusa-Firmware/pull/3434
* lang: lang-extract: Warn about unused catalog definitions
* lang: lang-extract: Allow propagating translation comments via //
The definition:
code //// definition [// comment]
will check [definition] as before, but blindly accumulate // comment.
The comment is then re-appended back into the PO files for translators
with the form:
definition
comment
comment...
* lang: Fix incorrect display definitions
* lang: lang-extract: Check source encoding/charmap
* lang: Translate the degree symbol
* lang: Unbreak/cleanup DEBUG_SEC_LANG
* lang: Improve meaning of comment
* lang: Split charset conversions into an aux lib for future use
* lang: Implement lang-map.py to extract the translation symbol map
- Extracts the translatable symbol map for further use
- Computes a stable "language signature" from the map itself
- Optionally patches the binary update the symbols
* lang: Check for translation recoding problems
* lang: Implement a transliteration map to post-process translations
TRANS_CHARS is now used to replace unavailable symbols to the source
encoding, only while producing the language catalog.
* lang: Handle/check character replacements in lang-check
Filter the translation through TRANS_CHARS, so that the preview and
length check are performed correctly for expanding replacements such as
'ß' to 'ss'.
* lang: Implement lang-build.py to generate the final language catalog
* Cleanup .gitignore
* lang: Drop txt language files
* lang: Remove outdated translation scripts and obsolete docs
* lang: Update build scripts for new infrastructure
* lang: [no] Integrate accents from po/new/no.po
We now support accents natively
* lang: Remove redundant directory po/new/
* lang: Fix encoding of LCD characters in PO files
* lang: [hr] Fix wrapping in MSG_CRASH_DET_ONLY_IN_NORMAL
* lang: Sort and reformat PO files for further massaging
* lang: Switch to developer (dot) comments for PO metadata
* lang: Allow the IGNORE annotation to skip extraction
* lang: Fix missing/broken language metadata in sources
* lang: Add update-pot.sh and regenerate po/Firmware.pot
* lang: Add update-po.sh and refresh all PO files
* lang: Add summary documentation about the new translation workflow
* Add more ignored files
* CI: Add new required dependencies to travis
* lang: lang-build: Improve warning message
"referenced" was really meaning that data is being duplicated.
* lang: Respect the language order as defined in config.sh
This correctly splits normal and community-made entries during language
selection.
* lang: More typos in the documentation
* lang: Check for the maximum size of each language
Each table needs to fit within LANG_SIZE_RESERVED
* lang: Properly align _SEC_LANG to page boundaries
... instead of relying on _SEC_LANG_TABLE to calculate the offset
* lang: Build support for dual-language hex files
Detect the printer type by checking the current variant type.
On printers with no xflash (MK2*), generate one hex file for each
additional language file by patching the built-in secondary language
table during the build process
* lang: Mention lang-patchsec.py
* lang: Use color() instead of tput for clarity
* lang: Allow disabling terminal colors with NO_COLOR/TERM=dumb
* lang: Consistent use of redirection in config.sh
* lang: Stricter variant-type check for xflash support
* lang: Output size stats when building double-language hex files
* lang: Respect NO_COLOR in lang-check.py
* lang: Check for repeated/incorrect annotations
Catch errors such as "c=1 c=2"
* lang: Correct MSG_SLIGHT_SKEW/MSG_SEVERE_SKEW annotations
* lang: [it] Improve MSG_*_SKEW translation
* lang: Use INTLHEX instead of OUTHEX_P/S for configuration
We already have OUTHEX which is the compiled firmware.
Use INTLHEX for the final internationalized firmware, which is less
confusing. Also, assume it being a prefix for all generated hex
files, which reduces the number of variables set.
* lang: Move lang_map to lib.io for further use
* lang: lang-check: Accept a firmware map file to suppress unused string warnings
* lang: Use the map file to reduce useless warnings during fw-build
* lang: lang-check: Also suppress unused empty annotations
* lang: Fix MSG_MOVE_CARRIAGE_TO_THE_TOP_Z annotation
Refresh pot file
* lang: lang-check: Do not warn about same-word translations by default
Do not warn when one-word translations such as "No" result in "No" also
in other languages, since this is common in latin languages.
Allow to re-enable the warning with --warn-same
* lang: lang-build: Handle same-source/translation efficiently
* lang: [it] Explicitly add On/Off/Reset/Wizard to suppress warnings
Instead of displaying a warning, supress the warning and explicitly
translate each entry using english (which is the common/acceptable
word in these cases).
* lang: [it] Suppress more warnings
* lang: lang-check: Add intermediate "suggest" warning category
Warnings in the "suggest" category as shown as [S] as based on pure
speculation from the checking tool, such as the translation being
significantly shorter than the original.
As a result, they can be suppressed with --no-suggest
* lang: Return translation status from lang-check
- 0 if the translation only contains suggestions
- 1 if the translation contains warnings or errors
Check for the exit status in fw-build.sh, but do nothing at the moment
except printing a non-fatal error.
* lang: Remove "trim_trailing_whitespace=false" for po files
PO files got cleaned up/rewritten. We can now ensure they stay
consistent.
* lang: [sv] Re-integrate changes from 70c73cb
* lang: [no] Reintegrate changes from @pkg2000
2022-06-16 15:03:30 +02:00
3d-gussner
53046ffeee
Update diacritics in Swedish and Norwegian `Firmware_xx.po` files
2022-05-24 09:06:46 +02:00
3d-gussner
44eb9d4ff9
Updated Norwegian files
2022-05-24 08:27:12 +02:00
3d-gussner
70c73cbf6b
Pre-release po file update
2022-05-24 08:14:24 +02:00
3d-gussner
1a4bbb4918
Activate Norwegian community translation
2022-05-24 07:51:05 +02:00
3d-gussner
3ae4b6d329
Merge remote-tracking branch 'pkg2000/MK3_3.11.0' into HEAD
...
Fix merge issues and POEdit double `\\` to `\`
Update `lang_en_no.txt`
Enable Norwegian translation in `config.h`
Tested on MK404 MK3S
2022-05-24 07:28:10 +02:00
pkg2000
a319e32c7e
Update no.po
...
hah, can you believe it. In Extruder info, nozzle fan is the extruder fan..
2022-04-20 17:30:02 +02:00
pkg2000
137e607fef
Update no.po
...
Mistake in naming of FAN with capitol within Extruder info, under Support. Fixed here.
2022-04-20 16:38:55 +02:00
pkg2000
8cc89c7207
Update no.po
...
Sorry. last one. Unified fan names
2022-04-20 14:02:19 +02:00
pkg2000
859f6215a9
Update no.po
...
Changes based on @trondkla feedback. exceptions to his suggestions have been discussed and agreed upon (most were due to char. count and linebreak limitations.) Vocabulary/wording ready. now just need to test how everything render on the screen.
2022-04-20 13:57:56 +02:00
pkg2000
b03acf0d03
Update no.po
...
Changed printfan (printvifte) to Nozzle fan (dysevifte).
Wizard (Veileder) reference improved in longer text.
Cleaned up linebreaks
Bed level correct -> Planecorrection (Plankorreksjon).
few minor typos fixed and found
Warning: Gt desktop or Poedit keeps adding an extra \ , when using \x0a (Linebreak)
2022-04-06 16:47:26 +02:00
3d-gussner
14f07963ac
Fix typo in Slovak thanks to Prusa test team
2022-04-05 15:07:45 +02:00
pkg2000
d00b20ee62
Update no.po
...
More fixes.
2022-03-31 17:22:23 +02:00
pkg2000
c2e56f6a4a
Update no.po
...
Some new updates and fixes.
2022-03-31 17:12:51 +02:00
3d-gussner
b3532749ff
Merge pull request #3451 from 3d-gussner/MK3_Translation_Maintainers
...
Update: Swedish active
2022-03-24 10:56:16 +01:00
3d-gussner
c71637107c
Swedish active
...
Norwegian added but inactive
2022-03-24 05:34:54 +01:00
3d-gussner
d2a542b554
Update from from [commit]( a05287cb2f)
2022-03-20 18:41:27 +01:00
3d-gussner
b244cedd7f
Add Swedish ` pa ` to ` på ` conversion
...
Update po files
2022-03-18 15:45:39 +01:00
3d-gussner
9a3f412aad
Forgot saving one file
2022-03-17 18:33:53 +01:00
3d-gussner
8bd3b473c4
Last fixes in Swedish
2022-03-17 18:26:45 +01:00
3d-gussner
bf20d18711
Fix French check
2022-03-16 11:55:51 +01:00
3d-gussner
92e733fdcb
Update po files
2022-03-16 11:37:24 +01:00
3d-gussner
3954c44bc9
update all languages files
2022-03-16 09:24:06 +01:00
3d-gussner
19b4c333c0
Improve lang import and cleanup
2022-03-16 09:23:34 +01:00
3d-gussner
7a64210043
Check if translation isn't equal to origin
...
Removed identical translations/origin all lang files incl. po files,
which saves some xflash space
2022-03-14 13:29:21 +01:00
3d-gussner
12b184cf68
Add missing `MSG_SHEET_OFFSET` to translations
2022-03-12 12:34:08 +01:00
3d-gussner
61695eebcc
Add `\x04Refresh` translations
2022-03-12 11:55:25 +01:00
3d-gussner
3aab3b7148
Delete old translations
...
- `Current`
- `Used during print`
- `Error - static memory has been overwritten`
2022-03-12 11:23:45 +01:00
3d-gussner
7c55cf801b
Fix additional merge issues
...
Update lang-??port.sh scripts
2022-03-12 10:51:26 +01:00
3d-gussner
764a1fd411
Merge remote-tracking branch 'upstream/MK3_3.11.0' into MK3_3.11.0_Improve_languages2
...
Fix Swedish merge issues
2022-03-12 09:44:00 +01:00
3d-gussner
7265174a93
Update lang-??port.sh documentation
2022-03-12 08:58:24 +01:00
3d-gussner
08332a8942
Merge pull request #3349 from 3d-gussner/MK3_3.11.0_Swedish
...
Swedish / Svenska / Sverige community translation
2022-03-12 08:55:30 +01:00
3d-gussner
00ec8bb01c
Update all po files
2022-03-12 08:48:15 +01:00
3d-gussner
3e6c4ac6fd
Fix Norgwegian merge issues
...
Update lang-??port.sh scripts for Norwegian
2022-03-12 08:46:46 +01:00
3d-gussner
ce5a9613ce
Merge remote-tracking branch 'upstream/MK3_3.11.0' into MK3_3.11.0_Improve_languages2
...
Fix merge
2022-03-11 17:26:52 +01:00
3d-gussner
1f4da80609
Fix `\0x Refresh` and `Sheet..` messages being added correctly
2022-03-11 15:35:30 +01:00
3d-gussner
18859a3609
Merge pull request #3427 from pkg2000/MK3_3.11.0
...
Norwegian
2022-03-11 15:14:31 +01:00
3d-gussner
b4492067a4
Merge branch 'MK3_3.11.0' into MK3_3.11.0_Swedish
2022-03-10 14:59:46 +01:00
3d-gussner
94f9a97344
Merge latest `sv.po` from https://github.com/prusa3d/Prusa-Firmware/pull/3353
...
create `lang_en_sv.txt` with `./lang-import.sh sv`
update `Firmware_sv.po` with `./lang-export.sh sv`
2022-03-10 14:49:05 +01:00
pkg2000
a4050b3e26
Update no.po
...
removed some identical strings
2022-03-10 14:44:30 +01:00
3d-gussner
f0a498abb1
Replace 'åÅ' with 'aA'
2022-03-09 06:37:15 +01:00
3d-gussner
5c0a443b4f
Fix Norwegian after rebase
2022-03-07 11:47:53 +01:00
3d-gussner
f9f76520d9
Temp. cal. -> PINDA cal.
...
01234567890123456789
Temp. cal. [Off] old
PINDA cal. [Off] new
Temp. cal. 1/6 old
PINDA cal. 1/6 new
MSG_TEMP_CALIBRATION -> MSG_PINDA_CALIBRATION
MSG_TEMP_CALIBRATION_DONE -> MSG_PINDA_CALIBRATION_DONE
Updated text
- MSG_PINDA_CALIBRATION_DONE
- MSG_PINDA_CAL_FAILED
Update status line during PINDA cal.
Changed PINDA cal. from submenu to function
- Deleted `lcd_pinda_calibration_menu()`
- Deleted `#MSG_CALIBRATE_PINDA c=17`
Tried to update translations
Updated po files
2022-03-07 11:47:53 +01:00
3d-gussner
c1e971c2ad
Change `Choose extruder` to `Select extruder` for consistant wording
2022-03-07 11:47:53 +01:00
3d-gussner
45cd904520
Remove duplicate `Extruder fan:`
...
Create MSG in messages to reuse it
Remove `Nozzle FAN`
Change Support -> Extruder info -> fan speeds
2022-03-07 11:47:53 +01:00
3d-gussner
bcd2b6f8bf
Remove `Choose filament` as it is a duplicate of `Select filament`
2022-03-07 11:47:53 +01:00
3d-gussner
879803daa9
Temp. cal. -> PINDA cal.
...
01234567890123456789
Temp. cal. [Off] old
PINDA cal. [Off] new
Temp. cal. 1/6 old
PINDA cal. 1/6 new
MSG_TEMP_CALIBRATION -> MSG_PINDA_CALIBRATION
MSG_TEMP_CALIBRATION_DONE -> MSG_PINDA_CALIBRATION_DONE
Updated text
- MSG_PINDA_CALIBRATION_DONE
- MSG_PINDA_CAL_FAILED
Update status line during PINDA cal.
Changed PINDA cal. from submenu to function
- Deleted `lcd_pinda_calibration_menu()`
- Deleted `#MSG_CALIBRATE_PINDA c=17`
Tried to update translations
Updated po files
2022-03-07 11:47:52 +01:00
3d-gussner
7939142922
Change `Choose extruder` to `Select extruder` for consistant wording
2022-03-07 11:47:52 +01:00
3d-gussner
81d8c72cc4
Remove duplicate `Extruder fan:`
...
Create MSG in messages to reuse it
Remove `Nozzle FAN`
Change Support -> Extruder info -> fan speeds
2022-03-07 11:47:52 +01:00
3d-gussner
4a73cad3fd
Remove `Choose filament` as it is a duplicate of `Select filament`
2022-03-07 11:47:52 +01:00
3d-gussner
ab48e9880e
Merge pull request #3215 from wavexx/lang_add_improvements
...
PFW-1297: lang-add.sh improvements
2022-03-07 11:47:11 +01:00
pkg2000
53bbd36cf3
Update no.po
...
And we try again before final audit.
2022-03-04 13:21:06 +01:00
pkg2000
ff9e79202e
Update no.po
...
Last push (?) before second party audit/approval
2022-03-04 12:16:04 +01:00
pkg2000
97b6356476
Update no.po
...
Fixed strings that did not fit.
2022-02-24 14:23:03 +01:00
pkg2000
bb2a64387c
Update no.po
...
Removed fuzzy ("needs work" in POedit) and (probably most) identical strings.
2022-02-23 16:48:57 +01:00
pkg2000
11ff93b78e
Update no.po
...
Almost all filled out. Some missing strings/words, no proofreading or checking done yet.
2022-02-23 15:51:43 +01:00
pkg2000
dee2061d73
Added 1 line
...
ftw longer text required?
2022-02-23 12:00:39 +01:00
pkg2000
3da07d34f3
Norwegian
...
Part 1
2022-02-23 11:46:07 +01:00
3d-gussner
a51f799e73
Replace `åÅ` with `aA`
2022-02-23 06:38:45 +01:00
3d-gussner
a33340c176
Typo
2022-02-22 12:18:54 +01:00
3d-gussner
715f466fda
Add Norwegian
2022-02-22 11:56:01 +01:00
3d-gussner
087b545e0f
Add Swedish to use `äöüß`
2022-02-22 06:58:37 +01:00
3d-gussner
913cc502b9
Fix merge issues
...
Fix `\x0a`
Update po files
2022-02-22 06:57:03 +01:00
3d-gussner
90734c9eff
Merge branch 'MK3_3.11.0_Swedish' into Swedish
2022-02-21 17:20:37 +01:00
3d-gussner
8eff9e35da
Merge pull request #3400 from 3d-gussner/MK3_Translation_Maintainers
...
Update Maintainers
2022-02-17 17:34:04 +01:00
Yuri D'Elia
b9ca45fea1
lang-add: add a *crude* metadata extractor
2022-02-16 17:24:05 +01:00
Yuri D'Elia
a07b7291b4
lang-add: handle duplicate translations and empty files
2022-02-16 17:24:05 +01:00
Yuri D'Elia
679730c9ed
lang-add: avoid repetition for supported languages
2022-02-16 17:24:03 +01:00
pkg2000
73c0837856
Changed "ae" to "ä" and "oe" to "ö"
...
Changed "ae" to "ä" and "oe" to "ö"
2022-02-16 11:59:12 +01:00
Alex Voinea
a6331d22c8
Remove ancient SNMM code in the MK3 branch
2022-02-15 15:58:33 +01:00
3d-gussner
1bba7815fc
MK3_3.11.0_Lang fixes ( #3404 )
...
* Replace non-block space with space
Fix of some editors create non-block spaces which cause issues.
* Replace non-block space with space
Fix single language run without config.sh OK
* Update Slovak po files
* revert delete of lang/po/Firmware_sk.po
* Fix typos
Unix format for md files
2022-02-14 08:39:03 +01:00
3d-gussner
13d4c077b6
Activate Slovak
2022-02-14 08:13:11 +01:00
3d-gussner
29a2ee998a
Added Slovak Maintainers
2022-02-13 10:50:44 +01:00
ingbrzy
592af52802
typo
2022-02-13 08:27:20 +01:00
ingbrzy
8db5ad1044
this letter doesn't exist in SK alphabet
2022-02-13 08:23:35 +01:00
ingbrzy
2eb32ac2c6
Typo
2022-02-13 08:11:21 +01:00
ingbrzy
d9cd5324e7
Typos after review
2022-02-13 07:45:45 +01:00
Alex Voinea
480c30221e
Merge branch 'MK3_3.11.0' into MK3_3.11.0
2022-02-12 23:01:02 +01:00
ingbrzy
e36d5ebe1c
Update .po files
2022-02-12 05:46:42 +01:00
ingbrzy
2a65086f75
Update .po files
2022-02-12 05:37:00 +01:00
3d-gussner
8e73bb030e
Change to python3
...
Bump up version
2022-02-11 15:04:35 +01:00
ingbrzy
65e99c62de
add SK letters replacement
2022-02-11 14:18:03 +01:00
ingbrzy
c9f17b30e6
typo
2022-02-11 12:50:28 +01:00
ingbrzy
54e4966f2c
typos
2022-02-11 12:48:38 +01:00
ingbrzy
79aa067a8a
Update SK .po files
2022-02-10 21:20:06 +01:00
ingbrzy
0ac7874d27
Add SK .po files
2022-02-10 21:01:16 +01:00
ingbrzy
834cc24e6c
Add SK language
2022-02-10 19:01:04 +01:00
3d-gussner
35cee44df1
Add SRCDIR for compatibility with build server
2022-02-10 08:27:04 +01:00
3d-gussner
00036bcfcc
Update all po files
2022-02-08 14:48:16 +01:00
3d-gussner
752eef0876
Enable to clean non active languages
2022-02-08 14:43:15 +01:00
3d-gussner
048117c3cb
Fix MSG in cz and hu as these have been different to other lang_en*.txt files
2022-02-08 14:41:35 +01:00
3d-gussner
dd72b079ea
Better translation in German for Bed level correct
2022-02-08 10:43:57 +01:00
3d-gussner
d80cef5443
Change [um] to [μm]
...
Including lang-im/export.sh to convert HD44780 to UTF-8 and vice versa
2022-02-08 10:18:27 +01:00
3d-gussner
881db2e747
Change `MSG_YES` to max. 4 chars
...
Hungarian YES is 4 letters long
2022-02-08 08:50:24 +01:00
3d-gussner
e7d7068840
Change `MSG_WIZARD_DONE` rows to 3
2022-02-08 08:46:07 +01:00
3d-gussner
d046619470
Update Community translation
...
Added Hugarian Co-Maintainer
Added Croatian Mainteners
Set Swedish to inactive, waiting for review
2022-02-08 08:19:17 +01:00
3d-gussner
709cdf5131
Merge pull request #3379 from Prime1910/MK3_3.11.0
...
Croatian translation Fix
2022-02-07 19:26:54 +01:00
Prime1910
a3930cbff6
some words changed
2022-02-04 09:38:38 -08:00
DRracer
1dd2e237a0
Merge pull request #3368 from D05S/MK3_3.11.0
...
Czech translation fix
2022-02-03 16:53:23 +01:00
Dominik Sauer
4302fccca8
Update cs.po
2022-02-03 13:47:14 +01:00
SauerDominik
6167813f07
Update lang_en_cz.txt
2022-02-03 09:46:12 +01:00
DRracer
546eafae8b
Merge pull request #3342 from 3d-gussner/MK3_improve_translations
...
Improve language scripts
2022-02-03 08:21:38 +01:00
3d-gussner
9e8ed08092
Add new line at end of file
2022-02-03 08:08:28 +01:00
3d-gussner
fc94322a10
Fix typo
2022-02-03 08:07:07 +01:00
3d-gussner
103c6e8819
Merge pull request #3372 from Prime1910/MK3_3.11.0
...
Croatian translation
2022-02-03 06:45:02 +01:00
Prime1910
eb04c5861d
shorten words corrected - croatitan translation
2022-02-02 15:10:19 -08:00
Prime1910
75118d540f
Croatian translation small changes
2022-02-02 14:50:33 -08:00
Prime1910
0f7dcdf885
Some small changes in translation
2022-02-02 14:35:56 -08:00
Prime1910
f3a817ae45
Croatian translation of "spinning" corected
2022-02-02 14:25:20 -08:00
Prime1910
cc4601f3fe
Croatian translation file changed
2022-02-02 14:17:53 -08:00
Prime1910
82dba06602
Croatian translation updated
2022-02-02 14:16:32 -08:00
3d-gussner
ce6b92052c
Update replace Czech non aA-zZ characters
2022-02-02 17:23:31 +01:00
3d-gussner
f290039dff
Add Hungarian replacement
...
Fix changed chars.
2022-02-02 17:23:31 +01:00
3d-gussner
c3347dd2cb
Improve language scripts
...
- Add German `äöüß` support
- Add/improve checks
- Check for syntax errors
- Output for translators
- gitignore more temporary files
2022-02-02 17:23:31 +01:00
3d-gussner
92ec7d3d24
Add some documentation
...
WIP
2022-02-02 17:23:31 +01:00
3d-gussner
1abd2be96d
Syntax check `lang_en.txt`
...
Display correct line having issues
2022-02-02 17:23:31 +01:00
3d-gussner
86235259a3
Add syntax checks
2022-02-02 17:23:31 +01:00
D05S
183eaf80ec
Created and updated files from new po
2022-02-02 15:05:25 +01:00
D05S
058c75f3ec
Delete mac files
2022-02-02 14:51:02 +01:00
D05S
0f76c05a36
test
2022-02-02 14:46:48 +01:00
D05S
45c121c7a4
\x0a edit
...
\\x0a to \x0a
2022-02-02 14:16:01 +01:00
D05S
d19fa38afe
Update cs.po
...
memory optimization
2022-02-02 12:29:17 +01:00
Prime1910
9e36c80963
Updated po files
2022-02-01 07:05:53 -08:00
Prime1910
77cba57eb6
Removed identical translations
2022-02-01 06:59:38 -08:00
Prime1910
0928d28def
Created Croatian lang file from po file
2022-02-01 06:46:43 -08:00
D05S
67a470e0ab
Czech translation fix
...
translated missing parts
2022-02-01 06:55:45 +01:00
3d-gussner
6a6376cb40
Merge pull request #3070 from 3d-gussner/MK3_Community_issue_template
...
MK3 community issue template and List of Community made translations
2022-01-21 15:08:16 +01:00
AttilaSVK
0b8e65bd6c
Updated Hungarian translation files
...
updated lang/lang_en_hu.txt and lang/po/Firmware_hu.po with files generated by lang-import.sh and lang-export.sh
2022-01-18 13:56:43 +01:00
AttilaSVK
bbf23d4473
Update hu.po
...
Corrected a string based on where it appears on the display (Main, corrected to Főmenü, meaning Main Menu)
2022-01-18 10:38:56 +01:00
AttilaSVK
3936da7529
Update hu.po
...
Revised some translations based on the output from lang-check.py
2022-01-18 10:38:56 +01:00
AttilaSVK
311aa2a4c6
Update hu.po
...
Reduced long strings
2022-01-18 10:38:56 +01:00
AttilaSVK
9308593f5e
Update hu.po
...
Corrected two ...(one character) to ...(three characters) and removed an accidental accent to maintain ASCII compatibility
2022-01-18 10:38:56 +01:00
AttilaSVK
a28631638f
New translation
...
Added Hungarian language
2022-01-18 10:38:56 +01:00
3d-gussner
2d01cb37ef
Replace ` ?` with `?`
...
No need for additional space before the question mark.
2022-01-18 09:21:18 +01:00
3d-gussner
84cba7f769
Fixed Swedish po files
...
created `lang_en_sv.txt`
Deleted vs files
Compiled and tested the firmware with Swedish. Can't read everything but it looks good.
2022-01-18 08:20:02 +01:00
Bernt Ahlbäck
68cf57272c
Swedish translation
2022-01-18 07:55:21 +01:00
Bernt Ahlbäck
2568ca66f2
Updated swedish lang
...
Looks bad as you dont support international languages (åäö).
2022-01-18 07:55:21 +01:00
Bernt Ahlbäck
7ab715c2dd
Added swedich language
2022-01-18 07:55:21 +01:00
Bernt Ahlbäck
036bc38b82
Added swedich language
2022-01-18 07:55:21 +01:00
3d-gussner
978b9d5eeb
Add Hungarian and Swedish maintainers
2022-01-18 07:39:03 +01:00
Alex Voinea
f59fe20393
Fix resized translation limits
2022-01-17 16:23:31 +01:00
Alex Voinea
365bd003f9
Update ro PO files
2022-01-17 16:21:59 +01:00
Alex Voinea
4f8be42555
Use um instead of the special character until it is implemented upstream
2022-01-17 16:21:59 +01:00
Hauzman
1a6b668ede
Fix typos
2022-01-17 16:21:59 +01:00
Hauzman
f9a591052c
Fix typos
...
I have tested on my MK3S+ because the MK404 stops working when I select the language.
Posible to be future improvemen
Co-Authored-By: Alex Voinea <voinea.dragos.alexandru@gmail.com>
2022-01-17 16:21:59 +01:00
Alex Voinea
625fa3ea50
Fix layout for a few translations
2022-01-17 16:21:59 +01:00
Alex Voinea
a49ef30477
Change Reglare->Optiuni
2022-01-17 16:21:59 +01:00
Alex Voinea
e3712a72e6
Fix typos
2022-01-17 16:21:59 +01:00
Alex Voinea
f50eaf4762
More language optimization
2022-01-17 16:21:59 +01:00
Alex Voinea
e1e0dac635
Quick fixes
2022-01-17 16:21:59 +01:00
crackerOil
5096073507
Romanian language translation
2022-01-17 16:21:59 +01:00
Alex Voinea
4d348fa953
Initial Romanian translation
2022-01-17 16:21:59 +01:00
Alex Voinea
669f15a269
Make "Filament sensor" translations shorter for ES and FR
2022-01-17 16:11:52 +01:00
Alex Voinea
aeec7236ee
Update Community_made_translations.md
2022-01-17 17:09:48 +02:00
Alex Voinea
93b1a6b736
"Unload filament" c adjustment
2022-01-16 11:19:24 +01:00
Alex Voinea
7442057aba
"Filament sensor" c adjustment
2022-01-16 11:13:52 +01:00
3d-gussner
1544a79b4e
Add Lithuanian
2022-01-03 15:00:45 +01:00
3d-gussner
6dd7681f6b
Cleanup outdated code
2022-01-03 12:19:58 +01:00
3d-gussner
54d7e9331b
Add Croatian
2022-01-03 11:25:15 +01:00
3d-gussner
75dc5bd410
Add Luxembourgish
2022-01-03 11:25:15 +01:00
3d-gussner
8911161f6b
Add Hungarian
...
Fix typo
2022-01-03 11:25:15 +01:00
3d-gussner
7083529990
Add Slovanian
2022-01-03 11:25:15 +01:00
3d-gussner
f8a0d3ad7b
Add Danish
2022-01-03 11:25:15 +01:00
3d-gussner
5bce397fab
Add Swedish
2022-01-03 11:25:15 +01:00
3d-gussner
ba54dc3d35
Update po files after fixing lang-export and lang-import
2022-01-03 11:25:15 +01:00
3d-gussner
20494f7260
Update lang scripts using for loop for languages
2022-01-03 11:25:15 +01:00
3d-gussner
fda665f9de
Fix some minor issues
2022-01-03 11:25:15 +01:00
3d-gussner
b57fd94f05
Add counter
...
replace two double quotes to `\x00`
remove CR
2022-01-03 11:25:15 +01:00
3d-gussner
7b0872be64
Add missing MSG
2022-01-03 11:25:15 +01:00
3d-gussner
8708b1d413
Fix missing last translation
...
In FW3.10.1 there are 351 translations in the `lang_en.txt` but only 350 have been exported the `po` files missing the last one.
2022-01-03 11:25:15 +01:00
3d-gussner
d59c08192b
Prepare to use one config file for all languages
2022-01-03 11:25:15 +01:00
3d-gussner
ecc8898b58
Change default Arduino path to by PF-build.sh created one
2022-01-03 11:25:15 +01:00
3d-gussner
add4872292
Update po files before release
2021-12-16 11:52:35 +01:00
DRracer
6188870c2e
Merge pull request #3157 from wavexx/improve_d2
...
Add extra debugging functions & crash analysis
2021-06-22 07:37:30 +02:00
jfestrada
72be8f7be5
Fix spanish translation for MSG_UNLOAD_SUCCESSFUL ( #3185 )
...
Fix spanish transtalation for MSG_UNLOAD_SUCCESSFUL by: jfestrada <jfestrada@cloudhd.eu>
2021-06-21 12:42:56 +02:00
Yuri D'Elia
0e75bc9d8e
lang/fw-build.sh: fix padding calculation
2021-06-08 17:24:10 +02:00
Yuri D'Elia
8417083b13
lang/fw-build.sh: check for language data size during build
...
Ensure the language data always fits the reserved space in the XFLASH.
The script *should* use the LANG_SIZE definition from "xflash_layout",
which can be obtained by preprocessing the source code.
At the moment though this step has been omitted since running
arduino-builder to preprocess the source requires extra flags passed by
build.sh. The size has been hard-coded (and it's unlikely to change
given the content size is constant for the architecture).
2021-06-08 15:30:05 +02:00
DRracer
80e248662c
Merge pull request #3079 from 3d-gussner/PFW-1189
...
PFW-1189 Pre-release tasks
2021-04-29 16:33:18 +02:00
3d-gussner
fa134ee9f1
Update all po files
2021-04-29 15:41:47 +02:00
D.R.racer
8e35ab0699
Looks like the last CZ message
2021-04-29 14:40:35 +02:00
D.R.racer
6563a691ce
ES missing translations
2021-04-29 13:57:56 +02:00
Yuri D'Elia
a5e40079e5
lang-check: optionally check for missing translations
2021-04-29 12:52:17 +02:00
Yuri D'Elia
a98bc1616a
lang-check: add missing rulers
2021-04-29 12:51:57 +02:00
Yuri D'Elia
8edecc911b
lang-check: Fix comment indentation
2021-04-29 12:43:26 +02:00
Yuri D'Elia
752d6c47f8
lang-check: use color names consistently
2021-04-29 12:35:10 +02:00
Yuri D'Elia
27d64b03fa
More missing Italian translations
2021-04-29 12:29:29 +02:00
D.R.racer
759451c7e3
PL "Community made"
2021-04-29 09:52:07 +02:00
3d-gussner
b9ee74ba0e
Update some French and Spanish missing translations
2021-04-29 09:22:29 +02:00
3d-gussner
2580733439
Another missing Spanish translation
2021-04-29 09:16:23 +02:00
3d-gussner
6b0e5ba387
Merge branch 'PFW-1189' of https://github.com/3d-gussner/Prusa-Firmware into PFW-1189
2021-04-29 09:02:23 +02:00
3d-gussner
07cc28e1c9
Updated few missing French Spanish translations
2021-04-29 09:01:44 +02:00
D.R.racer
b77945263d
IT temperatura
2021-04-29 09:01:37 +02:00
D.R.racer
eccb9bb9df
PL 2
2021-04-29 08:56:48 +02:00
D.R.racer
ba90ee3e28
Add 2 missing translations for PL
...
still missing "Community made"
2021-04-29 08:55:45 +02:00
D.R.racer
4aba5b636c
CZ Printer IP addr translation
2021-04-29 08:38:30 +02:00
D.R.racer
a2326ff986
Merge branch 'PFW-1189' of github.com:3d-gussner/Prusa-Firmware into PFW-1189
2021-04-29 08:34:48 +02:00
D.R.racer
0e3d4932cf
Add missing CZ translations
2021-04-29 08:34:31 +02:00
3d-gussner
a9ae8ea731
Remove `SpoolJoin` from translations
2021-04-29 08:15:24 +02:00
3d-gussner
2421733b3e
Update Dutch translation for `Cont.` as `Door.`
2021-04-29 07:50:08 +02:00
3d-gussner
7357bc0b3b
Thanks to @vintagepc for reviewing Dutch translation
2021-04-28 20:33:48 +02:00
3d-gussner
ef9748aa43
Update missing Dutch translations
2021-04-28 19:45:20 +02:00
3d-gussner
48dcbbb7b2
More missing German translations
2021-04-28 18:53:00 +02:00
3d-gussner
c18243cb21
More missing German translations
2021-04-28 18:42:32 +02:00
3d-gussner
79a5dafd25
Update few missing German translations
...
Fix Italian "SpoolJoin" to `\x00`
2021-04-28 18:28:54 +02:00
3d-gussner
488d9d4b38
Remove "Firmware" from translations
...
deleted another unused "Firmware" define in language.h
2021-04-28 18:02:36 +02:00
3d-gussner
d251f3980a
Remove FlashAir from translations
2021-04-28 17:57:39 +02:00
3d-gussner
b5ba4041d3
Remove FINDA from translations
2021-04-28 17:36:17 +02:00
3d-gussner
08566d4121
Remove PINDA from translations
2021-04-28 17:33:52 +02:00
D.R.racer
e172eaeb92
Fix ES
2021-04-28 09:47:36 +02:00
3d-gussner
7a54c3638c
Remove web links and `Prusa i3 MKxy OK.` from translations
...
as these never have been translated or doesn't make sense
to translate web links
2021-04-27 20:36:22 +02:00
3d-gussner
686054b95e
Changed `x of 4` and `y of 9` to `x/4` and `y/4`
...
Added `Iteration` translation
2021-04-27 20:22:28 +02:00
3d-gussner
94b195123f
Revert "Fix FR"
...
This reverts commit a2fa7d34c5 .
Fixed with commits
b8ae08fd3d
738a24178a
2021-04-27 19:05:29 +02:00
3d-gussner
3983fe9ad6
Merge branch 'PFW-1189' of https://github.com/3d-gussner/Prusa-Firmware into PFW-1189
2021-04-27 16:32:25 +02:00
D.R.racer
a2fa7d34c5
Fix FR
2021-04-27 15:33:21 +02:00
D.R.racer
c8266988c8
Fix PL
2021-04-27 12:52:25 +02:00
3d-gussner
738a24178a
Update #MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3
2021-04-27 07:45:36 +02:00
3d-gussner
b8ae08fd3d
Update `x of 4` and `x of 9` messages so longer text can be used.
2021-04-27 07:18:52 +02:00
3d-gussner
b3c5d395d4
Update French translation MSG_RESUME_PRINT
2021-04-26 14:43:06 +02:00
3d-gussner
1145b231a9
Define MSG_SELFTEST_FS_LEVEL
2021-04-26 14:30:20 +02:00
3d-gussner
af519626aa
Define MSG_FS_V_04_OR_NEWER and MSG_FS_V_03_OR_OLDER c=14
2021-04-26 14:21:33 +02:00
Yuri D'Elia
900443286d
lang-check: fancy ruler
2021-04-26 13:40:55 +02:00
3d-gussner
c11e06b2d4
Fix character ruler for too many rows
2021-04-26 12:49:05 +02:00
3d-gussner
b522ef4812
Update MSG_SEVER_SKEW and MSG_SLIGHT_SKEW message to c=14
...
Changed and tested Support-> "XYZ cal. details" LCD output
2021-04-26 12:39:13 +02:00
3d-gussner
79f6095bcc
Add character ruler
2021-04-26 11:39:37 +02:00
3d-gussner
946675b444
Remove white spaces and shortn some messages (inspired by FR, IT)
2021-04-26 08:28:48 +02:00
3d-gussner
40c8f3e1ca
Merge branch 'PFW-1189' of https://github.com/3d-gussner/Prusa-Firmware into PFW-1189
2021-04-26 08:14:44 +02:00
3d-gussner
431c469688
Remove white spaces in cz,nl,pl translations
2021-04-26 08:14:05 +02:00
D.R.racer
c843feee02
Fix some trailing whitespace and puctuation CZ
2021-04-26 08:07:51 +02:00
3d-gussner
466de83ae0
Remove white spaces in messags which saves ~62bytes
2021-04-26 07:22:22 +02:00
3d-gussner
127a8e4068
Fix typo in Spanish
2021-04-24 21:53:06 +02:00
3d-gussner
624827e51d
Use same wording in Spanish translation for "knob"
2021-04-24 21:51:15 +02:00
3d-gussner
9cacb41cbf
Fix French translation for MSG_MMU_LOAD_FAILS
2021-04-24 20:56:16 +02:00
3d-gussner
a645b30f63
Merge branch 'PFW-1189' of https://github.com/3d-gussner/Prusa-Firmware into PFW-1189
2021-04-24 20:52:59 +02:00
3d-gussner
cf4d8f68f4
Update lang/lang_en_fr.txt
...
Co-authored-by: awenelo <56133692+awenelo@users.noreply.github.com>
2021-04-24 20:52:33 +02:00
3d-gussner
2c687a9223
Update lang/lang_en_fr.txt
...
Co-authored-by: awenelo <56133692+awenelo@users.noreply.github.com>
2021-04-24 20:50:51 +02:00
3d-gussner
29ad021b23
Updated French translation of MSG_MMU_LOAD_FAILED c=20 as @awenelo suggested
2021-04-24 20:50:01 +02:00
3d-gussner
6a52921e63
Use origin message for MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY also in French
2021-04-24 20:44:59 +02:00
3d-gussner
fed80ebc73
Update French translation for MSG_SELECT_FILAMENT as @carlin57 suggested
2021-04-24 20:40:54 +02:00
3d-gussner
ff2b292234
Merge branch 'PFW-1189' of https://github.com/3d-gussner/Prusa-Firmware into PFW-1189
2021-04-24 20:40:21 +02:00
3d-gussner
93cabea391
Update lang/lang_en_fr.txt
...
Co-authored-by: awenelo <56133692+awenelo@users.noreply.github.com>
2021-04-24 20:39:47 +02:00
3d-gussner
43b16a95ce
Update lang/lang_en_fr.txt
...
Co-authored-by: awenelo <56133692+awenelo@users.noreply.github.com>
2021-04-24 20:39:29 +02:00
3d-gussner
1667e39a24
Update lang/lang_en_fr.txt
...
Co-authored-by: awenelo <56133692+awenelo@users.noreply.github.com>
2021-04-24 20:37:20 +02:00
3d-gussner
7d59e925be
Update lang/lang_en_fr.txt
...
Co-authored-by: awenelo <56133692+awenelo@users.noreply.github.com>
2021-04-24 20:36:21 +02:00
3d-gussner
b5478e5557
Update French translation for MSG_BED_CORRECTION_MENU by @carlin57
2021-04-24 20:33:37 +02:00
3d-gussner
c9c48a78e2
Update lang/lang_en_fr.txt
...
Co-authored-by: awenelo <56133692+awenelo@users.noreply.github.com>
2021-04-24 20:31:44 +02:00
3d-gussner
9f77ca31b8
Set MSG_SET_TEMPERATURE chars to c=20
...
Fix Italian warning shown by `lang-check.py`
2021-04-24 08:19:48 +02:00
3d-gussner
e53f37729b
Update German translation
2021-04-24 07:59:50 +02:00
Yuri D'Elia
c536407ab0
Italian translation: remove trailing whitespace
2021-04-24 01:04:46 +02:00
Yuri D'Elia
ceb1d2aaaf
lang-check: handle/warn about trailing whitespace
2021-04-24 01:03:38 +02:00
Yuri D'Elia
ecc375f94f
lang-check: improve error strings
2021-04-24 00:16:46 +02:00
Yuri D'Elia
0d89e48827
Two Italian translation improvements
2021-04-24 00:05:45 +02:00
Yuri D'Elia
e3ec295a0e
lang-check: add checks for % escapes
2021-04-23 23:59:50 +02:00
Yuri D'Elia
0db2c5c28a
lang-check: cleanup
2021-04-23 23:19:16 +02:00
Yuri D'Elia
5f0f6d740f
lang-check: attempt at spotting short translations
2021-04-23 23:08:02 +02:00
Yuri D'Elia
68fc2c71bb
lang-check: add basic punctuation checks
2021-04-23 22:49:27 +02:00
Yuri D'Elia
2ceb3897f1
lang-check: respect --no-warning
2021-04-23 22:49:00 +02:00
3d-gussner
fe32d42101
Fix Dutch FINDA translation
2021-04-23 16:19:33 +02:00
Yuri D'Elia
201d2a2434
lang-check: handle backslash sequences
2021-04-23 16:15:24 +02:00
Yuri D'Elia
27d7edae10
lang-check: highlight truncated strings
2021-04-23 15:49:19 +02:00
Yuri D'Elia
7f9910ad28
Update Italian translations
2021-04-23 15:47:48 +02:00
Yuri D'Elia
e4655e5afa
lang-check: pretty-print errors to aid in translation
2021-04-23 15:31:01 +02:00
Yuri D'Elia
695af99ada
lang-check: simplify wrapping, wrap according to cols
2021-04-23 15:31:01 +02:00
Yuri D'Elia
340928acc3
lang-check: print a warning if cols!=20 on multiline messages
2021-04-23 15:31:01 +02:00
3d-gussner
71ab3a9d53
Fix typo thanks to @wavexx
2021-04-23 14:20:28 +02:00
3d-gussner
540940b6a5
Fix German too long translation MSG_MMU_MODE
2021-04-23 13:36:12 +02:00
3d-gussner
c2cde83d7e
Fix MSG_SELFTEST_WIRINGERROR to c=18
2021-04-23 13:29:45 +02:00
3d-gussner
3f51627c02
Fix MSG_NO being too short, no need to be
2021-04-23 13:23:11 +02:00
3d-gussner
7cd76432b9
Fix German MSG_LOAD_TO_NOZZLE
2021-04-23 13:19:47 +02:00
3d-gussner
10a026e075
Fix Dutch + German MSG_UNLOAD_FILAMENT too long translations
2021-04-23 13:16:36 +02:00
3d-gussner
013708479f
Fix MSG_UNLOAD_FILAMENT length as in MMU a number is added
2021-04-23 13:12:57 +02:00
3d-gussner
2281bd1ef7
Merge branch 'PFW-1189' of https://github.com/3d-gussner/Prusa-Firmware into PFW-1189
2021-04-23 13:04:54 +02:00
3d-gussner
032e8a5957
@leptun strip 1st char hack for duplicate `Cancel`
2021-04-23 13:03:59 +02:00
D.R.racer
346044063a
Fix length of some CZ messages
2021-04-23 12:48:25 +02:00
Yuri D'Elia
90a9e350c0
Remove warnings caused by '\x00'
...
Manually unescape '\x00' for the time being, removing spurious warnings.
2021-04-23 12:37:54 +02:00
Yuri D'Elia
2e6e2c4fde
Do not output colors when redirecting output
2021-04-23 12:29:57 +02:00
Yuri D'Elia
8b5d01e3b1
Be more strict when checking translation lenght
...
Strip quotes immediately so that we can measure strings easily.
For single-line strings, check the translation lenght correctly.
2021-04-23 12:18:50 +02:00
Yuri D'Elia
a9f0ff441d
Allow to customize OUTDIR in config.sh
...
Useful for custom build trees.
2021-04-23 12:15:48 +02:00
3d-gussner
28aec049a2
Fix Typo in MSG_FIL_FAILED
2021-04-23 09:41:12 +02:00
3d-gussner
ff9185d1bb
Readded `>Cancel` as the `>` has some meaning. Sadly the previously 10bytes more free space are gone again
2021-04-23 08:50:50 +02:00
3d-gussner
8eeb177c7e
Use textwarp to check the message length and rows
...
@DRracer: Added origial English text to the output, added cols and rows as well
2021-04-23 08:46:32 +02:00
3d-gussner
681bc560c9
Merge remote-tracking branch 'upstream/MK3_3.10.0' into PFW-1189
2021-04-22 20:43:54 +02:00
3d-gussner
d864a5cfdb
Define #MSG_PRINTER_IP c=18
2021-03-31 08:46:17 +02:00
3d-gussner
8e74cbce58
Remove r=1 and some minor fixes
2021-03-31 08:07:42 +02:00
3d-gussner
84c3853351
Fix Dutch #MSG_FINDA c=5
2021-03-31 07:53:27 +02:00
3d-gussner
fb691b44b4
Update #MSG_INFO_SENSORS c=18
2021-03-31 07:51:22 +02:00
3d-gussner
3fb90be46f
Define #MSG_SELECT c=18
2021-03-31 07:50:18 +02:00
3d-gussner
9a0e67c1d7
Define #MSG_RENAME c=18
2021-03-31 07:43:48 +02:00
3d-gussner
15919a0f09
Define #MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=5, #MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9
2021-03-31 07:41:21 +02:00
3d-gussner
cdfc40fb62
Define #MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3
2021-03-31 07:38:41 +02:00
3d-gussner
c0869efc76
Define #MSG_MK3S_FIRMWARE_ON_MK3 c=20 r=4, #MSG_MK3_FIRMWARE_ON_MK3S c=20 r=4
2021-03-31 07:36:26 +02:00
3d-gussner
268d4020cf
Define #MSG_FINDA c=5 and update #MSG_PINDA c=5
2021-03-31 07:32:43 +02:00
3d-gussner
c0b8eef6cd
Define #MSG_FALSE_TRIGGERING c=20
2021-03-31 07:29:42 +02:00
3d-gussner
1ca443f1f4
Define #MSG_CHECKS c=18
2021-03-31 07:28:18 +02:00
3d-gussner
e470ee96c8
Update #MSG_BACK c=18
2021-03-31 07:26:41 +02:00
3d-gussner
5e049283be
Define #MSG_UNKNOWN c=13
2021-03-31 07:24:41 +02:00
3d-gussner
67a0370332
Delete "Unload" as it isn't used anymore
2021-03-31 07:19:56 +02:00
3d-gussner
982153fee1
Define and update #MSG_PRINT_TIME c=19, #MSG_FILAMENT_USED c=19, #MSG_TOTAL_FILAMENT c=19, #MSG_TOTAL_PRINT_TIME c=19
2021-03-31 07:16:36 +02:00
3d-gussner
7a88ce89e4
Update MSG_TEMPERATURE c=18
2021-03-31 07:11:01 +02:00
3d-gussner
c0df79d39a
Define #MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4
2021-03-31 07:10:03 +02:00