From b60e19962009ce216eb19302958ced8ee9842759 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Wed, 17 Apr 2013 15:29:43 +0200 Subject: [PATCH] * Sort deutsch.locale / english.locale --- data/locale/deutsch.locale | 8 ++++---- data/locale/english.locale | 22 +++++++++++----------- src/system/locals.h | 22 +++++++++++----------- src/system/locals_intern.h | 22 +++++++++++----------- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 8dd7b7a42..4565bd309 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1816,19 +1816,19 @@ usermenu.msg_warning_no_items Sie haben keine Menüpunkte für dieses Menü ange usermenu.name Name video_mode_ok Video-Einstellungen OK? videomenu.43mode 4:3 Anzeigeverhalten +videomenu.analog_hd_rgb RGB (HD) videomenu.analog_hd_rgb_cinch RGB -> Cinch (HD) videomenu.analog_hd_rgb_scart RGB -> Scart (HD) +videomenu.analog_hd_yprpb YPbPr(HD) videomenu.analog_hd_yprpb_cinch YPbPr -> Cinch (HD) videomenu.analog_hd_yprpb_scart YPbPr -> Scart (HD) videomenu.analog_mode Videomodus +videomenu.analog_sd_rgb RGB (SD) videomenu.analog_sd_rgb_cinch RGB -> Cinch (SD) videomenu.analog_sd_rgb_scart RGB -> Scart (SD) +videomenu.analog_sd_yprpb YPbPr (SD) videomenu.analog_sd_yprpb_cinch YPbPr -> Cinch (SD) videomenu.analog_sd_yprpb_scart YPbPr -> Scart (SD) -videomenu.analog_hd_rgb RGB (HD) -videomenu.analog_hd_yprpb YPbPr(HD) -videomenu.analog_sd_rgb RGB (SD) -videomenu.analog_sd_yprpb YPbPr (SD) videomenu.auto Automatisch videomenu.brightness Helligkeit videomenu.cinch Cinch diff --git a/data/locale/english.locale b/data/locale/english.locale index 55ff3757a..6474ff886 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -228,8 +228,8 @@ channellist.new_zap_mode Quickzap in list channellist.new_zap_mode_active active channellist.new_zap_mode_allow allow channellist.new_zap_mode_off off -channellist.numeric_adjust Numeric zap adjust channellist.nonefound No channels were found!\nPlease execute a scan\n(MENU-key -> service) +channellist.numeric_adjust Numeric zap adjust channellist.provs Providers channellist.recording_not_possible Recording not possible! channellist.reset_flags Reset 'new' channel flag @@ -997,8 +997,8 @@ menu.hint_scan_fast CanalDigitaal/TéléSAT/TV Vlaanderen provider scan\nWARNING menu.hint_scan_fastprov Select provider to scan menu.hint_scan_fasttype Select fast scan type menu.hint_scan_fec Select transponder FEC -menu.hint_scan_femode Select tuner connection type menu.hint_scan_felink Select tuner to link tuner to +menu.hint_scan_femode Select tuner connection type menu.hint_scan_fesetup Configure tuner(s) menu.hint_scan_fetimeout Time to wait for signal, in 1/10 of second menu.hint_scan_freq Enter transponder frequency @@ -1838,21 +1838,21 @@ usermenu.msg_warning_no_items No items defined!\nThe menu name is reset! usermenu.name Name video_mode_ok Is this video mode working ok ? videomenu.43mode 4:3 Content mode -videomenu.analog_hd_rgb_cinch RGB on cinch (HD) -videomenu.analog_hd_rgb_scart RGB on scart (HD) -videomenu.analog_hd_yprpb_cinch YPbPr on cinch (HD) -videomenu.analog_hd_yprpb_scart YPbPr on scart (HD) -videomenu.analog_mode Analog Video Output -videomenu.analog_sd_rgb_cinch RGB on cinch (SD) -videomenu.analog_sd_rgb_scart RGB on scart (SD) -videomenu.analog_sd_yprpb_cinch YPbPr on cinch (SD) -videomenu.analog_sd_yprpb_scart YPbPr on scart (SD) videomenu.analog_auto AUTO videomenu.analog_cvbs CVBS videomenu.analog_hd_rgb RGB (HD) +videomenu.analog_hd_rgb_cinch RGB on cinch (HD) +videomenu.analog_hd_rgb_scart RGB on scart (HD) videomenu.analog_hd_yprpb YPbPr(HD) +videomenu.analog_hd_yprpb_cinch YPbPr on cinch (HD) +videomenu.analog_hd_yprpb_scart YPbPr on scart (HD) +videomenu.analog_mode Analog Video Output videomenu.analog_sd_rgb RGB (SD) +videomenu.analog_sd_rgb_cinch RGB on cinch (SD) +videomenu.analog_sd_rgb_scart RGB on scart (SD) videomenu.analog_sd_yprpb YPbPr (SD) +videomenu.analog_sd_yprpb_cinch YPbPr on cinch (SD) +videomenu.analog_sd_yprpb_scart YPbPr on scart (SD) videomenu.auto Auto videomenu.brightness Brightness videomenu.cinch Cinch diff --git a/src/system/locals.h b/src/system/locals.h index c4b56b5f1..8ac2be9f0 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -255,8 +255,8 @@ typedef enum LOCALE_CHANNELLIST_NEW_ZAP_MODE_ACTIVE, LOCALE_CHANNELLIST_NEW_ZAP_MODE_ALLOW, LOCALE_CHANNELLIST_NEW_ZAP_MODE_OFF, - LOCALE_CHANNELLIST_NUMERIC_ADJUST, LOCALE_CHANNELLIST_NONEFOUND, + LOCALE_CHANNELLIST_NUMERIC_ADJUST, LOCALE_CHANNELLIST_PROVS, LOCALE_CHANNELLIST_RECORDING_NOT_POSSIBLE, LOCALE_CHANNELLIST_RESET_FLAGS, @@ -1024,8 +1024,8 @@ typedef enum LOCALE_MENU_HINT_SCAN_FASTPROV, LOCALE_MENU_HINT_SCAN_FASTTYPE, LOCALE_MENU_HINT_SCAN_FEC, - LOCALE_MENU_HINT_SCAN_FEMODE, LOCALE_MENU_HINT_SCAN_FELINK, + LOCALE_MENU_HINT_SCAN_FEMODE, LOCALE_MENU_HINT_SCAN_FESETUP, LOCALE_MENU_HINT_SCAN_FETIMEOUT, LOCALE_MENU_HINT_SCAN_FREQ, @@ -1865,21 +1865,21 @@ typedef enum LOCALE_USERMENU_NAME, LOCALE_VIDEO_MODE_OK, LOCALE_VIDEOMENU_43MODE, - LOCALE_VIDEOMENU_ANALOG_HD_RGB_CINCH, - LOCALE_VIDEOMENU_ANALOG_HD_RGB_SCART, - LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_CINCH, - LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_SCART, - LOCALE_VIDEOMENU_ANALOG_MODE, - LOCALE_VIDEOMENU_ANALOG_SD_RGB_CINCH, - LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART, - LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH, - LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART, LOCALE_VIDEOMENU_ANALOG_AUTO, LOCALE_VIDEOMENU_ANALOG_CVBS, LOCALE_VIDEOMENU_ANALOG_HD_RGB, + LOCALE_VIDEOMENU_ANALOG_HD_RGB_CINCH, + LOCALE_VIDEOMENU_ANALOG_HD_RGB_SCART, LOCALE_VIDEOMENU_ANALOG_HD_YPRPB, + LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_CINCH, + LOCALE_VIDEOMENU_ANALOG_HD_YPRPB_SCART, + LOCALE_VIDEOMENU_ANALOG_MODE, LOCALE_VIDEOMENU_ANALOG_SD_RGB, + LOCALE_VIDEOMENU_ANALOG_SD_RGB_CINCH, + LOCALE_VIDEOMENU_ANALOG_SD_RGB_SCART, LOCALE_VIDEOMENU_ANALOG_SD_YPRPB, + LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_CINCH, + LOCALE_VIDEOMENU_ANALOG_SD_YPRPB_SCART, LOCALE_VIDEOMENU_AUTO, LOCALE_VIDEOMENU_BRIGHTNESS, LOCALE_VIDEOMENU_CINCH, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index e7de3b0ab..fce38ae4d 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -255,8 +255,8 @@ const char * locale_real_names[] = "channellist.new_zap_mode_active", "channellist.new_zap_mode_allow", "channellist.new_zap_mode_off", - "channellist.numeric_adjust", "channellist.nonefound", + "channellist.numeric_adjust", "channellist.provs", "channellist.recording_not_possible", "channellist.reset_flags", @@ -1024,8 +1024,8 @@ const char * locale_real_names[] = "menu.hint_scan_fastprov", "menu.hint_scan_fasttype", "menu.hint_scan_fec", - "menu.hint_scan_femode", "menu.hint_scan_felink", + "menu.hint_scan_femode", "menu.hint_scan_fesetup", "menu.hint_scan_fetimeout", "menu.hint_scan_freq", @@ -1865,21 +1865,21 @@ const char * locale_real_names[] = "usermenu.name", "video_mode_ok", "videomenu.43mode", - "videomenu.analog_hd_rgb_cinch", - "videomenu.analog_hd_rgb_scart", - "videomenu.analog_hd_yprpb_cinch", - "videomenu.analog_hd_yprpb_scart", - "videomenu.analog_mode", - "videomenu.analog_sd_rgb_cinch", - "videomenu.analog_sd_rgb_scart", - "videomenu.analog_sd_yprpb_cinch", - "videomenu.analog_sd_yprpb_scart", "videomenu.analog_auto", "videomenu.analog_cvbs", "videomenu.analog_hd_rgb", + "videomenu.analog_hd_rgb_cinch", + "videomenu.analog_hd_rgb_scart", "videomenu.analog_hd_yprpb", + "videomenu.analog_hd_yprpb_cinch", + "videomenu.analog_hd_yprpb_scart", + "videomenu.analog_mode", "videomenu.analog_sd_rgb", + "videomenu.analog_sd_rgb_cinch", + "videomenu.analog_sd_rgb_scart", "videomenu.analog_sd_yprpb", + "videomenu.analog_sd_yprpb_cinch", + "videomenu.analog_sd_yprpb_scart", "videomenu.auto", "videomenu.brightness", "videomenu.cinch",