X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_intf_strings.h;h=cd532b5c9e5b4ee7264189b101b2eaab0b391523;hb=cb435e2774e43702c7b23ce9fd5bd303e300212e;hp=7609f95775062ee93f3e64505f3e4420715e6904;hpb=367c7701ec182923401425a43f8c0457bfb93922;p=vlc

diff --git a/include/vlc_intf_strings.h b/include/vlc_intf_strings.h
index 7609f95775..cd532b5c9e 100644
--- a/include/vlc_intf_strings.h
+++ b/include/vlc_intf_strings.h
@@ -29,13 +29,26 @@
  * This file defines a number of strings used in user interfaces
  */
 
+/* A helper macro that will expand to either of the arguments
+   depanding on platform. The arguments are supposed to be:
+   1. dir: a string containing "directory"
+   2. folder: a string with the same meaning but with directory
+              substituted with "folder"
+*/
+#if defined( WIN32 ) || defined(__APPLE__)
+    #define I_DIR_OR_FOLDER( dir, folder ) folder
+#else
+    #define I_DIR_OR_FOLDER( dir, folder ) dir
+#endif
+
 /*************** Open dialogs **************/
 
 #define I_OP_OPF        N_("Quick &Open File...")
 #define I_OP_ADVOP      N_("&Advanced Open...")
-#define I_OP_OPDIR      N_("Open &Directory...")
-
+#define I_OP_OPDIR I_DIR_OR_FOLDER( N_("Open D&irectory..."), \
+                                    N_("Open &Folder...") )
 #define I_OP_SEL_FILES  N_("Select one or more files to open")
+#define I_OP_SEL_DIR   I_DIR_OR_FOLDER( N_("Select Directory"), N_("Select Folder") )
 
 /******************* Menus *****************/
 
@@ -51,13 +64,16 @@
 /* Playlist popup */
 #define I_POP_PLAY N_("Play")
 #define I_POP_PREPARSE N_("Fetch Information")
-#define I_POP_DEL N_("Delete")
+#define I_POP_DEL N_("Remove Selected")
 #define I_POP_INFO N_("Information...")
 #define I_POP_SORT N_("Sort")
-#define I_POP_NEWFOLDER N_("Create Folder...")
+#define I_POP_NEWFOLDER I_DIR_OR_FOLDER( N_("Create Directory..."), \
+                                         N_("Create Folder...") )
+#define I_POP_EXPLORE I_DIR_OR_FOLDER( N_("Show Containing Directory..."), \
+                                       N_("Show Containing Folder...") )
 #define I_POP_STREAM N_("Stream...")
 #define I_POP_SAVE N_("Save...")
-#define I_POP_EXPLORE N_("Show Containing Folder...")
+
 
 /*************** Playlist *************/
 
@@ -73,7 +89,8 @@
 
 #define I_PL_ADDF       N_("Add File...")
 #define I_PL_ADVADD     N_("Advanced Open...")
-#define I_PL_ADDDIR     N_("Add Folder...")
+#define I_PL_ADDDIR     I_DIR_OR_FOLDER( N_("Add Directory..."), \
+                                         N_("Add Folder...") )
 
 #define I_PL_SAVE       N_("Save Playlist to &File...")
 #define I_PL_LOAD       N_("Open Play&list...")