- locales: clarify omdb locales

Signed-off-by: Thilo Graf <dbt@novatux.de>

 Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h

Detected: LOCALE_INETRADIO_AUTOSTART,
 	  LOCALE_INETRADIO_NAME,

These entries were messed because of different use of dots and
underlines in locales.

data/locale/deutsch.locale

@@ -1044,7 +1044,6 @@ imageinfo.os System:
 imageinfo.policy Datenschutz
 imageinfo.vcs Git:
 imageinfo.version Version:
-imdb.api_key IMDb API Schlüssel
 imdb.data_actors Darsteller
 imdb.data_awards Awards
 imdb.data_boxoffice Einspielergebnis
@@ -1062,9 +1061,6 @@ imdb.data_title Originaltitel
 imdb.data_votes Stimmen
 imdb.data_website Webseite
 imdb.data_writer Drehbuchautor
-imdb.enabled IMDb-Unterstützung
-imdb.head IMDb
-imdb.read_data Suche IMDb-Daten ...
 inetradio.autostart Internetradio Auto-Start
 inetradio.name Internetradio
 infoviewer.epgnotload Informationen noch nicht geladen ...
@@ -1528,7 +1524,7 @@ menu.hint_misc_energy Energieverbrauchs- und Standby-Optionen, verzögertes Auss
 menu.hint_misc_epg Diverse EPG-Einstellungen und Speicherverzeichnis für EPG-Daten
 menu.hint_misc_filebrowser Dateisystem, Dateirechte anzeigen im Dateibrowser, Startverzeichnisoptionen
 menu.hint_misc_general Standby-, Videotext- und Debuglevel-Einstellungen
-menu.hint_misc_onlineservices Konfigurieren und steuern von Online-Diensten wie Wetter, TMDb, IMDb, SHOUTCast und YouTube
+menu.hint_misc_onlineservices Konfigurieren und steuern von Online-Diensten wie Wetter, TMDb, OMDb, SHOUTCast und YouTube
 menu.hint_misc_zapit Verwaltung der Start-Kanäle für den TV/Radio-Modus
 menu.hint_movie Wiedergabe von Filmen
 menu.hint_moviebrowser_fonts Ändern Sie die Schriftgrößen im Moviebrowser (Meine Aufnahmen)
@@ -1573,6 +1569,8 @@ menu.hint_new_zap_mode Aktiviert Quickzap in der Kanalliste. Nach Betätigen der
 menu.hint_next Weiter zum nächsten Menü.\nDie Taste 'Menü' schließt alle Menüs
 menu.hint_next_brief Weiter zum nächsten Menü
 menu.hint_numeric_adjust Bei numerischer Programmwahl die Kanalliste am neu gewählten Programm ausrichten
+menu.hint_omdb_api_key Geben Sie den OMDb API Schlüssel ein. Eine leere Eingabe schaltet die OMDb-Unterstützung aus
+menu.hint_omdb_enabled Schaltet die OMDb-Unterstützung (omdb.org) ein bzw. aus
 menu.hint_opkg Software-Pakete installieren oder vorhandene aktualisieren
 menu.hint_opkg_feed_addresses_edit Bearbeiten von Feed-Adressen
 menu.hint_opkg_install_local_package Paket von USB-Stick, SD, Freigabe oder lokalem Ordner installieren.
@@ -2277,6 +2275,10 @@ nvodselector.directormode Bildregie-Modus
 nvodselector.head Bildregie
 nvodselector.starttime Anfangszeit auswählen
 nvodselector.subservice Perspektiven
+omdb.api_key OMDb API Schlüssel
+omdb.enabled OMDb-Unterstützung
+omdb.head OMDb
+omdb.read_data Suche OMDb-Daten ...
 opkg.button.expert_off Standard-Modus
 opkg.button.expert_on Experten-Modus
 opkg.button.info Paket-Informationen

data/locale/english.locale

@@ -1044,7 +1044,6 @@ imageinfo.os System:
 imageinfo.policy Privacy Policy
 imageinfo.vcs Git:
 imageinfo.version Version:
-imdb.api_key IMDb API-Key
 imdb.data_actors Actors
 imdb.data_awards Awards
 imdb.data_boxoffice Boxoffice
@@ -1062,9 +1061,6 @@ imdb.data_title Original title
 imdb.data_votes Votes
 imdb.data_website Website
 imdb.data_writer Screenplay author
-imdb.enabled IMDb-Support
-imdb.head IMDb
-imdb.read_data Search IMDb data ...
 inetradio.autostart Internetradio auto-start
 inetradio.name Internetradio
 infoviewer.epgnotload EPG not loaded ...
@@ -1528,7 +1524,7 @@ menu.hint_misc_energy Enable soft-standby, delayed shutdown\ninactivity timers
 menu.hint_misc_epg Save/load EPG options, EPG cache options\nEPG save directory
 menu.hint_misc_filebrowser Filesystem encoding, file rights\ndeny directory leave
 menu.hint_misc_general Standby-, teletext- and debuglevel-settings
-menu.hint_misc_onlineservices Configure and control online services like Weather, TMDb, IMDb, SHOUTCast and YouTube
+menu.hint_misc_onlineservices Configure and control online services like Weather, TMDb, OMDb, SHOUTCast and YouTube
 menu.hint_misc_zapit Initial TV/Radio channels
 menu.hint_movie Play movies
 menu.hint_moviebrowser_fonts Change moviebrowser (My recordings) font sizes
@@ -1573,6 +1569,8 @@ menu.hint_new_zap_mode Allow channel switch while browsing\n(toggle mode with 'm
 menu.hint_next Continue to next menu\nPress menu key to close all menus
 menu.hint_next_brief Continue to next menu
 menu.hint_numeric_adjust Adjust channel list mode on numeric zap
+menu.hint_omdb_api_key Type your OMDb API key. An empty input disables OMDb support
+menu.hint_omdb_enabled Enable or disable OMDb support (omdb.org)
 menu.hint_opkg Install or update software packages
 menu.hint_opkg_feed_addresses_edit Edit feed addresses
 menu.hint_opkg_install_local_package Install package from USB, SD, share or local directory.
@@ -2277,6 +2275,10 @@ nvodselector.directormode Director mode
 nvodselector.head Subservices
 nvodselector.starttime Select starting time
 nvodselector.subservice Select subservice
+omdb.api_key OMDb API-Key
+omdb.enabled OMDb-Support
+omdb.head OMDb
+omdb.read_data Search OMDb data ...
 opkg.button.expert_off Standard mode
 opkg.button.expert_on Expert mode
 opkg.button.info Package information

src/gui/epgview.cpp

@@ -1184,7 +1184,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 					{
 						CMsgBox msgBox(g_Locale->getText(LOCALE_MDB_CHOOSE), LOCALE_MDB_HEAD);
 						msgBox.setShowedButtons(CMsgBox::mbNo | CMsgBox::mbYes);
-						msgBox.setButtonText(CMsgBox::mbNo, g_Locale->getText(LOCALE_IMDB_HEAD));
+						msgBox.setButtonText(CMsgBox::mbNo, g_Locale->getText(LOCALE_OMDB_HEAD));
 						msgBox.setButtonText(CMsgBox::mbYes, g_Locale->getText(LOCALE_TMDB_HEAD));
 						msgBox.paint();
 						msgBox.exec();
@@ -1696,7 +1696,7 @@ void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info)
 	if (imdb_active || tmdb_active)
 		EpgButtons[UsedButtons][1].locale = LOCALE_MISCSETTINGS_EPG_HEAD;
 	else if (g_settings.omdb_enabled && !g_settings.tmdb_enabled)
-		EpgButtons[UsedButtons][1].locale = LOCALE_IMDB_HEAD;
+		EpgButtons[UsedButtons][1].locale = LOCALE_OMDB_HEAD;
 	else if (g_settings.tmdb_enabled && !g_settings.omdb_enabled)
 		EpgButtons[UsedButtons][1].locale = LOCALE_TMDB_HEAD;
 	else

src/gui/mdb-imdb.cpp

@@ -69,7 +69,7 @@ CIMDB::~CIMDB()
 
 void CIMDB::setTitle(std::string epgtitle)
 {
-	hintbox = new CHintBox(LOCALE_MESSAGEBOX_INFO, LOCALE_IMDB_READ_DATA);
+	hintbox = new CHintBox(LOCALE_MESSAGEBOX_INFO, LOCALE_OMDB_READ_DATA);
 	hintbox->paint();
 
 	getMovieDetails(epgtitle);

src/gui/miscsettings_menu.cpp

@@ -664,15 +664,15 @@ int CMiscMenue::showMiscSettingsMenuOnlineServices()
 	ms_oservices->addItem(GenericMenuSeparator);
 
 	// omdb
-	omdb_onoff = new CMenuOptionChooser(LOCALE_IMDB_ENABLED, &g_settings.omdb_enabled, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, CApiKey::check_omdb_api_key());
+	omdb_onoff = new CMenuOptionChooser(LOCALE_OMDB_ENABLED, &g_settings.omdb_enabled, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, CApiKey::check_omdb_api_key());
-	//omdb_onoff->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_IMDB_ENABLED);
+	omdb_onoff->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_OMDB_ENABLED);
 	ms_oservices->addItem(omdb_onoff);
 
 #if ENABLE_OMDB_KEY_MANAGE
-	changeNotify(LOCALE_IMDB_API_KEY, NULL);
+	changeNotify(LOCALE_OMDB_API_KEY, NULL);
-	CKeyboardInput omdb_api_key_input(LOCALE_IMDB_API_KEY, &g_settings.omdb_api_key, 8, this);
+	CKeyboardInput omdb_api_key_input(LOCALE_OMDB_API_KEY, &g_settings.omdb_api_key, 8, this);
-	CMenuForwarder *mf_om = new CMenuForwarder(LOCALE_IMDB_API_KEY, true, omdb_api_key_short, &omdb_api_key_input);
+	CMenuForwarder *mf_om = new CMenuForwarder(LOCALE_OMDB_API_KEY, true, omdb_api_key_short, &omdb_api_key_input);
-	//mf_om ->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_IMDB_API_KEY);
+	mf_om ->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_OMDB_API_KEY);
 	ms_oservices->addItem(mf_om);
 #endif
 
@@ -860,7 +860,7 @@ bool CMiscMenue::changeNotify(const neutrino_locale_t OptionName, void */*data*/
 			tmdb_api_key_short.clear();
 		tmdb_onoff->setActive(CApiKey::check_tmdb_api_key());
 	}
-	else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_IMDB_API_KEY))
+	else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_OMDB_API_KEY))
 	{
 		g_settings.omdb_enabled = g_settings.omdb_enabled && CApiKey::check_omdb_api_key();
 		if (g_settings.omdb_enabled)

src/system/locals.h

@@ -1071,7 +1071,6 @@ typedef enum
 	LOCALE_IMAGEINFO_POLICY,
 	LOCALE_IMAGEINFO_VCS,
 	LOCALE_IMAGEINFO_VERSION,
-	LOCALE_IMDB_API_KEY,
 	LOCALE_IMDB_DATA_ACTORS,
 	LOCALE_IMDB_DATA_AWARDS,
 	LOCALE_IMDB_DATA_BOXOFFICE,
@@ -1089,9 +1088,6 @@ typedef enum
 	LOCALE_IMDB_DATA_VOTES,
 	LOCALE_IMDB_DATA_WEBSITE,
 	LOCALE_IMDB_DATA_WRITER,
-	LOCALE_IMDB_ENABLED,
-	LOCALE_IMDB_HEAD,
-	LOCALE_IMDB_READ_DATA,
 	LOCALE_INETRADIO_AUTOSTART,
 	LOCALE_INETRADIO_NAME,
 	LOCALE_INFOVIEWER_EPGNOTLOAD,
@@ -1601,6 +1597,8 @@ typedef enum
 	LOCALE_MENU_HINT_NEXT,
 	LOCALE_MENU_HINT_NEXT_BRIEF,
 	LOCALE_MENU_HINT_NUMERIC_ADJUST,
+	LOCALE_MENU_HINT_OMDB_API_KEY,
+	LOCALE_MENU_HINT_OMDB_ENABLED,
 	LOCALE_MENU_HINT_OPKG,
 	LOCALE_MENU_HINT_OPKG_FEED_ADDRESSES_EDIT,
 	LOCALE_MENU_HINT_OPKG_INSTALL_LOCAL_PACKAGE,
@@ -2305,6 +2303,10 @@ typedef enum
 	LOCALE_NVODSELECTOR_HEAD,
 	LOCALE_NVODSELECTOR_STARTTIME,
 	LOCALE_NVODSELECTOR_SUBSERVICE,
+	LOCALE_OMDB_API_KEY,
+	LOCALE_OMDB_ENABLED,
+	LOCALE_OMDB_HEAD,
+	LOCALE_OMDB_READ_DATA,
 	LOCALE_OPKG_BUTTON_EXPERT_OFF,
 	LOCALE_OPKG_BUTTON_EXPERT_ON,
 	LOCALE_OPKG_BUTTON_INFO,

src/system/locals_intern.h

@@ -1071,7 +1071,6 @@ const char * locale_real_names[] =
 	"imageinfo.policy",
 	"imageinfo.vcs",
 	"imageinfo.version",
-	"imdb.api_key",
 	"imdb.data_actors",
 	"imdb.data_awards",
 	"imdb.data_boxoffice",
@@ -1089,9 +1088,6 @@ const char * locale_real_names[] =
 	"imdb.data_votes",
 	"imdb.data_website",
 	"imdb.data_writer",
-	"imdb.enabled",
-	"imdb.head",
-	"imdb.read_data",
 	"inetradio.autostart",
 	"inetradio.name",
 	"infoviewer.epgnotload",
@@ -1601,6 +1597,8 @@ const char * locale_real_names[] =
 	"menu.hint_next",
 	"menu.hint_next_brief",
 	"menu.hint_numeric_adjust",
+	"menu.hint_omdb_api_key",
+	"menu.hint_omdb_enabled",
 	"menu.hint_opkg",
 	"menu.hint_opkg_feed_addresses_edit",
 	"menu.hint_opkg_install_local_package",
@@ -2305,6 +2303,10 @@ const char * locale_real_names[] =
 	"nvodselector.head",
 	"nvodselector.starttime",
 	"nvodselector.subservice",
+	"omdb.api_key",
+	"omdb.enabled",
+	"omdb.head",
+	"omdb.read_data",
 	"opkg.button.expert_off",
 	"opkg.button.expert_on",
 	"opkg.button.info",