ALL:

 - the german translation requires two different translations of the word
   File. I added a _ANS() function to the macosx version that gets the
   translation of 1:File and strips the first two characters of this
   alternate translation.
 - updated all .po files to make sure we don't break anything
 - committed the March 1 version of the german translation by Felix
   Kuhne <FK@aenneburghardt.de>

configure.ac.in

@@ -185,7 +185,7 @@ else
   ])
 fi
 AM_CONDITIONAL(BUILD_INTL, test "${nls_cv_force_use_gnu_gettext}" = "yes")
-XGETTEXT="${XGETTEXT} --keyword=_NS"
+XGETTEXT="${XGETTEXT} --keyword=_NS --keyword=_ANS"
 
 AC_MSG_CHECKING(for suffix of libraries)
 AC_MSG_RESULT(${LIBEXT})

modules/gui/macosx/intf.h

@@ -2,7 +2,7 @@
  * intf.h: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: intf.h,v 1.29 2003/02/18 00:17:06 massiot Exp $
+ * $Id: intf.h,v 1.30 2003/03/04 17:31:45 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -50,6 +50,10 @@
 @end
 
 #define _NS(s) [NSApp localizedString: _(s)]
+/* Get an alternate version of the string.
+ * This string is stored as '1:string' but when displayed it only displays
+ * the translated string. the translation should be '1:translatedstring' though */
+#define _ANS(s) [[NSApp localizedString: _(s)] substringFromIndex:2]
 
 int ExecuteOnMainThread( id target, SEL sel, void * p_arg );
 

modules/gui/macosx/intf.m

@@ -2,7 +2,7 @@
  * intf.m: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: intf.m,v 1.62 2003/02/27 08:19:02 massiot Exp $
+ * $Id: intf.m,v 1.63 2003/03/04 17:31:45 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -304,7 +304,8 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
     [o_mi_show_all setTitle: _NS("Show All")];
     [o_mi_quit setTitle: _NS("Quit VLC")];
 
-    [o_mu_file setTitle: _NS("File")];
+    [o_mu_file setTitle: _ANS("1:File")];
+    NSLog(_ANS("1:File"));
     [o_mi_open_generic setTitle: _NS("Open...")];
     [o_mi_open_file setTitle: _NS("Open File...")];
     [o_mi_open_disc setTitle: _NS("Open Disc...")];

modules/gui/win32/strings.cpp

@@ -103,7 +103,7 @@
       Hint = _( "Pause stream" );
       Caption = _( "Stop" );
       Hint = _( "Stop stream" );
-      Caption = _( "Eject" );
+      Caption = _( "Eject disc" );
       Hint = _( "Eject disc" );
       Caption = _( "Slow" );
       Hint = _( "Play slower" );