josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'MK3' into MK3_Dutch 

Fix merge conflicts
This commit is contained in:
3d-gussner 2019-09-23 18:48:35 +02:00
parent 18e1a2266a ddc9cf6336
commit 2d82374c2b
16 changed files with 6749 additions and 11174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/lang_en_cz.txt
View File

@ -819,8 +819,8 @@
"Predehrev k vyjmuti" "Predehrev k vyjmuti"
#MSG_SELFTEST_PRINT_FAN_SPEED c=18 #MSG_SELFTEST_PRINT_FAN_SPEED c=18
"Print fan" "Print fan:"
"Tiskovy vent." "Tiskovy vent.:"
#MSG_CARD_MENU #MSG_CARD_MENU
"Print from SD" "Print from SD"

2
lang/lang_en_fr.txt
View File

@ -62,7 +62,7 @@
"Auto home" "Auto home"
"Mise a 0 des axes" "Mise a 0 des axes"
#MSG_AUTOLOAD_FILAMENT c=18 #MSG_AUTOLOAD_FILAMENT c=17
"AutoLoad filament" "AutoLoad filament"
"Autocharge du fil." "Autocharge du fil."

1
lang/lang_en_pl.txt
View File

@ -1413,6 +1413,7 @@
# #
"Sheet" "Sheet"
"Plyta" "Plyta"
# #
"Sound [assist]" "Sound [assist]"
"Dzwiek [asyst.]" "Dzwiek [asyst.]"

4
lang/po/Firmware.pot
View File

@ -7,8 +7,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: en\n" "Language: en\n"
"Project-Id-Version: Prusa-Firmware\n" "Project-Id-Version: Prusa-Firmware\n"
"POT-Creation-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: Sat, Sep 21, 2019 1:40:32 PM\n" "PO-Revision-Date: Sun, Sep 22, 2019 2:01:55 PM\n"
"Language-Team: \n" "Language-Team: \n"
"X-Generator: Poedit 2.0.7\n" "X-Generator: Poedit 2.0.7\n"
"X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-SourceCharset: UTF-8\n"

10
lang/po/Firmware_cs.po
View File

@ -7,8 +7,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: cs\n" "Language: cs\n"
"Project-Id-Version: Prusa-Firmware\n" "Project-Id-Version: Prusa-Firmware\n"
"POT-Creation-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: Sat, Sep 21, 2019 1:41:37 PM\n" "PO-Revision-Date: Sun, Sep 22, 2019 2:03:01 PM\n"
"Language-Team: \n" "Language-Team: \n"
"X-Generator: Poedit 2.0.7\n" "X-Generator: Poedit 2.0.7\n"
"X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-SourceCharset: UTF-8\n"
@ -1041,9 +1041,9 @@ msgid "Preheating to unload"
msgstr "Predehrev k vyjmuti" msgstr "Predehrev k vyjmuti"
# MSG_SELFTEST_PRINT_FAN_SPEED c=18 # MSG_SELFTEST_PRINT_FAN_SPEED c=18
#: #: ultralcd.cpp:8307
msgid "Print fan" msgid "Print fan:"
msgstr "Tiskovy vent." msgstr "Tiskovy vent.:"
# MSG_CARD_MENU # MSG_CARD_MENU
#: messages.c:21 #: messages.c:21

4
lang/po/Firmware_de.po
View File

@ -7,8 +7,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: de\n" "Language: de\n"
"Project-Id-Version: Prusa-Firmware\n" "Project-Id-Version: Prusa-Firmware\n"
"POT-Creation-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: Sat, Sep 21, 2019 1:42:42 PM\n" "PO-Revision-Date: Sun, Sep 22, 2019 2:04:09 PM\n"
"Language-Team: \n" "Language-Team: \n"
"X-Generator: Poedit 2.0.7\n" "X-Generator: Poedit 2.0.7\n"
"X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-SourceCharset: UTF-8\n"

4
lang/po/Firmware_es.po
View File

@ -7,8 +7,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: es\n" "Language: es\n"
"Project-Id-Version: Prusa-Firmware\n" "Project-Id-Version: Prusa-Firmware\n"
"POT-Creation-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: Sat, Sep 21, 2019 1:43:47 PM\n" "PO-Revision-Date: Sun, Sep 22, 2019 2:05:16 PM\n"
"Language-Team: \n" "Language-Team: \n"
"X-Generator: Poedit 2.0.7\n" "X-Generator: Poedit 2.0.7\n"
"X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-SourceCharset: UTF-8\n"

6
lang/po/Firmware_fr.po
View File

@ -7,8 +7,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: fr\n" "Language: fr\n"
"Project-Id-Version: Prusa-Firmware\n" "Project-Id-Version: Prusa-Firmware\n"
"POT-Creation-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: Sat, Sep 21, 2019 1:44:51 PM\n" "PO-Revision-Date: Sun, Sep 22, 2019 2:06:22 PM\n"
"Language-Team: \n" "Language-Team: \n"
"X-Generator: Poedit 2.0.7\n" "X-Generator: Poedit 2.0.7\n"
"X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-SourceCharset: UTF-8\n"
@ -95,7 +95,7 @@ msgstr ""
msgid "Auto home" msgid "Auto home"
msgstr "Mise a 0 des axes" msgstr "Mise a 0 des axes"
# MSG_AUTOLOAD_FILAMENT c=18 # MSG_AUTOLOAD_FILAMENT c=17
#: ultralcd.cpp:6822 #: ultralcd.cpp:6822
msgid "AutoLoad filament" msgid "AutoLoad filament"
msgstr "Autocharge du fil." msgstr "Autocharge du fil."

4
lang/po/Firmware_it.po
View File

@ -7,8 +7,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: it\n" "Language: it\n"
"Project-Id-Version: Prusa-Firmware\n" "Project-Id-Version: Prusa-Firmware\n"
"POT-Creation-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: Sat, Sep 21, 2019 1:47:01 PM\n" "PO-Revision-Date: Sun, Sep 22, 2019 2:07:29 PM\n"
"Language-Team: \n" "Language-Team: \n"
"X-Generator: Poedit 2.0.7\n" "X-Generator: Poedit 2.0.7\n"
"X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-SourceCharset: UTF-8\n"

9
lang/po/Firmware_pl.po
View File

@ -7,8 +7,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: pl\n" "Language: pl\n"
"Project-Id-Version: Prusa-Firmware\n" "Project-Id-Version: Prusa-Firmware\n"
"POT-Creation-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: Sat, Sep 21, 2019 1:48:09 PM\n" "PO-Revision-Date: Sun, Sep 22, 2019 2:08:35 PM\n"
"Language-Team: \n" "Language-Team: \n"
"X-Generator: Poedit 2.0.7\n" "X-Generator: Poedit 2.0.7\n"
"X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-SourceCharset: UTF-8\n"
@ -1780,6 +1780,11 @@ msgstr "Wybierz"
msgid "Sensor info" msgid "Sensor info"
msgstr "Info o sensorach" msgstr "Info o sensorach"
#
#: messages.c:58
msgid "Sheet"
msgstr "Plyta"
# #
#: sound.h:9 #: sound.h:9
msgid "Sound [assist]" msgid "Sound [assist]"

3481
lang/po/new/cs.po
View File

File diff suppressed because it is too large Load Diff

2325
lang/po/new/de.po
View File

File diff suppressed because it is too large Load Diff

2332
lang/po/new/es.po
View File

File diff suppressed because it is too large Load Diff

2493
lang/po/new/fr.po
View File

File diff suppressed because it is too large Load Diff

3752
lang/po/new/it.po
View File

File diff suppressed because it is too large Load Diff

3492
lang/po/new/pl.po
View File

File diff suppressed because it is too large Load Diff