Skip to content

Remove 'Media Released' message #17272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 3 commits into from
Apr 20, 2020
Merged

Remove 'Media Released' message #17272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c8bc4f
Remove 'Media Released' message
mathiasvr Mar 24, 2020
eb5af94
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bf2_media_m…
thinkyhead Apr 20, 2020
e2da48a
Remove from Hungarian and Galician
thinkyhead Apr 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Marlin/src/lcd/language/language_cz.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ namespace Language_cz {
PROGMEM Language_Str MSG_MEDIA_ABORTING = _UxGT("Rušení...");
PROGMEM Language_Str MSG_MEDIA_INSERTED = _UxGT("Médium vloženo");
PROGMEM Language_Str MSG_MEDIA_REMOVED = _UxGT("Médium vyjmuto");
PROGMEM Language_Str MSG_MEDIA_RELEASED = _UxGT("Médium uvolněno");
PROGMEM Language_Str MSG_MEDIA_WAITING = _UxGT("Čekání na médium");
PROGMEM Language_Str MSG_MEDIA_READ_ERROR = _UxGT("Chyba čtení média");
PROGMEM Language_Str MSG_MEDIA_USB_REMOVED = _UxGT("USB odstraněno");
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/lcd/language/language_de.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ namespace Language_de {
PROGMEM Language_Str MSG_MEDIA_ABORTING = _UxGT("Abbruch...");
PROGMEM Language_Str MSG_MEDIA_INSERTED = _UxGT("Medium erkannt");
PROGMEM Language_Str MSG_MEDIA_REMOVED = _UxGT("Medium entfernt");
PROGMEM Language_Str MSG_MEDIA_RELEASED = _UxGT("Medium freigegeben");
PROGMEM Language_Str MSG_MEDIA_WAITING = _UxGT("Warten auf Medium");
PROGMEM Language_Str MSG_MEDIA_READ_ERROR = _UxGT("Medium Lesefehler");
PROGMEM Language_Str MSG_MEDIA_USB_REMOVED = _UxGT("USB Gerät entfernt");
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/lcd/language/language_en.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ namespace Language_en {
PROGMEM Language_Str MSG_MEDIA_ABORTING = _UxGT("Aborting...");
PROGMEM Language_Str MSG_MEDIA_INSERTED = _UxGT("Media Inserted");
PROGMEM Language_Str MSG_MEDIA_REMOVED = _UxGT("Media Removed");
PROGMEM Language_Str MSG_MEDIA_RELEASED = _UxGT("Media Released");
PROGMEM Language_Str MSG_MEDIA_WAITING = _UxGT("Waiting for media");
PROGMEM Language_Str MSG_MEDIA_READ_ERROR = _UxGT("Media read error");
PROGMEM Language_Str MSG_MEDIA_USB_REMOVED = _UxGT("USB device removed");
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/lcd/language/language_es.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ namespace Language_es {
PROGMEM Language_Str MSG_MEDIA_ABORTING = _UxGT("Cancelando...");
PROGMEM Language_Str MSG_MEDIA_INSERTED = _UxGT("SD/USB insertado");
PROGMEM Language_Str MSG_MEDIA_REMOVED = _UxGT("SD/USB retirado");
PROGMEM Language_Str MSG_MEDIA_RELEASED = _UxGT("SD/USB lanzado");
PROGMEM Language_Str MSG_MEDIA_WAITING = _UxGT("Esperando al SD/USB");
PROGMEM Language_Str MSG_MEDIA_READ_ERROR = _UxGT("Error lectura SD/USB");
PROGMEM Language_Str MSG_MEDIA_USB_REMOVED = _UxGT("Disp. USB retirado");
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/lcd/language/language_fr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ namespace Language_fr {
PROGMEM Language_Str MSG_MEDIA_ABORTING = _UxGT("Annulation...");
PROGMEM Language_Str MSG_MEDIA_INSERTED = _UxGT("Média inséré");
PROGMEM Language_Str MSG_MEDIA_REMOVED = _UxGT("Média retiré");
PROGMEM Language_Str MSG_MEDIA_RELEASED = _UxGT("Média libéré");
PROGMEM Language_Str MSG_MEDIA_WAITING = _UxGT("Attente média");
PROGMEM Language_Str MSG_MEDIA_READ_ERROR = _UxGT("Err lecture média");
PROGMEM Language_Str MSG_MEDIA_USB_REMOVED = _UxGT("USB débranché");
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/lcd/language/language_gl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ namespace Language_gl {
PROGMEM Language_Str MSG_MEDIA_ABORTING = _UxGT("Cancelando...");
PROGMEM Language_Str MSG_MEDIA_INSERTED = _UxGT("Tarxeta inserida");
PROGMEM Language_Str MSG_MEDIA_REMOVED = _UxGT("Tarxeta retirada");
PROGMEM Language_Str MSG_MEDIA_RELEASED = _UxGT("SD/USB lanzado");
PROGMEM Language_Str MSG_MEDIA_WAITING = _UxGT("Agardando ao SD/USB");
PROGMEM Language_Str MSG_MEDIA_READ_ERROR = _UxGT("Erro lectura SD/USB");
PROGMEM Language_Str MSG_MEDIA_USB_REMOVED = _UxGT("Disp. USB retirado");
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/lcd/language/language_hu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ namespace Language_hu {
PROGMEM Language_Str MSG_MEDIA_ABORTING = _UxGT("Megszakítás...");
PROGMEM Language_Str MSG_MEDIA_INSERTED = _UxGT("Tároló Behelyezve");
PROGMEM Language_Str MSG_MEDIA_REMOVED = _UxGT("Tároló Eltávolítva");
PROGMEM Language_Str MSG_MEDIA_RELEASED = _UxGT("Tároló Leválasztva");
PROGMEM Language_Str MSG_MEDIA_WAITING = _UxGT("Várakozás a tárolóra");
PROGMEM Language_Str MSG_MEDIA_READ_ERROR = _UxGT("Tároló olvasási hiba");
PROGMEM Language_Str MSG_MEDIA_USB_REMOVED = _UxGT("USB eltávolítva");
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/lcd/language/language_it.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ namespace Language_it {
PROGMEM Language_Str MSG_MEDIA_ABORTING = _UxGT("Annullando...");
PROGMEM Language_Str MSG_MEDIA_INSERTED = _UxGT("Media inserito");
PROGMEM Language_Str MSG_MEDIA_REMOVED = _UxGT("Media rimosso");
PROGMEM Language_Str MSG_MEDIA_RELEASED = _UxGT("Media rilasciato");
PROGMEM Language_Str MSG_MEDIA_WAITING = _UxGT("Aspettando media");
PROGMEM Language_Str MSG_MEDIA_READ_ERROR = _UxGT("Err.leggendo media");
PROGMEM Language_Str MSG_MEDIA_USB_REMOVED = _UxGT("Dispos.USB rimosso");
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/lcd/language/language_jp_kana.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ namespace Language_jp_kana {
PROGMEM Language_Str MSG_MEDIA_INSERTED = _UxGT("メディアガソウニュウサレマシタ"); // "Card inserted"
PROGMEM Language_Str MSG_MEDIA_REMOVED = _UxGT("メディアガアリマセン"); // "Card removed"
PROGMEM Language_Str MSG_RELEASE_MEDIA = _UxGT("メディアノトリダシ");
PROGMEM Language_Str MSG_MEDIA_RELEASED = _UxGT("メディアガアリマセン"); // "Card removed"
PROGMEM Language_Str MSG_LCD_ENDSTOPS = _UxGT("エンドストップ"); // "Endstops" // Max length 8 characters
PROGMEM Language_Str MSG_MAIN = _UxGT("メイン"); // "Main"
PROGMEM Language_Str MSG_AUTOSTART = _UxGT("ジドウカイシ"); // "Autostart"
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/lcd/language/language_pl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ namespace Language_pl {
PROGMEM Language_Str MSG_MEDIA_ABORTING = _UxGT("Przerywanie...");
PROGMEM Language_Str MSG_MEDIA_INSERTED = _UxGT("Karta włożona");
PROGMEM Language_Str MSG_MEDIA_REMOVED = _UxGT("Karta usunięta");
PROGMEM Language_Str MSG_MEDIA_RELEASED = _UxGT("Karta zwolniona");
PROGMEM Language_Str MSG_MEDIA_WAITING = _UxGT("Oczekiwanie na kartę");
PROGMEM Language_Str MSG_MEDIA_READ_ERROR = _UxGT("Bład odczytu karty");
PROGMEM Language_Str MSG_MEDIA_USB_REMOVED = _UxGT("Urządzenie USB usunięte");
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/lcd/language/language_ru.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ namespace Language_ru {
PROGMEM Language_Str MSG_BACK = _UxGT("Назад");
PROGMEM Language_Str MSG_MEDIA_INSERTED = _UxGT("Карта вставлена");
PROGMEM Language_Str MSG_MEDIA_REMOVED = _UxGT("Карта извлечена");
PROGMEM Language_Str MSG_MEDIA_RELEASED = _UxGT("SD карта не активна");
PROGMEM Language_Str MSG_LCD_ENDSTOPS = _UxGT("Эндстопы"); // Max length 8 characters
PROGMEM Language_Str MSG_LCD_SOFT_ENDSTOPS = _UxGT("Прогр. эндстопы");
PROGMEM Language_Str MSG_MAIN = _UxGT("Меню");
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/lcd/language/language_sk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ namespace Language_sk {
PROGMEM Language_Str MSG_MEDIA_ABORTING = _UxGT("Ruším...");
PROGMEM Language_Str MSG_MEDIA_INSERTED = _UxGT("Karta vložená");
PROGMEM Language_Str MSG_MEDIA_REMOVED = _UxGT("Karta vybraná");
PROGMEM Language_Str MSG_MEDIA_RELEASED = _UxGT("Karta odpojená");
PROGMEM Language_Str MSG_MEDIA_WAITING = _UxGT("Čakám na kartu");
PROGMEM Language_Str MSG_MEDIA_READ_ERROR = _UxGT("Chyba čítania karty");
PROGMEM Language_Str MSG_MEDIA_USB_REMOVED = _UxGT("USB zaria. odstrán.");
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/lcd/language/language_tr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ namespace Language_tr {
PROGMEM Language_Str MSG_MEDIA_ABORTING = _UxGT("Durduruluyor...");
PROGMEM Language_Str MSG_MEDIA_INSERTED = _UxGT("SD K. Yerleştirildi.");
PROGMEM Language_Str MSG_MEDIA_REMOVED = _UxGT("SD Kart Çıkarıldı.");
PROGMEM Language_Str MSG_MEDIA_RELEASED = _UxGT("SD Kart Serbest");
PROGMEM Language_Str MSG_MEDIA_WAITING = _UxGT("SD Kart Bekleniyor");
PROGMEM Language_Str MSG_MEDIA_READ_ERROR = _UxGT("Kart Okuma Hatası");
PROGMEM Language_Str MSG_MEDIA_USB_REMOVED = _UxGT("USB Çıkarıldı");
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/lcd/language/language_vi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ namespace Language_vi {
PROGMEM Language_Str MSG_MEDIA_ABORTING = _UxGT("Đang hủy bỏ...");
PROGMEM Language_Str MSG_MEDIA_INSERTED = _UxGT("Phương tiện được cắm vào"); // Media inserted
PROGMEM Language_Str MSG_MEDIA_REMOVED = _UxGT("Phương tiện được rút ra");
PROGMEM Language_Str MSG_MEDIA_RELEASED = _UxGT("Phương tiện đã phát hành");
PROGMEM Language_Str MSG_MEDIA_WAITING = _UxGT("Chờ đợi phương tiện");
PROGMEM Language_Str MSG_MEDIA_READ_ERROR = _UxGT("Lỗi đọc phương tiện");
PROGMEM Language_Str MSG_MEDIA_USB_REMOVED = _UxGT("USB được rút ra");
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/lcd/language/language_zh_TW.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_MEDIA_ABORTING = _UxGT("正在中止..."); //"Aborting..."
PROGMEM Language_Str MSG_MEDIA_INSERTED = _UxGT("記憶卡已插入"); //"Card inserted"
PROGMEM Language_Str MSG_MEDIA_REMOVED = _UxGT("記憶卡被拔出"); //"Card removed"
PROGMEM Language_Str MSG_MEDIA_RELEASED = _UxGT("記憶卡被釋放"); //"Media Released"
PROGMEM Language_Str MSG_MEDIA_WAITING = _UxGT("等待記憶卡"); //"Waiting for media"
PROGMEM Language_Str MSG_MEDIA_READ_ERROR = _UxGT("記憶卡讀取錯誤"); //"Media read error"
PROGMEM Language_Str MSG_MEDIA_USB_REMOVED = _UxGT("USB裝置已移除"); //"USB device removed"
Expand Down
2 changes: 0 additions & 2 deletions Marlin/src/lcd/menu/menu_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ void menu_main() {
ACTION_ITEM(MSG_NO_MEDIA, nullptr);
#else
GCODES_ITEM(MSG_ATTACH_MEDIA, M21_STR);
ACTION_ITEM(MSG_MEDIA_RELEASED, nullptr);
#endif
}

Expand Down Expand Up @@ -229,7 +228,6 @@ void menu_main() {
ACTION_ITEM(MSG_NO_MEDIA, nullptr);
#else
GCODES_ITEM(MSG_ATTACH_MEDIA, M21_STR);
ACTION_ITEM(MSG_MEDIA_RELEASED, nullptr);
#endif
}

Expand Down