www

commit 55d7ac1351b794476775e6766979604a16e69797
parent 7ae36f968f65e3b9899cb62cf0b24b24d6c15d04
Author: Dan Stillman <dstillman@gmail.com>
Date:   Mon, 11 Nov 2013 10:10:13 -0800

Merge pull request #421 from aurimasv/import-charset-pref

Move import.charset preference element to the correct prefpane
Diffstat:
M
chrome/content/zotero/preferences/preferences_advanced.xul
 | 
1
-
M
chrome/content/zotero/preferences/preferences_export.xul
 | 
1
+

2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/content/zotero/preferences/preferences_advanced.xul b/chrome/content/zotero/preferences/preferences_advanced.xul
@@ -36,7 +36,6 @@
 			<preference id="pref-useDataDir" name="extensions.zotero.useDataDir" type="bool"/>
 			<preference id="pref-dataDir" name="extensions.zotero.dataDir" type="string"/>
 			<preference id="pref-debug-output-enableAfterRestart" name="extensions.zotero.debug.store" type="bool"/>
-			<preference id="pref-import-charset" name="extensions.zotero.import.charset" type="string"/>
 			<preference id="pref-openURL-resolver" name="extensions.zotero.openURL.resolver" type="string"/>
 			<preference id="pref-openURL-version" name="extensions.zotero.openURL.version" type="string"/>
 		</preferences>
diff --git a/chrome/content/zotero/preferences/preferences_export.xul b/chrome/content/zotero/preferences/preferences_export.xul
@@ -34,6 +34,7 @@
 			<preference id="pref-quickCopy-setting" name="extensions.zotero.export.quickCopy.setting" type="string"/>
 			<preference id="pref-quickCopy-dragLimit" name="extensions.zotero.export.quickCopy.dragLimit" type="int"/>
 			<preference id="pref-export-displayCharsetOption" name="extensions.zotero.export.displayCharsetOption" type="bool"/>
+			<preference id="pref-import-charset" name="extensions.zotero.import.charset" type="string"/>
 		</preferences>
 		
 		<groupbox id="zotero-prefpane-export-groupbox">