Lang - text "open failed, File: " removed from dictionary

This commit is contained in:
Robert Pelnar 2018-11-22 18:15:22 +01:00
parent 72d47eaeba
commit f4bbce4142
10 changed files with 5 additions and 32 deletions

View file

@ -330,7 +330,7 @@ void CardReader::diveSubfolder (const char *fileName, SdFile& dir)
SERIAL_ECHOLN(subdirname); SERIAL_ECHOLN(subdirname);
if (!dir.open(curDir, subdirname, O_READ)) if (!dir.open(curDir, subdirname, O_READ))
{ {
SERIAL_PROTOCOLRPGM(_T(MSG_SD_OPEN_FILE_FAIL)); SERIAL_PROTOCOLRPGM(MSG_SD_OPEN_FILE_FAIL);
SERIAL_PROTOCOL(subdirname); SERIAL_PROTOCOL(subdirname);
SERIAL_PROTOCOLLNPGM("."); SERIAL_PROTOCOLLNPGM(".");
return; return;
@ -431,7 +431,7 @@ void CardReader::openFile(const char* name,bool read, bool replace_current/*=tru
} }
else else
{ {
SERIAL_PROTOCOLRPGM(_T(MSG_SD_OPEN_FILE_FAIL)); SERIAL_PROTOCOLRPGM(MSG_SD_OPEN_FILE_FAIL);
SERIAL_PROTOCOL(fname); SERIAL_PROTOCOL(fname);
SERIAL_PROTOCOLLNPGM("."); SERIAL_PROTOCOLLNPGM(".");
} }
@ -440,7 +440,7 @@ void CardReader::openFile(const char* name,bool read, bool replace_current/*=tru
{ //write { //write
if (!file.open(curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC)) if (!file.open(curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC))
{ {
SERIAL_PROTOCOLRPGM(_T(MSG_SD_OPEN_FILE_FAIL)); SERIAL_PROTOCOLRPGM(MSG_SD_OPEN_FILE_FAIL);
SERIAL_PROTOCOL(fname); SERIAL_PROTOCOL(fname);
SERIAL_PROTOCOLLNPGM("."); SERIAL_PROTOCOLLNPGM(".");
} }

View file

@ -72,7 +72,6 @@ const char MSG_RECOVER_PRINT[] PROGMEM_I1 = ISTR("Blackout occurred. Recover pri
const char MSG_REFRESH[] PROGMEM_I1 = ISTR("\xF8" "Refresh"); ////c=0 r=0 const char MSG_REFRESH[] PROGMEM_I1 = ISTR("\xF8" "Refresh"); ////c=0 r=0
const char MSG_RESUMING_PRINT[] PROGMEM_I1 = ISTR("Resuming print"); ////c=0 r=0 const char MSG_RESUMING_PRINT[] PROGMEM_I1 = ISTR("Resuming print"); ////c=0 r=0
const char MSG_REMOVE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please remove steel sheet from heatbed."); ////c=20 r=4 const char MSG_REMOVE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please remove steel sheet from heatbed."); ////c=20 r=4
const char MSG_SD_OPEN_FILE_FAIL[] PROGMEM_I1 = ISTR("open failed, File: "); ////c=0 r=0
const char MSG_SELFTEST_COOLING_FAN[] PROGMEM_I1 = ISTR("Front print fan?"); ////c=20 r=0 const char MSG_SELFTEST_COOLING_FAN[] PROGMEM_I1 = ISTR("Front print fan?"); ////c=20 r=0
const char MSG_SELFTEST_EXTRUDER_FAN[] PROGMEM_I1 = ISTR("Left hotend fan?"); ////c=20 r=0 const char MSG_SELFTEST_EXTRUDER_FAN[] PROGMEM_I1 = ISTR("Left hotend fan?"); ////c=20 r=0
const char MSG_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("Selftest failed "); ////c=20 r=0 const char MSG_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("Selftest failed "); ////c=20 r=0
@ -122,3 +121,4 @@ const char MSG_Enqueing[] PROGMEM_N1 = "enqueing \""; ////c=0 r=0
const char MSG_ENDSTOPS_HIT[] PROGMEM_N1 = "endstops hit: "; ////c=0 r=0 const char MSG_ENDSTOPS_HIT[] PROGMEM_N1 = "endstops hit: "; ////c=0 r=0
const char MSG_SD_ERR_WRITE_TO_FILE[] PROGMEM_N1 = "error writing to file"; ////c=0 r=0 const char MSG_SD_ERR_WRITE_TO_FILE[] PROGMEM_N1 = "error writing to file"; ////c=0 r=0
const char MSG_OK[] PROGMEM_N1 = "ok"; ////c=0 r=0 const char MSG_OK[] PROGMEM_N1 = "ok"; ////c=0 r=0
const char MSG_SD_OPEN_FILE_FAIL[] PROGMEM_N1 = "open failed, File: "; ////c=0 r=0

View file

@ -73,7 +73,6 @@ extern const char MSG_RECOVER_PRINT[];
extern const char MSG_REFRESH[]; extern const char MSG_REFRESH[];
extern const char MSG_REMOVE_STEEL_SHEET[]; extern const char MSG_REMOVE_STEEL_SHEET[];
extern const char MSG_RESUMING_PRINT[]; extern const char MSG_RESUMING_PRINT[];
extern const char MSG_SD_OPEN_FILE_FAIL[];
extern const char MSG_SD_WORKDIR_FAIL[]; extern const char MSG_SD_WORKDIR_FAIL[];
extern const char MSG_SELFTEST_COOLING_FAN[]; extern const char MSG_SELFTEST_COOLING_FAN[];
extern const char MSG_SELFTEST_EXTRUDER_FAN[]; extern const char MSG_SELFTEST_EXTRUDER_FAN[];
@ -123,6 +122,7 @@ extern const char MSG_Enqueing[];
extern const char MSG_ENDSTOPS_HIT[]; extern const char MSG_ENDSTOPS_HIT[];
extern const char MSG_SD_ERR_WRITE_TO_FILE[]; extern const char MSG_SD_ERR_WRITE_TO_FILE[];
extern const char MSG_OK[]; extern const char MSG_OK[];
extern const char MSG_SD_OPEN_FILE_FAIL[];
#if defined(__cplusplus) #if defined(__cplusplus)
} }

View file

@ -556,9 +556,6 @@
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
"Old settings found. Default PID, Esteps etc. will be set." "Old settings found. Default PID, Esteps etc. will be set."
#MSG_SD_OPEN_FILE_FAIL c=0 r=0
"open failed, File: "
#MSG_ENDSTOP_OPEN c=0 r=0 #MSG_ENDSTOP_OPEN c=0 r=0
"open" "open"

View file

@ -742,10 +742,6 @@
"Old settings found. Default PID, Esteps etc. will be set." "Old settings found. Default PID, Esteps etc. will be set."
"Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd." "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd."
#MSG_SD_OPEN_FILE_FAIL c=0 r=0
"open failed, File: "
"nelze otevrit, Soubor: "
#MSG_ENDSTOP_OPEN c=0 r=0 #MSG_ENDSTOP_OPEN c=0 r=0
"open" "open"
"otevrit" "otevrit"

View file

@ -742,10 +742,6 @@
"Old settings found. Default PID, Esteps etc. will be set." "Old settings found. Default PID, Esteps etc. will be set."
"Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt." "Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt."
#MSG_SD_OPEN_FILE_FAIL c=0 r=0
"open failed, File: "
"Fehler beim Oeffnen der Datei: "
#MSG_ENDSTOP_OPEN c=0 r=0 #MSG_ENDSTOP_OPEN c=0 r=0
"open" "open"
"offen" "offen"

View file

@ -742,10 +742,6 @@
"Old settings found. Default PID, Esteps etc. will be set." "Old settings found. Default PID, Esteps etc. will be set."
"Se han encontrado ajustes anteriores. Se ajustara el PID, los pasos del extrusor, etc" "Se han encontrado ajustes anteriores. Se ajustara el PID, los pasos del extrusor, etc"
#MSG_SD_OPEN_FILE_FAIL c=0 r=0
"open failed, File: "
"error apertura, Arch.: "
#MSG_ENDSTOP_OPEN c=0 r=0 #MSG_ENDSTOP_OPEN c=0 r=0
"open" "open"
"abrir" "abrir"

View file

@ -742,10 +742,6 @@
"Old settings found. Default PID, Esteps etc. will be set." "Old settings found. Default PID, Esteps etc. will be set."
"Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront pris." "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront pris."
#MSG_SD_OPEN_FILE_FAIL c=0 r=0
"open failed, File: "
"Echec ouverture, Fichier :"
#MSG_ENDSTOP_OPEN c=0 r=0 #MSG_ENDSTOP_OPEN c=0 r=0
"open" "open"
"ouvrir" "ouvrir"

View file

@ -742,10 +742,6 @@
"Old settings found. Default PID, Esteps etc. will be set." "Old settings found. Default PID, Esteps etc. will be set."
"Sono state trovate impostazioni vecchie. I valori di default di PID, Esteps etc. saranno impostati" "Sono state trovate impostazioni vecchie. I valori di default di PID, Esteps etc. saranno impostati"
#MSG_SD_OPEN_FILE_FAIL c=0 r=0
"open failed, File: "
"apertura fallita, File: "
#MSG_ENDSTOP_OPEN c=0 r=0 #MSG_ENDSTOP_OPEN c=0 r=0
"open" "open"
"apri" "apri"

View file

@ -742,10 +742,6 @@
"Old settings found. Default PID, Esteps etc. will be set." "Old settings found. Default PID, Esteps etc. will be set."
"Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp." "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp."
#MSG_SD_OPEN_FILE_FAIL c=0 r=0
"open failed, File: "
"niepowodzenie otwarcia, Plik:"
#MSG_ENDSTOP_OPEN c=0 r=0 #MSG_ENDSTOP_OPEN c=0 r=0
"open" "open"
"otworz" "otworz"