diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 387468094..fe0f6c246 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1503,6 +1503,7 @@ moviebrowser.book_movieend Filmende: moviebrowser.book_moviestart Filmstart: moviebrowser.book_name Name: moviebrowser.book_new Neue Markierung +moviebrowser.book_no_end Keine Endmarkierung gefunden moviebrowser.book_position Position: moviebrowser.book_type Sprung (<0 zurück, >0 vor): moviebrowser.book_type_backward Wiederholung @@ -1513,7 +1514,15 @@ moviebrowser.browser_row_item Spalteninfo moviebrowser.browser_row_nr Anzahl Spalten moviebrowser.browser_row_width Spaltenbreite [% der Gesamtbreite] moviebrowser.cache_dir Cache-Verzeichnis +moviebrowser.copies Kopiere Sprungmarken vom Film in neue Dateien? +moviebrowser.copy Kopiere Sprungmarken vom Film in neue Datei? +moviebrowser.copy_failed Fehler beim Kopieren. Sind Sprungmarken und genug freier Speicher vorhanden? +moviebrowser.copying Kopiere Sprungmarken, bitte warten ... +moviebrowser.cut Schneide Sprungmarken aus dem Film? +moviebrowser.cut_failed Fehler beim Schneiden. Sind Sprungmarken und genug freier Speicher vorhanden? +moviebrowser.cutting Schneide Film, bitte warten ... moviebrowser.delete_info Lösche Dateien, bitte warten... +moviebrowser.delete_screenshot Lösche Screenshot? moviebrowser.dir Pfad moviebrowser.dir_head Zusätzliche Verzeichnisse moviebrowser.edit_book Bookmark Ändern @@ -1614,6 +1623,10 @@ moviebrowser.short_size Größe moviebrowser.short_title Titel moviebrowser.start_head Film starten von Position: moviebrowser.start_record_start Aufnahmestart +moviebrowser.truncate Film kürzen? +moviebrowser.truncate_failed Fehler beim Kürzen des Films +moviebrowser.truncate_failed_playing Kürzen des Films während der Wiedergabe nicht möglich. +moviebrowser.truncating Kürze Film, bitte warten ... moviebrowser.ts_only Nur Aufnahmen zeigen moviebrowser.update_if_dest_empty_only Übernehmen nur wenn Ziel leer moviebrowser.use_dir Verzeichnis verwenden diff --git a/data/locale/english.locale b/data/locale/english.locale index 036f06f24..747d55236 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1508,6 +1508,7 @@ moviebrowser.book_movieend Movie end: moviebrowser.book_moviestart User Movie start: moviebrowser.book_name Name: moviebrowser.book_new New Bookmark +moviebrowser.book_no_end No end bookmark defined moviebrowser.book_position Position: moviebrowser.book_type Jump (<0 back , >0 for): moviebrowser.book_type_backward Repeat @@ -1518,7 +1519,15 @@ moviebrowser.browser_row_item Row item moviebrowser.browser_row_nr Number of rows moviebrowser.browser_row_width Row width (% of screenwidth) moviebrowser.cache_dir Cache directory +moviebrowser.copies Copy jumps from movie to new files? +moviebrowser.copy Copy jumps from movie to new file? +moviebrowser.copy_failed Copy failed, are there jump bookmarks and enough free space? +moviebrowser.copying Coping, please wait ... +moviebrowser.cut Cut jumps from movie? +moviebrowser.cut_failed Cut failed, are there jump bookmarks and enough free space? +moviebrowser.cutting Cutting movie, please wait ... moviebrowser.delete_info Delete files, please wait... +moviebrowser.delete_screenshot Delete screenshot? moviebrowser.dir Path moviebrowser.dir_head Additional paths moviebrowser.edit_book Bookmark change @@ -1619,6 +1628,10 @@ moviebrowser.short_size MB moviebrowser.short_title Title moviebrowser.start_head Start movie from: moviebrowser.start_record_start Movie start +moviebrowser.truncate Truncate movie? +moviebrowser.truncate_failed Truncate failed. +moviebrowser.truncate_failed_playing Impossible to truncate playing movie. +moviebrowser.truncating Truncating movie, please wait ... moviebrowser.ts_only Show recordings only moviebrowser.update_if_dest_empty_only Copy if destination is empty only moviebrowser.use_dir Use directory diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index e2db5aa02..dd65a9d31 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -1751,8 +1751,8 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) } else if (msg == CRCInput::RC_text || msg == CRCInput::RC_radio) { if ((show_mode == MB_SHOW_RECORDS) && - (ShowMsg(LOCALE_MESSAGEBOX_INFO, msg == CRCInput::RC_radio ? "Copy jumps from movie to new file ?" : "Copy jumps from movie to new files ?", CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes)) { - CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, "Coping, please wait"); + (ShowMsg(LOCALE_MESSAGEBOX_INFO, msg == CRCInput::RC_radio ? LOCALE_MOVIEBROWSER_COPY : LOCALE_MOVIEBROWSER_COPIES, CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes)) { + CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEBROWSER_COPYING); hintBox->paint(); sleep(1); hintBox->hide(); @@ -1761,7 +1761,7 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) off64_t res = copy_movie(m_movieSelectionHandler, &m_movieInfo, msg == CRCInput::RC_radio); //g_RCInput->clearRCMsg(); if (res == 0) - ShowMsg(LOCALE_MESSAGEBOX_ERROR, "Copy failed, is there jump bookmarks ? Or check free space.", CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR); + ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_MOVIEBROWSER_COPY_FAILED, CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR); else loadMovies(); refresh(); @@ -1774,8 +1774,8 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) else #endif if ((show_mode == MB_SHOW_RECORDS) && - (ShowMsg(LOCALE_MESSAGEBOX_INFO, "Cut jumps from movie ?", CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes)) { - CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, "Cutting, please wait"); + (ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEBROWSER_CUT, CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes)) { + CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEBROWSER_CUTTING); hintBox->paint(); sleep(1); hintBox->hide(); @@ -1784,7 +1784,7 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) off64_t res = cut_movie(m_movieSelectionHandler, &m_movieInfo); //g_RCInput->clearRCMsg(); if (res == 0) - ShowMsg(LOCALE_MESSAGEBOX_ERROR, "Cut failed, is there jump bookmarks ? Or check free space.", CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR); + ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_MOVIEBROWSER_CUT_FAILED, CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR); else { loadMovies(); } @@ -1794,19 +1794,19 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) else if (msg == CRCInput::RC_games) { if ((show_mode == MB_SHOW_RECORDS) && m_movieSelectionHandler != NULL) { if ((m_movieSelectionHandler == playing_info) && (NeutrinoMessages::mode_ts == CNeutrinoApp::getInstance()->getMode())) - ShowMsg(LOCALE_MESSAGEBOX_ERROR, "Impossible to truncate playing movie.", CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR); + ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_MOVIEBROWSER_TRUNCATE_FAILED_PLAYING, CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR); else if (m_movieSelectionHandler->bookmarks.end == 0) - ShowMsg(LOCALE_MESSAGEBOX_ERROR, "No End bookmark defined!", CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR); + ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_MOVIEBROWSER_BOOK_NO_END, CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR); else { - if (ShowMsg(LOCALE_MESSAGEBOX_INFO, "Truncate movie ?", CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes) { - CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, "Truncating, please wait"); + if (ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEBROWSER_TRUNCATE, CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes) { + CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEBROWSER_TRUNCATING); hintBox->paint(); off64_t res = truncate_movie(m_movieSelectionHandler); hintBox->hide(); delete hintBox; g_RCInput->clearRCMsg(); if (res == 0) - ShowMsg(LOCALE_MESSAGEBOX_ERROR, "Truncate failed.", CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR); + ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_MOVIEBROWSER_TRUNCATE_FAILED, CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR); else { //printf("New movie info: size %lld len %d\n", res, m_movieSelectionHandler->bookmarks.end/60); m_movieInfo.saveMovieInfo(*m_movieSelectionHandler); @@ -1818,7 +1818,7 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) } } else if (msg == CRCInput::RC_favorites) { if (m_movieSelectionHandler != NULL) { - if (ShowMsg(LOCALE_MESSAGEBOX_INFO, "Remove screenshot ?", CMessageBox::mbrNo, CMessageBox:: mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes) { + if (ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_MOVIEBROWSER_DELETE_SCREENSHOT, CMessageBox::mbrNo, CMessageBox:: mbYes | CMessageBox::mbNo) == CMessageBox::mbrYes) { std::string fname = getScreenshotName(m_movieSelectionHandler->file.Name, S_ISDIR(m_movieSelectionHandler->file.Mode)); if (fname != "") unlink(fname.c_str()); diff --git a/src/system/locals.h b/src/system/locals.h index dddafab8b..4a7e97367 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1535,6 +1535,7 @@ typedef enum LOCALE_MOVIEBROWSER_BOOK_MOVIESTART, LOCALE_MOVIEBROWSER_BOOK_NAME, LOCALE_MOVIEBROWSER_BOOK_NEW, + LOCALE_MOVIEBROWSER_BOOK_NO_END, LOCALE_MOVIEBROWSER_BOOK_POSITION, LOCALE_MOVIEBROWSER_BOOK_TYPE, LOCALE_MOVIEBROWSER_BOOK_TYPE_BACKWARD, @@ -1545,7 +1546,15 @@ typedef enum LOCALE_MOVIEBROWSER_BROWSER_ROW_NR, LOCALE_MOVIEBROWSER_BROWSER_ROW_WIDTH, LOCALE_MOVIEBROWSER_CACHE_DIR, + LOCALE_MOVIEBROWSER_COPIES, + LOCALE_MOVIEBROWSER_COPY, + LOCALE_MOVIEBROWSER_COPY_FAILED, + LOCALE_MOVIEBROWSER_COPYING, + LOCALE_MOVIEBROWSER_CUT, + LOCALE_MOVIEBROWSER_CUT_FAILED, + LOCALE_MOVIEBROWSER_CUTTING, LOCALE_MOVIEBROWSER_DELETE_INFO, + LOCALE_MOVIEBROWSER_DELETE_SCREENSHOT, LOCALE_MOVIEBROWSER_DIR, LOCALE_MOVIEBROWSER_DIR_HEAD, LOCALE_MOVIEBROWSER_EDIT_BOOK, @@ -1646,6 +1655,10 @@ typedef enum LOCALE_MOVIEBROWSER_SHORT_TITLE, LOCALE_MOVIEBROWSER_START_HEAD, LOCALE_MOVIEBROWSER_START_RECORD_START, + LOCALE_MOVIEBROWSER_TRUNCATE, + LOCALE_MOVIEBROWSER_TRUNCATE_FAILED, + LOCALE_MOVIEBROWSER_TRUNCATE_FAILED_PLAYING, + LOCALE_MOVIEBROWSER_TRUNCATING, LOCALE_MOVIEBROWSER_TS_ONLY, LOCALE_MOVIEBROWSER_UPDATE_IF_DEST_EMPTY_ONLY, LOCALE_MOVIEBROWSER_USE_DIR, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index aaed15ea7..6a0230a01 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1535,6 +1535,7 @@ const char * locale_real_names[] = "moviebrowser.book_moviestart", "moviebrowser.book_name", "moviebrowser.book_new", + "moviebrowser.book_no_end", "moviebrowser.book_position", "moviebrowser.book_type", "moviebrowser.book_type_backward", @@ -1545,7 +1546,15 @@ const char * locale_real_names[] = "moviebrowser.browser_row_nr", "moviebrowser.browser_row_width", "moviebrowser.cache_dir", + "moviebrowser.copies", + "moviebrowser.copy", + "moviebrowser.copy_failed", + "moviebrowser.copying", + "moviebrowser.cut", + "moviebrowser.cut_failed", + "moviebrowser.cutting", "moviebrowser.delete_info", + "moviebrowser.delete_screenshot", "moviebrowser.dir", "moviebrowser.dir_head", "moviebrowser.edit_book", @@ -1646,6 +1655,10 @@ const char * locale_real_names[] = "moviebrowser.short_title", "moviebrowser.start_head", "moviebrowser.start_record_start", + "moviebrowser.truncate", + "moviebrowser.truncate_failed", + "moviebrowser.truncate_failed_playing", + "moviebrowser.truncating", "moviebrowser.ts_only", "moviebrowser.update_if_dest_empty_only", "moviebrowser.use_dir",