macosx: fixed non-appearance of the verbose error panel and a few l10n things

(cherry picked from commit bad63db868d59b72dfc48ab767e5ee74f4d5d3c6)

diff --git a/modules/gui/macosx/coredialogs.h b/modules/gui/macosx/coredialogs.h
index 8fecec162a98cac925045458428b2675ee163217..fe3a126938b6d39fde970cb260107d413720ae77 100644 (file)
--- a/modules/gui/macosx/coredialogs.h
+++ b/modules/gui/macosx/coredialogs.h
@@ -40,7 +40,7 @@
     NSMutableArray * o_errors;
     NSMutableArray * o_icons;
     
-    BOOL nib_loaded;
+    BOOL b_nib_loaded;
 }
 - (IBAction)cleanupTable:(id)sender;
 - (IBAction)showMessages:(id)sender;

diff --git a/modules/gui/macosx/coredialogs.m b/modules/gui/macosx/coredialogs.m
index 62ed718530735c5cc622b60765882ac2eab1efa3..bccfe3e1e0c84ad0084d1b59c204129862137cc2 100644 (file)
--- a/modules/gui/macosx/coredialogs.m
+++ b/modules/gui/macosx/coredialogs.m
@@ -234,12 +234,15 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
 {
     [super init];
 
-    nib_loaded = [NSBundle loadNibNamed:@"InteractionErrorPanel" owner:self];
-
-    /* init strings */
-    [o_window setTitle: _NS("Errors and Warnings")];
-    [o_cleanup_button setTitle: _NS("Clean up")];
-    [o_messages_btn setTitle: _NS("Show Details")];
+    if( !b_nib_loaded )
+    {
+        b_nib_loaded = [NSBundle loadNibNamed:@"ErrorPanel" owner:self];
+    
+        /* init strings */
+        [o_window setTitle: _NS("Errors and Warnings")];
+        [o_cleanup_button setTitle: _NS("Clean up")];
+        [o_messages_btn setTitle: _NS("Show Details")];
+    }
 
     /* init data sources */
     o_errors = [[NSMutableArray alloc] init];

diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index 13ca6c0ce10922691ca2fe33dc2152f14411b4d3..259b1305465461ca0ea600265bb66c0ad15b371b 100644 (file)
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -217,6 +217,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [o_screen_top_lbl setStringValue: _NS("Subscreen top:")];
     [o_screen_width_lbl setStringValue: _NS("Subscreen width:")];
     [o_screen_height_lbl setStringValue: _NS("Subscreen height:")];
+    [o_screen_follow_mouse_ckb setTitle: _NS("Follow the mouse")];
     [o_eyetv_currentChannel_lbl setStringValue: _NS("Current channel:")];
     [o_eyetv_previousProgram_btn setTitle: _NS("Previous Channel")];
     [o_eyetv_nextProgram_btn setTitle: _NS("Next Channel")];

diff --git a/po/POTFILES.in b/po/POTFILES.in
index d78fdcc29d788c92eaa054f81f44bdb3f0ecb55f..a6eee132be476f04cdb293b7ff5b1bb1cc004b9f 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -591,6 +591,8 @@ modules/gui/macosx/bookmarks.h
 modules/gui/macosx/bookmarks.m
 modules/gui/macosx/controls.h
 modules/gui/macosx/controls.m
+modules/gui/macosx/coredialogs.h
+modules/gui/macosx/coredialogs.m
 modules/gui/macosx/embeddedwindow.h
 modules/gui/macosx/embeddedwindow.m
 modules/gui/macosx/equalizer.h

diff --git a/po/de.po b/po/de.po
index fc5c7effc444f4f91043ca1fd63f46a2446b3391..79f438bb8c582279dd028667a7c74324b327ff0f 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -1,11 +1,11 @@
 # German translation of VLC
-# (c) 2002-2006 the VideoLAN team
+# (c) 2002-2009 the VideoLAN team
 # $Id$
 #
 # Thanks to Thomas Graf <tgr at reeler.org> for starting a translation in 2002.
 # Thanks to Philipp Weissenbacher <philippweissenbacher _at_ aon.at> for various fixes in 2004.
 # Thanks to Jens Seidel <jensseidel _at_ users.sf.net> for some minor fixes in 2005.
-# Felix Kühne <fkuehne at users.sf.net>, 2003-2006.
+# Felix Kühne <fkuehne at users.sf.net>, 2003-2009.
 # Mathias C. Berens | welcome-soft <berens at welcome-soft.de>, 2006.
 #
 #
@@ -9059,7 +9059,7 @@ msgstr ""
 #: modules/codec/avcodec/avcodec.h:125 modules/gui/macosx/simple_prefs.m:256
 #: modules/gui/qt4/ui/sprefs_input.h:250
 msgid "Skip the loop filter for H.264 decoding"
-msgstr "Loop-Filter für das Verarbeiten von H.264 überspringen"
+msgstr "Loop-Filter für H.264-Dekodierung auslassen"
 
 #: modules/codec/avcodec/avcodec.h:126
 msgid ""
@@ -14152,11 +14152,11 @@ msgstr "Maximales Level"
 
 #: modules/gui/macosx/extended.m:95
 msgid "Restore Defaults"
-msgstr "Standardwerte wiederherstellen"
+msgstr "Standards wiederherstellen"
 
 #: modules/gui/macosx/extended.m:102 modules/gui/macosx/macosx.m:57
 msgid "Opaqueness"
-msgstr "Undurchsichtigkeit"
+msgstr "Transparenz"
 
 #: modules/gui/macosx/extended.m:172 modules/gui/macosx/extended.m:234
 msgid "Adjust Image"
@@ -14974,9 +14974,8 @@ msgid "Expand Node"
 msgstr "Knoten ausklappen"
 
 #: modules/gui/macosx/playlist.m:441
-#, fuzzy
 msgid "Download Cover Art"
-msgstr "Jetzt herunterladen"
+msgstr "Cover herunterladen"
 
 #: modules/gui/macosx/playlist.m:442
 msgid "Fetch Meta Data"
@@ -14984,7 +14983,7 @@ msgstr "Metadaten abrufen"
 
 #: modules/gui/macosx/playlist.m:443 modules/gui/macosx/playlist.m:444
 msgid "Reveal in Finder"
-msgstr "Im Finden anzeigen"
+msgstr "Im Finder anzeigen"
 
 #: modules/gui/macosx/playlist.m:446
 msgid "Sort Node by Name"
@@ -15370,7 +15369,7 @@ msgstr "OSD aktivieren"
 
 #: modules/gui/macosx/simple_prefs.m:279
 msgid "Black screens in Fullscreen mode"
-msgstr "Im Vollbildmodus andere Bildschirme schwärzen"
+msgstr "Bei Vollbild Bildschirme schwärzen"
 
 #: modules/gui/macosx/simple_prefs.m:281 modules/gui/qt4/ui/sprefs_video.h:280
 #: modules/stream_out/display.c:54 modules/video_filter/deinterlace.c:132