3 files changed, 246 insertions, 207 deletions

diff --git a/www/xpi-foxmarks/Makefile b/www/xpi-foxmarks/Makefile
index faa0678ef658..86781b68dd0e 100644
--- a/www/xpi-foxmarks/Makefile
+++ b/www/xpi-foxmarks/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	foxmarks
-PORTVERSION=	2.1.0.12
+PORTVERSION=	2.6.0
 DISTVERSIONSUFFIX=	-fx
 CATEGORIES=	www
 
diff --git a/www/xpi-foxmarks/distinfo b/www/xpi-foxmarks/distinfo
index 6a38c8eb6494..df7d2bc0ed61 100644
--- a/www/xpi-foxmarks/distinfo
+++ b/www/xpi-foxmarks/distinfo
@@ -1,3 +1,3 @@
-MD5 (xpi/foxmarks_bookmark_synchronizer-2.1.0.12-fx.xpi) = a3e2dac3ad98ea67b07d3377351ce649
-SHA256 (xpi/foxmarks_bookmark_synchronizer-2.1.0.12-fx.xpi) = 297ba34157d906a106370fdf12dcb0faaa46280b1902a3da716a912a8d93f102
-SIZE (xpi/foxmarks_bookmark_synchronizer-2.1.0.12-fx.xpi) = 300429
+MD5 (xpi/foxmarks_bookmark_synchronizer-2.6.0-fx.xpi) = aaf262f460597db113115c1c2f0463ad
+SHA256 (xpi/foxmarks_bookmark_synchronizer-2.6.0-fx.xpi) = b971bc7bc84d355ad30ea8e1e83c4f50c12f612bc88b7781400abefb9121ed13
+SIZE (xpi/foxmarks_bookmark_synchronizer-2.6.0-fx.xpi) = 517509
diff --git a/www/xpi-foxmarks/pkg-plist b/www/xpi-foxmarks/pkg-plist
index 7990260c5a16..ce52c2034c0d 100644
--- a/www/xpi-foxmarks/pkg-plist
+++ b/www/xpi-foxmarks/pkg-plist
@@ -1,211 +1,250 @@
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-bookmarkconflict.xul
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-changeprofile.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-changeprofile.xul
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-clobber.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-clobber.xul
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-command.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-conflicts.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-core.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-dialog.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-dialog.xul
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-folderconflict.xul
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-json.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-log.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-login.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-login.xul
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-manageroverlay.xul
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-network.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-nodes.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-overlay.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-overlay.xul
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-parentconflict.xul
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-places.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-placesoverlay-mac.xul
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-placesoverlay.xul
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-progress.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-progress.xul
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-rdf.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-server.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-settings.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-setup.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-setup.xul
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-statusbar.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-statusbar.xul
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-uitools.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-update.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/content/foxmarks-utils.js
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/cs-CZ/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/cs-CZ/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/cs-CZ/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/cs-CZ/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/da-DK/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/da-DK/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/da-DK/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/da-DK/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/de-DE/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/de-DE/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/de-DE/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/de-DE/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/el-GR/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/el-GR/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/el-GR/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/el-GR/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/en-US/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/en-US/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/en-US/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/en-US/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/es-ES/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/es-ES/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/es-ES/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/es-ES/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/eu-ES/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/eu-ES/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/eu-ES/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/eu-ES/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fa-IR/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fa-IR/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fa-IR/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fa-IR/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fi-FI/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fi-FI/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fi-FI/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fi-FI/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fr-FR/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fr-FR/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fr-FR/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fr-FR/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fy-NL/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fy-NL/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fy-NL/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/fy-NL/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/he-IL/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/he-IL/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/he-IL/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/he-IL/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/it-IT/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/it-IT/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/it-IT/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/it-IT/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ja/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ja/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ja/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ja/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ja-JP/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ja-JP/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ja-JP/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ja-JP/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ko-KR/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ko-KR/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ko-KR/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ko-KR/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/nb-NO/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/nb-NO/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/nb-NO/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/nb-NO/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/nl-NL/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/nl-NL/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/nl-NL/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/nl-NL/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/pl-PL/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/pl-PL/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/pl-PL/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/pl-PL/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/pt-BR/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/pt-BR/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/pt-BR/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/pt-BR/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/pt-PT/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/pt-PT/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/pt-PT/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/pt-PT/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ru-RU/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ru-RU/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ru-RU/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/ru-RU/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/sk-SK/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/sk-SK/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/sk-SK/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/sk-SK/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/sv-SE/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/sv-SE/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/sv-SE/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/sv-SE/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/tr-TR/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/tr-TR/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/tr-TR/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/tr-TR/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/uk-UA/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/uk-UA/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/uk-UA/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/uk-UA/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/zh-CN/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/zh-CN/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/zh-CN/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/zh-CN/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/zh-TW/conflicts.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/zh-TW/foxmarks.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/zh-TW/foxmarks.properties
-%%XPI_XPIDIR%%/chrome/chromeFiles/locale/zh-TW/setup.dtd
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/foxmarks.css
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/Throbber-small.gif
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/dirty.png
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/error.png
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/foxmarks-active.png
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/foxmarks-default.png
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/foxmarks-hover.png
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/foxmarks.ico
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/foxmarks_bug.png
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/pane-selector-advanced.png
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/pane-selector-bg-hover.png
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/pane-selector-bg-selected.png
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/pane-selector-bg.png
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/pane-selector-general.png
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/pane-selector-icons.png
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/pane-selector-macosx-bg-sel.png
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/pane-selector-macosx-bg.png
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/pane-selector-profiles_TEMP.png
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/ready.png
-%%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images/working.gif
+%%XPI_XPIDIR%%/META-INF/manifest.mf
+%%XPI_XPIDIR%%/META-INF/zigbert.rsa
+%%XPI_XPIDIR%%/META-INF/zigbert.sf
+%%XPI_XPIDIR%%/chrome/.DS_Store
+%%XPI_XPIDIR%%/chrome/content/foxmarks-alert.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-bookmark.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-bookmarkconflict.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-changeprofile.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-changeprofile.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-clobber.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-clobber.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-command.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-conflicts.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-core.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-dialog.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-dialog.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-folderconflict.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-invalidpin.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-invalidpin.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-json.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-log.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-login.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-login.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-manageroverlay.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-moresecurityinfo.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-network.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-nodes.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-overlay.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-overlay.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-parentconflict.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-password.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-passwordconflict.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-passwordconflict.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-places.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-placesoverlay-mac.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-placesoverlay.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-progress.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-progress.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-pwprefoverlay.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-pwprefoverlay.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-pwsanitizeoverlay.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-pwsanitizeoverlay.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-rdf.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-resetpin.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-resetpin.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-server.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-settings.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-setup.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-setup.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-statusbar.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-statusbar.xul
+%%XPI_XPIDIR%%/chrome/content/foxmarks-test.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-uitools.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-unittest.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-update.js
+%%XPI_XPIDIR%%/chrome/content/foxmarks-utils.js
+%%XPI_XPIDIR%%/chrome/content/shared/Base64.js
+%%XPI_XPIDIR%%/chrome/content/shared/CreateAESManager.js
+%%XPI_XPIDIR%%/chrome/content/shared/passwordmeter.js
+%%XPI_XPIDIR%%/chrome/locale/bg-BG/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/bg-BG/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/bg-BG/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/bg-BG/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/bn-IN/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/bn-IN/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/bn-IN/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/bn-IN/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/cs-CZ/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/cs-CZ/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/cs-CZ/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/cs-CZ/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/da-DK/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/da-DK/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/da-DK/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/da-DK/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/de-DE/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/de-DE/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/de-DE/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/de-DE/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/el-GR/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/el-GR/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/el-GR/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/el-GR/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/en-US/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/en-US/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/en-US/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/en-US/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/es-ES/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/es-ES/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/es-ES/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/es-ES/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/eu-ES/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/eu-ES/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/eu-ES/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/eu-ES/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/fi-FI/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/fi-FI/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/fi-FI/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/fi-FI/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/fr-FR/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/fr-FR/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/fr-FR/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/fr-FR/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/fy-NL/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/fy-NL/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/fy-NL/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/fy-NL/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/it-IT/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/it-IT/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/it-IT/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/it-IT/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/ja-JP/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/ja-JP/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/ja-JP/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/ja-JP/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/ko-KR/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/ko-KR/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/ko-KR/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/ko-KR/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/nb-NO/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/nb-NO/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/nb-NO/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/nb-NO/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/nl-NL/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/nl-NL/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/nl-NL/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/nl-NL/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/pl-PL/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/pl-PL/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/pl-PL/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/pl-PL/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/pt-BR/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/pt-BR/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/pt-BR/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/pt-BR/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/pt-PT/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/pt-PT/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/pt-PT/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/pt-PT/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/ro-RO/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/ro-RO/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/ro-RO/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/ro-RO/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/ru-RU/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/ru-RU/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/ru-RU/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/ru-RU/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/sk-SK/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/sk-SK/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/sk-SK/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/sk-SK/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/sv-SE/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/sv-SE/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/sv-SE/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/sv-SE/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/tr-TR/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/tr-TR/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/tr-TR/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/tr-TR/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/uk-UA/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/uk-UA/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/uk-UA/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/uk-UA/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/vi-VN/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/vi-VN/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/vi-VN/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/vi-VN/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/zh-CN/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/zh-CN/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/zh-CN/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/zh-CN/setup.dtd
+%%XPI_XPIDIR%%/chrome/locale/zh-TW/conflicts.dtd
+%%XPI_XPIDIR%%/chrome/locale/zh-TW/foxmarks.dtd
+%%XPI_XPIDIR%%/chrome/locale/zh-TW/foxmarks.properties
+%%XPI_XPIDIR%%/chrome/locale/zh-TW/setup.dtd
+%%XPI_XPIDIR%%/chrome/skin/modern/foxmarks.css
+%%XPI_XPIDIR%%/chrome/skin/modern/images/Throbber-small.gif
+%%XPI_XPIDIR%%/chrome/skin/modern/images/check-24.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/dirty.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/error.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/foxmarks-active.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/foxmarks-default.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/foxmarks-hover.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/foxmarks.ico
+%%XPI_XPIDIR%%/chrome/skin/modern/images/foxmarks_bug.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/pane-selector-advanced.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/pane-selector-bg-hover.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/pane-selector-bg-selected.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/pane-selector-bg.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/pane-selector-general.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/pane-selector-icons.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/pane-selector-macosx-bg-sel.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/pane-selector-macosx-bg.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/pane-selector-profiles_TEMP.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/pane-selector-types.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/progress-good.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/ready.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/security-icon-bg.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/status-bad.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/status-dirty.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/status-good.png
+%%XPI_XPIDIR%%/chrome/skin/modern/images/wheel.gif
+%%XPI_XPIDIR%%/chrome/skin/modern/images/wheel36x28.gif
+%%XPI_XPIDIR%%/chrome/skin/modern/images/wheel_16.gif
+%%XPI_XPIDIR%%/chrome/skin/modern/images/wheel_32.gif
+%%XPI_XPIDIR%%/chrome/skin/modern/images/working.gif
 %%XPI_XPIDIR%%/chrome.manifest
-%%XPI_XPIDIR%%/components/foxmarks-service.idl
 %%XPI_XPIDIR%%/components/foxmarks-service.js
 %%XPI_XPIDIR%%/components/foxmarks-service.xpt
 %%XPI_XPIDIR%%/defaults/preferences/prefs.js
 %%XPI_XPIDIR%%/install.rdf
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/content
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/cs-CZ
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/da-DK
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/de-DE
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/el-GR
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/en-US
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/es-ES
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/eu-ES
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/fa-IR
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/fi-FI
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/fr-FR
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/fy-NL
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/he-IL
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/it-IT
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/ja
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/ja-JP
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/ko-KR
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/nb-NO
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/nl-NL
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/pl-PL
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/pt-BR
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/pt-PT
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/ru-RU
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/sk-SK
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/sv-SE
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/tr-TR
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/uk-UA
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/zh-CN
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale/zh-TW
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/locale
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern/images
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/skin/modern
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/skin
-@dirrm %%XPI_XPIDIR%%/chrome/chromeFiles
+@dirrm %%XPI_XPIDIR%%/META-INF
+@dirrm %%XPI_XPIDIR%%/chrome/content/shared
+@dirrm %%XPI_XPIDIR%%/chrome/content
+@dirrm %%XPI_XPIDIR%%/chrome/locale/bg-BG
+@dirrm %%XPI_XPIDIR%%/chrome/locale/bn-IN
+@dirrm %%XPI_XPIDIR%%/chrome/locale/cs-CZ
+@dirrm %%XPI_XPIDIR%%/chrome/locale/da-DK
+@dirrm %%XPI_XPIDIR%%/chrome/locale/de-DE
+@dirrm %%XPI_XPIDIR%%/chrome/locale/el-GR
+@dirrm %%XPI_XPIDIR%%/chrome/locale/en-US
+@dirrm %%XPI_XPIDIR%%/chrome/locale/es-ES
+@dirrm %%XPI_XPIDIR%%/chrome/locale/eu-ES
+@dirrm %%XPI_XPIDIR%%/chrome/locale/fi-FI
+@dirrm %%XPI_XPIDIR%%/chrome/locale/fr-FR
+@dirrm %%XPI_XPIDIR%%/chrome/locale/fy-NL
+@dirrm %%XPI_XPIDIR%%/chrome/locale/it-IT
+@dirrm %%XPI_XPIDIR%%/chrome/locale/ja-JP
+@dirrm %%XPI_XPIDIR%%/chrome/locale/ko-KR
+@dirrm %%XPI_XPIDIR%%/chrome/locale/nb-NO
+@dirrm %%XPI_XPIDIR%%/chrome/locale/nl-NL
+@dirrm %%XPI_XPIDIR%%/chrome/locale/pl-PL
+@dirrm %%XPI_XPIDIR%%/chrome/locale/pt-BR
+@dirrm %%XPI_XPIDIR%%/chrome/locale/pt-PT
+@dirrm %%XPI_XPIDIR%%/chrome/locale/ro-RO
+@dirrm %%XPI_XPIDIR%%/chrome/locale/ru-RU
+@dirrm %%XPI_XPIDIR%%/chrome/locale/sk-SK
+@dirrm %%XPI_XPIDIR%%/chrome/locale/sv-SE
+@dirrm %%XPI_XPIDIR%%/chrome/locale/tr-TR
+@dirrm %%XPI_XPIDIR%%/chrome/locale/uk-UA
+@dirrm %%XPI_XPIDIR%%/chrome/locale/vi-VN
+@dirrm %%XPI_XPIDIR%%/chrome/locale/zh-CN
+@dirrm %%XPI_XPIDIR%%/chrome/locale/zh-TW
+@dirrm %%XPI_XPIDIR%%/chrome/locale
+@dirrm %%XPI_XPIDIR%%/chrome/skin/modern/images
+@dirrm %%XPI_XPIDIR%%/chrome/skin/modern
+@dirrm %%XPI_XPIDIR%%/chrome/skin
 @dirrm %%XPI_XPIDIR%%/chrome
 @dirrm %%XPI_XPIDIR%%/components
 @dirrm %%XPI_XPIDIR%%/defaults/preferences