[Pkg-mozext-commits] [automatic-save-folder] 107/133: [Experimental. Please report on the forum your opinion regarding these changes] http://asf.mangaheart.org/index.php?menu=5&f=2&t=113
David Prévot
taffit at moszumanska.debian.org
Mon Apr 27 20:33:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch wip
in repository automatic-save-folder.
commit f28dda9ee6b14f31a06b30aa340dde75ff3d56c9
Author: Cyan <Cyan at d0063192-6b2e-11de-89a9-0b20f3e2dceb>
Date: Sun Feb 19 13:04:09 2012 +0000
[Experimental. Please report on the forum your opinion regarding these changes]
http://asf.mangaheart.org/index.php?menu=5&f=2&t=113
Add:
The file explorer is now activated on a case-by-case basis when downloading (whether a filter is found or not).
It's the first step in prevision of ASF2.0 filter-by-filter basis.
Change:
For better clarity, the option to select whether the file explorer should be displayed is now written like in Firefox's options.
Fix:
Fixed the suggested folder's display if the saved folder is forced to Desktop or Download.
Please report any problem you encounter with this revision.
If it doesn't work correctly, use r115 instead and let me know on the forum.
git-svn-id: http://automatic-save-folder.googlecode.com/svn/trunk@116 d0063192-6b2e-11de-89a9-0b20f3e2dceb
---
content/asf.js | 41 +++++++++++++++++++++++-----
content/asf_download.js | 49 +++++++++++++++++++++++-----------
content/asf_right_click.js | 12 +++++++--
content/common.dtd | 2 +-
content/help/about.xhtml | 4 +++
content/help/update.xhtml | 6 +++++
content/options.xul | 26 +++++++++++-------
content/overlay_unknownContentType.xul | 6 ++---
defaults/preferences/asf.js | 4 ++-
locale/cs/about.dtd | 7 +++++
locale/cs/asf.dtd | 31 ++++++++++++++++++---
locale/cs/asf.properties | 6 ++---
locale/cs/help.dtd | 2 ++
locale/en-US/about.dtd | 7 +++++
locale/en-US/asf.dtd | 16 +++++++----
locale/en-US/asf.properties | 3 ++-
locale/en-US/help.dtd | 2 ++
locale/fr/about.dtd | 7 +++++
locale/fr/asf.dtd | 16 +++++++----
locale/fr/asf.properties | 5 ++--
locale/fr/help.dtd | 2 ++
locale/it/about.dtd | 7 +++++
locale/it/asf.dtd | 12 ++++++---
locale/it/asf.properties | 3 ++-
locale/it/help.dtd | 2 ++
locale/ru/about.dtd | 7 +++++
locale/ru/asf.dtd | 12 ++++++---
locale/ru/asf.properties | 3 ++-
locale/ru/help.dtd | 2 ++
locale/sv-SE/about.dtd | 7 +++++
locale/sv-SE/asf.dtd | 12 ++++++---
locale/sv-SE/asf.properties | 3 ++-
locale/sv-SE/help.dtd | 2 ++
33 files changed, 257 insertions(+), 69 deletions(-)
diff --git a/content/asf.js b/content/asf.js
index cd7a54c..f9766d5 100644
--- a/content/asf.js
+++ b/content/asf.js
@@ -470,15 +470,18 @@ var automatic_save_folder = {
var asf_rightclicktimeout = document.getElementById("asf-rightclicktimeout");
// check if autosave is selected, if not : set the saving path to "filtered" and disable the dropdown menu.
- if (useDownloadDir.checked == false)
+ if (useDownloadDir.value == "false")
{
document.getElementById("asf-folderList").value = 2;
document.getElementById("asf-folderList").disabled = true;
this.prefManager.setIntPref("browser.download.folderList",2);
+ document.getElementById("asf-useDownloadDirFiltered").checked = false;
+ document.getElementById("asf-useDownloadDirFiltered").disabled = true;
}
- if (useDownloadDir.checked == true)
+ if (useDownloadDir.value == "true")
{
document.getElementById("asf-folderList").disabled = false;
+ document.getElementById("asf-useDownloadDirFiltered").disabled = false;
}
@@ -1085,7 +1088,7 @@ var automatic_save_folder = {
apply = true;
// upgrade exemple
- // 1.0.2bReb86
+ // 1.0.2bRev86
if (this.versionChecker.compare(import_version, "1.0.2bRev86") == -1) // convert usecurrenturl=true to checkDomainOrder=1,5
{
for (var i = 2; i < data.length ; i++)
@@ -1146,6 +1149,25 @@ var automatic_save_folder = {
}
+ // 1.0.5bRev116
+ if (this.versionChecker.compare(import_version, "1.0.5bRev116") == -1) // copy useDownloadDir to extensions.asf.useDownloadDir
+ {
+ for (var i = 2; i < data.length ; i++)
+ {
+ if (data[i].indexOf("browser.download.useDownloadDir") >= 0)
+ {
+ if (data[i] == "browser.download.useDownloadDir;bool=true")
+ {
+ data[i] = "extensions.asf.useDownloadDir;bool=true";
+ }
+ else
+ {
+ data[i] = "extensions.asf.useDownloadDir;bool=false";
+ }
+ break;
+ }
+ }
+ }
}
@@ -1207,8 +1229,9 @@ var automatic_save_folder = {
document.getElementById("asf-keeptemp-check").checked = this.prefManager.getBoolPref("extensions.asf.keeptemp"); // but last folder if same domain
// options tab
- document.getElementById("asf-useDownloadDir").checked = this.prefManager.getBoolPref("browser.download.useDownloadDir"); // useDownloadDir (firefox pref)
- document.getElementById("asf-folderList").value = this.prefManager.getIntPref("browser.download.folderList"); // folderList 0= desk, 1= download, 2= user
+ document.getElementById("asf-useDownloadDir").value = this.prefManager.getBoolPref("extensions.asf.useDownloadDir"); // useDownloadDir
+ document.getElementById("asf-folderList").value = this.prefManager.getIntPref("browser.download.folderList"); // folderList 0= desk, 1= download, 2= user (firefox pref)
+ document.getElementById("asf-useDownloadDirFiltered").checked = this.prefManager.getBoolPref("extensions.asf.useDownloadDirFiltered"); // only if a filter is found
document.getElementById("asf-dialogaccept").checked = this.prefManager.getBoolPref("extensions.asf.dialogaccept"); // auto accept the save dialog
document.getElementById("asf-dialogacceptFiltered").checked = this.prefManager.getBoolPref("extensions.asf.dialogacceptFiltered"); // only if a filter is found
@@ -1289,7 +1312,7 @@ var automatic_save_folder = {
var ASF_prefs = new Array;
var additionnal_prefs = new Array;
// ASF 1.0.0
- ASF_prefs[ASF_prefs.length] = "browser.download.useDownloadDir";
+ //ASF_prefs[ASF_prefs.length] = "browser.download.useDownloadDir"; // Removed since 1.0.5bRev116, now using ASF's own useDownloadDir setting.
ASF_prefs[ASF_prefs.length] = "browser.download.folderList";
@@ -1336,6 +1359,11 @@ var automatic_save_folder = {
additionnal_prefs = ["extensions.asf.suggestAllPossibleFolders"];
ASF_prefs = ASF_prefs.concat(additionnal_prefs);
+ // ASF version 1.0.5bRev116
+ // add useDownloadDir to ASF preferences instead of using Firefox's preferences.
+ additionnal_prefs = ["extensions.asf.useDownloadDir", "extensions.asf.useDownloadDirFiltered"];
+ ASF_prefs = ASF_prefs.concat(additionnal_prefs);
+
// just before the filters, put number of filters
ASF_prefs[ASF_prefs.length] = "extensions.asf.filtersNumber"; // number of shown Filters in the filter list (not the same as total filters stored in prefManager)
@@ -1759,6 +1787,7 @@ var automatic_save_folder = {
this.prefManager.setBoolPref("extensions.asf.rightclicktimeout", document.getElementById("asf-rightclicktimeout").checked);
this.prefManager.setBoolPref("extensions.asf.dialogacceptFiltered", document.getElementById("asf-dialogacceptFiltered").checked);
this.prefManager.setBoolPref("extensions.asf.useSiteBySiteSavePath", document.getElementById("asf-useSiteBySiteSavePath").checked);
+ this.prefManager.setBoolPref("extensions.asf.useDownloadDirFiltered", document.getElementById("asf-useDownloadDirFiltered").checked);
},
diff --git a/content/asf_download.js b/content/asf_download.js
index 294a0ab..f64df21 100644
--- a/content/asf_download.js
+++ b/content/asf_download.js
@@ -1,6 +1,6 @@
/* ***** BEGIN LICENSE BLOCK *****
Automatic Save Folder
-Copyright (C) 2007-2011 Éric Cassar (Cyan).
+Copyright (C) 2007-2012 Éric Cassar (Cyan).
2009 Ted Gifford - Dynamic variable capturing
"Automatic Save Folder" is free software: you can redistribute it and/or modify
@@ -318,6 +318,14 @@ Copyright (C) 2007-2011 Éric Cassar (Cyan).
this.saveUnicodeString("extensions.asf.tempdomain", domain);
}
+ // Set the FileExplorer display status here.
+ var useDownloadDirFiltered = this.prefManager.getBoolPref("extensions.asf.useDownloadDirFiltered");
+ if (useDownloadDirFiltered && idx < 0) this.prefManager.setBoolPref("browser.download.useDownloadDir", true); // no filter matched, enable the File Explorer if chosen by the user.
+ else
+ {
+ var useDownloadDir = this.prefManager.getBoolPref("extensions.asf.useDownloadDir");
+ this.prefManager.setBoolPref("browser.download.useDownloadDir", useDownloadDir);
+ }
// Automatic saving when clicking on a link. The save dialog still flash onscreen very quickly.
if (dialogacceptFiltered && idx < 0) dialogaccept = false; // no filter matched, do not autoaccept the dialog
@@ -376,7 +384,7 @@ Copyright (C) 2007-2011 Éric Cassar (Cyan).
var lastdir = this.prefManager.getBoolPref("extensions.asf.lastdir"); // for Firefox2 : set save as Ctrl+S too
var directory = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
- // Check if the user use the "do not show file explorer" to automatically save to "desktop" or "downloads" and force the suggested path to those folders instead of filtered path
+ // Check if the user use the "useDownloadDir" setting to automatically save to "desktop" or "downloads" and force the suggested path to those folders instead of filtered path
if ( (folderList == 0) || (folderList == 1) )
{
var desk = Components.classes["@mozilla.org/file/directory_service;1"]
@@ -769,6 +777,8 @@ Copyright (C) 2007-2011 Éric Cassar (Cyan).
// read asf/content/info_save_ff2-3.txt for differences between Firefox 2 and Firefox 3 saving preferences.
var asf_dloptions = document.getElementById('asf_dloptions');
var asf_radiogroup_pathselect = document.getElementById('asf_radiogroup_pathselect');
+ var asf_lastpath = document.getElementById('asf_lastpath');
+ var asf_currentURI_lastpath = document.getElementById('asf_currentURI_lastpath');
var asf_savefolder = document.getElementById('asf_savefolder');
var asf_folder_list = document.getElementById('asf_folder_list');
var asf_viewdloption = this.prefManager.getBoolPref("extensions.asf.viewdloption");
@@ -776,6 +786,10 @@ Copyright (C) 2007-2011 Éric Cassar (Cyan).
var asf_viewpathselect = this.prefManager.getBoolPref("extensions.asf.viewpathselect");
var useDownloadDir = this.prefManager.getBoolPref("browser.download.useDownloadDir");
var folderList = this.prefManager.getIntPref("browser.download.folderList");
+ var stringbundle = Components.classes['@mozilla.org/intl/stringbundle;1']
+ .getService(Components.interfaces.nsIStringBundleService)
+ .createBundle('chrome://asf/locale/asf.properties');
+ var fromfilter = stringbundle.GetStringFromName("save.fromfilter");
var folder = "";
if (this.firefoxversion == 2) folder = this.loadUnicodeString("browser.download.dir");
@@ -808,7 +822,6 @@ Copyright (C) 2007-2011 Éric Cassar (Cyan).
// check the lastpath, if different than current folder, then print radio choice to user
// so he can choose from found filters, or last used path.
var lastpath = this.loadUnicodeString("extensions.asf.lastpath");
- var asf_lastpath = document.getElementById('asf_lastpath');
asf_lastpath.label = lastpath;
if ( (lastpath == folder) || (lastpath == "") || (this.indexInArray(this.matching_folders, lastpath) > -1)) // if same or empty (first time using ASF), or already present from a filter's path, do not show radio for lastpath choice
@@ -821,7 +834,6 @@ Copyright (C) 2007-2011 Éric Cassar (Cyan).
}
// Firefox 7.0.1+ : Check the current uri lastpath, if not in the available paths then print another radio choice to the user
- var asf_currentURI_lastpath = document.getElementById('asf_currentURI_lastpath');
asf_currentURI_lastpath.hidden = true;
if ((this.firefoxversion >= 7.01) && (this.current_uri_lastpath != ""))
{
@@ -833,7 +845,7 @@ Copyright (C) 2007-2011 Éric Cassar (Cyan).
}
//set the text to be written on the Radio comment
- if (this.matching_filters.length >= 1)
+ if (this.matching_filters.length >= 1 && folderList == 2)
{
for (var i=asf_savefolder.childNodes.length-1 ; i>=0 ; i--)
{
@@ -848,6 +860,7 @@ Copyright (C) 2007-2011 Éric Cassar (Cyan).
new_radio.setAttribute("crop", "center");
new_radio.setAttribute("label", this.matching_folders[i]);
new_radio.setAttribute("class", "small-indent");
+ new_radio.setAttribute("tooltiptext", fromfilter);
new_radio.setAttribute("oncommand", "automatic_save_folder.asf_toggle_savepath(this);");
asf_savefolder.appendChild(new_radio);
}
@@ -863,13 +876,15 @@ Copyright (C) 2007-2011 Éric Cassar (Cyan).
new_radio.setAttribute("crop", "center");
new_radio.setAttribute("label", this.matching_folders[0]);
new_radio.setAttribute("class", "small-indent");
+ new_radio.setAttribute("tooltiptext", fromfilter);
new_radio.setAttribute("oncommand", "automatic_save_folder.asf_toggle_savepath(this);");
asf_savefolder.appendChild(new_radio);
}
- document.getElementById('asf_savefolder_0').label = folder;
}
+ document.getElementById('asf_savefolder_0').label = folder;
+
// Force check the first radio choice (needed on linux + ff2.x) (linux has blank radio choices on loading, this is only visual, it doesn't affect anything here, the value are set to the new path by default until the user change the radio choice)
var asf_radio_savepath = document.getElementById('asf_radio_savepath');
asf_radio_savepath.value = 0;
@@ -888,7 +903,7 @@ Copyright (C) 2007-2011 Éric Cassar (Cyan).
- //and last, if the user checked the option to view the path list on saving window, set it to visible
+ //If the user checked the option to view the path list on saving window, set it to visible
if(asf_viewpathselect == true)
{
this.read_all_filterpath();
@@ -899,17 +914,17 @@ Copyright (C) 2007-2011 Éric Cassar (Cyan).
asf_radiogroup_pathselect.style.visibility = "collapse";
}
- // Check if the user use the "do not show file explorer" to automatically save to "desktop" or "downloads" and force the suggested path to those folders instead of found filters
- if((useDownloadDir == true) && (folderList != 2)) // if set to desktop or Download
+ // Check if the user use the "useDownloadDir" setting to automatically save to "desktop" or "downloads" and force the suggested path to those folders instead of found filters
+ if(folderList != 2) // if set to desktop or Download
{
asf_radio_savepath.disabled = true;
- asf_radiogroup_pathselect.disabled = true;
+ asf_savefolder.disabled = true;
asf_folder_list.disabled = true;
}
else
{
asf_radio_savepath.disabled = false;
- asf_radiogroup_pathselect.disabled = false;
+ asf_savefolder.disabled = false;
asf_folder_list.disabled = false;
}
@@ -938,11 +953,13 @@ Copyright (C) 2007-2011 Éric Cassar (Cyan).
// Check if the user change the unkownContentType option (open with, save as, save with a download manager, etc.)
var save = document.getElementById("save").selected;
var asf_radio_savepath = document.getElementById('asf_radio_savepath');
- var asf_radiogroup_pathselect = document.getElementById('asf_radiogroup_pathselect');
+ var asf_savefolder = document.getElementById('asf_savefolder');
var asf_folder_list = document.getElementById('asf_folder_list');
+ var asf_radiogroup_pathselect = document.getElementById('asf_radiogroup_pathselect');
var asf_viewdloption = this.prefManager.getBoolPref("extensions.asf.viewdloption");
var asf_viewdloptionType = this.prefManager.getIntPref("extensions.asf.viewdloptionType");
var asf_viewpathselect = this.prefManager.getBoolPref("extensions.asf.viewpathselect");
+ var folderList = this.prefManager.getIntPref("browser.download.folderList");
var dTa = false;
if (this.DownThemAll_isEnabled) // enable ASF box if dTa is selected and sending folder to dTa is enabled.
{
@@ -957,9 +974,9 @@ Copyright (C) 2007-2011 Éric Cassar (Cyan).
{
if(save || dTa) // if set to "save the file"
{
- asf_radio_savepath.disabled = false;
- asf_radiogroup_pathselect.disabled = false;
- asf_folder_list.disabled = false;
+ if (folderList == 2) asf_radio_savepath.disabled = false;
+ if (folderList == 2) asf_savefolder.disabled = false;
+ if (folderList == 2) asf_folder_list.disabled = false;
if ((asf_viewdloptionType == 2) || (asf_viewdloptionType == 3))
{
document.getElementById('asf_dloptions').style.visibility = "visible";
@@ -973,7 +990,7 @@ Copyright (C) 2007-2011 Éric Cassar (Cyan).
else
{
asf_radio_savepath.disabled = true;
- asf_radiogroup_pathselect.disabled = true;
+ asf_savefolder.disabled = true;
asf_folder_list.disabled = true;
if (asf_viewdloptionType == 2) // minimize only
{
diff --git a/content/asf_right_click.js b/content/asf_right_click.js
index 20f6add..80591c5 100644
--- a/content/asf_right_click.js
+++ b/content/asf_right_click.js
@@ -1,6 +1,6 @@
/* ***** BEGIN LICENSE BLOCK *****
Automatic Save Folder
-Copyright (C) 2007-2011 Éric Cassar (Cyan).
+Copyright (C) 2007-2012 Éric Cassar (Cyan).
2009 Ted Gifford - Dynamic variable capturing
"Automatic Save Folder" is free software: you can redistribute it and/or modify
@@ -32,7 +32,7 @@ var automatic_save_folder = {
firefoxversion : "",
logtoconsole: true,
inPrivateBrowsing: false,
- importantVersionAlert: "1.0.2",
+ importantVersionAlert: "1.0.5bRev116",
result: "", // print_r result
previousASFVersion: "",
currentASFVersion : "",
@@ -943,6 +943,7 @@ var automatic_save_folder = {
if (this.versionChecker.compare(this.previousASFVersion, "1.0.2bRev86") == -1) this.upgrade("1.0.2bRev86"); // convert currenturl to 1,5
if (this.versionChecker.compare(this.previousASFVersion, "1.0.2bRev90") == -1) this.upgrade("1.0.2bRev90"); // remove the slashes to regexp
+ if (this.versionChecker.compare(this.previousASFVersion, "1.0.5bRev116") == -1) this.upgrade("1.0.5bRev116"); // copy useDownloadDir preference
// write the current version as old to prevent showing the updateMessage again
this.previousASFVersion = this.currentASFVersion;
this.prefManager.setCharPref("extensions.asf.version", this.currentASFVersion);
@@ -1015,6 +1016,13 @@ var automatic_save_folder = {
}
}
break;
+
+ case "1.0.5bRev116": // // copy useDownloadDir to extensions.asf.useDownloadDir
+
+ this.prefManager.setBoolPref("extensions.asf.useDownloadDir", this.prefManager.getBoolPref("browser.download.useDownloadDir"));
+ break;
+
+
}
},
diff --git a/content/common.dtd b/content/common.dtd
index a112c92..5171009 100644
--- a/content/common.dtd
+++ b/content/common.dtd
@@ -1,5 +1,5 @@
<!-- Current version -->
-<!ENTITY asf.version "1.0.5bRev115">
+<!ENTITY asf.version "1.0.5bRev116">
<!ENTITY about.translators "
- cs : Stanislav Horáček<br />
diff --git a/content/help/about.xhtml b/content/help/about.xhtml
index cfb7f49..d0be12c 100644
--- a/content/help/about.xhtml
+++ b/content/help/about.xhtml
@@ -34,6 +34,10 @@
! &about.fix;
+<strong>&about.version.title; 1.0.5 :</strong> (2012 xx xx)
+&about.version.105;
+
+
<strong>&about.version.title; 1.0.4 :</strong> (2012 01 07)
&about.version.104;
diff --git a/content/help/update.xhtml b/content/help/update.xhtml
index 061f132..713c74f 100644
--- a/content/help/update.xhtml
+++ b/content/help/update.xhtml
@@ -94,6 +94,12 @@
<h2>○ &firstinstall.title.importantupdates;</h2>
<p>
+ <strong> &version; 1.0.5b Revision 115 :</strong><br />
+ <ul>
+ <li>&importantupdates.105b.1;</li>
+ </ul>
+</p>
+<p>
<strong> &version; 1.0.2 :</strong><br />
<ul>
<li>&importantupdates.102.1;</li>
diff --git a/content/options.xul b/content/options.xul
index 1221ace..366fec1 100644
--- a/content/options.xul
+++ b/content/options.xul
@@ -43,7 +43,8 @@
<preference id="asf_userightclick" name="extensions.asf.userightclick" type="bool"/>
<preference id="asf_rightclicktimeout" name="extensions.asf.rightclicktimeout" type="bool"/>
<preference id="asf_domainTestOrder" name="extensions.asf.domainTestOrder" type="string"/>
- <preference id="asf_useDownloadDir" name="browser.download.useDownloadDir" type="bool"/>
+ <preference id="asf_useDownloadDir" name="extensions.asf.useDownloadDir" type="bool"/>
+ <preference id="asf_useDownloadDirFiltered" name="extensions.asf.useDownloadDirFiltered" type="bool"/>
<preference id="asf_folderList" name="browser.download.folderList" type="int"/>
<preference id="asf_regexp_caseinsensitive" name="extensions.asf.regexp_caseinsensitive" type="bool"/>
<preference id="asf_pathlist_defaultforceontop" name="extensions.asf.pathlist_defaultforceontop" type="bool"/>
@@ -87,6 +88,7 @@
<tooltip id="tooltip_rightclicktimeout" label="&asf.rightclicktimeout.tooltip1;
&asf.rightclicktimeout.tooltip2;
&asf.rightclicktimeout.tooltip3;
&asf.rightclicktimeout.tooltip4;" noautohide="true" />
<tooltip id="tooltip_variablemode" label="&asf.variablemode.tooltip1;
&asf.variablemode.tooltip2;" noautohide="true" />
<tooltip id="tooltip_dialogacceptFiltered" label="&asf.dialogacceptFiltered.tooltip;" noautohide="true" />
+ <tooltip id="tooltip_useDownloadDirFiltered" label="&asf.useDownloadDirFiltered.tooltip;" noautohide="true" />
<tooltip id="tooltip_domainTestOrder" noautohide="true" align="vertical">
<label>&asf.domainTestOrder.tooltip1;</label>
<hbox><description value="1 :"/><label>&asf.domainTestOrder.tooltip2;</label></hbox>
@@ -197,14 +199,20 @@
<vbox id="asf-options-tab1" flex="1">
<groupbox><caption label="&asf.options.groupbox1.label;" />
<hbox>
- <checkbox id="asf-useDownloadDir" preference="asf_useDownloadDir" label="&asf.useDownloadDir.bool;" oncommand="automatic_save_folder.toggle_options();"/>
- <menulist id="asf-folderList" preference="asf_folderList" tooltip="tooltip_folderList">
- <menupopup>
- <menuitem value="0" label="&asf.desktop.label;"></menuitem>
- <menuitem value="1" label="&asf.systemdownload.label;"></menuitem>
- <menuitem value="2" label="&asf.filteredfolder.label;"></menuitem>
- </menupopup>
- </menulist>
+ <radiogroup id="asf-useDownloadDir" preference="asf_useDownloadDir">
+ <hbox>
+ <radio value="true" label="&asf.useDownloadDir.label;" oncommand="automatic_save_folder.toggle_options();"/>
+ <menulist id="asf-folderList" preference="asf_folderList" tooltip="tooltip_folderList">
+ <menupopup>
+ <menuitem value="0" label="&asf.desktop.label;"></menuitem>
+ <menuitem value="1" label="&asf.systemdownload.label;"></menuitem>
+ <menuitem value="2" label="&asf.filteredfolder.label;"></menuitem>
+ </menupopup>
+ </menulist>
+ </hbox>
+ <checkbox id="asf-useDownloadDirFiltered" preference="asf_useDownloadDirFiltered" label="&asf.useDownloadDirFiltered.bool;" tooltip="tooltip_useDownloadDirFiltered" style="margin-left:25px;"/>
+ <radio value="false" label="&asf.alwaysAskWhereToSave.label;" oncommand="automatic_save_folder.toggle_options();"/>
+ </radiogroup>
</hbox>
</groupbox>
<groupbox><caption label="&asf.options.groupbox2.label;" />
diff --git a/content/overlay_unknownContentType.xul b/content/overlay_unknownContentType.xul
index 07491a1..e269f46 100644
--- a/content/overlay_unknownContentType.xul
+++ b/content/overlay_unknownContentType.xul
@@ -19,10 +19,10 @@
<vbox id="asf_dloptions_content" style="visibility: visible;" >
<radiogroup id="asf_radio_savepath" align="left">
<vbox id="asf_savefolder">
- <radio id="asf_savefolder_0" value="0" width="280" crop="center" label="folder" class="small-indent" oncommand="automatic_save_folder.asf_toggle_savepath(this)"/>
+ <radio id="asf_savefolder_0" value="0" width="280" crop="center" label="folder" class="small-indent" tooltiptext="&asf.saveFromFilter.label;" oncommand="automatic_save_folder.asf_toggle_savepath(this)"/>
</vbox>
- <radio id="asf_lastpath" value="97" width="280" crop="center" label="folder" class="small-indent" oncommand="automatic_save_folder.asf_toggle_savepath(this)"/>
- <radio id="asf_currentURI_lastpath" value="98" width="280" crop="center" label="folder" class="small-indent" oncommand="automatic_save_folder.asf_toggle_savepath(this)"/>
+ <radio id="asf_lastpath" value="97" width="280" crop="center" label="folder" class="small-indent" tooltiptext="&asf.savePreviousFolder.label;" oncommand="automatic_save_folder.asf_toggle_savepath(this)"/>
+ <radio id="asf_currentURI_lastpath" value="98" width="280" crop="center" label="folder" class="small-indent" tooltiptext="&asf.savePreviousFolderSite.label;" oncommand="automatic_save_folder.asf_toggle_savepath(this)"/>
<vbox id="asf_radiogroup_pathselect" style="visibility: collapse;">
<radio id="asf_pathselect" value="99" width="280" crop="center" label="&asf.pathselect.label;" class="small-indent" oncommand="automatic_save_folder.asf_toggle_savepath(this)"/>
<hbox>
diff --git a/defaults/preferences/asf.js b/defaults/preferences/asf.js
index ca67dbf..568be78 100644
--- a/defaults/preferences/asf.js
+++ b/defaults/preferences/asf.js
@@ -33,4 +33,6 @@ pref("extensions.asf at mangaheart.org.description", "chrome://asf/locale/asf.prope
pref("extensions.asf.exportFolder", "");
pref("extensions.asf.showExportButton", false);
pref("extensions.asf.suggestAllPossibleFolders", false);
- pref("extensions.asf.useSiteBySiteSavePath", false); // new feature since Firefox 7.0.1
\ No newline at end of file
+ pref("extensions.asf.useSiteBySiteSavePath", false); // new feature since Firefox 7.0.1
+ pref("extensions.asf.useDownloadDir", false);
+ pref("extensions.asf.useDownloadDirFiltered", false);
\ No newline at end of file
diff --git a/locale/cs/about.dtd b/locale/cs/about.dtd
index 78b80a6..63b3fc5 100644
--- a/locale/cs/about.dtd
+++ b/locale/cs/about.dtd
@@ -23,6 +23,13 @@
<!ENTITY about.version.title "Verze">
<!-- Keep the newline intact as it uses the < pre > tag, keep the 2 beginning spaces to create indentation -->
+<!ENTITY about.version.105 "+ Added two new Domain Type while filtering: Referrer URL and URL bar content.
++ Added an alert if a filter creation error is detected when downloading.
++ The file explorer is now activated on a case-by-case basis when downloading.
+* For better clarity, the option to select whether the file explorer should be displayed is now written like in Firefox's options.
+! Fixed the suggested folder's display if the saved folder is forced to Desktop or Download.
+! Fixed single-click saving on Firefox 7.0.1+ if the current website URI is not in the database.">
+
<!ENTITY about.version.104 "* Prevent duplicated suggested folders on the save window.
! Fixed single-click saving on Firefox 7.0.1+ if the current website URI is not in the database.">
diff --git a/locale/cs/asf.dtd b/locale/cs/asf.dtd
index 9a02f53..07b7b96 100644
--- a/locale/cs/asf.dtd
+++ b/locale/cs/asf.dtd
@@ -1,8 +1,9 @@
<!-- ASF Settings -->
-<!-- Change the preferences window size to fit your localization. Default values : resize=false width=617 height=423, in pixels-->
+<!-- Change the preferences window size to fit your localization. Default values : resize=false width=617 height=443, in pixels-->
<!ENTITY asf.preferences_window.resize "true">
<!ENTITY asf.preferences_window.width "580">
-<!ENTITY asf.preferences_window.height "446">
+<!ENTITY asf.preferences_window.height "466">
+
<!-- new line, U+00A0 ISOnum -->
<!ENTITY NL "
" >
@@ -11,6 +12,10 @@
<!ENTITY asf.label "Automaticky uložit do složky…">
<!ENTITY asf.addedit.label "Přidat nebo upravit filtr">
<!ENTITY asf.pathselect.label "Cesta k dostupným filtrům:">
+<!ENTITY asf.saveFromFilter.label "Folder from a filter.">
+<!ENTITY asf.savePreviousFolder.label "Previous folder.">
+<!ENTITY asf.savePreviousFolderSite.label "Previous folder used for this site.">
+
<!-- Filters tab - top -->
<!ENTITY asf.filters.label "Filtry">
<!ENTITY asf.tree.column.domain "Doména">
@@ -23,6 +28,7 @@
<!ENTITY asf.options.edit "Upravit">
<!ENTITY asf.options.delete " Smazat">
<!ENTITY asf.options.add " Přidat">
+
<!-- Filters tab - bottom -->
<!ENTITY asf.default.label "Pokud soubor nevyhovuje žádnému filtru, uložit do:">
<!ENTITY asf.lastselected.label "Naposledy použité složky">
@@ -30,23 +36,30 @@
<!ENTITY asf.defaultfolder.label "Této složky:">
<!ENTITY asf.selectfolder.label "Vybrat…">
<!ENTITY asf.keeptemp.label "Použít poslední složku, je-li soubor ze stejné domény jako naposledy stažený soubor.">
+
<!-- popup -->
<!ENTITY asf.top.popup "Přesunout nahoru">
<!ENTITY asf.copy.popup "Vytvořit kopii">
<!ENTITY asf.delete.popup "Smazat">
<!ENTITY asf.bottom.popup "Přesunout dolů">
+
<!-- Options tab -->
<!ENTITY asf.options.label "Možnosti">
<!ENTITY asf.options.tab1.label "Strana 1">
<!ENTITY asf.options.tab2.label "Strana 2">
<!ENTITY asf.options.tabdta.label "DownThemAll!">
<!ENTITY asf.options.tabdata.label "Správa dat">
+
<!ENTITY asf.options.groupbox1.label "Prohlížeč souborů">
-<!ENTITY asf.useDownloadDir.bool "Nezobrazovat prohlížeč souborů a automaticky uložit do:">
+<!ENTITY asf.useDownloadDir.label "Save files to">
<!ENTITY asf.desktop.label "Plocha">
<!ENTITY asf.systemdownload.label "Downloads">
<!ENTITY asf.filteredfolder.label "Nastavit podle filtrů">
<!ENTITY asf.folderList.tooltip "Jestliže neexistuje složka „Downloads“, zobrazí se prohlížeč souborů.">
+<!ENTITY asf.useDownloadDirFiltered.bool "Only if a filter is found.">
+<!ENTITY asf.useDownloadDirFiltered.tooltip "Asks where to save the files only if no filter matches.">
+<!ENTITY asf.alwaysAskWhereToSave.label "Always ask me where to save files.">
+
<!ENTITY asf.options.groupbox2.label "Dialog Uložit">
<!ENTITY asf.dialogaccept.bool "Automaticky potvrdit dialogové okno „Co má aplikace Firefox udělat s tímto souborem“.">
<!ENTITY asf.dialogacceptFiltered.bool "Jenom pokud je nalezen filtr">
@@ -67,12 +80,14 @@
<!ENTITY asf.suggestAllPossibleFolders.tooltip "Umožní rychle bez rozbalovací nabídky vybrat složku z těch, pro které odpovídá filtr.">
<!ENTITY asf.viewpathselect.bool "Zobrazit seznam složek">
<!ENTITY asf.viewpathselect.tooltip "Aktivuje rozbalovací seznam se všemi cestami filtrů">
+
<!ENTITY asf.option.groupbox.checkUpdate.label "Beta aktualizace">
<!ENTITY asf.checkBetaUpdate.button "Zkontrolovat beta aktualizace…">
<!ENTITY asf.betaVersionAvailable.label "K dispozici je nová verze:">
<!ENTITY asf.betaVersionNotAvailable.label "Není k dispozici nová verze.">
<!ENTITY asf.autoCheckBetaUpdate.bool "Automaticky kontrolovat při otevírání okna s nastavením.">
<!ENTITY asf.betaVersionUpdateNow.label "Aktualizovat nyní">
+
<!ENTITY asf.options.groupbox3.label "Možnosti filtrů">
<!ENTITY asf.lastdir.bool "Nastavit složku pro příkaz „Uložit jako“, pokud filtr vyhovuje">
<!ENTITY asf.domainTestOrder.label1 "Zvolte domény, které se budou používat, a jejich pořadí při filtrování:">
@@ -87,6 +102,7 @@
<!ENTITY asf.domainTestOrder.tooltip8 "Active page's referrer URL">
<!ENTITY asf.domainTestOrder.tooltip9 "Content of the active tab's URL">
<!ENTITY asf.regexp_caseinsensitive.bool "Filtry nerozlišují velikost písmen.">
+
<!ENTITY asf.options.groupbox4.label "Klepnutí pravým tlačítkem">
<!ENTITY asf.userightclick.bool "Použít filtry v nabídkách">
<!ENTITY asf.userightclick.tooltip "Povolí filtry v nabídkách „Uložit odkaz jako…“, „Uložit obrázek jako…“ a „Uložit jako… (Ctrl+S)“">
@@ -97,18 +113,21 @@
<!ENTITY asf.rightclicktimeout.tooltip4 "Poznámka: Tato možnost neovlivní nabídky „Uložit obrázek jako…“ ani „Uložit jako… (Ctrl+S)“.">
<!ENTITY asf.rightclick.ff2.label "Vlastnosti pro pravé tlačítko nejsou dostupné ve Firefoxu 2. Chcete-li používat filtry pro stahování pomocí „Uložit odkaz jako“ v nabídce vyvolané pravým tlačítkem, je nutné aktualizovat Firefox alespoň na verzi 3.0 (doporučena je verze 3.5 a novější).">
<!ENTITY asf.rightclick.DSort.label "Bylo zjištěno rozšíření Download Sort.&NL;Vlastnosti pro pravé tlačítko rozšíření Automaticky uložit do složky nebudou fungovat, dokud nebude rozšíření Download Sort ve Správci rozšíření vypnuto.">
+
<!ENTITY asf.options.groupbox5.label "Grafické rozhraní">
<!ENTITY asf.pathlist_defaultforceontop.bool "V rozbalovacích nabídkách zobrazovat nejdříve výchozí cestu pro uložení.">
<!ENTITY asf.pathlist_alphasort.bool "Řadit seznam cest pro uložení abecedně.">
<!ENTITY asf.rowmatchinghighlight.label "Barevně zvýraznit, pokud je vybrán vyhovující filtr:">
<!ENTITY asf.rowmatchinghighlight.color "Barvy rozšíření">
<!ENTITY asf.rowmatchinghighlight.system "Systémové barvy">
+
<!ENTITY asf.options.groupbox6.label "DownThemAll!">
<!ENTITY asf.options.dtaDetected.label "Rozšíření Automaticky uložit do složky zjistilo, že je používán doplněk DownThemAll!&NL;Automaticky uložit do složky může posílat cestu získanou z filtrů do DownThemAll!, pokud se používá dialog pro uložení „Co má aplikace Firefox udělat s tímto souborem“.&NL;&NL;Poznámka: Tato možnost nefunguje v režimu Anonymního prohlížení.">
<!ENTITY asf.dta_ASFtoDTA_isActive.bool "Povolit, aby rozšíření Automaticky uložit do složky posílalo cestu podle filtrů do DownThemAll!">
<!ENTITY asf.dta_chooseSendingMethod.label "Vyberte metodu pro posílání do DTA OneClick!:">
<!ENTITY asf.dta_methodReplace.label "Nahradit první složku v seznamu">
<!ENTITY asf.dta_methodAdd.label "Přidat do seznamu">
+
<!ENTITY asf.options.groupbox.datamanagement.label "Správa dat">
<!ENTITY asf.export.notemp.bool "Neimportovat dočasná data jako doména, ze které se naposledy stahovalo, nebo naposledy uložená cesta.">
<!ENTITY asf.export.forceimport.bool "Vynutit import, i když se nejedná o kompatibilní verzi. Upozornění: Abyste zabránili ztrátě dat, před vynucením importu exportujte a uschovejte stávající data.">
@@ -126,6 +145,7 @@
<!ENTITY asf.export.button.deleteuserprefs.label "Nastavit předvolby na výchozí hodnoty">
<!ENTITY asf.export.defaultfolder.label "Výchozí složka pro exportovaná data (volitelné):">
<!ENTITY asf.export.showbutton.bool "Přidat tlačítko pro správu dat na panel s filtry.">
+
<!-- Dynamics tab-->
<!ENTITY asf.dynamics.label "Dynamické složky">
<!ENTITY asf.variablemode.bool "Povolit">
@@ -133,12 +153,15 @@
<!ENTITY asf.variablemode.tooltip2 "Upozornění: Používá-li se režim Anonymního prohlížení, Firefox nevytváří složky, pokud neexistují. Navržena bude proto složka naposledy použitá v neanonymním prohlížení.">
<!ENTITY asf.variablemode.label "Upozornění: U značek se rozlišuje velikost písmen.">
<!ENTITY asf.variables.label "Seznam značek:">
+
<!-- help tab-->
<!ENTITY asf.help.label "Nápověda">
<!ENTITY asf.help.title "Nápověda">
+
<!-- About tab-->
<!ENTITY asf.about.label "O rozšíření…">
<!ENTITY asf.about.title "O rozšíření Automaticky uložit do složky">
+
<!-- preference add & edit-->
<!ENTITY buttonlabelextra1 "OK">
<!ENTITY asf.add.title "Přidat nový filtr">
@@ -152,10 +175,12 @@
<!ENTITY asf.addedit.all "Všechno">
<!ENTITY asf.addedit.regexp.exemple "Příklady regulárních výrazů:">
<!ENTITY asf.addedit.regexphelp.label "Nápověda k regulárním výrazům">
+
<!ENTITY asf.addedit.inforegexp1 "Filtry mohou být:">
<!ENTITY asf.addedit.inforegexp2 "Pevně určené: file_to_download.zip">
<!ENTITY asf.addedit.inforegexp3 "Částečně určené za použití zástupných znaků: file*.zip">
<!ENTITY asf.addedit.inforegexp4 "Regulární výrazy: .*(.rar|.zip)$">
+
<!-- Regular expression Help dialog -->
<!ENTITY asf.regexp.title "Regulární výrazy">
<!ENTITY asf.regexp.label "Nápověda a příklady">
diff --git a/locale/cs/asf.properties b/locale/cs/asf.properties
index c99c221..f628bfb 100644
--- a/locale/cs/asf.properties
+++ b/locale/cs/asf.properties
@@ -37,16 +37,16 @@ day3_abbr=st
day4_abbr=čt
day5_abbr=pá
day6_abbr=so
+
select_default_folder=Vyberte prosím výchozí složku použitou, nevyhovuje-li žádný filtr.
select_folder=Vyberte prosím cílovou složku pro tento filtr.
nodata.domain=Jméno domény je prázdné. Vyberte prosím „Všechno“, nebo zadejte filtr pro doménu.
nodata.filename=Název souboru je prázdný. Vyberte prosím „Všechno“, nebo zadejte filtr pro název souboru.
nodata.folder=Název složky je prázdný. Vyberte prosím pro tento filtr cílovou složku.
-checkForUpdates.updateAvailable=Oznámení aktualizace
-K dispozici je rozšíření Automaticky uložit do složky ve verzi %S.
-Tuto verzi lze instalovat na panelu Možnosti.
+checkForUpdates.updateAvailable=Oznámení aktualizace\nK dispozici je rozšíření Automaticky uložit do složky ve verzi %S.\nTuto verzi lze instalovat na panelu Možnosti.
checkForUpdates.updated=Nová verze byla nainstalována.\nAby se změny projevily, je třeba restartovat Firefox.
export.default_folder=Vyberte složku pro uložení exportovaných dat.
export.importnewer=Importovaný soubor byl vytvořen novější verzí.\nAktualizujte prosím rozšíření Automaticky uložit do složky.
export.importsuccessful=Data byla úspěšně importována.
export.recoveredfilters=%S filtr/filtrů obnoveno.\nZkontrolujte položky filtru dole v seznamu.\nPoznámka: Obnovené soubory nemusí být nutně ty, které byly naposledy smazány.
+save.fromfilter=Folder from a filter.
\ No newline at end of file
diff --git a/locale/cs/help.dtd b/locale/cs/help.dtd
index b6c1d58..7d7f206 100644
--- a/locale/cs/help.dtd
+++ b/locale/cs/help.dtd
@@ -98,3 +98,5 @@ Pokud se tak stane, opakujte krok 1.">
<!ENTITY importantupdates.102.3 "Import/export filtrů.">
<!ENTITY importantupdates.102.4 "Není nutno používat lomítka kolem filtrů s regulárními výrazy.">
<!ENTITY importantupdates.102.5 "Poznámka: V zájmu dalšího vývoje rozšíření Automaticky uložit do složky je tato verze poslední, která je určena také pro starší verze Firefoxu (1.5, 2.0 a 3.0).">
+
+<!ENTITY importantupdates.105b.1 "Automatic Save Folder is not linked anymore with the saved folder option defined in Firefox preferences.<br />The Firefox option "Always ask me where to save files" is now set on a case-by-case basis when downloading.">
\ No newline at end of file
diff --git a/locale/en-US/about.dtd b/locale/en-US/about.dtd
index 3179ac1..e4cc8ff 100644
--- a/locale/en-US/about.dtd
+++ b/locale/en-US/about.dtd
@@ -23,6 +23,13 @@
<!ENTITY about.version.title "Version">
<!-- Keep the newline intact as it uses the < pre > tag, keep the 2 beginning spaces to create indentation -->
+<!ENTITY about.version.105 "+ Added two new Domain Type while filtering: Referrer URL and URL bar content.
++ Added an alert if a filter creation error is detected when downloading.
++ The file explorer is now activated on a case-by-case basis when downloading.
+* For better clarity, the option to select whether the file explorer should be displayed is now written like in Firefox's options.
+! Fixed the suggested folder's display if the saved folder is forced to Desktop or Download.
+! Fixed single-click saving on Firefox 7.0.1+ if the current website URI is not in the database.">
+
<!ENTITY about.version.104 "* Prevent duplicated suggested folders on the save window.
! Fixed single-click saving on Firefox 7.0.1+ if the current website URI is not in the database.">
diff --git a/locale/en-US/asf.dtd b/locale/en-US/asf.dtd
index cde51a7..74793c0 100644
--- a/locale/en-US/asf.dtd
+++ b/locale/en-US/asf.dtd
@@ -1,8 +1,8 @@
<!-- ASF Settings -->
-<!-- Change the preferences window size to fit your localization. Default values : resize=false width=617 height=423, in pixels-->
+<!-- Change the preferences window size to fit your localization. Default values : resize=false width=617 height=443, in pixels-->
<!ENTITY asf.preferences_window.resize "true">
<!ENTITY asf.preferences_window.width "580">
-<!ENTITY asf.preferences_window.height "446">
+<!ENTITY asf.preferences_window.height "466">
<!-- new line, U+00A0 ISOnum -->
<!ENTITY NL "
" >
@@ -12,6 +12,9 @@
<!ENTITY asf.label "Automatic Save Folder...">
<!ENTITY asf.addedit.label "Add or edit a filter">
<!ENTITY asf.pathselect.label "Available filter's path:">
+<!ENTITY asf.saveFromFilter.label "Folder from a filter.">
+<!ENTITY asf.savePreviousFolder.label "Previous folder.">
+<!ENTITY asf.savePreviousFolderSite.label "Previous folder used for this site.">
<!-- Filters tab - top -->
<!ENTITY asf.filters.label "Filters">
@@ -48,15 +51,18 @@
<!ENTITY asf.options.tabdata.label "Data management">
<!ENTITY asf.options.groupbox1.label "File Explorer">
-<!ENTITY asf.useDownloadDir.bool "Do not show the file explorer, and automatically save to:">
+<!ENTITY asf.useDownloadDir.label "Save files to">
<!ENTITY asf.desktop.label "Desktop">
<!ENTITY asf.systemdownload.label "Downloads">
<!ENTITY asf.filteredfolder.label "Set by the filters">
<!ENTITY asf.folderList.tooltip "If the "Downloads" folder doesn't exist, the file explorer will be shown.">
+<!ENTITY asf.useDownloadDirFiltered.bool "Only if a filter is found.">
+<!ENTITY asf.useDownloadDirFiltered.tooltip "Asks where to save the files only if no filter matches.">
+<!ENTITY asf.alwaysAskWhereToSave.label "Always ask me where to save files.">
<!ENTITY asf.options.groupbox2.label "Save dialog">
<!ENTITY asf.dialogaccept.bool "Automatically accept the "What should Firefox do with this file?" dialog windows.">
-<!ENTITY asf.dialogacceptFiltered.bool "Only if a filter is found">
+<!ENTITY asf.dialogacceptFiltered.bool "Only if a filter is found.">
<!ENTITY asf.dialogacceptFiltered.tooltip "Will not automatically accept the "What should Firefox do with this file?" dialog windows if no filter matches.">
<!ENTITY asf.dialogForceRadio_Start.bool "Force the radio choice to">
<!ENTITY asf.dialogForceRadioTo.label1 "Open with">
@@ -72,7 +78,7 @@
<!ENTITY asf.viewdloptionType3.label "Hide if disabled">
<!ENTITY asf.suggestAllPossibleFolders.bool "Suggest all possible folders">
<!ENTITY asf.suggestAllPossibleFolders.tooltip "Adds a radio choice for each matching filter to select one of them quickly without using the drop-down list.">
-<!ENTITY asf.viewpathselect.bool "View the list of folders">
+<!ENTITY asf.viewpathselect.bool "View the list of folders.">
<!ENTITY asf.viewpathselect.tooltip "Activate a drop-down menu with all the filter's path.">
<!ENTITY asf.option.groupbox.checkUpdate.label "Beta update">
diff --git a/locale/en-US/asf.properties b/locale/en-US/asf.properties
index 0e7d375..dc5c4ee 100644
--- a/locale/en-US/asf.properties
+++ b/locale/en-US/asf.properties
@@ -48,4 +48,5 @@ checkForUpdates.updated=The new version has been installed.\nYou need to restart
export.default_folder=Select the saving folder for exported data.
export.importnewer=The imported file is from a more recent version.\nPlease update Automatic Save Folder.
export.importsuccessful=Data successfully imported.
-export.recoveredfilters=%S filter(s) recovered.\n Check your filters at the bottom of the list to delete duplicates.\n Note : Recovered filters are not necessarily the last deleted ones.
\ No newline at end of file
+export.recoveredfilters=%S filter(s) recovered.\n Check your filters at the bottom of the list to delete duplicates.\n Note : Recovered filters are not necessarily the last deleted ones.
+save.fromfilter=Folder from a filter.
\ No newline at end of file
diff --git a/locale/en-US/help.dtd b/locale/en-US/help.dtd
index 84d5bab..36f1ba4 100644
--- a/locale/en-US/help.dtd
+++ b/locale/en-US/help.dtd
@@ -129,3 +129,5 @@ If it ever happens, do Step 1 again.">
<!ENTITY importantupdates.102.3 "Import/export the filters.">
<!ENTITY importantupdates.102.4 "Removed the need of the slashes around a regular expression's filters.">
<!ENTITY importantupdates.102.5 "Note: In order to develop Automatic Save Folder further, this version is the last compatible with older Firefox versions (1.5, 2.0 and 3.0).">
+
+<!ENTITY importantupdates.105b.1 "Automatic Save Folder is not linked anymore with the saved folder option defined in Firefox preferences.<br />The Firefox option "Always ask me where to save files" is now set on a case-by-case basis when downloading.">
\ No newline at end of file
diff --git a/locale/fr/about.dtd b/locale/fr/about.dtd
index d6cbc98..273e03b 100644
--- a/locale/fr/about.dtd
+++ b/locale/fr/about.dtd
@@ -23,6 +23,13 @@
<!ENTITY about.version.title "Version">
<!-- Conserver les retours à la ligne car le tag < pre > est utilisé, gardez les deux espaces en début de ligne pour l'indentation -->
+<!ENTITY about.version.105 "+ Ajout de deux nouveaux types de domaine lors du filtrage : URL du referrer et contenu de la barre d'URL.
++ Ajout d'une alerte si une erreur de filtre est détectée lors de l'enregistrement.
++ L'explorateur de fichier est désormais activé au cas par cas lors de l'enregistrement.
+* Pour plus de clarté, l'option permettant de choisir si l'explorateur de fichier doit s'afficher est maintenant rédigé de la même façon que dans les options de Firefox.
+! Correction de l'affichage des propositions de dossiers lorsque le dossier de sauvegarde est forcé sur l'option Bureau ou Téléchargement.
+! Correction de l'enregistrement d'un fichier avec simple-clic pour Firefox 7.0.1+ si l'URI du site n'est pas présent dans la base de donnée.">
+
<!ENTITY about.version.104 "* Vérification des dossiers proposés sur la fenêtre d'enregistrement afin d'éviter les doublons.
! Correction de l'enregistrement d'un fichier avec simple-clic pour Firefox 7.0.1+ si l'URI du site n'est pas présent dans la base de donnée.">
diff --git a/locale/fr/asf.dtd b/locale/fr/asf.dtd
index 707415e..26a8f8c 100644
--- a/locale/fr/asf.dtd
+++ b/locale/fr/asf.dtd
@@ -1,8 +1,8 @@
<!-- ASF Settings -->
-<!-- Change the preferences window size to fit your localization. Default values : resize=false width=617 height=423, in pixels-->
+<!-- Change the preferences window size to fit your localization. Default values : resize=false width=617 height=443, in pixels-->
<!ENTITY asf.preferences_window.resize "true">
<!ENTITY asf.preferences_window.width "647">
-<!ENTITY asf.preferences_window.height "446">
+<!ENTITY asf.preferences_window.height "466">
<!-- new line, U+00A0 ISOnum -->
<!ENTITY NL "
" >
@@ -12,6 +12,9 @@
<!ENTITY asf.label "Automatic Save Folder...">
<!ENTITY asf.addedit.label "Ajouter ou éditer un filtre">
<!ENTITY asf.pathselect.label "Liste des filtres :">
+<!ENTITY asf.saveFromFilter.label "Dossier provenant d'un filtre">
+<!ENTITY asf.savePreviousFolder.label "Dossier précédant">
+<!ENTITY asf.savePreviousFolderSite.label "Dossier précédemment utilisé pour ce site">
<!-- Filters tab - top -->
<!ENTITY asf.filters.label "Filtres">
@@ -48,15 +51,18 @@
<!ENTITY asf.options.tabdata.label "Gestion des données">
<!ENTITY asf.options.groupbox1.label "Explorateur de fichiers">
-<!ENTITY asf.useDownloadDir.bool "Ne pas afficher l'explorateur de fichiers, et enregistrer directement dans le dossier :">
+<!ENTITY asf.useDownloadDir.label "Enregistrer les fichiers dans le dossier">
<!ENTITY asf.desktop.label "Bureau">
<!ENTITY asf.systemdownload.label "Téléchargements">
<!ENTITY asf.filteredfolder.label "Défini par les filtres">
<!ENTITY asf.folderList.tooltip "Si le dossier "Téléchargements" n'existe pas, l'explorateur de fichier s'affichera.">
+<!ENTITY asf.useDownloadDirFiltered.bool "Seulement si un filtre est trouvé.">
+<!ENTITY asf.useDownloadDirFiltered.tooltip "Demande où enregistrer les fichiers uniquement si un aucun filtre ne correspond.">
+<!ENTITY asf.alwaysAskWhereToSave.label "Toujours demander où enregistrer les fichiers.">
<!ENTITY asf.options.groupbox2.label "Fenêtre de sauvegarde">
<!ENTITY asf.dialogaccept.bool "Valider automatiquement la fenêtre "Que doit faire Firefox avec ce fichier ?".">
-<!ENTITY asf.dialogacceptFiltered.bool "Seulement si un filtre est trouvé">
+<!ENTITY asf.dialogacceptFiltered.bool "Seulement si un filtre est trouvé.">
<!ENTITY asf.dialogacceptFiltered.tooltip "Ne valide pas automatiquement la fenêtre "Que doit faire Firefox avec ce fichier ?" si aucun filtre ne correspond.">
<!ENTITY asf.dialogForceRadio_Start.bool "Forcer le choix sur">
<!ENTITY asf.dialogForceRadioTo.label1 "Ouvrir avec">
@@ -72,7 +78,7 @@
<!ENTITY asf.viewdloptionType3.label "Masquer si désactivé">
<!ENTITY asf.suggestAllPossibleFolders.bool "Suggérer tous les dossiers possibles.">
<!ENTITY asf.suggestAllPossibleFolders.tooltip "Ajoute un élement radio pour chaque filtre trouvé afin d'en selectionner un rapidement sans passer par le menu déroulant.">
-<!ENTITY asf.viewpathselect.bool "Afficher la liste des filtres">
+<!ENTITY asf.viewpathselect.bool "Afficher la liste des dossiers.">
<!ENTITY asf.viewpathselect.tooltip "Active le menu déroulant contenant le chemin de chaque filtre.">
<!ENTITY asf.option.groupbox.checkUpdate.label "Mise à jour béta">
diff --git a/locale/fr/asf.properties b/locale/fr/asf.properties
index 7b7db57..8b32eb7 100644
--- a/locale/fr/asf.properties
+++ b/locale/fr/asf.properties
@@ -47,5 +47,6 @@ checkForUpdates.updateAvailable=Alerte de mise à jour\nAutomatic Save Folder %S
checkForUpdates.updated=La nouvelle version à été installée.\nVous devez redémarrer Firefox pour appliquer les changements.
export.default_folder=Sélectionnez le dossier de sauvegarde des fichiers d'exportation.
export.importnewer=Le fichier que vous importez provient d'une version plus récente.\nVeuillez mettre à jour Automatic Save Folder.
-export.importsuccessful=Importation réussie.
-export.recoveredfilters=%S filtre(s) récupéré(s).\n Verrifiez vos filtres en fin de liste afin de supprimer ceux en doubles.\n Note : Les filtres récupérés ne sont pas forcéments les derniers supprimés.
\ No newline at end of file
+export.importsuccessful=Importation réussi.
+export.recoveredfilters=%S filtre(s) récupéré(s).\n Verrifiez vos filtres en fin de liste afin de supprimer ceux en doubles.\n Note : Les filtres récupérés ne sont pas forcéments les derniers supprimés.
+save.fromfilter=Dossier provenant d'un filtre.
\ No newline at end of file
diff --git a/locale/fr/help.dtd b/locale/fr/help.dtd
index aa58093..39f851c 100644
--- a/locale/fr/help.dtd
+++ b/locale/fr/help.dtd
@@ -129,3 +129,5 @@ Si cela devait arriver, revérifiez l'étape 1.">
<!ENTITY importantupdates.102.3 "Import/export des filtres.">
<!ENTITY importantupdates.102.4 "Suppression des slashs aux extrémités des filtres utilisant les expressions régulières.">
<!ENTITY importantupdates.102.5 "Note : Afin de pouvoir faire évoluer Automatic Save Folder, cette version est la dernière compatible avec les anciennes versions de Firefox (1.5, 2.0 et 3.0).">
+
+<!ENTITY importantupdates.105b.1 "Automatic Save Folder n'est plus lié aux préférences de Firefox concernant le dossier d'enregistrement.<br />L'option de Firefox "Toujours demander ou enregistrer les fichiers" est désormais modifié au cas par cas lors de l'enregistrement.">
\ No newline at end of file
diff --git a/locale/it/about.dtd b/locale/it/about.dtd
index 68c4699..933adc2 100644
--- a/locale/it/about.dtd
+++ b/locale/it/about.dtd
@@ -23,6 +23,13 @@
<!ENTITY about.version.title "Versione">
<!-- Keep the newline intact as it uses the < pre > tag, keep the 2 beginning spaces to create indentation -->
+<!ENTITY about.version.105 "+ Added two new Domain Type while filtering: Referrer URL and URL bar content.
++ Added an alert if a filter creation error is detected when downloading.
++ The file explorer is now activated on a case-by-case basis when downloading.
+* For better clarity, the option to select whether the file explorer should be displayed is now written like in Firefox's options.
+! Fixed the suggested folder's display if the saved folder is forced to Desktop or Download.
+! Fixed single-click saving on Firefox 7.0.1+ if the current website URI is not in the database.">
+
<!ENTITY about.version.104 "* Prevent duplicated suggested folders on the save window.
! Fixed single-click saving on Firefox 7.0.1+ if the current website URI is not in the database.">
diff --git a/locale/it/asf.dtd b/locale/it/asf.dtd
index 72ca611..44e3b58 100644
--- a/locale/it/asf.dtd
+++ b/locale/it/asf.dtd
@@ -1,8 +1,8 @@
<!-- ASF Settings -->
-<!-- Change the preferences window size to fit your localization. Default values : resize=false width=617 height=423, in pixels-->
+<!-- Change the preferences window size to fit your localization. Default values : resize=false width=617 height=443, in pixels-->
<!ENTITY asf.preferences_window.resize "false">
<!ENTITY asf.preferences_window.width "617">
-<!ENTITY asf.preferences_window.height "423">
+<!ENTITY asf.preferences_window.height "443">
<!-- new line, U+00A0 ISOnum -->
<!ENTITY NL "
" >
@@ -12,6 +12,9 @@
<!ENTITY asf.label "Automatic Save Folder...">
<!ENTITY asf.addedit.label "Aggiungi o modifica filtro">
<!ENTITY asf.pathselect.label "Percorsi disponibili per i filtri:">
+<!ENTITY asf.saveFromFilter.label "Folder from a filter.">
+<!ENTITY asf.savePreviousFolder.label "Previous folder.">
+<!ENTITY asf.savePreviousFolderSite.label "Previous folder used for this site.">
<!-- Filters tab - top -->
<!ENTITY asf.filters.label "Filtri">
@@ -48,11 +51,14 @@
<!ENTITY asf.options.tabdata.label "Data management">
<!ENTITY asf.options.groupbox1.label "File Explorer">
-<!ENTITY asf.useDownloadDir.bool "Do not show the file explorer, and automatically save to:">
+<!ENTITY asf.useDownloadDir.label "Save files to">
<!ENTITY asf.desktop.label "Desktop">
<!ENTITY asf.systemdownload.label "Downloads">
<!ENTITY asf.filteredfolder.label "Set by the filters">
<!ENTITY asf.folderList.tooltip "If the "Downloads" folder doesn't exist, the file explorer will be shown.">
+<!ENTITY asf.useDownloadDirFiltered.bool "Only if a filter is found.">
+<!ENTITY asf.useDownloadDirFiltered.tooltip "Asks where to save the files only if no filter matches.">
+<!ENTITY asf.alwaysAskWhereToSave.label "Always ask me where to save files.">
<!ENTITY asf.options.groupbox2.label "Save dialog">
<!ENTITY asf.dialogaccept.bool "Automatically accept the "What should Firefox do with this file" dialog windows.">
diff --git a/locale/it/asf.properties b/locale/it/asf.properties
index f532ac2..51218b6 100644
--- a/locale/it/asf.properties
+++ b/locale/it/asf.properties
@@ -48,4 +48,5 @@ checkForUpdates.updated=The new version has been installed.\nYou need to restart
export.default_folder=Select the saving folder for exported data.
export.importnewer=The imported file is from a more recent version.\nPlease update Automatic Save Folder.
export.importsuccessful=Data successfully imported.
-export.recoveredfilters=%S filter(s) recovered.\n Check your filters at the bottom of the list to delete dupplicates.\n Note : Recovered filters are not necessarily the last deleted ones.
\ No newline at end of file
+export.recoveredfilters=%S filter(s) recovered.\n Check your filters at the bottom of the list to delete dupplicates.\n Note : Recovered filters are not necessarily the last deleted ones.
+save.fromfilter=Folder from a filter.
\ No newline at end of file
diff --git a/locale/it/help.dtd b/locale/it/help.dtd
index a08c9cd..59e7771 100644
--- a/locale/it/help.dtd
+++ b/locale/it/help.dtd
@@ -129,3 +129,5 @@ If it ever happens, do Step 1 again.">
<!ENTITY importantupdates.102.3 "Import/export the filters.">
<!ENTITY importantupdates.102.4 "Removed the need of the slashes around a regular expression's filters.">
<!ENTITY importantupdates.102.5 "Note: In order to develop Automatic Save Folder further, this version is the last compatible with older Firefox versions (1.5, 2.0 and 3.0).">
+
+<!ENTITY importantupdates.105b.1 "Automatic Save Folder is not linked anymore with the saved folder option defined in Firefox preferences.<br />The Firefox option "Always ask me where to save files" is now set on a case-by-case basis when downloading.">
\ No newline at end of file
diff --git a/locale/ru/about.dtd b/locale/ru/about.dtd
index dbad0b5..428cff0 100644
--- a/locale/ru/about.dtd
+++ b/locale/ru/about.dtd
@@ -23,6 +23,13 @@
<!ENTITY about.version.title "Версия">
<!-- Keep the newline intact as it uses the < pre > tag, keep the 2 beginning spaces to create indentation -->
+<!ENTITY about.version.105 "+ Added two new Domain Type while filtering: Referrer URL and URL bar content.
++ Added an alert if a filter creation error is detected when downloading.
++ The file explorer is now activated on a case-by-case basis when downloading.
+* For better clarity, the option to select whether the file explorer should be displayed is now written like in Firefox's options.
+! Fixed the suggested folder's display if the saved folder is forced to Desktop or Download.
+! Fixed single-click saving on Firefox 7.0.1+ if the current website URI is not in the database.">
+
<!ENTITY about.version.104 "* Prevent duplicated suggested folders on the save window.
! Fixed single-click saving on Firefox 7.0.1+ if the current website URI is not in the database.">
diff --git a/locale/ru/asf.dtd b/locale/ru/asf.dtd
index 4795e27..0d246e5 100644
--- a/locale/ru/asf.dtd
+++ b/locale/ru/asf.dtd
@@ -1,8 +1,8 @@
<!-- ASF Settings -->
-<!-- Change the preferences window size to fit your localization. Default values : resize=false width=617 height=423, in pixels-->
+<!-- Change the preferences window size to fit your localization. Default values : resize=false width=617 height=443, in pixels-->
<!ENTITY asf.preferences_window.resize "true">
<!ENTITY asf.preferences_window.width "630">
-<!ENTITY asf.preferences_window.height "440">
+<!ENTITY asf.preferences_window.height "460">
<!-- new line, U+00A0 ISOnum -->
<!ENTITY NL "
" >
@@ -12,6 +12,9 @@
<!ENTITY asf.label "Automatic Save Folder...">
<!ENTITY asf.addedit.label "Добавить или изменить фильтр">
<!ENTITY asf.pathselect.label "Доступные пути фильтра:">
+<!ENTITY asf.saveFromFilter.label "Folder from a filter.">
+<!ENTITY asf.savePreviousFolder.label "Previous folder.">
+<!ENTITY asf.savePreviousFolderSite.label "Previous folder used for this site.">
<!-- Filters tab - top -->
<!ENTITY asf.filters.label "Фильтры">
@@ -48,11 +51,14 @@
<!ENTITY asf.options.tabdata.label "Data management">
<!ENTITY asf.options.groupbox1.label "Проводник">
-<!ENTITY asf.useDownloadDir.bool "Не предлагать выбор папки и автоматически сохранить в:">
+<!ENTITY asf.useDownloadDir.label "Save files to">
<!ENTITY asf.desktop.label "Рабочий стол">
<!ENTITY asf.systemdownload.label "Загрузки">
<!ENTITY asf.filteredfolder.label "Использовать фильтры">
<!ENTITY asf.folderList.tooltip "Если папка "Загрузки" не существует, будет предложено выбрать папку.">
+<!ENTITY asf.useDownloadDirFiltered.bool "Only if a filter is found.">
+<!ENTITY asf.useDownloadDirFiltered.tooltip "Asks where to save the files only if no filter matches.">
+<!ENTITY asf.alwaysAskWhereToSave.label "Always ask me where to save files.">
<!ENTITY asf.options.groupbox2.label "Диалог сохранения">
<!ENTITY asf.dialogaccept.bool "Автоматически использовать настройку "Как FireFox следует обработать это файл".">
diff --git a/locale/ru/asf.properties b/locale/ru/asf.properties
index 78ef26b..8a78e6e 100644
--- a/locale/ru/asf.properties
+++ b/locale/ru/asf.properties
@@ -48,4 +48,5 @@ checkForUpdates.updated=The new version has been installed.\nYou need to restart
export.default_folder=Select the saving folder for exported data.
export.importnewer=The imported file is from a more recent version.\nPlease update Automatic Save Folder.
export.importsuccessful=Data successfully imported.
-export.recoveredfilters=%S filter(s) recovered.\n Check your filters at the bottom of the list to delete dupplicates.\n Note : Recovered filters are not necessarily the last deleted ones.
\ No newline at end of file
+export.recoveredfilters=%S filter(s) recovered.\n Check your filters at the bottom of the list to delete dupplicates.\n Note : Recovered filters are not necessarily the last deleted ones.
+save.fromfilter=Folder from a filter.
\ No newline at end of file
diff --git a/locale/ru/help.dtd b/locale/ru/help.dtd
index 81aad78..ba8edb7 100644
--- a/locale/ru/help.dtd
+++ b/locale/ru/help.dtd
@@ -135,3 +135,5 @@ If it ever happens, do Step 1 again.">
<!ENTITY importantupdates.102.3 "Import/export the filters.">
<!ENTITY importantupdates.102.4 "Removed the need of the slashes around a regular expression's filters.">
<!ENTITY importantupdates.102.5 "Note: In order to develop Automatic Save Folder further, this version is the last compatible with older Firefox versions (1.5, 2.0 and 3.0).">
+
+<!ENTITY importantupdates.105b.1 "Automatic Save Folder is not linked anymore with the saved folder option defined in Firefox preferences.<br />The Firefox option "Always ask me where to save files" is now set on a case-by-case basis when downloading.">
\ No newline at end of file
diff --git a/locale/sv-SE/about.dtd b/locale/sv-SE/about.dtd
index 21ded68..4eb701c 100644
--- a/locale/sv-SE/about.dtd
+++ b/locale/sv-SE/about.dtd
@@ -23,6 +23,13 @@
<!ENTITY about.version.title "Version">
<!-- Keep the newline intact as it uses the < pre > tag, keep the 2 beginning spaces to create indentation -->
+<!ENTITY about.version.105 "+ Added two new Domain Type while filtering: Referrer URL and URL bar content.
++ Added an alert if a filter creation error is detected when downloading.
++ The file explorer is now activated on a case-by-case basis when downloading.
+* For better clarity, the option to select whether the file explorer should be displayed is now written like in Firefox's options.
+! Fixed the suggested folder's display if the saved folder is forced to Desktop or Download.
+! Fixed single-click saving on Firefox 7.0.1+ if the current website URI is not in the database.">
+
<!ENTITY about.version.104 "* Prevent duplicated suggested folders on the save window.
! Fixed single-click saving on Firefox 7.0.1+ if the current website URI is not in the database.">
diff --git a/locale/sv-SE/asf.dtd b/locale/sv-SE/asf.dtd
index 2866b89..c36fff9 100644
--- a/locale/sv-SE/asf.dtd
+++ b/locale/sv-SE/asf.dtd
@@ -1,8 +1,8 @@
<!-- ASF Settings -->
-<!-- Change the preferences window size to fit your localization. Default values : resize=false width=617 height=423, in pixels-->
+<!-- Change the preferences window size to fit your localization. Default values : resize=false width=617 height=443, in pixels-->
<!ENTITY asf.preferences_window.resize "false">
<!ENTITY asf.preferences_window.width "617">
-<!ENTITY asf.preferences_window.height "423">
+<!ENTITY asf.preferences_window.height "443">
<!-- new line, U+00A0 ISOnum -->
<!ENTITY NL "
">
@@ -12,6 +12,9 @@
<!ENTITY asf.label "Automatic Save Folder...">
<!ENTITY asf.addedit.label "Lägg till eller redigera ett filter">
<!ENTITY asf.pathselect.label "Sökväg till filter:">
+<!ENTITY asf.saveFromFilter.label "Folder from a filter.">
+<!ENTITY asf.savePreviousFolder.label "Previous folder.">
+<!ENTITY asf.savePreviousFolderSite.label "Previous folder used for this site.">
<!-- Filters tab - top -->
<!ENTITY asf.filters.label "Filter">
@@ -48,11 +51,14 @@
<!ENTITY asf.options.tabdata.label "Datahantering">
<!ENTITY asf.options.groupbox1.label "Filutforskaren">
-<!ENTITY asf.useDownloadDir.bool "Visa inte Filutforskaren, utan spara automatiskt till:">
+<!ENTITY asf.useDownloadDir.label "Save files to">
<!ENTITY asf.desktop.label "Skrivbordet">
<!ENTITY asf.systemdownload.label "Hämtade filer">
<!ENTITY asf.filteredfolder.label "Mapp angiven av filtren">
<!ENTITY asf.folderList.tooltip "Om mappen "Hämtade filer" inte finns, kommer Filutforskaren att visas.">
+<!ENTITY asf.useDownloadDirFiltered.bool "Only if a filter is found.">
+<!ENTITY asf.useDownloadDirFiltered.tooltip "Asks where to save the files only if no filter matches.">
+<!ENTITY asf.alwaysAskWhereToSave.label "Always ask me where to save files.">
<!ENTITY asf.options.groupbox2.label "Spardialog">
<!ENTITY asf.dialogaccept.bool "Godkänn dialogfönstren "Vad vill du att Firefox gör med denna fil?" automatiskt.">
diff --git a/locale/sv-SE/asf.properties b/locale/sv-SE/asf.properties
index 5e68999..f5fee5c 100644
--- a/locale/sv-SE/asf.properties
+++ b/locale/sv-SE/asf.properties
@@ -48,4 +48,5 @@ checkForUpdates.updated=Den nya versionen har installerats.\nDu måste starta om
export.default_folder=Välj sparmappen för exporterad data.
export.importnewer=Den importerade filen kommer från en nyare version.\nVar vänlig uppdatera Automatic Save Folder.
export.importsuccessful=Data importerades utan fel.
-export.recoveredfilters=%S filter återställdes.\n Granska dina filter i slutet av listan för att ta bort duplikat.\n Obs : Återställda filter är inte nödvändigtvis de som raderades sist.
\ No newline at end of file
+export.recoveredfilters=%S filter återställdes.\n Granska dina filter i slutet av listan för att ta bort duplikat.\n Obs : Återställda filter är inte nödvändigtvis de som raderades sist.
+save.fromfilter=Folder from a filter.
\ No newline at end of file
diff --git a/locale/sv-SE/help.dtd b/locale/sv-SE/help.dtd
index 870195d..ae102f0 100644
--- a/locale/sv-SE/help.dtd
+++ b/locale/sv-SE/help.dtd
@@ -129,3 +129,5 @@ If it ever happens, do Step 1 again.">
<!ENTITY importantupdates.102.3 "Import/export the filters.">
<!ENTITY importantupdates.102.4 "Removed the need of the slashes around a regular expression's filters.">
<!ENTITY importantupdates.102.5 "Note: In order to develop Automatic Save Folder further, this version is the last compatible with older Firefox versions (1.5, 2.0 and 3.0).">
+
+<!ENTITY importantupdates.105b.1 "Automatic Save Folder is not linked anymore with the saved folder option defined in Firefox preferences.<br />The Firefox option "Always ask me where to save files" is now set on a case-by-case basis when downloading.">
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/automatic-save-folder.git
More information about the Pkg-mozext-commits
mailing list