Merging pr3 branch to trunk:

Renaming "Plugins" -> "Plug-ins"

b=53976
r=ssu
a=sfraser

modules/appfilelocprovider/src/nsAppFileLocationProvider.cpp

@@ -72,7 +72,7 @@ static NS_DEFINE_CID(kChromeRegistryCID,    NS_CHROMEREGISTRY_CID);
 #define DEFAULTS_PROFILE_DIR_NAME   "Profile"
 #define RES_DIR_NAME                "Res"
 #define CHROME_DIR_NAME             "Chrome"
-#define PLUGINS_DIR_NAME            "Plugins"
+#define PLUGINS_DIR_NAME            "Plug-ins"
 #define SEARCH_DIR_NAME             "Search Plugins" 
 #else
 #define DEFAULTS_DIR_NAME           "defaults"

xpcom/io/nsAppFileLocationProvider.cpp

@@ -72,7 +72,7 @@ static NS_DEFINE_CID(kChromeRegistryCID,    NS_CHROMEREGISTRY_CID);
 #define DEFAULTS_PROFILE_DIR_NAME   "Profile"
 #define RES_DIR_NAME                "Res"
 #define CHROME_DIR_NAME             "Chrome"
-#define PLUGINS_DIR_NAME            "Plugins"
+#define PLUGINS_DIR_NAME            "Plug-ins"
 #define SEARCH_DIR_NAME             "Search Plugins" 
 #else
 #define DEFAULTS_DIR_NAME           "defaults"

xpfe/appshell/src/nsFileLocations.cpp

@@ -501,7 +501,7 @@ void nsSpecialFileSpec::operator = (Type aType)
             {
                 *this = nsSpecialSystemDirectory(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
 #ifdef XP_MAC
-                *this += "Plugins";
+                *this += "Plug-ins";
 #else
                 *this += "plugins";
 #endif