Merge branch 'MK3' into MK3_Dutch
Fix merge conflicts
This commit is contained in:
commit
2d82374c2b
16 changed files with 6749 additions and 11174 deletions
|
@ -819,8 +819,8 @@
|
|||
"Predehrev k vyjmuti"
|
||||
|
||||
#MSG_SELFTEST_PRINT_FAN_SPEED c=18
|
||||
"Print fan"
|
||||
"Tiskovy vent."
|
||||
"Print fan:"
|
||||
"Tiskovy vent.:"
|
||||
|
||||
#MSG_CARD_MENU
|
||||
"Print from SD"
|
||||
|
|
|
@ -62,7 +62,7 @@
|
|||
"Auto home"
|
||||
"Mise a 0 des axes"
|
||||
|
||||
#MSG_AUTOLOAD_FILAMENT c=18
|
||||
#MSG_AUTOLOAD_FILAMENT c=17
|
||||
"AutoLoad filament"
|
||||
"Autocharge du fil."
|
||||
|
||||
|
|
|
@ -1413,6 +1413,7 @@
|
|||
#
|
||||
"Sheet"
|
||||
"Plyta"
|
||||
|
||||
#
|
||||
"Sound [assist]"
|
||||
"Dzwiek [asyst.]"
|
||||
|
|
|
@ -7,8 +7,8 @@ msgstr ""
|
|||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: en\n"
|
||||
"Project-Id-Version: Prusa-Firmware\n"
|
||||
"POT-Creation-Date: Sat, Sep 21, 2019 1:40:32 PM\n"
|
||||
"PO-Revision-Date: Sat, Sep 21, 2019 1:40:32 PM\n"
|
||||
"POT-Creation-Date: Sun, Sep 22, 2019 2:01:55 PM\n"
|
||||
"PO-Revision-Date: Sun, Sep 22, 2019 2:01:55 PM\n"
|
||||
"Language-Team: \n"
|
||||
"X-Generator: Poedit 2.0.7\n"
|
||||
"X-Poedit-SourceCharset: UTF-8\n"
|
||||
|
|
|
@ -7,8 +7,8 @@ msgstr ""
|
|||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: cs\n"
|
||||
"Project-Id-Version: Prusa-Firmware\n"
|
||||
"POT-Creation-Date: Sat, Sep 21, 2019 1:41:37 PM\n"
|
||||
"PO-Revision-Date: Sat, Sep 21, 2019 1:41:37 PM\n"
|
||||
"POT-Creation-Date: Sun, Sep 22, 2019 2:03:01 PM\n"
|
||||
"PO-Revision-Date: Sun, Sep 22, 2019 2:03:01 PM\n"
|
||||
"Language-Team: \n"
|
||||
"X-Generator: Poedit 2.0.7\n"
|
||||
"X-Poedit-SourceCharset: UTF-8\n"
|
||||
|
@ -1041,9 +1041,9 @@ msgid "Preheating to unload"
|
|||
msgstr "Predehrev k vyjmuti"
|
||||
|
||||
# MSG_SELFTEST_PRINT_FAN_SPEED c=18
|
||||
#:
|
||||
msgid "Print fan"
|
||||
msgstr "Tiskovy vent."
|
||||
#: ultralcd.cpp:8307
|
||||
msgid "Print fan:"
|
||||
msgstr "Tiskovy vent.:"
|
||||
|
||||
# MSG_CARD_MENU
|
||||
#: messages.c:21
|
||||
|
|
|
@ -7,8 +7,8 @@ msgstr ""
|
|||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: de\n"
|
||||
"Project-Id-Version: Prusa-Firmware\n"
|
||||
"POT-Creation-Date: Sat, Sep 21, 2019 1:42:42 PM\n"
|
||||
"PO-Revision-Date: Sat, Sep 21, 2019 1:42:42 PM\n"
|
||||
"POT-Creation-Date: Sun, Sep 22, 2019 2:04:09 PM\n"
|
||||
"PO-Revision-Date: Sun, Sep 22, 2019 2:04:09 PM\n"
|
||||
"Language-Team: \n"
|
||||
"X-Generator: Poedit 2.0.7\n"
|
||||
"X-Poedit-SourceCharset: UTF-8\n"
|
||||
|
|
|
@ -7,8 +7,8 @@ msgstr ""
|
|||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: es\n"
|
||||
"Project-Id-Version: Prusa-Firmware\n"
|
||||
"POT-Creation-Date: Sat, Sep 21, 2019 1:43:47 PM\n"
|
||||
"PO-Revision-Date: Sat, Sep 21, 2019 1:43:47 PM\n"
|
||||
"POT-Creation-Date: Sun, Sep 22, 2019 2:05:16 PM\n"
|
||||
"PO-Revision-Date: Sun, Sep 22, 2019 2:05:16 PM\n"
|
||||
"Language-Team: \n"
|
||||
"X-Generator: Poedit 2.0.7\n"
|
||||
"X-Poedit-SourceCharset: UTF-8\n"
|
||||
|
|
|
@ -7,8 +7,8 @@ msgstr ""
|
|||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: fr\n"
|
||||
"Project-Id-Version: Prusa-Firmware\n"
|
||||
"POT-Creation-Date: Sat, Sep 21, 2019 1:44:51 PM\n"
|
||||
"PO-Revision-Date: Sat, Sep 21, 2019 1:44:51 PM\n"
|
||||
"POT-Creation-Date: Sun, Sep 22, 2019 2:06:22 PM\n"
|
||||
"PO-Revision-Date: Sun, Sep 22, 2019 2:06:22 PM\n"
|
||||
"Language-Team: \n"
|
||||
"X-Generator: Poedit 2.0.7\n"
|
||||
"X-Poedit-SourceCharset: UTF-8\n"
|
||||
|
@ -95,7 +95,7 @@ msgstr ""
|
|||
msgid "Auto home"
|
||||
msgstr "Mise a 0 des axes"
|
||||
|
||||
# MSG_AUTOLOAD_FILAMENT c=18
|
||||
# MSG_AUTOLOAD_FILAMENT c=17
|
||||
#: ultralcd.cpp:6822
|
||||
msgid "AutoLoad filament"
|
||||
msgstr "Autocharge du fil."
|
||||
|
|
|
@ -7,8 +7,8 @@ msgstr ""
|
|||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: it\n"
|
||||
"Project-Id-Version: Prusa-Firmware\n"
|
||||
"POT-Creation-Date: Sat, Sep 21, 2019 1:47:01 PM\n"
|
||||
"PO-Revision-Date: Sat, Sep 21, 2019 1:47:01 PM\n"
|
||||
"POT-Creation-Date: Sun, Sep 22, 2019 2:07:29 PM\n"
|
||||
"PO-Revision-Date: Sun, Sep 22, 2019 2:07:29 PM\n"
|
||||
"Language-Team: \n"
|
||||
"X-Generator: Poedit 2.0.7\n"
|
||||
"X-Poedit-SourceCharset: UTF-8\n"
|
||||
|
|
|
@ -7,8 +7,8 @@ msgstr ""
|
|||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: pl\n"
|
||||
"Project-Id-Version: Prusa-Firmware\n"
|
||||
"POT-Creation-Date: Sat, Sep 21, 2019 1:48:09 PM\n"
|
||||
"PO-Revision-Date: Sat, Sep 21, 2019 1:48:09 PM\n"
|
||||
"POT-Creation-Date: Sun, Sep 22, 2019 2:08:35 PM\n"
|
||||
"PO-Revision-Date: Sun, Sep 22, 2019 2:08:35 PM\n"
|
||||
"Language-Team: \n"
|
||||
"X-Generator: Poedit 2.0.7\n"
|
||||
"X-Poedit-SourceCharset: UTF-8\n"
|
||||
|
@ -1780,6 +1780,11 @@ msgstr "Wybierz"
|
|||
msgid "Sensor info"
|
||||
msgstr "Info o sensorach"
|
||||
|
||||
#
|
||||
#: messages.c:58
|
||||
msgid "Sheet"
|
||||
msgstr "Plyta"
|
||||
|
||||
#
|
||||
#: sound.h:9
|
||||
msgid "Sound [assist]"
|
||||
|
|
3481
lang/po/new/cs.po
3481
lang/po/new/cs.po
File diff suppressed because it is too large
Load diff
2325
lang/po/new/de.po
2325
lang/po/new/de.po
File diff suppressed because it is too large
Load diff
2332
lang/po/new/es.po
2332
lang/po/new/es.po
File diff suppressed because it is too large
Load diff
2493
lang/po/new/fr.po
2493
lang/po/new/fr.po
File diff suppressed because it is too large
Load diff
3752
lang/po/new/it.po
3752
lang/po/new/it.po
File diff suppressed because it is too large
Load diff
3492
lang/po/new/pl.po
3492
lang/po/new/pl.po
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue