From: Wolfgang Rosenauer

Subject: Don't use localized Downloads unless XDG is set up

References:

https://bugzilla.novell.com/show_bug.cgi?id=501724

diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js

--- a/browser/components/preferences/main.js

+++ b/browser/components/preferences/main.js

@@ -344,7 +344,7 @@ var gMainPane = {

       // With 3.0, a new desktop folder - 'Downloads' was introduced for

       // platforms and versions that don't support a default system downloads

       // folder. See nsDownloadManager for details. 

-      downloadFolder.label = bundlePreferences.getString("downloadsFolderName");

+      downloadFolder.label = "Downloads";

       iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1));

     } else {

       // 'Desktop'

diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp

--- a/toolkit/components/downloads/nsDownloadManager.cpp

+++ b/toolkit/components/downloads/nsDownloadManager.cpp

@@ -1269,8 +1269,10 @@ nsDownloadManager::GetDefaultDownloadsDi

   // XDG user dir spec, with a fallback to Home/Downloads

   nsXPIDLString folderName;

-  mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(),

-                             getter_Copies(folderName));

+  // We don't want localized "Downloads" unless XDG is used

+  //mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(),

+  //                           getter_Copies(folderName));

+  folderName.AssignLiteral("Downloads");

 #if defined (XP_MACOSX)

   rv = dirService->Get(NS_OSX_DEFAULT_DOWNLOAD_DIR,