From b6a794fc41e1127e78b919a69bdfe674b89a70be Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 19 Dec 2015 22:15:03 +0100 Subject: [PATCH] moviebrowser: small changes in locales Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/beb324c606ccfdc2f5057c31b2fc9815012e0c4e Author: vanhofen Date: 2015-12-19 (Sat, 19 Dec 2015) Origin message was: ------------------ - moviebrowser: small changes in locales ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/locale/deutsch.locale | 5 +++-- data/locale/english.locale | 5 +++-- src/gui/moviebrowser.cpp | 4 ++-- src/system/locals.h | 3 ++- src/system/locals_intern.h | 3 ++- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index f4776fcaf..5546cc590 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1579,7 +1579,8 @@ moviebrowser.delete_all Alle markierten Filme ohne weitere Nachfrage löschen? moviebrowser.delete_info Lösche Dateien, bitte warten... moviebrowser.delete_screenshot Lösche Screenshot? moviebrowser.dir Pfad -moviebrowser.dir_head Zusätzliche Verzeichnisse +moviebrowser.directories Verzeichnisse +moviebrowser.directories_additional Zusätzliche Verzeichnisse moviebrowser.edit_book Bookmark Ändern moviebrowser.edit_book_name_info1 Neuer Markierungsname moviebrowser.edit_book_name_info2 Markierungsname info2 @@ -1654,7 +1655,7 @@ moviebrowser.menu_copy_onefile Film kopieren moviebrowser.menu_copy_several Film kopieren und teilen moviebrowser.menu_cut Film schneiden moviebrowser.menu_cut_head Kopieren, Schneiden und Kürzen -moviebrowser.menu_directories_head Verzeichnisse/Freier Speicher +moviebrowser.menu_directories_head Verzeichnisse de/aktivieren moviebrowser.menu_help_head Hilfe moviebrowser.menu_main_bookmarks Markierungen moviebrowser.menu_main_head Einstellungen diff --git a/data/locale/english.locale b/data/locale/english.locale index e9a3ada62..189e43380 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1581,7 +1581,8 @@ moviebrowser.delete_all Delete all selected movies without any questions? moviebrowser.delete_info Delete files, please wait... moviebrowser.delete_screenshot Delete screenshot? moviebrowser.dir Path -moviebrowser.dir_head Additional paths +moviebrowser.directories Directories +moviebrowser.directories_additional Additional directories moviebrowser.edit_book Bookmark change moviebrowser.edit_book_name_info1 Enter new Bookmark name moviebrowser.edit_book_name_info2 book name info2 @@ -1656,7 +1657,7 @@ moviebrowser.menu_copy_onefile Copy movie moviebrowser.menu_copy_several Copy and split movie moviebrowser.menu_cut Cut movie moviebrowser.menu_cut_head Copy, cut and truncate -moviebrowser.menu_directories_head Paths +moviebrowser.menu_directories_head Directories de/activate moviebrowser.menu_help_head Help moviebrowser.menu_main_bookmarks Bookmarks moviebrowser.menu_main_head Settings diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index 8b5ccae33..a28a4a556 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -3006,7 +3006,7 @@ bool CMovieBrowser::showMenu(bool calledExternally) optionsMenuDir.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_USE_MOVIE_DIR, (int*)(&m_settings.storageDirMovieUsed), MESSAGEBOX_YES_NO_OPTIONS, MESSAGEBOX_YES_NO_OPTIONS_COUNT, true)); optionsMenuDir.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_DIR, false, g_settings.network_nfs_moviedir)); - optionsMenuDir.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MOVIEBROWSER_DIR_HEAD)); + optionsMenuDir.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MOVIEBROWSER_DIRECTORIES_ADDITIONAL)); COnOffNotifier* notifier[MB_MAX_DIRS]; for (i = 0; i < MB_MAX_DIRS ; i++) @@ -3056,7 +3056,7 @@ bool CMovieBrowser::showMenu(bool calledExternally) optionsMenu.addIntroItems(LOCALE_EPGPLUS_OPTIONS); optionsMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_LOAD_DEFAULT, true, NULL, this, "loaddefault", CRCInput::RC_red)); optionsMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_OPTION_BROWSER, true, NULL, &optionsMenuBrowser,NULL, CRCInput::RC_green)); - optionsMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_DIRECTORIES_HEAD, true, NULL, &optionsMenuDir,NULL, CRCInput::RC_yellow)); + optionsMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_DIRECTORIES, true, NULL, &optionsMenuDir,NULL, CRCInput::RC_yellow)); if (m_parentalLock != MB_PARENTAL_LOCK_OFF) optionsMenu.addItem(new CLockedMenuForwarder(LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_HEAD, g_settings.parentallock_pincode, true, true, NULL, &parentalMenu,NULL,CRCInput::RC_blue)); else diff --git a/src/system/locals.h b/src/system/locals.h index 9414fb8c8..ed0b4642a 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1608,7 +1608,8 @@ typedef enum LOCALE_MOVIEBROWSER_DELETE_INFO, LOCALE_MOVIEBROWSER_DELETE_SCREENSHOT, LOCALE_MOVIEBROWSER_DIR, - LOCALE_MOVIEBROWSER_DIR_HEAD, + LOCALE_MOVIEBROWSER_DIRECTORIES, + LOCALE_MOVIEBROWSER_DIRECTORIES_ADDITIONAL, LOCALE_MOVIEBROWSER_EDIT_BOOK, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO1, LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO2, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index a6ad77040..3bd5b0347 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1608,7 +1608,8 @@ const char * locale_real_names[] = "moviebrowser.delete_info", "moviebrowser.delete_screenshot", "moviebrowser.dir", - "moviebrowser.dir_head", + "moviebrowser.directories", + "moviebrowser.directories_additional", "moviebrowser.edit_book", "moviebrowser.edit_book_name_info1", "moviebrowser.edit_book_name_info2",