6 files changed, 53 insertions, 32 deletions

diff --git a/japanese/mozilla-jlp-devel/Makefile b/japanese/mozilla-jlp-devel/Makefile
index 0322d5f0fafb..b957eb24050f 100644
--- a/japanese/mozilla-jlp-devel/Makefile
+++ b/japanese/mozilla-jlp-devel/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.2
 PORTEPOCH=	1
 CATEGORIES=	japanese www
-MASTER_SITES=	http://www.mozilla.gr.jp/jlp/
+MASTER_SITES=	http://www.mozilla.gr.jp/jlp/ \
+		http://www.ash.ne.jp/~mal/mozilla/
 PKGNAMESUFFIX=	-jlp
 DISTNAME=	${JLP_SRC}
 EXTRACT_SUFX=	# none
@@ -73,9 +74,6 @@ do-install:
 	${MV} -f all.js all.js.orig; ${MV} -f unix.js unix.js.orig)
 	(cd ${PREFIX}/lib/mozilla/defaults/profile; \
 	${MV} -f bookmarks.html bookmarks.html.orig; \
-	${MV} -f localstore.rdf localstore.rdf.orig; \
-	${MV} -f mimeTypes.rdf mimeTypes.rdf.orig; \
-	${MV} -f panels.rdf panels.rdf.orig; \
 	${MV} -f search.rdf search.rdf.orig)
 	(cd ${PREFIX}/lib/mozilla/searchplugins; \
 	${MV} -f google.gif google.gif.orig; \
@@ -90,9 +88,6 @@ do-install:
 	${TAR} -xf - -C ${PREFIX}/lib/mozilla
 	(cd ${PREFIX}/lib/mozilla/defaults/profile; \
 	${CP} -p JP/bookmarks.html bookmarks.html; \
-	${CP} -p JP/localstore.rdf localstore.rdf; \
-	${CP} -p JP/mimeTypes.rdf mimeTypes.rdf; \
-	${CP} -p JP/panels.rdf panels.rdf; \
 	${CP} -p JP/search.rdf search.rdf)
 	(cd ${PREFIX}/lib/mozilla/chrome; \
 	${CP} installed-chrome.txt.orig installed-chrome.txt; \
diff --git a/japanese/mozilla-jlp-devel/distinfo b/japanese/mozilla-jlp-devel/distinfo
index e0e5df10b514..887c05c9bfaf 100644
--- a/japanese/mozilla-jlp-devel/distinfo
+++ b/japanese/mozilla-jlp-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla0.9.1-langjajp.xpi) = cc22c9dadcdbd465097109ceebeb1663
-MD5 (mozilla0.9.1-regjp.xpi) = 2a719d30e82317a8c5e2329490d30d4d
+MD5 (mozilla0.9.2-langjajp.xpi) = d302c11889422629dd3bf70a3737d6a4
+MD5 (mozilla0.9.2-regjp.xpi) = 6201bbedac5d2a41d72e936a7cd29511
diff --git a/japanese/mozilla-jlp-devel/files/all.js b/japanese/mozilla-jlp-devel/files/all.js
index 7ebef0563285..63f5a2b00501 100644
--- a/japanese/mozilla-jlp-devel/files/all.js
+++ b/japanese/mozilla-jlp-devel/files/all.js
@@ -28,7 +28,7 @@ pref("network.search.url","http://cgi.netscape.com/cgi-bin/url_search.cgi?search
 pref("keyword.URL", "http://keyword.netscape.com/keyword/");
 pref("keyword.enabled", true);
 pref("general.useragent.locale", "chrome://navigator/locale/navigator.properties");
-pref("general.useragent.misc", "rv:0.9.1");
+pref("general.useragent.misc", "rv:0.9.2");
 
 pref("general.startup.browser",             true);
 pref("general.startup.mail",                false);
@@ -52,13 +52,14 @@ pref("browser.cache.enable",                true);
 pref("browser.cache.disk.enable",           true);
 pref("browser.cache.memory_cache_size",     4096);
 pref("browser.cache.disk_cache_ssl",        false);
-pref("browser.cache.check_doc_frequency",   0);
+// 0 = once-per-session, 1 = each-time, 2 = never, 3 = when-appropriate/automatically
+pref("browser.cache.check_doc_frequency",   3);
 
 pref("browser.display.use_document_fonts",  1);  // 0 = never, 1 = quick, 2 = always
 pref("browser.display.use_document_colors", true);
-pref("browser.display.use_system_colors",true);
+pref("browser.display.use_system_colors",   false);
 pref("browser.display.foreground_color",    "#000000");
-pref("browser.display.background_color",    "#C0C0C0");
+pref("browser.display.background_color",    "#FFFFFF");
 pref("browser.anchor_color",                "#0000EE");
 pref("browser.visited_color",               "#551A8B");
 pref("browser.underline_anchors",           true);
@@ -80,6 +81,8 @@ pref("browser.toolbars.showbutton.net2phone", true);
 pref("browser.toolbars.showbutton.print",   true);
 pref("browser.toolbars.showbutton.search",  true);
 
+pref("browser.helperApps.alwaysAsk.force",  false);
+
 pref("accessibility.browsewithcaret", false);
 pref("accessibility.usetexttospeech", "");
 pref("accessibility.usebrailledisplay", "");
@@ -121,6 +124,9 @@ pref("browser.target_new_blocked", false);
 // loading and rendering of framesets and iframes
 pref("browser.frames.enabled", true);
 
+// form submission
+pref("browser.forms.submit.backwards_compatible", true);
+
 // view source
 pref("view_source.syntax_highlight", true);
 
@@ -275,9 +281,11 @@ pref("network.http.keep-alive.max-connections-per-server", 8);
 pref("network.http.connect.timeout",  30);	// in seconds
 pref("network.http.request.timeout", 120);	// in seconds
 
-// Accept header
+// Headers
 pref("network.http.accept.default", "text/xml, application/xml, application/xhtml+xml, text/html;q=0.9, image/png, image/jpeg, image/gif;q=0.2, text/plain;q=0.8, text/css, */*;q=0.1");
 
+pref("network.http.sendRefererHeader",      2); // 0=don't send any, 1=send only on clicks, 2=send on image requests as well
+
 // Enable http compression: comment this out in case of problems with 1.1
 pref("network.http.accept-encoding" ,"gzip,deflate,compress,identity");
 
@@ -334,7 +342,6 @@ pref("network.foreign_cookies",             0); // 0 = Accept, 1 = Don't accept
 pref("network.cookie.cookieBehavior",       0); // 0-Accept, 1-dontAcceptForeign, 2-dontUse
 pref("network.cookie.warnAboutCookies",     false);
 pref("signon.rememberSignons",              true);
-pref("network.sendRefererHeader",           2); // 0=don't send any, 1=send only on clicks, 2=send on image requests as well
 pref("network.enablePad",                   false); // Allow client to do proxy autodiscovery
 pref("converter.html2txt.structs",          true); // Output structured phrases (strong, em, code, sub, sup, b, i, u)
 pref("converter.html2txt.header_strategy",  1); // 0 = no indention; 1 = indention, increased with header level; 2 = numbering and slight indention
@@ -346,6 +353,12 @@ pref("wallet.Samples",                      "chrome://navigator/locale/navigator
 pref("wallet.version",                      "1");
 pref("wallet.enabled",                      true);
 pref("wallet.crypto",                       false);
+pref("wallet.namePanel.hide",               false);
+pref("wallet.addressPanel.hide",            false);
+pref("wallet.phonePanel.hide",              false);
+pref("wallet.creditPanel.hide",             false);
+pref("wallet.employPanel.hide",             false);
+pref("wallet.miscPanel.hide",               false);
 pref("imageblocker.enabled",                true);
 pref("intl.accept_languages",               "chrome://navigator/locale/navigator.properties");
 pref("intl.accept_charsets",                "iso-8859-1,*,utf-8");
diff --git a/japanese/mozilla-jlp-devel/files/installed-chrome.txt b/japanese/mozilla-jlp-devel/files/installed-chrome.txt
index a691112840c4..3402f88a8621 100644
--- a/japanese/mozilla-jlp-devel/files/installed-chrome.txt
+++ b/japanese/mozilla-jlp-devel/files/installed-chrome.txt
@@ -3,13 +3,13 @@ locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/communicator/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/messenger/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/editor/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/navigator/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/aim/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/necko/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/cookie/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/wallet/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/help/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/pipnss/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/pippki/
+locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/content-packs/
 locale,install,url,jar:resource:/chrome/ja-unix.jar!/locale/ja-JP/global-platform/
 locale,install,url,jar:resource:/chrome/ja-unix.jar!/locale/ja-JP/communicator-platform/
 locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/global-region/
diff --git a/japanese/mozilla-jlp-devel/files/unix.js b/japanese/mozilla-jlp-devel/files/unix.js
index 4f5c951d004f..a6517734285b 100644
--- a/japanese/mozilla-jlp-devel/files/unix.js
+++ b/japanese/mozilla-jlp-devel/files/unix.js
@@ -51,8 +51,9 @@ pref("middlemouse.scrollbarPosition", true);
 // Clipboard behavior
 pref("clipboard.autocopy", true);
 
-// keyboard Mode_switch workaround
-pref("keyboard.mode_switch.enable_workaround", true);
+// autocomplete keyboard grab workaround
+pref("autocomplete.grab_during_popup", true);
+pref("autocomplete.ungrab_during_mode_switch", true);
 
 // Most Unix people think modal pref windows are stupid:
 pref("browser.prefWindowModal", false);
@@ -82,6 +83,7 @@ pref("print.print_color", true);
 pref("print.print_landscape", false);
 pref("print.print_paper_size", 0);
 
+pref("font.allow_double_byte_special_chars", true);
 // font names
 
 // ar
@@ -138,6 +140,26 @@ pref("font.name.monospace.zh-CN", "isas-song ti-gb2312.1980-0");
 
 // zh-TW
 
+// below a certian pixel size scaled fonts produce poor results
+pref("font.scale.outline.min",      6);
+pref("font.scale.bitmap.min",       12);
+pref("font.scale.bitmap.undersize", 80);
+pref("font.scale.bitmap.oversize",  120);
+
+pref("font.scale.outline.min.ja",      10);
+pref("font.scale.bitmap.min.ja",       14);
+pref("font.scale.bitmap.undersize.ja", 80);
+pref("font.scale.bitmap.oversize.ja",  120);
+
+pref("font.scale.outline.min.zh-CN",      10);
+pref("font.scale.bitmap.min.zh-CN",       14);
+pref("font.scale.bitmap.undersize.zh-CN", 80);
+pref("font.scale.bitmap.oversize.zh-CN",  120);
+
+pref("font.scale.outline.min.zh-TW",      10);
+pref("font.scale.bitmap.min.zh-TW",       14);
+pref("font.scale.bitmap.undersize.zh-TW", 80);
+pref("font.scale.bitmap.oversize.zh-TW",  120);
 
 // minimum font sizes
 
@@ -147,11 +169,11 @@ pref("font.min-size.fixed.ja", 8);
 pref("font.min-size.variable.ko", 10);
 pref("font.min-size.fixed.ko", 10);
 
-pref("font.min-size.variable.zh-CN", 16);
-pref("font.min-size.fixed.zh-CN", 16);
+pref("font.min-size.variable.zh-CN", 10);
+pref("font.min-size.fixed.zh-CN", 10);
 
-pref("font.min-size.variable.zh-TW", 16);
-pref("font.min-size.fixed.zh-TW", 16);
+pref("font.min-size.variable.zh-TW", 10);
+pref("font.min-size.fixed.zh-TW", 10);
 
 // ps font
 // this list is used by the postscript font
diff --git a/japanese/mozilla-jlp-devel/pkg-plist b/japanese/mozilla-jlp-devel/pkg-plist
index 3836fc798560..c5531835f3f9 100644
--- a/japanese/mozilla-jlp-devel/pkg-plist
+++ b/japanese/mozilla-jlp-devel/pkg-plist
@@ -7,9 +7,6 @@
 @exec mv %D/lib/mozilla/defaults/pref/all.js %D/lib/mozilla/defaults/pref/all.js.orig
 @exec mv %D/lib/mozilla/defaults/pref/unix.js %D/lib/mozilla/defaults/pref/unix.js.orig
 @exec mv %D/lib/mozilla/defaults/profile/bookmarks.html %D/lib/mozilla/defaults/profile/bookmarks.html.orig
-@exec mv %D/lib/mozilla/defaults/profile/localstore.rdf %D/lib/mozilla/defaults/profile/localstore.rdf.orig
-@exec mv %D/lib/mozilla/defaults/profile/mimeTypes.rdf %D/lib/mozilla/defaults/profile/mimeTypes.rdf.orig
-@exec mv %D/lib/mozilla/defaults/profile/panels.rdf %D/lib/mozilla/defaults/profile/panels.rdf.orig
 @exec mv %D/lib/mozilla/defaults/profile/search.rdf %D/lib/mozilla/defaults/profile/search.rdf.orig
 @exec mv %D/lib/mozilla/searchplugins/google.gif %D/lib/mozilla/searchplugins/google.gif.orig
 @exec mv %D/lib/mozilla/searchplugins/google.src %D/lib/mozilla/searchplugins/google.src.orig
@@ -35,9 +32,6 @@ lib/mozilla/defaults/profile/JP/mimeTypes.rdf
 lib/mozilla/defaults/profile/JP/panels.rdf
 lib/mozilla/defaults/profile/JP/search.rdf
 lib/mozilla/defaults/profile/bookmarks.html
-lib/mozilla/defaults/profile/localstore.rdf
-lib/mozilla/defaults/profile/mimeTypes.rdf
-lib/mozilla/defaults/profile/panels.rdf
 lib/mozilla/defaults/profile/search.rdf
 lib/mozilla/searchplugins/AllAboutJapan.png
 lib/mozilla/searchplugins/AllAboutJapan.src
@@ -109,9 +103,6 @@ lib/mozilla/searchplugins/w3c.src
 @unexec mv %D/lib/mozilla/defaults/pref/all.js.orig %D/lib/mozilla/defaults/pref/all.js
 @unexec mv %D/lib/mozilla/defaults/pref/unix.js.orig %D/lib/mozilla/defaults/pref/unix.js
 @unexec mv %D/lib/mozilla/defaults/profile/bookmarks.html.orig %D/lib/mozilla/defaults/profile/bookmarks.html
-@unexec mv %D/lib/mozilla/defaults/profile/localstore.rdf.orig %D/lib/mozilla/defaults/profile/localstore.rdf
-@unexec mv %D/lib/mozilla/defaults/profile/mimeTypes.rdf.orig %D/lib/mozilla/defaults/profile/mimeTypes.rdf
-@unexec mv %D/lib/mozilla/defaults/profile/panels.rdf.orig %D/lib/mozilla/defaults/profile/panels.rdf
 @unexec mv %D/lib/mozilla/defaults/profile/search.rdf.orig %D/lib/mozilla/defaults/profile/search.rdf
 @unexec mv %D/lib/mozilla/searchplugins/google.gif.orig %D/lib/mozilla/searchplugins/google.gif
 @unexec mv %D/lib/mozilla/searchplugins/google.src.orig %D/lib/mozilla/searchplugins/google.src