summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--i18n.c46
-rw-r--r--setup_menu.c29
2 files changed, 37 insertions, 38 deletions
diff --git a/i18n.c b/i18n.c
index a0bbec00..5400deff 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: i18n.c,v 1.20 2007-05-17 22:05:40 phintuka Exp $
+ * $Id: i18n.c,v 1.21 2007-06-11 16:59:59 phintuka Exp $
*
* Translations provided by:
*
@@ -2194,6 +2194,7 @@ const tI18nPhrase Phrases[] = {
"", // Russian
"", // Croatian
},
+#if 0
{
" Options", // English
" Optionen", // Deutsch
@@ -2214,6 +2215,7 @@ const tI18nPhrase Phrases[] = {
"", // Russian
"", // Croatian
},
+#endif
{
" Address", // English
" Multicast-Adresse", // Deutsch
@@ -2558,15 +2560,15 @@ const tI18nPhrase Phrases[] = {
"", // Croatian
},
{ // tvtime de-interlacing
- " Method", // English
- " Methode", // Deutsch
+ " Method", // English
+ " Methode", // Deutsch
"", // Slovenski
"", // Italiano
"", // Nederlands
"", // Portugu<EA>s
"", // Fran<E7>ais
"", // Norsk
- " Menetelmä", // Suomi
+ " Menetelmä", // Suomi
"", // Polski
"", // Espa<F1>ol
"", // Ellinika
@@ -2578,15 +2580,15 @@ const tI18nPhrase Phrases[] = {
"", // Croatian
},
{ // tvtime de-interlacing
- " Cheap mode", // English
- " einfacher Modus", // Deutsch
+ " Cheap mode", // English
+ " einfacher Modus", // Deutsch
"", // Slovenski
"", // Italiano
"", // Nederlands
"", // Portugu<EA>s
"", // Fran<E7>ais
"", // Norsk
- " Käytä Cheap-moodia", // Suomi
+ " Käytä Cheap-moodia", // Suomi
"", // Polski
"", // Espa<F1>ol
"", // Ellinika
@@ -2598,15 +2600,15 @@ const tI18nPhrase Phrases[] = {
"", // Croatian
},
{ // tvtime de-interlacing
- " Pulldown", // English
- " Pulldown", // Deutsch
+ " Pulldown", // English
+ " Pulldown", // Deutsch
"", // Slovenski
"", // Italiano
"", // Nederlands
"", // Portugu<EA>s
"", // Fran<E7>ais
"", // Norsk
- " Pulldown-moodi", // Suomi
+ " Pulldown-moodi", // Suomi
"", // Polski
"", // Espa<F1>ol
"", // Ellinika
@@ -2618,15 +2620,15 @@ const tI18nPhrase Phrases[] = {
"", // Croatian
},
{ // tvtime de-interlacing
- " Frame rate", // English
- " Bildrate", // Deutsch
+ " Frame rate", // English
+ " Bildrate", // Deutsch
"", // Slovenski
"", // Italiano
"", // Nederlands
"", // Portugu<EA>s
"", // Fran<E7>ais
"", // Norsk
- " Ruudunpäivitys", // Suomi
+ " Ruudunpäivitys", // Suomi
"", // Polski
"", // Espa<F1>ol
"", // Ellinika
@@ -2638,15 +2640,15 @@ const tI18nPhrase Phrases[] = {
"", // Croatian
},
{ // tvtime de-interlacing
- " Judder Correction", // English
- " Ruckel-Korrektur", // Deutsch
+ " Judder Correction", // English
+ " Ruckel-Korrektur", // Deutsch
"", // Slovenski
"", // Italiano
"", // Nederlands
"", // Portugu<EA>s
"", // Fran<E7>ais
"", // Norsk
- " Käytä tärinänkorjausta", // Suomi
+ " Käytä tärinänkorjausta", // Suomi
"", // Polski
"", // Espa<F1>ol
"", // Ellinika
@@ -2658,15 +2660,15 @@ const tI18nPhrase Phrases[] = {
"", // Croatian
},
{ // tvtime de-interlacing
- " Use progressive frame flag", // English
- " Nutze progressive frame flag", // Deutsch
+ " Use progressive frame flag", // English
+ " Nutze progressive frame flag", // Deutsch
"", // Slovenski
"", // Italiano
"", // Nederlands
"", // Portugu<EA>s
"", // Fran<E7>ais
"", // Norsk
- " Tunnista progressiivinen kuva", // Suomi
+ " Tunnista progressiivinen kuva", // Suomi
"", // Polski
"", // Espa<F1>ol
"", // Ellinika
@@ -2678,15 +2680,15 @@ const tI18nPhrase Phrases[] = {
"", // Croatian
},
{ // tvtime de-interlacing
- " Chroma Filter", // English
- " Chrominanz-Filter", // Deutsch
+ " Chroma Filter", // English
+ " Chrominanz-Filter", // Deutsch
"", // Slovenski
"", // Italiano
"", // Nederlands
"", // Portugu<EA>s
"", // Fran<E7>ais
"", // Norsk
- " Käytä Chroma-suodinta", // Suomi
+ " Käytä Chroma-suodinta", // Suomi
"", // Polski
"", // Espa<F1>ol
"", // Ellinika
diff --git a/setup_menu.c b/setup_menu.c
index 5efdde47..c248f271 100644
--- a/setup_menu.c
+++ b/setup_menu.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: setup_menu.c,v 1.26 2007-05-17 22:05:40 phintuka Exp $
+ * $Id: setup_menu.c,v 1.27 2007-06-11 16:59:59 phintuka Exp $
*
*/
@@ -490,7 +490,7 @@ class cMenuSetupVideo : public cMenuSetupPage
cOsdItem *ctrl_overscan;
cOsdItem *ctrl_pp;
cOsdItem *ctrl_deinterlace;
- cOsdItem *ctrl_deinterlace_opts;
+ cOsdItem *ctrl_tvtime_method;
cOsdItem *ctrl_unsharp;
cOsdItem *ctrl_denoise3d;
@@ -584,23 +584,20 @@ void cMenuSetupVideo::Set(void)
DEINTERLACE_count,
xc.s_deinterlaceMethodNames));
- ctrl_deinterlace_opts = NULL;
+ ctrl_tvtime_method = NULL;
if(deinterlace == DEINTERLACE_TVTIME) {
- Add(ctrl_deinterlace_opts = new cMenuEditStrItem(tr(" Options"),
- newconfig.deinterlace_opts,
- 254, OptionsChars));
-
- Add(new cMenuEditStraI18nItem(tr(" Method"), &tvtime.method,
+ Add(ctrl_tvtime_method =
+ new cMenuEditStraI18nItem(tr(" Method"), &tvtime.method,
tvtime_methods_count, tvtime_method_name));
- Add(new cMenuEditBoolItem(tr(" Cheap mode"), &tvtime.cheap_mode));
- Add(new cMenuEditStraI18nItem(tr(" Pulldown"), &tvtime.pulldown,
+ Add(new cMenuEditBoolItem(tr(" Cheap mode"), &tvtime.cheap_mode));
+ Add(new cMenuEditStraI18nItem(tr(" Pulldown"), &tvtime.pulldown,
2, tvtime_pulldown_name));
- Add(new cMenuEditStraI18nItem(tr(" Frame rate"), &tvtime.framerate,
+ Add(new cMenuEditStraI18nItem(tr(" Frame rate"), &tvtime.framerate,
3, tvtime_framerate_name));
- Add(new cMenuEditBoolItem(tr(" Judder Correction"), &tvtime.judder_correction));
- Add(new cMenuEditBoolItem(tr(" Use progressive frame flag"),
+ Add(new cMenuEditBoolItem(tr(" Judder Correction"), &tvtime.judder_correction));
+ Add(new cMenuEditBoolItem(tr(" Use progressive frame flag"),
&tvtime.use_progressive_frame_flag));
- Add(new cMenuEditBoolItem(tr(" Chroma Filter"),
+ Add(new cMenuEditBoolItem(tr(" Chroma Filter"),
&tvtime.chroma_filter));
}
@@ -713,9 +710,9 @@ eOSState cMenuSetupVideo::ProcessKey(eKeys Key)
Set();
}
else if(item == ctrl_deinterlace) {
- if(deinterlace == DEINTERLACE_TVTIME && !ctrl_deinterlace_opts) {
+ if(deinterlace == DEINTERLACE_TVTIME && !ctrl_tvtime_method) {
Set();
- } else if(deinterlace != DEINTERLACE_TVTIME && ctrl_deinterlace_opts) {
+ } else if(deinterlace != DEINTERLACE_TVTIME && ctrl_tvtime_method) {
Set();
}
}