[Pkg-mozext-commits] [wot] 37/226: #12 New WarningScreen
David Prévot
taffit at moszumanska.debian.org
Fri May 1 00:35:32 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository wot.
commit 8dd9b633923fc3235395e1c84b3badd52b15930d
Author: Sergey Andryukhin <sorgoz at yandex.com>
Date: Fri Sep 7 15:10:05 2012 +0300
#12 New WarningScreen
---
chrome.manifest | 1 +
content/config.js | 2 +-
content/core.js | 35 +-
content/ui.js | 10 +-
content/warning.js | 356 ++++++-----
locale/cs-CZ/blocked.html | 115 +---
locale/cs-CZ/blocked.png | Bin 3851 -> 0 bytes
locale/cs-CZ/warning.png | Bin 3388 -> 0 bytes
locale/cs-CZ/wot.dtd | 4 +-
locale/cs-CZ/wot.properties | 15 +-
locale/de-DE/blocked.html | 117 +---
locale/de-DE/blocked.png | Bin 3129 -> 0 bytes
locale/de-DE/warning.png | Bin 3564 -> 0 bytes
locale/de-DE/wot.dtd | 4 +-
locale/de-DE/wot.properties | 15 +-
locale/en-US/blocked.html | 115 +---
locale/en-US/blocked.png | Bin 19917 -> 0 bytes
locale/en-US/warning.png | Bin 3953 -> 0 bytes
locale/en-US/wot.dtd | 4 +-
locale/en-US/wot.properties | 17 +-
locale/es-ES/blocked.html | 119 +---
locale/es-ES/blocked.png | Bin 3670 -> 0 bytes
locale/es-ES/warning.png | Bin 4249 -> 0 bytes
locale/es-ES/wot.dtd | 4 +-
locale/es-ES/wot.properties | 15 +-
locale/fi-FI/blocked.html | 117 +---
locale/fi-FI/blocked.png | Bin 2628 -> 0 bytes
locale/fi-FI/warning.png | Bin 3312 -> 0 bytes
locale/fi-FI/wot.dtd | 4 +-
locale/fi-FI/wot.properties | 15 +-
locale/fr-FR/blocked.html | 117 +---
locale/fr-FR/blocked.png | Bin 2770 -> 0 bytes
locale/fr-FR/warning.png | Bin 2809 -> 0 bytes
locale/fr-FR/wot.dtd | 4 +-
locale/fr-FR/wot.properties | 17 +-
locale/it-IT/blocked.html | 117 +---
locale/it-IT/blocked.png | Bin 2696 -> 0 bytes
locale/it-IT/warning.png | Bin 4036 -> 0 bytes
locale/it-IT/wot.dtd | 4 +-
locale/it-IT/wot.properties | 15 +-
locale/ja-JP/blocked.html | 117 +---
locale/ja-JP/blocked.png | Bin 6476 -> 0 bytes
locale/ja-JP/warning.png | Bin 2015 -> 0 bytes
locale/ja-JP/wot.dtd | 4 +-
locale/ja-JP/wot.properties | 15 +-
locale/ko-KR/blocked.html | 117 +---
locale/ko-KR/blocked.png | Bin 1757 -> 0 bytes
locale/ko-KR/warning.png | Bin 1832 -> 0 bytes
locale/ko-KR/wot.properties | 15 +-
locale/pl-PL/blocked.html | 117 +---
locale/pl-PL/blocked.png | Bin 4393 -> 0 bytes
locale/pl-PL/warning.png | Bin 5515 -> 0 bytes
locale/pl-PL/wot.dtd | 4 +-
locale/pl-PL/wot.properties | 15 +-
locale/pt-BR/blocked.html | 117 +---
locale/pt-BR/blocked.png | Bin 3578 -> 0 bytes
locale/pt-BR/warning.png | Bin 2828 -> 0 bytes
locale/pt-BR/wot.dtd | 4 +-
locale/pt-BR/wot.properties | 15 +-
locale/ru-RU/blocked.html | 115 +---
locale/ru-RU/blocked.png | Bin 7351 -> 0 bytes
locale/ru-RU/loading.html | 4 +-
locale/ru-RU/warning.png | Bin 4279 -> 0 bytes
locale/ru-RU/wot.dtd | 6 +-
locale/ru-RU/wot.properties | 23 +-
locale/sv-SE/blocked.html | 116 +---
locale/sv-SE/blocked.png | Bin 3598 -> 0 bytes
locale/sv-SE/warning.png | Bin 3019 -> 0 bytes
locale/sv-SE/wot.dtd | 4 +-
locale/sv-SE/wot.properties | 15 +-
locale/uk-UA/blocked.html | 115 +---
locale/uk-UA/blocked.png | Bin 6638 -> 0 bytes
locale/uk-UA/warning.png | Bin 6100 -> 0 bytes
locale/uk-UA/wot.properties | 13 +-
locale/zh-CN/blocked.html | 116 +---
locale/zh-CN/blocked.png | Bin 1714 -> 0 bytes
locale/zh-CN/warning.png | Bin 2015 -> 0 bytes
locale/zh-CN/wot.dtd | 4 +-
locale/zh-CN/wot.properties | 15 +-
locale/zh-TW/blocked.html | 116 +---
locale/zh-TW/blocked.png | Bin 3047 -> 0 bytes
locale/zh-TW/warning.png | Bin 2015 -> 0 bytes
locale/zh-TW/wot.dtd | 4 +-
locale/zh-TW/wot.properties | 15 +-
skin/b/accessible/logo.png | Bin 0 -> 5644 bytes
skin/b/accessible/r0.png | Bin 0 -> 6296 bytes
skin/b/accessible/r1.png | Bin 0 -> 5850 bytes
skin/b/accessible/r2.png | Bin 0 -> 5801 bytes
skin/b/accessible/r3.png | Bin 0 -> 5906 bytes
skin/b/accessible/r4.png | Bin 0 -> 5692 bytes
skin/b/accessible/r5.png | Bin 0 -> 5392 bytes
skin/b/i.png | Bin 0 -> 3230 bytes
skin/b/logo.png | Bin 0 -> 6147 bytes
skin/b/r0.png | Bin 0 -> 6123 bytes
skin/b/r1.png | Bin 0 -> 6024 bytes
skin/b/r2.png | Bin 0 -> 6028 bytes
skin/b/r3.png | Bin 0 -> 6042 bytes
skin/b/r4.png | Bin 0 -> 6180 bytes
skin/b/r5.png | Bin 0 -> 6265 bytes
skin/fusion/warnings/bg_rating_bottom.png | Bin 284 -> 0 bytes
skin/fusion/warnings/bg_rating_tile1px_center.png | Bin 139 -> 0 bytes
skin/fusion/warnings/bg_rating_top.png | Bin 455 -> 0 bytes
skin/fusion/warnings/bg_warning_bottom.png | Bin 384 -> 0 bytes
skin/fusion/warnings/bg_warning_tile1px_center.png | Bin 132 -> 0 bytes
skin/fusion/warnings/bg_warning_top.png | Bin 300 -> 0 bytes
skin/fusion/warnings/go_to_button.png | Bin 16052 -> 0 bytes
skin/fusion/warnings/info_button_left.png | Bin 2005 -> 0 bytes
skin/fusion/warnings/info_button_right.png | Bin 9242 -> 0 bytes
skin/fusion/warnings/rate_button.png | Bin 16171 -> 0 bytes
skin/fusion/warnings/wot_logo_bottom.png | Bin 17652 -> 0 bytes
skin/include/blocked.css | 678 +++++++++++----------
skin/include/blocked.js | 164 +++--
112 files changed, 1112 insertions(+), 2309 deletions(-)
diff --git a/chrome.manifest b/chrome.manifest
index b74ff44..998f43e 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -15,6 +15,7 @@ locale wot pt-BR locale/pt-BR/
locale wot es-ES locale/es-ES/
locale wot ru-RU locale/ru-RU/
locale wot ja-JP locale/ja-JP/
+locale wot ko-KR locale/ko-KR/
locale wot zh-CN locale/zh-CN/
locale wot zh-TW locale/zh-TW/
locale wot uk-UA locale/uk-UA/
diff --git a/content/config.js b/content/config.js
index 269a75e..8611531 100644
--- a/content/config.js
+++ b/content/config.js
@@ -19,7 +19,7 @@
*/
const WOT_PLATFORM = "firefox";
-const WOT_VERSION = "20120827";
+const WOT_VERSION = "20120910";
/*
* Constants
diff --git a/content/core.js b/content/core.js
index 6c5ccba..85d58c1 100644
--- a/content/core.js
+++ b/content/core.js
@@ -1,6 +1,6 @@
/*
core.js
- Copyright © 2005-2011 WOT Services Oy <info at mywot.com>
+ Copyright © 2005 - 2012 WOT Services Oy <info at mywot.com>
This file is part of WOT.
@@ -457,17 +457,18 @@ var wot_core =
}
},
+ is_internal: function(url)
+ {
+ return (url.indexOf(WOT_BLOCK_LOADING) >= 0 || url.indexOf(WOT_BLOCK_BLOCKED) >= 0);
+ },
+
isredirect: function(url)
{
+ // on the Blocked page we extract encoded hostname from parameter, and use it as a target
try {
- if (!url) {
- return null;
- }
+ if (!url) return null;
- if (url.indexOf(WOT_BLOCK_LOADING) != 0 &&
- url.indexOf(WOT_BLOCK_BLOCKED) != 0) {
- return null;
- }
+ if(!this.is_internal(url)) return null;
var m = /#(.+)$/.exec(url);
@@ -677,6 +678,24 @@ var wot_core =
wot_service_url: function() {
return this.force_https ? WOT_SERVICE_SECURE : WOT_SERVICE_NORMAL;
+ },
+
+ get_level: function(r) {
+ if (r >= WOT_MIN_REPUTATION_5) {
+ return 5;
+ } else if (r >= WOT_MIN_REPUTATION_4) {
+ return 4;
+ } else if (r >= WOT_MIN_REPUTATION_3) {
+ return 3;
+ } else if (r >= WOT_MIN_REPUTATION_2) {
+ return 2;
+ } else if (r >= 0) {
+ return 1;
+ } else if (r == -1){
+ return 0;
+ } else {
+ return "x";
+ }
}
};
diff --git a/content/ui.js b/content/ui.js
index 1ac6600..1a926be 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -1,6 +1,6 @@
/*
ui.js
- Copyright © 2005-2011 WOT Services Oy <info at mywot.com>
+ Copyright © 2005 - 2012 WOT Services Oy <info at mywot.com>
This file is part of WOT.
@@ -18,8 +18,7 @@
along with WOT. If not, see <http://www.gnu.org/licenses/>.
*/
-var wot_status =
-{
+var wot_status = {
set: function(status, description)
{
try {
@@ -113,7 +112,7 @@ var wot_status =
if (type == WOT_WARNING_NOTIFICATION || type == WOT_WARNING_DOM) {
wot_warning.add(wot_core.hostname, content, type);
} else {
- wot_warning.hide(content);
+ if(type != WOT_WARNING_BLOCK) wot_warning.hide(content);
}
} catch (e) {
dump("wot_status.update: failed with " + e + "\n");
@@ -121,8 +120,7 @@ var wot_status =
}
};
-var wot_ui =
-{
+var wot_ui = {
show_accessible: function()
{
try {
diff --git a/content/warning.js b/content/warning.js
index 11f088a..d83a2a5 100644
--- a/content/warning.js
+++ b/content/warning.js
@@ -1,6 +1,6 @@
/*
warning.js
- Copyright © 2006-2011 WOT Services Oy <info at mywot.com>
+ Copyright © 2006 - 2012 WOT Services Oy <info at mywot.com>
This file is part of WOT.
@@ -18,105 +18,66 @@
along with WOT. If not, see <http://www.gnu.org/licenses/>.
*/
-const WOT_WARNING_CSS =
- "@import \"chrome://wot/skin/include/blocked.css\";"
-
-const WOT_WARNING_HTML =
- "<table id=\"wotcontainer\" cellspacing=\"0\" lang=\"{LANG}\" class=\"{CLASS}\">" +
- "<tr id=\"wotheadline\">" +
- "<td colspan=\"2\"></td>" +
- "</tr>" +
- "<tr id=\"wotcontainertop\">" +
- "<td colspan=\"2\"></td>" +
- "</tr>" +
- "<tr id=\"wotdescription\" class=\"wotcontainermiddle\">" +
- "<td colspan=\"2\">" +
- "<div id=\"wotdescriptiontext\" class=\"wotlimitwidth {DESCCLASS}\">{DESC}</div>" +
- "</td>" +
- "</tr>" +
- "<tr id=\"wottarget\" class=\"wotcontainermiddle\">" +
- "<td colspan=\"2\">" +
- "<div id=\"wotwebsite\" class=\"wotlimitwidth\" title=\"{TITLE}\">{TITLE}</div>" +
- "</td> " +
- "</tr>" +
- "<tr id=\"wotinfo\" class=\"wotcontainermiddle\">" +
- "<td colspan=\"2\">" +
- "<div id=\"wotinfobutton\">" +
- "<span id=\"wotinfotext\">{INFO}</span>" +
- "</div>" +
- "</td>" +
- "</tr>" +
- "<tr id=\"wotratingtop\" class=\"wotcontainermiddle\">" +
- "<td colspan=\"2\"></td>" +
- "</tr>" +
- "<tr id=\"wotratingareatop\" class=\"wotratingarea\">" +
- "<td colspan=\"2\"></td>" +
- "</tr>" +
- "<tr id=\"wotrating0\" class=\"wotratingarea wotratingrow wotreputation{RATING0}\">" +
- "<td class=\"wotratingcol wotratingcolleft\">" +
- "<span class=\"wotratingname\">{RATINGDESC0}</span>" +
- "</td>" +
- "<td class=\"wotratingcol wotratingcolright\">" +
- "<span id=\"wotratingexpl0\" class=\"wotratingexpl\">{RATINGEXPL0}</span>" +
- "</td>" +
- "</tr>" +
- "<tr id=\"wotrating1\" class=\"wotratingarea wotratingrow wotreputation{RATING1}\">" +
- "<td class=\"wotratingcol wotratingcolleft\">" +
- "<span class=\"wotratingname\">{RATINGDESC1}</span>" +
- "</td>" +
- "<td class=\"wotratingcol wotratingcolright\">" +
- "<span id=\"wotratingexpl1\" class=\"wotratingexpl\">{RATINGEXPL1}</span>" +
- "</td>" +
- "</tr>" +
- "<tr id=\"wotrating2\" class=\"wotratingarea wotratingrow wotreputation{RATING2}\">" +
- "<td class=\"wotratingcol wotratingcolleft\">" +
- "<span class=\"wotratingname\">{RATINGDESC2}</span>" +
- "</td>" +
- "<td class=\"wotratingcol wotratingcolright\">" +
- "<span id=\"wotratingexpl2\" class=\"wotratingexpl\">{RATINGEXPL2}</span>" +
- "</td>" +
- "</tr>" +
- "<tr id=\"wotrating4\" class=\"wotratingarea wotratingrow wotreputation{RATING4}\">" +
- "<td class=\"wotratingcol wotratingcolleft\">" +
- "<span class=\"wotratingname\">{RATINGDESC4}</span>" +
- "</td>" +
- "<td class=\"wotratingcol wotratingcolright\">" +
- "<span id=\"wotratingexpl4\" class=\"wotratingexpl\">{RATINGEXPL4}</span>" +
- "</td>" +
- "</tr>" +
- "<tr id=\"wotratingareabottom\" class=\"wotratingarea\">" +
- "<td colspan=\"2\"></td>" +
- "</tr>" +
- "<tr id=\"wotratingbottom\" class=\"wotcontainermiddle\">" +
- "<td colspan=\"2\"></td>" +
- "</tr>" +
- "<tr id=\"wotbuttonstop\" class=\"wotcontainermiddle\">" +
- "<td colspan=\"2\"></td>" +
- "</tr>" +
- "<tr id=\"wotbuttons\" class=\"wotcontainermiddle\">" +
- "<td id=\"wotbuttonrate\">" +
- "<span id=\"wotratebutton\" class=\"wotbutton\">{RATETEXT}</span>" +
- "</td>" +
- "<td id=\"wotbuttongoto\">" +
- "<span id=\"wotgotobutton\" class=\"wotbutton\">{GOTOTEXT}</span>" +
- "</td>" +
- "</tr>" +
- "<tr id=\"wotcontainerbottom\">" +
- "<td colspan=\"2\"></td>" +
- "</tr>" +
- "<tr id=\"wotlogo\">" +
- "<td colspan=\"2\"></td>" +
- "</tr>" +
- "</table>";
-
-const WOT_WARNING_MINHEIGHT = 600;
+const WOT_WARNING_CSS = "@import \"chrome://wot/skin/include/blocked.css\";";
var wot_warning =
{
- load_delayed: function()
+ minheight: 600,
+ exit_mode: "back",
+ is_blocked: false,
+
+ make_warning: function()
{
+ var wot_warning = "<div id='wotcontainer' class='wotcontainer {CLASS} {ACCESSIBLE}'>" +
+ "<div class='wot-logo'></div>" +
+ "<div class='wot-warning'>{WARNING}</div>" +
+ "<div class='wot-title'>{TITLE}</div>" +
+ "<div class='wot-desc'>{DESC}</div>" +
+ "<div class='wot-openscorecard-wrap'>" +
+ "<span id='wotinfobutton' class='wot-openscorecard wot-link'>{INFO}</span>" +
+ "</div>" +
+ "<div id='wot-ratings'>";
+
+ for(var c=0; c < WOT_APPLICATIONS; c++) {
+
+ if(!wot_prefs["show_application_" + c]) continue;
+
+ var S_COMPNAME = "RATINGDESC" + c,
+ S_RATING = "RATING" + c,
+ S_RATING_EXPL = "RATINGEXPL" + c;
+
+ wot_warning += "" +
+ "<div class='wot-component'>" +
+ "<div class='wot-comp-name'>{" + S_COMPNAME + "}</div>" +
+ "<div class='wot-comp-level' r='{" + S_RATING + "}'>{" + S_RATING_EXPL + "}</div>" +
+ "<div class='wot-comp-icon' r='{" + S_RATING + "}'></div>" +
+ "</div>";
+ }
+
+ wot_warning +=
+ "</div>" +
+ "<div class='wot-rateit-wrap'>" +
+ "<span>{RATETEXT}</span>" +
+ "</div>" +
+ "<div class='wot-buttons'>";
+
+ if(!this.is_blocked) {
+ // don't show "Goto the site" button in "Blocked" mode
+ wot_warning += "<div id='wot-btn-hide' class='wot-button'>{GOTOSITE}</div>";
+ }
+
+ wot_warning += "<div id='wot-btn-leave' class='wot-button'>{LEAVESITE}</div>" +
+ "</div>" +
+ "</div>";
+
+ return wot_warning;
+ },
+
+ load_delayed: function(blocked)
+ {
+ this.is_blocked = !!blocked || false;
try {
- if (this.warned) {
+ if (this.warned && !this.is_blocked) {
return;
}
@@ -141,15 +102,16 @@ var wot_warning =
"RATINGDESC4",
wot_util.getstring("rating_4")
], [
- "RATETEXT",
- wot_util.getstring("warning_rate")
- ], [
- "GOTOTEXT",
+ "GOTOSITE",
wot_util.getstring("warning_goto")
+ ], [
+ "WARNING",
+ this.is_blocked ? wot_util.getstring("warning_blocked") : wot_util.getstring("warning_warning")
+
]
];
- this.container = this.processhtml(WOT_WARNING_HTML, replaces);
+ this.container = this.processhtml(this.make_warning(), replaces);
this.warned = {};
} catch (e) {
dump("wot_warning.load: failed with " + e + "\n");
@@ -175,6 +137,7 @@ var wot_warning =
isblocking: function()
{
+ // decides whether we must block page or just warn
var blocking = false;
try {
for (var i = 0; i < WOT_APPLICATIONS; ++i) {
@@ -189,36 +152,36 @@ var wot_warning =
return blocking;
},
- getwarningtype: function(hostname, i, reason)
+ getwarningtype: function(hostname, app, reason)
{
try {
- if (!wot_prefs["show_application_" + i]) {
+ if (!wot_prefs["show_application_" + app]) {
return WOT_WARNING_NONE;
}
- var type = wot_prefs["warning_type_" + i];
+ var type = wot_prefs["warning_type_" + app];
if (type == WOT_WARNING_NONE) {
return WOT_WARNING_NONE;
}
- var confidence = wot_prefs.min_confidence_level;
- var level = wot_prefs["warning_level_" + i];
- var r = wot_cache.get(hostname, "reputation_" + i);
- var c = wot_cache.get(hostname, "confidence_" + i);
- var x = wot_cache.get(hostname, "excluded_" + i);
+ var min_confidence = wot_prefs.min_confidence_level;
+ var level = wot_prefs["warning_level_" + app];
+ var r = wot_cache.get(hostname, "reputation_" + app);
+ var c = wot_cache.get(hostname, "confidence_" + app);
+ var x = wot_cache.get(hostname, "excluded_" + app);
var t = -1;
if (wot_cache.get(hostname, "status") == WOT_QUERY_OK) {
- t = wot_cache.get(hostname, "testimony_" + i);
+ t = wot_cache.get(hostname, "testimony_" + app);
}
- var unknown = wot_prefs["warning_unknown_" + i];
+ var unknown = wot_prefs["warning_unknown_" + app];
var rr = x ? 0 : r;
var cc = x ? level : c;
- if (((rr >= 0 && r <= level && (cc >= confidence || unknown)) ||
+ if (((rr >= 0 && r <= level && (cc >= min_confidence || unknown)) ||
(rr < 0 && unknown)) &&
(t < 0 || t <= level)) {
if (r < 0) {
@@ -347,7 +310,19 @@ var wot_warning =
return -1;
},
- add: function(hostname, content, type)
+ set_exitmode: function(content)
+ {
+ var window = content.defaultView;
+ var steps_back = this.is_blocked ? 2 : 1; // when mode is Blocking, there are at least 2 steps in history
+ if(window.history.length > steps_back) {
+ wot_warning.exit_mode = "back"; // note: don't change this string, there are code dependent on it
+ } else {
+ wot_warning.exit_mode = "leave";
+ }
+ return wot_warning.exit_mode;
+ },
+
+ add: function(hostname, content, type, forced_reason)
{
/* Obviously, this isn't exactly foolproof. A site might have
elements with a higher z-index, or it might try to remove
@@ -363,51 +338,53 @@ var wot_warning =
return false;
}
+ // If is set, no need to decide what kind of warning to show.
+ forced_reason = forced_reason || false; // used when func is called from blocked.js.
+
+ if(!forced_reason) wot_warning.set_exitmode(content); // call it only in usual mode
+
+ var rate_site = wot_util.getstring("warning_rate").replace("<a>", "<a id='wotrate-link' class='wot-link'>");
var replaces = [
[
"TITLE",
(wot_shared.decodehostname(hostname) || "")
.replace(/[<>&="']/g, "")
+ ],
+ [
+ "LEAVESITE",
+ wot_util.getstring("warning_" + wot_warning.exit_mode)
+ ],
+ [
+ "RATETEXT", rate_site
]
];
var reason = WOT_WARNING_NONE;
- var accessible = wot_prefs.accessible ? " wotaccessible" : "";
+ var accessible = wot_prefs.accessible ? " accessible" : "";
+
+ replaces.push([ "ACCESSIBLE", accessible ]);
for (var i = 0; i < WOT_APPLICATIONS; ++i) {
- var t = this.getwarningtype(hostname, i, true);
+ // don't call getwarningtype() if forced_reason is provided
+ var t = forced_reason ? WOT_WARNING_NONE : this.getwarningtype(hostname, i, true);
+
var r = wot_cache.get(hostname, "reputation_" + i);
var x = wot_cache.get(hostname, "excluded_" + i);
- if (reason < t) {
- reason = t;
+ if (forced_reason) {
+ reason = forced_reason;
+ } else {
+ reason = (reason < t) ? t : reason;
}
- if (r >= WOT_MIN_REPUTATION_5) {
- replaces.push([ "RATING" + i, 5 + accessible ]);
- replaces.push([ "RATINGEXPL" + i,
- wot_util.getstring("help_5") ]);
- } else if (r >= WOT_MIN_REPUTATION_4) {
- replaces.push([ "RATING" + i, 4 + accessible ]);
- replaces.push([ "RATINGEXPL" + i,
- wot_util.getstring("help_4")]);
- } else if (r >= WOT_MIN_REPUTATION_3) {
- replaces.push([ "RATING" + i, 3 + accessible ]);
- replaces.push([ "RATINGEXPL" + i,
- wot_util.getstring("help_3") ]);
- } else if (r >= WOT_MIN_REPUTATION_2) {
- replaces.push([ "RATING" + i, 2 + accessible ]);
- replaces.push([ "RATINGEXPL" + i,
- wot_util.getstring("help_2") ]);
- } else if (r >= 0) {
- replaces.push([ "RATING" + i, 1 + accessible ]);
- replaces.push([ "RATINGEXPL" + i,
- wot_util.getstring("help_1") ]);
+
+ var r_level = wot_core.get_level(r);
+
+ if (r_level >= 0) {
+ replaces.push([ "RATING" + i, "r" + r_level ]);
+ replaces.push([ "RATINGEXPL" + i, wot_util.getstring("help_" + r_level) ]);
} else if (x) {
- replaces.push([ "RATING" + i, "x" + accessible ]);
- replaces.push([ "RATINGEXPL" + i, " " ]);
- } else {
- replaces.push([ "RATING" + i, 0 + accessible ]);
+ replaces.push([ "RATING" + i, "rx" ]);
replaces.push([ "RATINGEXPL" + i, " " ]);
}
}
@@ -415,7 +392,7 @@ var wot_warning =
var notification;
var warnclass = "";
- if (this.getheight(content) < WOT_WARNING_MINHEIGHT) {
+ if (this.getheight(content) < this.minheight) {
warnclass = "wotnoratings";
}
@@ -501,8 +478,8 @@ var wot_warning =
body[0].appendChild(wrapper);
/* Flash has authority issues with z-index, so try to hide it
- while warning is being shown. */
- this.hideobjects(content, true);
+ while warning is being shown (skip on "blocked!" page) */
+ if (forced_reason === false) this.hideobjects(content, true);
return true;
} catch (e) {
dump("wot_warning.add: failed with " + e + "\n");
@@ -534,9 +511,12 @@ var wot_warning =
hideobjects: function(content, hide)
{
try {
- if (content.defaultView && content.defaultView.frames) {
- var frames = content.defaultView.frames;
- for (var j = 0; j < frames.length; ++j) {
+ var i,j;
+ var win = content.defaultView;
+
+ if (win && win.frames) {
+ var frames = win.frames;
+ for (j = 0; j < frames.length; ++j) {
if (frames[j].document) {
this.hideobjects(frames[j].document, hide);
}
@@ -545,10 +525,10 @@ var wot_warning =
var elems = [ "embed", "object", "iframe", "applet" ];
- for (var i = 0; i < elems.length; ++i) {
+ for (i = 0; i < elems.length; ++i) {
var objs = content.getElementsByTagName(elems[i]);
- for (var j = 0; objs && j < objs.length; ++j) {
+ for (j = 0; objs && j < objs.length; ++j) {
if (hide) {
objs[j].setAttribute("wothidden",
objs[j].style.display || "block");
@@ -569,6 +549,7 @@ var wot_warning =
click: function(event)
{
+
try {
if (!event || !event.view) {
return;
@@ -592,33 +573,78 @@ var wot_warning =
return;
}
+ var wot_blocked = content.getElementById("wotblocked"); // Important to have element with this ID
+ var is_blocked = !!wot_blocked;
+ if(is_blocked) {
+ this.exit_mode = wot_blocked.getAttribute("exit_mode"); // take exit_mode from DOM, since this is module
+ }
+
var node = event.originalTarget;
+ var handle_ids = {
+ "wotrate-link": true,
+ "wot-btn-hide": true,
+ "wot-btn-leave": true,
+ "wotinfobutton": true
+ };
+
+ var node_id = null;
while (node) {
- if (node.id &&
- (node.id == "wotratebutton" ||
- node.id == "wotgotobutton" ||
- node.id == "wotinfobutton")) {
- break;
- }
+ node_id = node.id;
+ if (node_id && handle_ids[node_id]) break;
node = node.parentNode;
}
- if (!node || !node.id) {
+ if (!node || !node_id) {
return;
}
- if (node.id == "wotgotobutton") {
- wot_warning.warned[wot_core.hostname] = true;
- warning.style.display = "none";
- wrapper.style.display = "none";
- wot_warning.hideobjects(content, false);
- } else if (node.id == "wotinfobutton") {
- wot_browser.openscorecard(wot_core.hostname, null, "warning");
- } else if (node.id == "wotratebutton") {
- wot_browser.openscorecard(wot_core.hostname, WOT_SCORECARD_RATE,
- "warning");
+ switch (node_id) {
+ case "wot-btn-hide":
+ wot_warning.warned[wot_core.hostname] = true;
+ warning.style.display = "none";
+ wrapper.style.display = "none";
+ wot_warning.hideobjects(content, false);
+ break;
+
+ case "wotinfobutton":
+ wot_browser.openscorecard(wot_core.hostname, null, "warning");
+ break;
+
+ case "wotrate-link":
+ wot_browser.openscorecard(wot_core.hostname, WOT_SCORECARD_RATE, "warning");
+ break;
+
+ case "wot-btn-leave":
+ var window = content.defaultView;
+ if(wot_warning.exit_mode == "leave") {
+ // close tab
+ window.close();
+ } else {
+ var e_beforeunload = window.onbeforeunload;
+ var back_timer = null;
+ window.onbeforeunload = function() {
+ if(back_timer) {
+ window.clearTimeout(back_timer);
+ }
+ if(e_beforeunload) e_beforeunload(window);
+ };
+
+ var steps_back = is_blocked ? -2 : -1;
+ var prev_location = window.location.href;
+ window.history.go(steps_back);
+
+ back_timer = window.setTimeout(function() {
+ // this is a trick: we don't know if there is a back-step possible if history.length>1,
+ // so we simply wait for a short time, and if we are still on a page, then "back" is impossible and
+ // we should go to blank page
+ if(window.location.href == prev_location) window.close();
+ }, 500);
+ }
+
+ break;
}
+
} catch (e) {
dump("wot_warning.click: failed with " + e + "\n");
}
diff --git a/locale/cs-CZ/blocked.html b/locale/cs-CZ/blocked.html
index 7627415..27d13e4 100644
--- a/locale/cs-CZ/blocked.html
+++ b/locale/cs-CZ/blocked.html
@@ -2,107 +2,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="cs" lang="cs">
-<head>
- <meta charset="utf-8">
- <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
- <style type="text/css">
- @import "chrome://wot/skin/include/blocked.css";
- </style>
- <title>WOT: Zablokováno</title>
-</head>
-<body id="wotblocked" onload="blocked_load();">
- <table id="wotcontainer" cellspacing="0" lang="cs-CZ" class="wotblocked">
- <tr id="wotheadline">
- <td colspan="2"></td>
- </tr>
- <tr id="wotcontainertop">
- <td colspan="2"></td>
- </tr>
- <tr id="wotdescription" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotdescriptiontext" class="wotlimitwidth">Reputace této stránky je špatná.</div>
- </td>
- </tr>
- <tr id="wottarget" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotwebsite" class="wotlimitwidth" title=""> </div>
- </td>
- </tr>
- <tr id="wotinfo" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotinfobutton">
- <span id="wotinfotext" onclick="blocked_info();">Zobrazit podrobnosti hodnocení a komentáře</span>
- </div>
- </td>
- </tr>
- <tr id="wotratingtop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingareatop" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotrating0" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Důvěryhodnost</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl0" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating1" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Spolehlivost poskytovatele</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl1" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating2" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Ochrana osobních dat</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl2" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating4" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Bezpečnost dětí</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl4" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotratingareabottom" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingbottom" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttonstop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttons" class="wotcontainermiddle">
- <td id="wotbuttonrate">
- <span id="wotratebutton" class="wotbutton">Tato stránka je bezpečná - Chci ji ohodnotit</span>
- </td>
- <td id="wotbuttongoto">
- <span id="wotgotobutton" class="wotbutton">Ignorovat varování a vstoupit na stránku</span>
- </td>
- </tr>
- <tr id="wotcontainerbottom">
- <td colspan="2"></td>
- </tr>
- <tr id="wotlogo">
- <td colspan="2"></td>
- </tr>
- </table>
- <div id="wottextdescunknown" style="display: none;">Hodnocení této stránky není známo.</div>
- <div id="wottextdescuserrat" style="display: none;">Dali jste této stránce špatné hodnocení,<br/>což spustilo varování.</div>
- <div id="wottextreputation5" style="display: none;">Excelentní</div>
- <div id="wottextreputation4" style="display: none;">Dobrá</div>
- <div id="wottextreputation3" style="display: none;">Neuspokojivá</div>
- <div id="wottextreputation2" style="display: none;">Špatná</div>
- <div id="wottextreputation1" style="display: none;">Velmi špatná</div>
-</body>
+ <head>
+ <meta charset="utf-8">
+ <script type="text/javascript" src="chrome://wot/content/config.js"></script>
+ <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
+ <script type="text/javascript" src="chrome://wot/content/warning.js"></script>
+ <style type="text/css">
+ @import "chrome://wot/skin/include/blocked.css";
+ </style>
+ <title>WOT: Zablokováno</title>
+ </head>
+ <body id="wotblocked" onload="blocked_load();">
+ </body>
</html>
diff --git a/locale/cs-CZ/blocked.png b/locale/cs-CZ/blocked.png
deleted file mode 100644
index 775cc33..0000000
Binary files a/locale/cs-CZ/blocked.png and /dev/null differ
diff --git a/locale/cs-CZ/warning.png b/locale/cs-CZ/warning.png
deleted file mode 100644
index 9a809e7..0000000
Binary files a/locale/cs-CZ/warning.png and /dev/null differ
diff --git a/locale/cs-CZ/wot.dtd b/locale/cs-CZ/wot.dtd
index fb4d41d..cfcf239 100644
--- a/locale/cs-CZ/wot.dtd
+++ b/locale/cs-CZ/wot.dtd
@@ -32,8 +32,8 @@
<!ENTITY wotRating.app1 "Spolehlivost poskytovatele:">
<!ENTITY wotRating.app2 "Ochrana osobních dat:">
<!ENTITY wotRating.app4 "Bezpečnost dětí:">
-<!ENTITY wotRating.scorecard "Zobrazit výsledky s detaily hodnocení.">
-<!ENTITY wotRating.comment "Přidat komentář.">
+<!ENTITY wotRating.scorecard "Zobrazit výsledky s detaily hodnocení">
+<!ENTITY wotRating.comment "Přidat komentář">
<!ENTITY wotRating.guide "Příručka">
<!ENTITY wotRating.prefs "Nastavení">
<!ENTITY wotRating.link "www.mywot.com">
diff --git a/locale/cs-CZ/wot.properties b/locale/cs-CZ/wot.properties
index be5196c..999d3ca 100644
--- a/locale/cs-CZ/wot.properties
+++ b/locale/cs-CZ/wot.properties
@@ -19,6 +19,7 @@ description_rating_1 = Velmi špatná
description_rating_0 = Pro tuto stránku není k dispozici dostatek hodnocení
description_restart = Doplněk WOT aktivujete restartováním prohlížeče.
description_uninstall = Doplněk WOT bude odinstalován po restartování.
+help_0 =
help_1 = Velmi špatná
help_2 = Špatná
help_3 = Neuspokojivá
@@ -27,16 +28,20 @@ help_5 = Excelentní
help_comment = Váš údaj se liší.
help_comment_link = Zanechat komentář?
warning = Varování WOT: %S
+warning_warning = Varování!
+warning_blocked = Zablokováno
warning_button = Podrobnosti hodnocení
warning_message_normal = Reputace této stránky je špatná.
warning_message_userrated = Dali jste této stránce špatné hodnocení.
warning_message_unknown = Hodnocení této stránky není známo.
warning_info = Zobrazit podrobnosti hodnocení a komentáře
-warning_rate = Tato stránka je bezpečná - Chci ji ohodnotit
-warning_goto = Ignorovat varování a vstoupit na stránku
-warning_desc_normal = Reputace této stránky je špatná.
-warning_desc_userrated = Dali jste této stránce špatné hodnocení,<br/>což spustilo varování.
-warning_desc_unknown = Hodnocení této stránky není známo.
+warning_rate = Tato stránka je bezpečná - Chci <a>ji ohodnotit</a>
+warning_goto = Pokračovat
+warning_leave = Opustit stránku
+warning_back = Vrátit se zpět
+warning_desc_normal = Reputace této stránky je špatná
+warning_desc_userrated = Dali jste této stránce špatné hodnocení, což spustilo varování
+warning_desc_unknown = Hodnocení této stránky není známo
rating_0 = Důvěryhodnost
rating_1 = Spolehlivost poskytovatele
rating_2 = Ochrana osobních dat
diff --git a/locale/de-DE/blocked.html b/locale/de-DE/blocked.html
index a94df07..39217c8 100644
--- a/locale/de-DE/blocked.html
+++ b/locale/de-DE/blocked.html
@@ -1,108 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
-<head>
- <meta charset="utf-8">
- <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
- <style type="text/css">
- @import "chrome://wot/skin/include/blocked.css";
- </style>
- <title>WOT: Blockiert</title>
-</head>
-<body id="wotblocked" onload="blocked_load();">
- <table id="wotcontainer" cellspacing="0" lang="de-DE" class="wotblocked">
- <tr id="wotheadline">
- <td colspan="2"></td>
- </tr>
- <tr id="wotcontainertop">
- <td colspan="2"></td>
- </tr>
- <tr id="wotdescription" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotdescriptiontext" class="wotlimitwidth">Diese Seite hat einen schlechten Ruf.</div>
- </td>
- </tr>
- <tr id="wottarget" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotwebsite" class="wotlimitwidth" title=""> </div>
- </td>
- </tr>
- <tr id="wotinfo" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotinfobutton">
- <span id="wotinfotext" onclick="blocked_info();">Bewertungsdetails und Kommentare anzeigen</span>
- </div>
- </td>
- </tr>
- <tr id="wotratingtop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingareatop" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotrating0" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Vertrauenswürdigkeit</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl0" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating1" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Händlerzuverlässigkeit</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl1" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating2" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Datenschutz</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl2" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating4" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Jugendschutz</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl4" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotratingareabottom" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingbottom" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttonstop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttons" class="wotcontainermiddle">
- <td id="wotbuttonrate">
- <span id="wotratebutton" class="wotbutton">Diese Website ist sicher, und ich möchte sie bewerten</span>
- </td>
- <td id="wotbuttongoto">
- <span id="wotgotobutton" class="wotbutton">Warnung ignorieren und Website aufrufen</span>
- </td>
- </tr>
- <tr id="wotcontainerbottom">
- <td colspan="2"></td>
- </tr>
- <tr id="wotlogo">
- <td colspan="2"></td>
- </tr>
- </table>
- <div id="wottextdescunknown" style="display: none;">Diese Website besitzt eine unbekannte Bewertung.</div>
- <div id="wottextdescuserrat" style="display: none;">Sie haben dieser Website eine schlechte Bewertung<br/>gegeben, die eine Warnung ausgelöst hat.</div>
- <div id="wottextreputation5" style="display: none;">Ausgezeichnet</div>
- <div id="wottextreputation4" style="display: none;">Gut</div>
- <div id="wottextreputation3" style="display: none;">Ungenügend</div>
- <div id="wottextreputation2" style="display: none;">Schlecht</div>
- <div id="wottextreputation1" style="display: none;">Sehr schlecht</div>
-</body>
+ <head>
+ <meta charset="utf-8">
+ <script type="text/javascript" src="chrome://wot/content/config.js"></script>
+ <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
+ <script type="text/javascript" src="chrome://wot/content/warning.js"></script>
+ <style type="text/css">
+ @import "chrome://wot/skin/include/blocked.css";
+ </style>
+ <title>WOT: Blockiert</title>
+ </head>
+ <body id="wotblocked" onload="blocked_load();">
+ </body>
</html>
diff --git a/locale/de-DE/blocked.png b/locale/de-DE/blocked.png
deleted file mode 100644
index b1766cc..0000000
Binary files a/locale/de-DE/blocked.png and /dev/null differ
diff --git a/locale/de-DE/warning.png b/locale/de-DE/warning.png
deleted file mode 100644
index ad3e2e6..0000000
Binary files a/locale/de-DE/warning.png and /dev/null differ
diff --git a/locale/de-DE/wot.dtd b/locale/de-DE/wot.dtd
index f027af7..e95e7ea 100644
--- a/locale/de-DE/wot.dtd
+++ b/locale/de-DE/wot.dtd
@@ -32,8 +32,8 @@
<!ENTITY wotRating.app1 "Händlerzuverlässigkeit:">
<!ENTITY wotRating.app2 "Datenschutz:">
<!ENTITY wotRating.app4 "Jugendschutz:">
-<!ENTITY wotRating.scorecard "Detailanzeige auf der Bewertungsliste.">
-<!ENTITY wotRating.comment "Eigenen Kommentar hinzufügen.">
+<!ENTITY wotRating.scorecard "Detailanzeige auf der Bewertungsliste">
+<!ENTITY wotRating.comment "Eigenen Kommentar hinzufügen">
<!ENTITY wotRating.guide "Leitfaden">
<!ENTITY wotRating.prefs "Einstellungen">
<!ENTITY wotRating.link "www.mywot.com">
diff --git a/locale/de-DE/wot.properties b/locale/de-DE/wot.properties
index 08ad42e..2e416ce 100644
--- a/locale/de-DE/wot.properties
+++ b/locale/de-DE/wot.properties
@@ -19,6 +19,7 @@ description_rating_1 = Sehr schlecht
description_rating_0 = Nicht genügend Bewertungen für diese Website
description_restart = Starten Sie den Browser erneut, um WOT zu aktivieren.
description_uninstall = WOT wird nach dem Neustart deinstalliert.
+help_0 =
help_1 = Sehr schlecht
help_2 = Schlecht
help_3 = Ungenügend
@@ -27,16 +28,20 @@ help_5 = Ausgezeichnet
help_comment =
help_comment_link = Möchten Sie einen Kommentar schreiben?
warning = WOT-Warnung: %S
+warning_warning = Warnung!
+warning_blocked = Blockiert
warning_button = Bewertungsdetails
warning_message_normal = Diese Seite hat einen schlechten Ruf basierend auf Benutzerbewertungen.
warning_message_userrated = Sie haben dieser Website eine schlechte Bewertung gegeben, die eine Warnung ausgelöst hat.
warning_message_unknown = Diese Website besitzt eine unbekannte Bewertung.
warning_info = Bewertungsdetails und Kommentare anzeigen
-warning_rate = Site ist sicher. Ich möchte sie bewerten
-warning_goto = Warnung ignorieren und Website aufrufen
-warning_desc_normal = Diese Seite hat einen schlechten Ruf basierend<br/>auf Benutzerbewertungen.
-warning_desc_userrated = Sie haben dieser Website eine schlechte Bewertung<br/>gegeben, die eine Warnung ausgelöst hat.
-warning_desc_unknown = Diese Website besitzt eine unbekannte Bewertung.
+warning_rate = Site ist sicher. Ich möchte <a>sie bewerten</a>
+warning_goto = Gehe zur Seite
+warning_leave = Verlasse die Seite
+warning_back = Gehe zurück
+warning_desc_normal = Diese Seite hat einen schlechten Ruf basierend auf Benutzerbewertungen
+warning_desc_userrated = Sie haben dieser Website eine schlechte Bewertung gegeben, die eine Warnung ausgelöst hat
+warning_desc_unknown = Diese Website besitzt eine unbekannte Bewertung
rating_0 = Vertrauenswürdigkeit
rating_1 = Händlerzuverlässigkeit
rating_2 = Datenschutz
diff --git a/locale/en-US/blocked.html b/locale/en-US/blocked.html
index c303645..74a5234 100644
--- a/locale/en-US/blocked.html
+++ b/locale/en-US/blocked.html
@@ -2,107 +2,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <meta charset="utf-8">
- <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
- <style type="text/css">
- @import "chrome://wot/skin/include/blocked.css";
- </style>
- <title>WOT: Blocked</title>
-</head>
-<body id="wotblocked" onload="blocked_load();">
- <table id="wotcontainer" cellspacing="0" lang="en-US" class="wotblocked">
- <tr id="wotheadline">
- <td colspan="2"></td>
- </tr>
- <tr id="wotcontainertop">
- <td colspan="2"></td>
- </tr>
- <tr id="wotdescription" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotdescriptiontext" class="wotlimitwidth">This site has a poor reputation.</div>
- </td>
- </tr>
- <tr id="wottarget" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotwebsite" class="wotlimitwidth" title=""> </div>
- </td>
- </tr>
- <tr id="wotinfo" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotinfobutton">
- <span id="wotinfotext" onclick="blocked_info();">View rating details and comments</span>
- </div>
- </td>
- </tr>
- <tr id="wotratingtop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingareatop" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotrating0" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Trustworthiness</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl0" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating1" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Vendor reliability</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl1" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating2" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Privacy</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl2" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating4" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Child safety</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl4" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotratingareabottom" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingbottom" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttonstop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttons" class="wotcontainermiddle">
- <td id="wotbuttonrate">
- <span id="wotratebutton" class="wotbutton">This site is safe - I want to rate it</span>
- </td>
- <td id="wotbuttongoto">
- <span id="wotgotobutton" class="wotbutton">Ignore warning and go to the site</span>
- </td>
- </tr>
- <tr id="wotcontainerbottom">
- <td colspan="2"></td>
- </tr>
- <tr id="wotlogo">
- <td colspan="2"></td>
- </tr>
- </table>
- <div id="wottextdescunknown" style="display: none;">This site has an unknown rating.</div>
- <div id="wottextdescuserrat" style="display: none;">You have given this site a poor rating,<br/>which triggered a warning.</div>
- <div id="wottextreputation5" style="display: none;">Excellent</div>
- <div id="wottextreputation4" style="display: none;">Good</div>
- <div id="wottextreputation3" style="display: none;">Unsatisfactory</div>
- <div id="wottextreputation2" style="display: none;">Poor</div>
- <div id="wottextreputation1" style="display: none;">Very poor</div>
-</body>
+ <head>
+ <meta charset="utf-8">
+ <script type="text/javascript" src="chrome://wot/content/config.js"></script>
+ <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
+ <script type="text/javascript" src="chrome://wot/content/warning.js"></script>
+ <style type="text/css">
+ @import "chrome://wot/skin/include/blocked.css";
+ </style>
+ <title>WOT: Blocked</title>
+ </head>
+ <body id="wotblocked" onload="blocked_load();">
+ </body>
</html>
diff --git a/locale/en-US/blocked.png b/locale/en-US/blocked.png
deleted file mode 100644
index f162202..0000000
Binary files a/locale/en-US/blocked.png and /dev/null differ
diff --git a/locale/en-US/warning.png b/locale/en-US/warning.png
deleted file mode 100644
index a048bf0..0000000
Binary files a/locale/en-US/warning.png and /dev/null differ
diff --git a/locale/en-US/wot.dtd b/locale/en-US/wot.dtd
index 43b3cd5..dd1ef9d 100644
--- a/locale/en-US/wot.dtd
+++ b/locale/en-US/wot.dtd
@@ -32,8 +32,8 @@
<!ENTITY wotRating.app1 "Vendor reliability:">
<!ENTITY wotRating.app2 "Privacy:">
<!ENTITY wotRating.app4 "Child safety:">
-<!ENTITY wotRating.scorecard "View scorecard for rating details.">
-<!ENTITY wotRating.comment "Add your comment.">
+<!ENTITY wotRating.scorecard "View scorecard for rating details">
+<!ENTITY wotRating.comment "Add your comment">
<!ENTITY wotRating.guide "Guide">
<!ENTITY wotRating.prefs "Settings">
<!ENTITY wotRating.link "www.mywot.com">
diff --git a/locale/en-US/wot.properties b/locale/en-US/wot.properties
index 4ad4661..474c95c 100644
--- a/locale/en-US/wot.properties
+++ b/locale/en-US/wot.properties
@@ -19,6 +19,7 @@ description_rating_1 = Very poor
description_rating_0 = Not enough ratings for this site
description_restart = Restart the browser to activate WOT.
description_uninstall = WOT will be uninstalled after restart.
+help_0 =
help_1 = Very poor
help_2 = Poor
help_3 = Unsatisfactory
@@ -27,21 +28,25 @@ help_5 = Excellent
help_comment = Your rating differs.
help_comment_link = Leave a comment?
warning = WOT Warning: %S
+warning_warning = Warning!
+warning_blocked = Blocked
warning_button = Rating details
warning_message_normal = This site has a poor reputation based on user ratings.
warning_message_userrated = You have given this site a poor rating.
warning_message_unknown = This site has an unknown rating.
warning_info = View rating details and comments
-warning_rate = This site is safe - I want to rate it
-warning_goto = Ignore warning and go to the site
-warning_desc_normal = This site has a poor reputation based on<br/>user ratings.
-warning_desc_userrated = You have given this site a poor rating,<br/>which triggered a warning.
-warning_desc_unknown = This site has an unknown rating.
+warning_rate = This site is safe - I want to <a>rate it</a>
+warning_goto = Go to the site
+warning_leave = Leave the site
+warning_back = Go back
+warning_desc_normal = This site has a poor reputation based on user ratings
+warning_desc_userrated = You have given this site a poor rating, which triggered a warning
+warning_desc_unknown = This site has an unknown rating
rating_0 = Trustworthiness
rating_1 = Vendor reliability
rating_2 = Privacy
rating_4 = Child safety
-popup_0 = Trustworthiness
+popup_0 = Trustworthinessbg_rating_bottom
popup_1 = Vendor reliability
popup_2 = Privacy
popup_4 = Child safety
diff --git a/locale/es-ES/blocked.html b/locale/es-ES/blocked.html
index 6c4de64..5a25b9e 100644
--- a/locale/es-ES/blocked.html
+++ b/locale/es-ES/blocked.html
@@ -1,108 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <meta charset="utf-8">
- <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
- <style type="text/css">
- @import "chrome://wot/skin/include/blocked.css";
- </style>
- <title>WOT: Bloqueado</title>
-</head>
-<body id="wotblocked" onload="blocked_load();">
- <table id="wotcontainer" cellspacing="0" lang="es-ES" class="wotblocked">
- <tr id="wotheadline">
- <td colspan="2"></td>
- </tr>
- <tr id="wotcontainertop">
- <td colspan="2"></td>
- </tr>
- <tr id="wotdescription" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotdescriptiontext" class="wotlimitwidth">Este sitio tiene una reputación pobre.</div>
- </td>
- </tr>
- <tr id="wottarget" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotwebsite" class="wotlimitwidth" title=""> </div>
- </td>
- </tr>
- <tr id="wotinfo" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotinfobutton">
- <span id="wotinfotext" onclick="blocked_info();">Ver detalles de valoración y comentarios</span>
- </div>
- </td>
- </tr>
- <tr id="wotratingtop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingareatop" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotrating0" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Confiabilidad</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl0" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating1" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Fiabilidad del vendedor</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl1" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating2" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Privacidad</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl2" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating4" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Seguridad para menores</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl4" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotratingareabottom" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingbottom" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttonstop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttons" class="wotcontainermiddle">
- <td id="wotbuttonrate">
- <span id="wotratebutton" class="wotbutton">Este sitio es seguro y deseo valorarlo</span>
- </td>
- <td id="wotbuttongoto">
- <span id="wotgotobutton" class="wotbutton">Omitir la advertencia e ir al sitio</span>
- </td>
- </tr>
- <tr id="wotcontainerbottom">
- <td colspan="2"></td>
- </tr>
- <tr id="wotlogo">
- <td colspan="2"></td>
- </tr>
- </table>
- <div id="wottextdescunknown" style="display: none;">Este sitio tiene una valoración desconocida.</div>
- <div id="wottextdescuserrat" style="display: none;">Ha asignado a este sitio una valoración pobre,<br/>lo que ha desencadenado una advertencia.</div>
- <div id="wottextreputation5" style="display: none;">Excelente</div>
- <div id="wottextreputation4" style="display: none;">Buena</div>
- <div id="wottextreputation3" style="display: none;">No satisfactoria</div>
- <div id="wottextreputation2" style="display: none;">Pobre</div>
- <div id="wottextreputation1" style="display: none;">Muy pobre</div>
-</body>
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="es" lang="es">
+ <head>
+ <meta charset="utf-8">
+ <script type="text/javascript" src="chrome://wot/content/config.js"></script>
+ <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
+ <script type="text/javascript" src="chrome://wot/content/warning.js"></script>
+ <style type="text/css">
+ @import "chrome://wot/skin/include/blocked.css";
+ </style>
+ <title>WOT: Bloqueado</title>
+ </head>
+ <body id="wotblocked" onload="blocked_load();">
+ </body>
</html>
diff --git a/locale/es-ES/blocked.png b/locale/es-ES/blocked.png
deleted file mode 100644
index c00737d..0000000
Binary files a/locale/es-ES/blocked.png and /dev/null differ
diff --git a/locale/es-ES/warning.png b/locale/es-ES/warning.png
deleted file mode 100644
index cf373ab..0000000
Binary files a/locale/es-ES/warning.png and /dev/null differ
diff --git a/locale/es-ES/wot.dtd b/locale/es-ES/wot.dtd
index b9d7d94..8daaac3 100644
--- a/locale/es-ES/wot.dtd
+++ b/locale/es-ES/wot.dtd
@@ -32,8 +32,8 @@
<!ENTITY wotRating.app1 "Fiabilidad del vendedor:">
<!ENTITY wotRating.app2 "Privacidad:">
<!ENTITY wotRating.app4 "Seguridad para menores:">
-<!ENTITY wotRating.scorecard "Ver puntuación para detalles de valoración.">
-<!ENTITY wotRating.comment "Añadir comentario.">
+<!ENTITY wotRating.scorecard "Ver puntuación para detalles de valoración">
+<!ENTITY wotRating.comment "Añadir comentario">
<!ENTITY wotRating.guide "Guía">
<!ENTITY wotRating.prefs "Configuración">
<!ENTITY wotRating.link "www.mywot.com">
diff --git a/locale/es-ES/wot.properties b/locale/es-ES/wot.properties
index 6ede63f..dcc678c 100644
--- a/locale/es-ES/wot.properties
+++ b/locale/es-ES/wot.properties
@@ -19,6 +19,7 @@ description_rating_1 = Muy pobre
description_rating_0 = No existen suficientes valoraciones para este sitio.
description_restart = Reinicie el navegador para activar WOT.
description_uninstall = WOT se desinstalará después de reiniciar.
+help_0 =
help_1 = Muy pobre
help_2 = Pobre
help_3 = No satisfactoria
@@ -27,16 +28,20 @@ help_5 = Excelente
help_comment =
help_comment_link = ¿Desea añadir un comentario?
warning = Advertencia de WOT: %S
+warning_warning = ¡Advertencia!
+warning_blocked = Bloqueado
warning_button = Detalles de la valoración
warning_message_normal = este sitio tiene una reputación pobre.
warning_message_userrated = ha asignado a este sitio una valoración pobre.
warning_message_unknown = este sitio tiene una valoración desconocida.
warning_info = Ver detalles de valoración y comentarios
-warning_rate = Este sitio es seguro y deseo valorarlo
-warning_goto = Omitir la advertencia e ir al sitio
-warning_desc_normal = Este sitio tiene una reputación pobre.
-warning_desc_userrated = Ha asignado a este sitio una valoración pobre,<br/>lo que ha desencadenado una advertencia.
-warning_desc_unknown = Este sitio tiene una valoración desconocida.
+warning_rate = Este sitio es seguro y deseo <a>valorarlo</a>
+warning_goto = Vaya al sitio
+warning_leave = Abandone el sitio
+warning_back = Regrese
+warning_desc_normal = Este sitio tiene una reputación pobre
+warning_desc_userrated = Ha asignado a este sitio una valoración pobre, lo que ha desencadenado una advertencia
+warning_desc_unknown = Este sitio tiene una valoración desconocida
rating_0 = Confiabilidad
rating_1 = Fiabilidad del vendedor
rating_2 = Privacidad
diff --git a/locale/fi-FI/blocked.html b/locale/fi-FI/blocked.html
index ed7e014..01ab38c 100644
--- a/locale/fi-FI/blocked.html
+++ b/locale/fi-FI/blocked.html
@@ -1,108 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fi" lang="fi">
-<head>
- <meta charset="utf-8">
- <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
- <style type="text/css">
- @import "chrome://wot/skin/include/blocked.css";
- </style>
- <title>WOT: Estetty</title>
-</head>
-<body id="wotblocked" onload="blocked_load();">
- <table id="wotcontainer" cellspacing="0" lang="fi-FI" class="wotblocked">
- <tr id="wotheadline">
- <td colspan="2"></td>
- </tr>
- <tr id="wotcontainertop">
- <td colspan="2"></td>
- </tr>
- <tr id="wotdescription" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotdescriptiontext" class="wotlimitwidth">Tällä sivustolla on huono maine.</div>
- </td>
- </tr>
- <tr id="wottarget" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotwebsite" class="wotlimitwidth" title=""> </div>
- </td>
- </tr>
- <tr id="wotinfo" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotinfobutton">
- <span id="wotinfotext" onclick="blocked_info();">Näytä luokitustiedot ja kommentit</span>
- </div>
- </td>
- </tr>
- <tr id="wotratingtop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingareatop" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotrating0" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Luotettavuus</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl0" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating1" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Asioinnin turvallisuus</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl1" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating2" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Tietosuoja</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl2" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating4" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Lapsiturvallisuus</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl4" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotratingareabottom" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingbottom" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttonstop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttons" class="wotcontainermiddle">
- <td id="wotbuttonrate">
- <span id="wotratebutton" class="wotbutton">Sivusto on turvallinen, haluan luokitella sen</span>
- </td>
- <td id="wotbuttongoto">
- <span id="wotgotobutton" class="wotbutton">Ohita varoitus ja siirry sivustoon</span>
- </td>
- </tr>
- <tr id="wotcontainerbottom">
- <td colspan="2"></td>
- </tr>
- <tr id="wotlogo">
- <td colspan="2"></td>
- </tr>
- </table>
- <div id="wottextdescunknown" style="display: none;">Tämän sivuston luokitus on tuntematon.</div>
- <div id="wottextdescuserrat" style="display: none;">Sivustolle antamasi huono luokitus<br/>laukaisi varoituksen.</div>
- <div id="wottextreputation5" style="display: none;">Erinomainen</div>
- <div id="wottextreputation4" style="display: none;">Hyvä</div>
- <div id="wottextreputation3" style="display: none;">Epätyydyttävä</div>
- <div id="wottextreputation2" style="display: none;">Huono</div>
- <div id="wottextreputation1" style="display: none;">Erittäin huono</div>
-</body>
+ <head>
+ <meta charset="utf-8">
+ <script type="text/javascript" src="chrome://wot/content/config.js"></script>
+ <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
+ <script type="text/javascript" src="chrome://wot/content/warning.js"></script>
+ <style type="text/css">
+ @import "chrome://wot/skin/include/blocked.css";
+ </style>
+ <title>WOT: Estetty</title>
+ </head>
+ <body id="wotblocked" onload="blocked_load();">
+ </body>
</html>
diff --git a/locale/fi-FI/blocked.png b/locale/fi-FI/blocked.png
deleted file mode 100644
index d185555..0000000
Binary files a/locale/fi-FI/blocked.png and /dev/null differ
diff --git a/locale/fi-FI/warning.png b/locale/fi-FI/warning.png
deleted file mode 100644
index 8eff0c6..0000000
Binary files a/locale/fi-FI/warning.png and /dev/null differ
diff --git a/locale/fi-FI/wot.dtd b/locale/fi-FI/wot.dtd
index d7b30ae..425931e 100644
--- a/locale/fi-FI/wot.dtd
+++ b/locale/fi-FI/wot.dtd
@@ -32,8 +32,8 @@
<!ENTITY wotRating.app1 "Asioinnin turvallisuus:">
<!ENTITY wotRating.app2 "Tietosuoja:">
<!ENTITY wotRating.app4 "Lapsiturvallisuus:">
-<!ENTITY wotRating.scorecard "Näet yksityiskohtaiset tiedot tuloskortista.">
-<!ENTITY wotRating.comment "Voit myös lisätä oman kommentin.">
+<!ENTITY wotRating.scorecard "Näet yksityiskohtaiset tiedot tuloskortista">
+<!ENTITY wotRating.comment "Voit myös lisätä oman kommentin">
<!ENTITY wotRating.guide "Opas">
<!ENTITY wotRating.prefs "Asetukset">
<!ENTITY wotRating.link "www.mywot.com">
diff --git a/locale/fi-FI/wot.properties b/locale/fi-FI/wot.properties
index 9e4ffb8..649e58d 100644
--- a/locale/fi-FI/wot.properties
+++ b/locale/fi-FI/wot.properties
@@ -19,6 +19,7 @@ description_rating_1 = Erittäin huono
description_rating_0 = Sivustolle ei ole tarpeeksi luokituksia.
description_restart = Ota WOT käyttöön käynnistämällä selain uudelleen.
description_uninstall = WOT-asennus poistetaan uudelleenkäynnistyksen jälkeen.
+help_0 =
help_1 = Erittäin huono
help_2 = Huono
help_3 = Epätyydyttävä
@@ -27,16 +28,20 @@ help_5 = Erinomainen
help_comment =
help_comment_link = Haluatko lisätä kommentin?
warning = WOT-Varoitus: %S
+warning_warning = Varoitus!
+warning_blocked = Estetty
warning_button = Luokitustiedot
warning_message_normal = Tällä sivustolla on huono maine käyttäjien luokitusten perusteella.
warning_message_userrated = Olet antanut tälle sivustolle huonon luokituksen.
warning_message_unknown = Tämän sivuston luokitus on tuntematon.
warning_info = Näytä luokitustiedot ja kommentit
-warning_rate = Sivusto on turvallinen, haluan luokitella sen
-warning_goto = Ohita varoitus ja siirry sivustoon
-warning_desc_normal = Tällä sivustolla on huono maine käyttäjien<br/>luokitusten perusteella.
-warning_desc_userrated = Sivustolle antamasi huono luokitus<br/>laukaisi varoituksen.
-warning_desc_unknown = Tämän sivuston luokitus on tuntematon.
+warning_rate = Sivusto on turvallinen, haluan <a>luokitella sen</a>
+warning_goto = Siirry sivustoon
+warning_leave = Poistu sivustolta
+warning_back = Takaisin
+warning_desc_normal = Tällä sivustolla on huono maine käyttäjien luokitusten perusteella
+warning_desc_userrated = Sivustolle antamasi huono luokitus laukaisi varoituksen
+warning_desc_unknown = Tämän sivuston luokitus on tuntematon
rating_0 = Luotettavuus
rating_1 = Asioinnin turvallisuus
rating_2 = Tietosuoja
diff --git a/locale/fr-FR/blocked.html b/locale/fr-FR/blocked.html
index 6b6f204..b6d665a 100644
--- a/locale/fr-FR/blocked.html
+++ b/locale/fr-FR/blocked.html
@@ -1,108 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
-<head>
- <meta charset="utf-8">
- <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
- <style type="text/css">
- @import "chrome://wot/skin/include/blocked.css";
- </style>
- <title>WOT : Contenu bloqué</title>
-</head>
-<body id="wotblocked" onload="blocked_load();">
- <table id="wotcontainer" cellspacing="0" lang="fr-FR" class="wotblocked">
- <tr id="wotheadline">
- <td colspan="2"></td>
- </tr>
- <tr id="wotcontainertop">
- <td colspan="2"></td>
- </tr>
- <tr id="wotdescription" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotdescriptiontext" class="wotlimitwidth">Ce site a mauvaise réputation.</div>
- </td>
- </tr>
- <tr id="wottarget" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotwebsite" class="wotlimitwidth" title=""> </div>
- </td>
- </tr>
- <tr id="wotinfo" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotinfobutton">
- <span id="wotinfotext" onclick="blocked_info();">Afficher l'évaluation détaillée et les commentaires</span>
- </div>
- </td>
- </tr>
- <tr id="wotratingtop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingareatop" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotrating0" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Crédibilité</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl0" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating1" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Fiabilité commerciale</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl1" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating2" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Confidentialité</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl2" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating4" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Sécurité des mineurs</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl4" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotratingareabottom" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingbottom" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttonstop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttons" class="wotcontainermiddle">
- <td id="wotbuttonrate">
- <span id="wotratebutton" class="wotbutton">Ce site est sûr - Je souhaite l'évaluer</span>
- </td>
- <td id="wotbuttongoto">
- <span id="wotgotobutton" class="wotbutton">Ignorer l'alerte et accéder au site</span>
- </td>
- </tr>
- <tr id="wotcontainerbottom">
- <td colspan="2"></td>
- </tr>
- <tr id="wotlogo">
- <td colspan="2"></td>
- </tr>
- </table>
- <div id="wottextdescunknown" style="display: none;">Ce site présente une évaluation inconnue.</div>
- <div id="wottextdescuserrat" style="display: none;">Vous avez attribué à ce site une mauvaise<br/>évaluation ayant déclenché une alerte.</div>
- <div id="wottextreputation5" style="display: none;">Excellent</div>
- <div id="wottextreputation4" style="display: none;">Bon</div>
- <div id="wottextreputation3" style="display: none;">Médiocre</div>
- <div id="wottextreputation2" style="display: none;">Mauvais</div>
- <div id="wottextreputation1" style="display: none;">Très mauvais</div>
-</body>
+ <head>
+ <meta charset="utf-8">
+ <script type="text/javascript" src="chrome://wot/content/config.js"></script>
+ <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
+ <script type="text/javascript" src="chrome://wot/content/warning.js"></script>
+ <style type="text/css">
+ @import "chrome://wot/skin/include/blocked.css";
+ </style>
+ <title>WOT: Contenu bloqué</title>
+ </head>
+ <body id="wotblocked" onload="blocked_load();">
+ </body>
</html>
diff --git a/locale/fr-FR/blocked.png b/locale/fr-FR/blocked.png
deleted file mode 100644
index 4ad135e..0000000
Binary files a/locale/fr-FR/blocked.png and /dev/null differ
diff --git a/locale/fr-FR/warning.png b/locale/fr-FR/warning.png
deleted file mode 100644
index 881d98e..0000000
Binary files a/locale/fr-FR/warning.png and /dev/null differ
diff --git a/locale/fr-FR/wot.dtd b/locale/fr-FR/wot.dtd
index fb27324..ea00d44 100644
--- a/locale/fr-FR/wot.dtd
+++ b/locale/fr-FR/wot.dtd
@@ -32,8 +32,8 @@
<!ENTITY wotRating.app1 "Fiabilité commerciale :">
<!ENTITY wotRating.app2 "Confidentialité :">
<!ENTITY wotRating.app4 "Sécurité des mineurs :">
-<!ENTITY wotRating.scorecard "Afficher le tableau de bord détaillé.">
-<!ENTITY wotRating.comment "Ajouter votre commentaire.">
+<!ENTITY wotRating.scorecard "Afficher le tableau de bord détaillé">
+<!ENTITY wotRating.comment "Ajouter votre commentaire">
<!ENTITY wotRating.guide "Guide">
<!ENTITY wotRating.prefs "Paramètres">
<!ENTITY wotRating.link "www.mywot.com">
diff --git a/locale/fr-FR/wot.properties b/locale/fr-FR/wot.properties
index 2576b72..af36e95 100644
--- a/locale/fr-FR/wot.properties
+++ b/locale/fr-FR/wot.properties
@@ -19,24 +19,29 @@ description_rating_1 = Très mauvais
description_rating_0 = Nombre d'évaluations insuffisant pour ce site
description_restart = Redémarrez le navigateur pour activer WOT.
description_uninstall = WOT sera désinstallé au redémarrage.
+help_0 =
help_1 = Très mauvais
help_2 = Mauvais
help_3 = Médiocre
help_4 = Bon
help_5 = Excellent
help_comment =
-help_comment_link = Voulez-vous laisser un commentaire ?
+help_comment_link = Voulez-vous laisser un commentaire?
warning = Alerte WOT : %S
+warning_blocked = Contenu bloqué
+warning_warning = Attention!
warning_button = Évaluation détaillée
warning_message_normal = ce site a mauvaise réputation.
warning_message_userrated = vous avez attribué à ce site une mauvaise évaluation.
warning_message_unknown = ce site présente une évaluation inconnue.
warning_info = Afficher l'évaluation détaillée et les commentaires
-warning_rate = Ce site est sûr - Je souhaite l'évaluer
-warning_goto = Ignorer l'alerte et accéder au site
-warning_desc_normal = Ce site a mauvaise réputation.
-warning_desc_userrated = Vous avez attribué à ce site une mauvaise<br/>évaluation ayant déclenché une alerte.
-warning_desc_unknown = Ce site présente une évaluation inconnue.
+warning_rate = Ce site est sûr - Je souhaite <a>l'évaluer</a>
+warning_goto = Entrer sur le site
+warning_leave = Quitter le site
+warning_back = Reculer
+warning_desc_normal = Ce site a mauvaise réputation
+warning_desc_userrated = Vous avez attribué à ce site une mauvaise évaluation ayant déclenché une alerte
+warning_desc_unknown = Ce site présente une évaluation inconnue
rating_0 = Crédibilité
rating_1 = Fiabilité commerciale
rating_2 = Confidentialité
diff --git a/locale/it-IT/blocked.html b/locale/it-IT/blocked.html
index 89f74ed..f6b6563 100644
--- a/locale/it-IT/blocked.html
+++ b/locale/it-IT/blocked.html
@@ -1,108 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="it" lang="it">
-<head>
- <meta charset="utf-8">
- <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
- <style type="text/css">
- @import "chrome://wot/skin/include/blocked.css";
- </style>
- <title>WOT: bloccato</title>
-</head>
-<body id="wotblocked" onload="blocked_load();">
- <table id="wotcontainer" cellspacing="0" lang="it-IT" class="wotblocked">
- <tr id="wotheadline">
- <td colspan="2"></td>
- </tr>
- <tr id="wotcontainertop">
- <td colspan="2"></td>
- </tr>
- <tr id="wotdescription" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotdescriptiontext" class="wotlimitwidth">Questo sito ha una reputazione scadente.</div>
- </td>
- </tr>
- <tr id="wottarget" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotwebsite" class="wotlimitwidth" title=""> </div>
- </td>
- </tr>
- <tr id="wotinfo" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotinfobutton">
- <span id="wotinfotext" onclick="blocked_info();">Visualizza dettagli valutazione e commenti</span>
- </div>
- </td>
- </tr>
- <tr id="wotratingtop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingareatop" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotrating0" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Attendibilità</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl0" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating1" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Affidabilità fornitore</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl1" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating2" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Riservatezza</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl2" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating4" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Sicurezza per i bambini</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl4" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotratingareabottom" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingbottom" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttonstop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttons" class="wotcontainermiddle">
- <td id="wotbuttonrate">
- <span id="wotratebutton" class="wotbutton">Questo sito è sicuro - Do valutazione</span>
- </td>
- <td id="wotbuttongoto">
- <span id="wotgotobutton" class="wotbutton">Ignora avviso e vai al sito</span>
- </td>
- </tr>
- <tr id="wotcontainerbottom">
- <td colspan="2"></td>
- </tr>
- <tr id="wotlogo">
- <td colspan="2"></td>
- </tr>
- </table>
- <div id="wottextdescunknown" style="display: none;">Questo sito ha una valutazione sconosciuta.</div>
- <div id="wottextdescuserrat" style="display: none;">La valutazione scadente assegnata al<br/>sito ha generato un avviso.</div>
- <div id="wottextreputation5" style="display: none;">Eccellente</div>
- <div id="wottextreputation4" style="display: none;">Soddisfacente</div>
- <div id="wottextreputation3" style="display: none;">Insoddisfacente</div>
- <div id="wottextreputation2" style="display: none;">Scadente</div>
- <div id="wottextreputation1" style="display: none;">Molto scadente</div>
-</body>
+ <head>
+ <meta charset="utf-8">
+ <script type="text/javascript" src="chrome://wot/content/config.js"></script>
+ <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
+ <script type="text/javascript" src="chrome://wot/content/warning.js"></script>
+ <style type="text/css">
+ @import "chrome://wot/skin/include/blocked.css";
+ </style>
+ <title>WOT: Bloccato</title>
+ </head>
+ <body id="wotblocked" onload="blocked_load();">
+ </body>
</html>
diff --git a/locale/it-IT/blocked.png b/locale/it-IT/blocked.png
deleted file mode 100644
index bfb04f8..0000000
Binary files a/locale/it-IT/blocked.png and /dev/null differ
diff --git a/locale/it-IT/warning.png b/locale/it-IT/warning.png
deleted file mode 100644
index df92b0a..0000000
Binary files a/locale/it-IT/warning.png and /dev/null differ
diff --git a/locale/it-IT/wot.dtd b/locale/it-IT/wot.dtd
index adfe1e2..a423280 100644
--- a/locale/it-IT/wot.dtd
+++ b/locale/it-IT/wot.dtd
@@ -32,8 +32,8 @@
<!ENTITY wotRating.app1 "Affidabilità fornitore:">
<!ENTITY wotRating.app2 "Riservatezza:">
<!ENTITY wotRating.app4 "Sicurezza per i bambini:">
-<!ENTITY wotRating.scorecard "Visualizza dettagli scheda di valutazione.">
-<!ENTITY wotRating.comment "Aggiungi un commento.">
+<!ENTITY wotRating.scorecard "Visualizza dettagli scheda di valutazione">
+<!ENTITY wotRating.comment "Aggiungi un commento">
<!ENTITY wotRating.guide "Guida">
<!ENTITY wotRating.prefs "Impostazioni">
<!ENTITY wotRating.link "www.mywot.com">
diff --git a/locale/it-IT/wot.properties b/locale/it-IT/wot.properties
index a957ba6..779a526 100644
--- a/locale/it-IT/wot.properties
+++ b/locale/it-IT/wot.properties
@@ -19,6 +19,7 @@ description_rating_1 = Molto scadente
description_rating_0 = Valutazioni insufficienti per questo sito
description_restart = Riavviare il browser per attivare WOT.
description_uninstall = WOT verrà disinstallato dopo il riavvio.
+help_0 =
help_1 = Molto scadente
help_2 = Scadente
help_3 = Insoddisfacente
@@ -27,16 +28,20 @@ help_5 = Eccellente
help_comment =
help_comment_link = Lasciare un commento?
warning = Avviso WOT: %S
+warning_warning = Avviso!
+warning_blocked = Bloccato
warning_button = Dettagli sulle valutazioni
warning_message_normal = questo sito ha una reputazione scadente.
warning_message_userrated = hai dato a questo sito una valutazione scadente.
warning_message_unknown = questo sito ha una valutazione sconosciuta.
warning_info = Visualizza dettagli valutazione e commenti
-warning_rate = Questo sito è sicuro - Do valutazione
-warning_goto = Ignora avviso e vai al sito
-warning_desc_normal = Questo sito ha una reputazione scadente.
-warning_desc_userrated = La valutazione scadente assegnata al<br/>sito ha generato un avviso.
-warning_desc_unknown = Questo sito ha una valutazione sconosciuta.
+warning_rate = Questo sito è sicuro - <a>Do valutazione</a>
+warning_goto = Vai al sito
+warning_leave = Lascia il sito
+warning_back = Torna indietro
+warning_desc_normal = Questo sito ha una reputazione scadente
+warning_desc_userrated = La valutazione scadente assegnata al sito ha generato un avviso
+warning_desc_unknown = Questo sito ha una valutazione sconosciuta
rating_0 = Attendibilità
rating_1 = Affidabilità fornitore
rating_2 = Riservatezza
diff --git a/locale/ja-JP/blocked.html b/locale/ja-JP/blocked.html
index 23b7ee0..20524db 100644
--- a/locale/ja-JP/blocked.html
+++ b/locale/ja-JP/blocked.html
@@ -1,108 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja">
-<head>
- <meta charset="utf-8">
- <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
- <style type="text/css">
- @import "chrome://wot/skin/include/blocked.css";
- </style>
- <title>WOT: ブロックされました</title>
-</head>
-<body id="wotblocked" onload="blocked_load();">
- <table id="wotcontainer" cellspacing="0" lang="ja-JP" class="wotblocked">
- <tr id="wotheadline">
- <td colspan="2"></td>
- </tr>
- <tr id="wotcontainertop">
- <td colspan="2"></td>
- </tr>
- <tr id="wotdescription" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotdescriptiontext" class="wotlimitwidth">評価の低いサイトです。</div>
- </td>
- </tr>
- <tr id="wottarget" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotwebsite" class="wotlimitwidth" title=""> </div>
- </td>
- </tr>
- <tr id="wotinfo" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotinfobutton">
- <span id="wotinfotext" onclick="blocked_info();">詳しい評価とコメントを見る</span>
- </div>
- </td>
- </tr>
- <tr id="wotratingtop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingareatop" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotrating0" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">信頼性</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl0" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating1" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">業者の信頼度</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl1" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating2" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">プライバシーについて</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl2" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating4" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">子供の安全</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl4" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotratingareabottom" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingbottom" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttonstop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttons" class="wotcontainermiddle">
- <td id="wotbuttonrate">
- <span id="wotratebutton" class="wotbutton">このサイトは安全です - 評価を行います</span>
- </td>
- <td id="wotbuttongoto">
- <span id="wotgotobutton" class="wotbutton">警告を無視してサイトにアクセスする</span>
- </td>
- </tr>
- <tr id="wotcontainerbottom">
- <td colspan="2"></td>
- </tr>
- <tr id="wotlogo">
- <td colspan="2"></td>
- </tr>
- </table>
- <div id="wottextdescunknown" style="display: none;">評価が不明なサイトです。</div>
- <div id="wottextdescuserrat" style="display: none;">このサイトに対するあなたの評価が低いために、<br/>警告が表示されました。</div>
- <div id="wottextreputation5" style="display: none;">非常に優れている</div>
- <div id="wottextreputation4" style="display: none;">良い</div>
- <div id="wottextreputation3" style="display: none;">満足できない</div>
- <div id="wottextreputation2" style="display: none;">悪い</div>
- <div id="wottextreputation1" style="display: none;">非常に悪い</div>
-</body>
+ <head>
+ <meta charset="utf-8">
+ <script type="text/javascript" src="chrome://wot/content/config.js"></script>
+ <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
+ <script type="text/javascript" src="chrome://wot/content/warning.js"></script>
+ <style type="text/css">
+ @import "chrome://wot/skin/include/blocked.css";
+ </style>
+ <title>WOT: ブロックされました</title>
+ </head>
+ <body id="wotblocked" onload="blocked_load();">
+ </body>
</html>
diff --git a/locale/ja-JP/blocked.png b/locale/ja-JP/blocked.png
deleted file mode 100644
index 60e2073..0000000
Binary files a/locale/ja-JP/blocked.png and /dev/null differ
diff --git a/locale/ja-JP/warning.png b/locale/ja-JP/warning.png
deleted file mode 100644
index 8f9e8f7..0000000
Binary files a/locale/ja-JP/warning.png and /dev/null differ
diff --git a/locale/ja-JP/wot.dtd b/locale/ja-JP/wot.dtd
index e4634d8..b6fdf66 100644
--- a/locale/ja-JP/wot.dtd
+++ b/locale/ja-JP/wot.dtd
@@ -32,8 +32,8 @@
<!ENTITY wotRating.app1 "業者の信頼度：">
<!ENTITY wotRating.app2 "プライバシー：">
<!ENTITY wotRating.app4 "子供の安全：">
-<!ENTITY wotRating.scorecard "スコアカードで格付けの詳細を見る。">
-<!ENTITY wotRating.comment "コメントを追加してください。">
+<!ENTITY wotRating.scorecard "スコアカードで格付けの詳細を見る">
+<!ENTITY wotRating.comment "コメントを追加してください">
<!ENTITY wotRating.guide "ガイド">
<!ENTITY wotRating.prefs "設定">
<!ENTITY wotRating.link "www.mywot.com">
diff --git a/locale/ja-JP/wot.properties b/locale/ja-JP/wot.properties
index 5fca8a2..317eb4b 100644
--- a/locale/ja-JP/wot.properties
+++ b/locale/ja-JP/wot.properties
@@ -19,6 +19,7 @@ description_rating_1 = 非常に悪い
description_rating_0 = このサイトにはまだ十分な評価がありません。
description_restart = WOTを有効化するには、ブラウザーを再起動してください。
description_uninstall = 再起動後にWOTがアンインストールされます。
+help_0 =
help_1 = 非常に悪い
help_2 = 悪い
help_3 = 満足できない
@@ -27,16 +28,20 @@ help_5 = 非常に優れている
help_comment =
help_comment_link = コメントを投稿しますか？
warning = WOTからの警告： %S
+warning_blocked = ブロックされました
+warning_warning = 警告!
warning_button = 詳しい評価
warning_message_normal = 評価の低いサイトです。
warning_message_userrated = あなたはこのサイトを低く評価しています。
warning_message_unknown = 評価が不明なサイトです。
warning_info = 詳しい評価とコメントを見る
-warning_rate = このサイトは安全です - 評価を行います
-warning_goto = 警告を無視してサイトにアクセスする
-warning_desc_normal = 評価の低いサイトです。
-warning_desc_userrated = このサイトに対するあなたの評価が低いために、<br/>警告が表示されました。
-warning_desc_unknown = 評価が不明なサイトです。
+warning_rate = このサイトは安全です - <a>評価を行います</a>
+warning_goto = このサイトを開く
+warning_leave = このサイトを閉じる
+warning_back = 戻る
+warning_desc_normal = 評価の低いサイトです
+warning_desc_userrated = このサイトに対するあなたの評価が低いために、警告が表示されました
+warning_desc_unknown = 評価が不明なサイトです
rating_0 = 信頼性
rating_1 = 業者の信頼度
rating_2 = プライバシー
diff --git a/locale/ko-KR/blocked.html b/locale/ko-KR/blocked.html
index 25e36b5..5ba6766 100644
--- a/locale/ko-KR/blocked.html
+++ b/locale/ko-KR/blocked.html
@@ -1,108 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ko" lang="ko">
-<head>
- <meta charset="utf-8">
- <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
- <style type="text/css">
- @import "chrome://wot/skin/include/blocked.css";
- </style>
- <title>WOT: 차단됨</title>
-</head>
-<body id="wotblocked" onload="blocked_load();">
- <table id="wotcontainer" cellspacing="0" lang="ko-KR" class="wotblocked">
- <tr id="wotheadline">
- <td colspan="2"></td>
- </tr>
- <tr id="wotcontainertop">
- <td colspan="2"></td>
- </tr>
- <tr id="wotdescription" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotdescriptiontext" class="wotlimitwidth">이 사이트는 나쁜 평가를 가지고 있습니다.</div>
- </td>
- </tr>
- <tr id="wottarget" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotwebsite" class="wotlimitwidth" title=""> </div>
- </td>
- </tr>
- <tr id="wotinfo" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotinfobutton">
- <span id="wotinfotext" onclick="blocked_info();">자세한 평가와 후기 보기</span>
- </div>
- </td>
- </tr>
- <tr id="wotratingtop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingareatop" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotrating0" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">신뢰성</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl0" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating1" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">업체 안전성</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl1" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating2" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">개인정보 보호</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl2" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating4" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">어린이 안전성</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl4" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotratingareabottom" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingbottom" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttonstop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttons" class="wotcontainermiddle">
- <td id="wotbuttonrate">
- <span id="wotratebutton" class="wotbutton">이 사이트는 안전합니다- 이 사이트를 평가하기</span>
- </td>
- <td id="wotbuttongoto">
- <span id="wotgotobutton" class="wotbutton">경고를 무시하고 사이트로 들어가기</span>
- </td>
- </tr>
- <tr id="wotcontainerbottom">
- <td colspan="2"></td>
- </tr>
- <tr id="wotlogo">
- <td colspan="2"></td>
- </tr>
- </table>
- <div id="wottextdescunknown" style="display: none;">이 사이트는 평가를 가지고 있지 않습니다.</div>
- <div id="wottextdescuserrat" style="display: none;">사용자님은 이 사이트에 나쁜 평가를 주셨습니다,<br/>나쁜 평가는 경고를 작동시킵니다.</div>
- <div id="wottextreputation5" style="display: none;">매우 좋음</div>
- <div id="wottextreputation4" style="display: none;">좋음</div>
- <div id="wottextreputation3" style="display: none;">불만족</div>
- <div id="wottextreputation2" style="display: none;">나쁨</div>
- <div id="wottextreputation1" style="display: none;">매우 나쁨</div>
-</body>
+ <head>
+ <meta charset="utf-8">
+ <script type="text/javascript" src="chrome://wot/content/config.js"></script>
+ <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
+ <script type="text/javascript" src="chrome://wot/content/warning.js"></script>
+ <style type="text/css">
+ @import "chrome://wot/skin/include/blocked.css";
+ </style>
+ <title>WOT: 차단됨</title>
+ </head>
+ <body id="wotblocked" onload="blocked_load();">
+ </body>
</html>
diff --git a/locale/ko-KR/blocked.png b/locale/ko-KR/blocked.png
deleted file mode 100644
index 56abe78..0000000
Binary files a/locale/ko-KR/blocked.png and /dev/null differ
diff --git a/locale/ko-KR/warning.png b/locale/ko-KR/warning.png
deleted file mode 100644
index 2072b26..0000000
Binary files a/locale/ko-KR/warning.png and /dev/null differ
diff --git a/locale/ko-KR/wot.properties b/locale/ko-KR/wot.properties
index e47695f..8f7e8cf 100644
--- a/locale/ko-KR/wot.properties
+++ b/locale/ko-KR/wot.properties
@@ -19,6 +19,7 @@ description_rating_1 = 매우 나쁨
description_rating_0 = 이 사이트에 대한 충분한 평가가 없습니다.
description_restart = WOT를 활성화하기 위해 브라우저를 다시 시작해주십시오.
description_uninstall = 다시 시작하면 WOT가 제거됩니다.
+help_0 =
help_1 = 매우 나쁨
help_2 = 나쁨
help_3 = 불만족
@@ -27,16 +28,20 @@ help_5 = 매우 좋음
help_comment =
help_comment_link = 후기를 남기시겠습니까?
warning = WOT 경고: %S
+warning_warning = 경고!
+warning_blocked = 차단됨
warning_button = 평가 내용
warning_message_normal = 이 사이트는 나쁜 평가를 가지고 있습니다.
warning_message_userrated = 사용자님은 이 사이트에 나쁜 평가를 주셨습니다.
warning_message_unknown = 이 사이트는 평가를 가지고 있지 않습니다.
warning_info = 자세한 평가와 후기 보기
-warning_rate = 이 사이트는 안전합니다- 이 사이트를 평가하기
-warning_goto = 경고를 무시하고 사이트로 들어가기
-warning_desc_normal = 이 사이트는 나쁜 평가를 가지고 있습니다.
-warning_desc_userrated = 사용자님은 이 사이트에 나쁜 평가를 주셨습니다.<br/>나쁜 평가는 경고를 작동시킵니다.
-warning_desc_unknown = 이 사이트는 평가를 가지고 있지 않습니다.
+warning_rate = 이 사이트는 안전합니다- <a>이 사이트를 평가하기</a>
+warning_goto = 사이트 가기
+warning_leave = 사이트 나가기
+warning_back = 돌아가기
+warning_desc_normal = 이 사이트는 나쁜 평가를 가지고 있습니다
+warning_desc_userrated = 사용자님은 이 사이트에 나쁜 평가를 주셨습니다. 나쁜 평가는 경고를 작동시킵니다
+warning_desc_unknown = 이 사이트는 평가를 가지고 있지 않습니다
rating_0 = 신뢰성
rating_1 = 업체 안전성
rating_2 = 개인정보 보호
diff --git a/locale/pl-PL/blocked.html b/locale/pl-PL/blocked.html
index c0fa75f..cf60b27 100644
--- a/locale/pl-PL/blocked.html
+++ b/locale/pl-PL/blocked.html
@@ -1,108 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="pl" lang="pl">
-<head>
- <meta charset="utf-8">
- <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
- <style type="text/css">
- @import "chrome://wot/skin/include/blocked.css";
- </style>
- <title>WOT: Zablokowano</title>
-</head>
-<body id="wotblocked" onload="blocked_load();">
- <table id="wotcontainer" cellspacing="0" lang="pl-PL" class="wotblocked">
- <tr id="wotheadline">
- <td colspan="2"></td>
- </tr>
- <tr id="wotcontainertop">
- <td colspan="2"></td>
- </tr>
- <tr id="wotdescription" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotdescriptiontext" class="wotlimitwidth">Ta witryna ma złą reputację.</div>
- </td>
- </tr>
- <tr id="wottarget" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotwebsite" class="wotlimitwidth" title=""> </div>
- </td>
- </tr>
- <tr id="wotinfo" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotinfobutton">
- <span id="wotinfotext" onclick="blocked_info();">Pokaż szczegóły ocen i komentarze</span>
- </div>
- </td>
- </tr>
- <tr id="wotratingtop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingareatop" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotrating0" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Zaufanie</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl0" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating1" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Wiarygodność operatora</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl1" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating2" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Prywatność</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl2" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating4" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Bezpieczeństwo dzieci</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl4" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotratingareabottom" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingbottom" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttonstop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttons" class="wotcontainermiddle">
- <td id="wotbuttonrate">
- <span id="wotratebutton" class="wotbutton">Ta witryna jest bezpieczna - chcę ją ocenić</span>
- </td>
- <td id="wotbuttongoto">
- <span id="wotgotobutton" class="wotbutton">Zignoruj ostrzeżenie i przejdź do witryny</span>
- </td>
- </tr>
- <tr id="wotcontainerbottom">
- <td colspan="2"></td>
- </tr>
- <tr id="wotlogo">
- <td colspan="2"></td>
- </tr>
- </table>
- <div id="wottextdescunknown" style="display: none;">Ocena tej witryny jest nieznana.</div>
- <div id="wottextdescuserrat" style="display: none;">Ostrzeżenie zostało wyświetlone, ponieważ<br/>ta witryna dostała od Ciebie złą ocenę.</div>
- <div id="wottextreputation5" style="display: none;">Doskonała</div>
- <div id="wottextreputation4" style="display: none;">Dobra</div>
- <div id="wottextreputation3" style="display: none;">Słaba</div>
- <div id="wottextreputation2" style="display: none;">Zła</div>
- <div id="wottextreputation1" style="display: none;">Bardzo zła</div>
-</body>
+ <head>
+ <meta charset="utf-8">
+ <script type="text/javascript" src="chrome://wot/content/config.js"></script>
+ <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
+ <script type="text/javascript" src="chrome://wot/content/warning.js"></script>
+ <style type="text/css">
+ @import "chrome://wot/skin/include/blocked.css";
+ </style>
+ <title>WOT: Zablokowano</title>
+ </head>
+ <body id="wotblocked" onload="blocked_load();">
+ </body>
</html>
diff --git a/locale/pl-PL/blocked.png b/locale/pl-PL/blocked.png
deleted file mode 100644
index f06ea7c..0000000
Binary files a/locale/pl-PL/blocked.png and /dev/null differ
diff --git a/locale/pl-PL/warning.png b/locale/pl-PL/warning.png
deleted file mode 100644
index 589dcb9..0000000
Binary files a/locale/pl-PL/warning.png and /dev/null differ
diff --git a/locale/pl-PL/wot.dtd b/locale/pl-PL/wot.dtd
index 02a8747..ab8f0bc 100644
--- a/locale/pl-PL/wot.dtd
+++ b/locale/pl-PL/wot.dtd
@@ -32,8 +32,8 @@
<!ENTITY wotRating.app1 "Wiarygodność operatora:">
<!ENTITY wotRating.app2 "Prywatność:">
<!ENTITY wotRating.app4 "Bezpieczeństwo dzieci:">
-<!ENTITY wotRating.scorecard "Szczegółowe oceny są na karcie wyników.">
-<!ENTITY wotRating.comment "Dodaj komentarz.">
+<!ENTITY wotRating.scorecard "Szczegółowe oceny są na karcie wyników">
+<!ENTITY wotRating.comment "Dodaj komentarz">
<!ENTITY wotRating.guide "Przewodnik">
<!ENTITY wotRating.prefs "Ustawienia">
<!ENTITY wotRating.link "www.mywot.com">
diff --git a/locale/pl-PL/wot.properties b/locale/pl-PL/wot.properties
index fd38f03..ae49fd1 100644
--- a/locale/pl-PL/wot.properties
+++ b/locale/pl-PL/wot.properties
@@ -19,6 +19,7 @@ description_rating_1 = Bardzo zła
description_rating_0 = Za mało ocen dla tej witryny
description_restart = Uruchom przeglądarkę ponownie, by włączyć dodatek WOT.
description_uninstall = Dodatek WOT zostanie odinstalowany po ponownym uruchomieniu.
+help_0 =
help_1 = Bardzo zła
help_2 = Zła
help_3 = Słaba
@@ -27,16 +28,20 @@ help_5 = Doskonała
help_comment =
help_comment_link = Czy chcesz dodać komentarz?
warning = Ostrzeżenie WOT: %S
+warning_blocked = Zablokowano
+warning_warning = Ostrzeżenie!
warning_button = Szczegóły oceny
warning_message_normal = Ta witryna ma złą reputację.
warning_message_userrated = Ta witryna dostała od Ciebie złą ocenę.
warning_message_unknown = Ocena tej witryny jest nieznana.
warning_info = Pokaż szczegóły ocen i komentarze
-warning_rate = Ta witryna jest bezpieczna - chcę ją ocenić
-warning_goto = Zignoruj ostrzeżenie i przejdź do witryny
-warning_desc_normal = Ta witryna ma złą reputację.
-warning_desc_userrated = Ostrzeżenie zostało wyświetlone, ponieważ<br/>ta witryna dostała od Ciebie złą ocenę.
-warning_desc_unknown = Ocena tej witryny jest nieznana.
+warning_rate = Ta witryna jest bezpieczna - chcę <a>ją ocenić</a>
+warning_goto = Idź do strony
+warning_leave = Porzuć stronę
+warning_back = Powrót
+warning_desc_normal = Ta witryna ma złą reputację
+warning_desc_userrated = Ostrzeżenie zostało wyświetlone, ponieważ ta witryna dostała od Ciebie złą ocenę
+warning_desc_unknown = Ocena tej witryny jest nieznana
rating_0 = Zaufanie
rating_1 = Wiarygodność operatora
rating_2 = Prywatność
diff --git a/locale/pt-BR/blocked.html b/locale/pt-BR/blocked.html
index 2edbc76..35c6673 100644
--- a/locale/pt-BR/blocked.html
+++ b/locale/pt-BR/blocked.html
@@ -1,108 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="pt-BR" lang="pt-BR">
-<head>
- <meta charset="utf-8">
- <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
- <style type="text/css">
- @import "chrome://wot/skin/include/blocked.css";
- </style>
- <title>WOT: bloqueio</title>
-</head>
-<body id="wotblocked" onload="blocked_load();">
- <table id="wotcontainer" cellspacing="0" lang="pt-BR" class="wotblocked">
- <tr id="wotheadline">
- <td colspan="2"></td>
- </tr>
- <tr id="wotcontainertop">
- <td colspan="2"></td>
- </tr>
- <tr id="wotdescription" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotdescriptiontext" class="wotlimitwidth">Este site tem má reputação.</div>
- </td>
- </tr>
- <tr id="wottarget" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotwebsite" class="wotlimitwidth" title=""> </div>
- </td>
- </tr>
- <tr id="wotinfo" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotinfobutton">
- <span id="wotinfotext" onclick="blocked_info();">Exibir detalhes de classificação e comentários</span>
- </div>
- </td>
- </tr>
- <tr id="wotratingtop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingareatop" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotrating0" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Fidedignidade</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl0" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating1" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Confiabilidade do fornecedor</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl1" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating2" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Privacidade</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl2" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating4" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Segurança para crianças</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl4" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotratingareabottom" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingbottom" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttonstop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttons" class="wotcontainermiddle">
- <td id="wotbuttonrate">
- <span id="wotratebutton" class="wotbutton">Este site é seguro - quero classificá-lo</span>
- </td>
- <td id="wotbuttongoto">
- <span id="wotgotobutton" class="wotbutton">Ignorar aviso e ir ao site</span>
- </td>
- </tr>
- <tr id="wotcontainerbottom">
- <td colspan="2"></td>
- </tr>
- <tr id="wotlogo">
- <td colspan="2"></td>
- </tr>
- </table>
- <div id="wottextdescunknown" style="display: none;">Este site tem classificação desconhecida.</div>
- <div id="wottextdescuserrat" style="display: none;">Você deu a este site uma classificação<br/>ruim, o que gerou um aviso.</div>
- <div id="wottextreputation5" style="display: none;">Excelente</div>
- <div id="wottextreputation4" style="display: none;">Boa</div>
- <div id="wottextreputation3" style="display: none;">Insatisfatória</div>
- <div id="wottextreputation2" style="display: none;">Má</div>
- <div id="wottextreputation1" style="display: none;">Péssima</div>
-</body>
+ <head>
+ <meta charset="utf-8">
+ <script type="text/javascript" src="chrome://wot/content/config.js"></script>
+ <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
+ <script type="text/javascript" src="chrome://wot/content/warning.js"></script>
+ <style type="text/css">
+ @import "chrome://wot/skin/include/blocked.css";
+ </style>
+ <title>WOT: Bloqueio</title>
+ </head>
+ <body id="wotblocked" onload="blocked_load();">
+ </body>
</html>
diff --git a/locale/pt-BR/blocked.png b/locale/pt-BR/blocked.png
deleted file mode 100644
index 5686f6b..0000000
Binary files a/locale/pt-BR/blocked.png and /dev/null differ
diff --git a/locale/pt-BR/warning.png b/locale/pt-BR/warning.png
deleted file mode 100644
index 7254e3d..0000000
Binary files a/locale/pt-BR/warning.png and /dev/null differ
diff --git a/locale/pt-BR/wot.dtd b/locale/pt-BR/wot.dtd
index bbf7298..7b24d19 100644
--- a/locale/pt-BR/wot.dtd
+++ b/locale/pt-BR/wot.dtd
@@ -32,8 +32,8 @@
<!ENTITY wotRating.app1 "Confiabilidade do fornecedor:">
<!ENTITY wotRating.app2 "Privacidade:">
<!ENTITY wotRating.app4 "Segurança para crianças:">
-<!ENTITY wotRating.scorecard "Ver indicador de detalhes de classificação.">
-<!ENTITY wotRating.comment "Adicionar seu comentário.">
+<!ENTITY wotRating.scorecard "Ver indicador de detalhes de classificação">
+<!ENTITY wotRating.comment "Adicionar seu comentário">
<!ENTITY wotRating.guide "Guia">
<!ENTITY wotRating.prefs "Configurações">
<!ENTITY wotRating.link "www.mywot.com">
diff --git a/locale/pt-BR/wot.properties b/locale/pt-BR/wot.properties
index d25d3e2..5f938af 100644
--- a/locale/pt-BR/wot.properties
+++ b/locale/pt-BR/wot.properties
@@ -19,6 +19,7 @@ description_rating_1 = Péssima
description_rating_0 = Não há classificações suficiente deste site.
description_restart = Reinicie o navegador para ativar o software da WOT.
description_uninstall = A WOT será desinstalada depois da reinicialização.
+help_0 =
help_1 = Péssima
help_2 = Má
help_3 = Insatisfatória
@@ -27,16 +28,20 @@ help_5 = Excelente
help_comment =
help_comment_link = Deixar um comentário?
warning = Aviso da WOT: %S
+warning_warning = Aviso!
+warning_blocked = Bloqueio
warning_button = Detalhes da classificação
warning_message_normal = este site tem má reputação.
warning_message_userrated = você deu a este site uma classificação ruim.
warning_message_unknown = este site tem classificação desconhecida.
warning_info = Exibir detalhes de classificação e comentários
-warning_rate = Este site é seguro - quero classificá-lo
-warning_goto = Ignorar aviso e ir ao site
-warning_desc_normal = Este site tem má reputação.
-warning_desc_userrated = Você deu a este site uma classificação<br/>ruim, o que gerou um aviso.
-warning_desc_unknown = Este site tem classificação desconhecida.
+warning_rate = Este site é seguro - quero <a>classificá-lo</a>
+warning_goto = Ir ao sítio
+warning_leave = Sair do sítio
+warning_back = Voltar
+warning_desc_normal = Este site tem má reputação
+warning_desc_userrated = Você deu a este site uma classificação ruim, o que gerou um aviso
+warning_desc_unknown = Este site tem classificação desconhecida
rating_0 = Fidedignidade
rating_1 = Confiabilidade do fornecedor
rating_2 = Privacidade
diff --git a/locale/ru-RU/blocked.html b/locale/ru-RU/blocked.html
index 5e79a6b..40a2153 100644
--- a/locale/ru-RU/blocked.html
+++ b/locale/ru-RU/blocked.html
@@ -2,107 +2,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
-<head>
- <meta charset="utf-8">
- <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
- <style type="text/css">
- @import "chrome://wot/skin/include/blocked.css";
- </style>
- <title>WOT: заблокировано</title>
-</head>
-<body id="wotblocked" onload="blocked_load();">
-<table id="wotcontainer" cellspacing="0" lang="ru-RU" class="wotblocked">
- <tr id="wotheadline">
- <td colspan="2"></td>
- </tr>
- <tr id="wotcontainertop">
- <td colspan="2"></td>
- </tr>
- <tr id="wotdescription" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotdescriptiontext" class="wotlimitwidth">У этого сайта плохая репутация.</div>
- </td>
- </tr>
- <tr id="wottarget" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotwebsite" class="wotlimitwidth" title=""> </div>
- </td>
- </tr>
- <tr id="wotinfo" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotinfobutton">
- <span id="wotinfotext" onclick="blocked_info();">Посмотреть сведения о рейтинге и комментарии</span>
- </div>
- </td>
- </tr>
- <tr id="wotratingtop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingareatop" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotrating0" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Заслуживает доверие</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl0" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating1" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Надежность продавца</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl1" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating2" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Конфиденциальность</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl2" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating4" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Безопасность для детей</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl4" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotratingareabottom" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingbottom" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttonstop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttons" class="wotcontainermiddle">
- <td id="wotbuttonrate">
- <span id="wotratebutton" class="wotbutton">Этот сайт безопасен. Я хочу выставить ему рейтинг</span>
- </td>
- <td id="wotbuttongoto">
- <span id="wotgotobutton" class="wotbutton">Перейти на веб-сайт несмотря на предупреждение</span>
- </td>
- </tr>
- <tr id="wotcontainerbottom">
- <td colspan="2"></td>
- </tr>
- <tr id="wotlogo">
- <td colspan="2"></td>
- </tr>
-</table>
-<div id="wottextdescunknown" style="display: none;">Pейтинг этого сайта неизвестен.</div>
-<div id="wottextdescuserrat" style="display: none;">Вы выставили этому веб-сайту низкий рейтинг, в<br/>результате чего отобразилось предупреждение.</div>
-<div id="wottextreputation5" style="display: none;">Превосходно</div>
-<div id="wottextreputation4" style="display: none;">Хорошо</div>
-<div id="wottextreputation3" style="display: none;">Неудовлетворительно</div>
-<div id="wottextreputation2" style="display: none;">Плохо</div>
-<div id="wottextreputation1" style="display: none;">Очень плохо</div>
-</body>
+ <head>
+ <meta charset="utf-8">
+ <script type="text/javascript" src="chrome://wot/content/config.js"></script>
+ <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
+ <script type="text/javascript" src="chrome://wot/content/warning.js"></script>
+ <style type="text/css">
+ @import "chrome://wot/skin/include/blocked.css";
+ </style>
+ <title>WOT: Заблокировано</title>
+ </head>
+ <body id="wotblocked" onload="blocked_load();">
+ </body>
</html>
diff --git a/locale/ru-RU/blocked.png b/locale/ru-RU/blocked.png
deleted file mode 100644
index 524c12f..0000000
Binary files a/locale/ru-RU/blocked.png and /dev/null differ
diff --git a/locale/ru-RU/loading.html b/locale/ru-RU/loading.html
index 901d3f5..e5ad515 100644
--- a/locale/ru-RU/loading.html
+++ b/locale/ru-RU/loading.html
@@ -7,7 +7,7 @@
<style type="text/css">
@import "chrome://wot/skin/include/loading.css";
</style>
- <title>WOT: загрузка веб-сайта...</title>
+ <title>WOT: загрузка сайта...</title>
</head>
<body>
<div id="loading">
@@ -18,7 +18,7 @@
<div id="image-3" class="image"> </div>
<div id="image-4" class="image"> </div>
</div>
- <div id="text">Загрузка веб-сайта</div>
+ <div id="text">Загрузка сайта</div>
</div>
</body>
</html>
diff --git a/locale/ru-RU/warning.png b/locale/ru-RU/warning.png
deleted file mode 100644
index cce19e5..0000000
Binary files a/locale/ru-RU/warning.png and /dev/null differ
diff --git a/locale/ru-RU/wot.dtd b/locale/ru-RU/wot.dtd
index de31721..fa4c131 100644
--- a/locale/ru-RU/wot.dtd
+++ b/locale/ru-RU/wot.dtd
@@ -22,7 +22,7 @@
<!ENTITY wotMy.accesskey "W">
<!ENTITY wotCheckUpdates.label "Проверка обновлений…">
<!ENTITY wotCheckUpdates.accesskey "p">
-<!ENTITY wotLinkScorecard.label "Просмотреть оценочную карту WOT…">
+<!ENTITY wotLinkScorecard.label "Посмотреть оценочную карту WOT…">
<!ENTITY wotLinkScorecard.accesskey "W">
<!-- Rating window -->
<!ENTITY wotRating.title "Инициализация WOT…">
@@ -32,8 +32,8 @@
<!ENTITY wotRating.app1 "Надежность продавца:">
<!ENTITY wotRating.app2 "Конфиденциальность:">
<!ENTITY wotRating.app4 "Безопасность для детей:">
-<!ENTITY wotRating.scorecard "Просмотр подробных данных о рейтингах.">
-<!ENTITY wotRating.comment "Добавьте свой комментарий.">
+<!ENTITY wotRating.scorecard "Посмотреть подробности оценок">
+<!ENTITY wotRating.comment "Добавьте свой комментарий">
<!ENTITY wotRating.guide "Руководство">
<!ENTITY wotRating.prefs "Настройки">
<!ENTITY wotRating.link "www.mywot.com">
diff --git a/locale/ru-RU/wot.properties b/locale/ru-RU/wot.properties
index 6210bb3..d48735d 100644
--- a/locale/ru-RU/wot.properties
+++ b/locale/ru-RU/wot.properties
@@ -19,6 +19,7 @@ description_rating_1 = Очень плохо
description_rating_0 = Недостаточно рейтингов для этого сайта
description_restart = Перезапустите браузер для активизации WOT.
description_uninstall = WOT будет удалена после перезапуска.
+help_0 =
help_1 = Очень плохо
help_2 = Плохо
help_3 = Неудовлетворительно
@@ -27,16 +28,20 @@ help_5 = Превосходно
help_comment =
help_comment_link = Добавить комментарий?
warning = Предупреждение WOT: %S
+warning_warning = Внимание!
+warning_blocked = Заблокировано
warning_button = Подробная информация о рейтинге
-warning_message_normal = у этого сайта плохая репутация.
-warning_message_userrated = вы выставили низкий рейтинг этому веб-сайту.
-warning_message_unknown = рейтинг этого сайта неизвестен.
-warning_info = Посмотреть сведения о рейтинге и комментарии
-warning_rate = Этот сайт безопасен. Я хочу оценить его
-warning_goto = Перейти на веб-сайт несмотря на предупреждение
-warning_desc_normal = У этого сайта плохая репутация.
-warning_desc_userrated = Вы выставили этому веб-сайту низкий рейтинг, в<br/>результате чего отобразилось предупреждение.
-warning_desc_unknown = Pейтинг этого сайта неизвестен.
+warning_message_normal = У этого сайта плохая репутация.
+warning_message_userrated = Вы выставили низкий рейтинг этому веб-сайту.
+warning_message_unknown = Рейтинг этого сайта неизвестен.
+warning_info = Посмотреть рейтинг и комментарии
+warning_rate = Этот сайт безопасен - я хочу <a>оценить его</a>
+warning_goto = Открыть сайт
+warning_leave = Покинуть сайт
+warning_back = Назад
+warning_desc_normal = У этого сайта плохая репутация
+warning_desc_userrated = Вы выставили этому веб-сайту низкий рейтинг
+warning_desc_unknown = Pейтинг этого сайта неизвестен
rating_0 = Заслуживает доверие
rating_1 = Надежность продавца
rating_2 = Конфиденциальность
diff --git a/locale/sv-SE/blocked.html b/locale/sv-SE/blocked.html
index a3a01ca..35bb67d 100644
--- a/locale/sv-SE/blocked.html
+++ b/locale/sv-SE/blocked.html
@@ -1,107 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="sv" lang="sv">
-<head>
- <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
- <style type="text/css">
- @import "chrome://wot/skin/include/blocked.css";
- </style>
- <title>WOT: Blockerad</title>
-</head>
-<body id="wotblocked" onload="blocked_load();">
- <table id="wotcontainer" cellspacing="0" lang="sv-SE" class="wotblocked">
- <tr id="wotheadline">
- <td colspan="2"></td>
- </tr>
- <tr id="wotcontainertop">
- <td colspan="2"></td>
- </tr>
- <tr id="wotdescription" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotdescriptiontext" class="wotlimitwidth">Den här webbplatsen har dåligt rykte.</div>
- </td>
- </tr>
- <tr id="wottarget" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotwebsite" class="wotlimitwidth" title=""> </div>
- </td>
- </tr>
- <tr id="wotinfo" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotinfobutton">
- <span id="wotinfotext" onclick="blocked_info();">Visa klassificeringsdetaljer och kommentarer</span>
- </div>
- </td>
- </tr>
- <tr id="wotratingtop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingareatop" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotrating0" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Pålitlighet</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl0" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating1" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Transaktionssäkerhet</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl1" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating2" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Sekretess</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl2" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating4" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Barnsäkerhet</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl4" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotratingareabottom" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingbottom" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttonstop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttons" class="wotcontainermiddle">
- <td id="wotbuttonrate">
- <span id="wotratebutton" class="wotbutton">Webbplatsen är säker - jag vill klassificera den</span>
- </td>
- <td id="wotbuttongoto">
- <span id="wotgotobutton" class="wotbutton">Ignorera varningen och gå till webbplatsen</span>
- </td>
- </tr>
- <tr id="wotcontainerbottom">
- <td colspan="2"></td>
- </tr>
- <tr id="wotlogo">
- <td colspan="2"></td>
- </tr>
- </table>
- <div id="wottextdescunknown" style="display: none;">Webbplatsen har en okänd klassificering.</div>
- <div id="wottextdescuserrat" style="display: none;">Du har gett webbplatsen klassificeringen Dålig,<br/>vilket gav upphov till en varning.</div>
- <div id="wottextreputation5" style="display: none;">Utmärkt</div>
- <div id="wottextreputation4" style="display: none;">Bra</div>
- <div id="wottextreputation3" style="display: none;">Otillräcklig</div>
- <div id="wottextreputation2" style="display: none;">Dålig</div>
- <div id="wottextreputation1" style="display: none;">Mycket dålig</div>
-</body>
+ <head>
+ <meta charset="utf-8">
+ <script type="text/javascript" src="chrome://wot/content/config.js"></script>
+ <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
+ <script type="text/javascript" src="chrome://wot/content/warning.js"></script>
+ <style type="text/css">
+ @import "chrome://wot/skin/include/blocked.css";
+ </style>
+ <title>WOT: Blockerad</title>
+ </head>
+ <body id="wotblocked" onload="blocked_load();">
+ </body>
</html>
diff --git a/locale/sv-SE/blocked.png b/locale/sv-SE/blocked.png
deleted file mode 100644
index a8ac8b6..0000000
Binary files a/locale/sv-SE/blocked.png and /dev/null differ
diff --git a/locale/sv-SE/warning.png b/locale/sv-SE/warning.png
deleted file mode 100644
index 388a9a7..0000000
Binary files a/locale/sv-SE/warning.png and /dev/null differ
diff --git a/locale/sv-SE/wot.dtd b/locale/sv-SE/wot.dtd
index ff94c84..fb9ec65 100644
--- a/locale/sv-SE/wot.dtd
+++ b/locale/sv-SE/wot.dtd
@@ -32,8 +32,8 @@
<!ENTITY wotRating.app1 "Transaktionssäkerhet:">
<!ENTITY wotRating.app2 "Sekretess:">
<!ENTITY wotRating.app4 "Barnsäkerhet:">
-<!ENTITY wotRating.scorecard "Visa scorekort för klassificeringsdetaljer.">
-<!ENTITY wotRating.comment "Lägg till en kommentar.">
+<!ENTITY wotRating.scorecard "Visa scorekort för klassificeringsdetaljer">
+<!ENTITY wotRating.comment "Lägg till en kommentar">
<!ENTITY wotRating.guide "Guide">
<!ENTITY wotRating.prefs "Inställningar">
<!ENTITY wotRating.link "www.mywot.com">
diff --git a/locale/sv-SE/wot.properties b/locale/sv-SE/wot.properties
index 0ac5402..5ba242c 100644
--- a/locale/sv-SE/wot.properties
+++ b/locale/sv-SE/wot.properties
@@ -19,6 +19,7 @@ description_rating_1 = Mycket dålig
description_rating_0 = Inte tillräckligt många klassificeringar för webbplatsen
description_restart = Starta om webbläsaren om du vill aktivera WOT.
description_uninstall = WOT avinstalleras efter omstart.
+help_0 =
help_1 = Mycket dålig
help_2 = Dålig
help_3 = Otillräcklig
@@ -27,16 +28,20 @@ help_5 = Utmärkt
help_comment =
help_comment_link = Vill du lägga till en kommentar?
warning = WOT-varning: %S
+warning_warning = Varning!
+warning_blocked = Blockerad
warning_button = Klassificeringsdetaljer
warning_message_normal = Den här webbplatsen har dåligt rykte.
warning_message_userrated = Du har gett webbplatsen klassificeringen Dålig.
warning_message_unknown = Webbplatsen har en okänd klassificering.
warning_info = Visa klassificeringsdetaljer och kommentarer
-warning_rate = Webbplatsen är säker - jag vill klassificera den
-warning_goto = Ignorera varningen och gå till webbplatsen
-warning_desc_normal = Den här webbplatsen har dåligt rykte.
-warning_desc_userrated = Du har gett webbplatsen klassificeringen Dålig,<br/>vilket gav upphov till en varning.
-warning_desc_unknown = Webbplatsen har en okänd klassificering.
+warning_rate = Webbplatsen är säker - jag vill <a>klassificera den</a>
+warning_goto = Gå till webbsidan
+warning_leave = Lämna webbsidan
+warning_back = Gå tillbaka
+warning_desc_normal = Den här webbplatsen har dåligt rykte
+warning_desc_userrated = Du har gett webbplatsen klassificeringen Dålig, vilket gav upphov till en varning
+warning_desc_unknown = Webbplatsen har en okänd klassificering
rating_0 = Pålitlighet
rating_1 = Transaktionssäkerhet
rating_2 = Sekretess
diff --git a/locale/uk-UA/blocked.html b/locale/uk-UA/blocked.html
index 2130ca1..06e9c55 100644
--- a/locale/uk-UA/blocked.html
+++ b/locale/uk-UA/blocked.html
@@ -2,107 +2,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="uk" lang="uk">
-<head>
- <meta charset="utf-8">
- <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
- <style type="text/css">
- @import "chrome://wot/skin/include/blocked.css";
- </style>
- <title>WOT: заблоковано</title>
-</head>
-<body id="wotblocked" onload="blocked_load();">
-<table id="wotcontainer" cellspacing="0" lang="ru-RU" class="wotblocked">
- <tr id="wotheadline">
- <td colspan="2"></td>
- </tr>
- <tr id="wotcontainertop">
- <td colspan="2"></td>
- </tr>
- <tr id="wotdescription" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotdescriptiontext" class="wotlimitwidth">Цей сайт має погану репутацію</div>
- </td>
- </tr>
- <tr id="wottarget" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotwebsite" class="wotlimitwidth" title=""> </div>
- </td>
- </tr>
- <tr id="wotinfo" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotinfobutton">
- <span id="wotinfotext" onclick="blocked_info();">Переглянути рейтинг і коментарі</span>
- </div>
- </td>
- </tr>
- <tr id="wotratingtop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingareatop" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotrating0" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Заслуговує довіри</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl0" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating1" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Надійність продавця</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl1" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating2" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Конфіденційність</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl2" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating4" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">Безпека для дітей</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl4" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotratingareabottom" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingbottom" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttonstop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttons" class="wotcontainermiddle">
- <td id="wotbuttonrate">
- <span id="wotratebutton" class="wotbutton">Цей сайт є безпечним - Я хочу оцінити його</span>
- </td>
- <td id="wotbuttongoto">
- <span id="wotgotobutton" class="wotbutton">Ігнорувати попередження і зайти на сайт</span>
- </td>
- </tr>
- <tr id="wotcontainerbottom">
- <td colspan="2"></td>
- </tr>
- <tr id="wotlogo">
- <td colspan="2"></td>
- </tr>
-</table>
-<div id="wottextdescunknown" style="display: none;">Цей сайт має невідомий рейтинг</div>
-<div id="wottextdescuserrat" style="display: none;">Ви дали цьому сайту низький рейтинг</div>
-<div id="wottextreputation5" style="display: none;">Відмінно</div>
-<div id="wottextreputation4" style="display: none;">Добре</div>
-<div id="wottextreputation3" style="display: none;">Незадовільно</div>
-<div id="wottextreputation2" style="display: none;">Погано</div>
-<div id="wottextreputation1" style="display: none;">Дуже погано</div>
-</body>
+ <head>
+ <meta charset="utf-8">
+ <script type="text/javascript" src="chrome://wot/content/config.js"></script>
+ <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
+ <script type="text/javascript" src="chrome://wot/content/warning.js"></script>
+ <style type="text/css">
+ @import "chrome://wot/skin/include/blocked.css";
+ </style>
+ <title>WOT: Заблоковано</title>
+ </head>
+ <body id="wotblocked" onload="blocked_load();">
+ </body>
</html>
diff --git a/locale/uk-UA/blocked.png b/locale/uk-UA/blocked.png
deleted file mode 100644
index c567ea0..0000000
Binary files a/locale/uk-UA/blocked.png and /dev/null differ
diff --git a/locale/uk-UA/warning.png b/locale/uk-UA/warning.png
deleted file mode 100644
index 3f0e8ad..0000000
Binary files a/locale/uk-UA/warning.png and /dev/null differ
diff --git a/locale/uk-UA/wot.properties b/locale/uk-UA/wot.properties
index eec81b1..485e8b3 100644
--- a/locale/uk-UA/wot.properties
+++ b/locale/uk-UA/wot.properties
@@ -19,6 +19,7 @@ description_rating_1 = Дуже погано
description_rating_0 = Недостатньо оцінок для цього сайту
description_restart = Перезапустіть браузер для активізації WOT
description_uninstall = WOT буде видалено після перезапуску
+help_0 =
help_1 = Дуже погано
help_2 = Погано
help_3 = Незадовільно
@@ -27,13 +28,17 @@ help_5 = Відмінно
help_comment =
help_comment_link = Залишіть коментар?
warning = Попередження: %S
+warning_warning = Попередження!
+warning_blocked = Заблоковано
warning_button = Переглянути детальніше про рейтинг
-warning_message_normal = Цей сайт має погану репутацію на основі рейтингів користувачів
-warning_message_userrated = Ви дали цьому сайту низький рейтинг
-warning_message_unknown = Цей сайт має невідомий рейтинг
+warning_message_normal = Цей сайт має погану репутацію на основі рейтингів користувачів.
+warning_message_userrated = Ви дали цьому сайту низький рейтинг.
+warning_message_unknown = Цей сайт має невідомий рейтинг.
warning_info = Переглянути рейтинг і коментарі
warning_rate = Цей сайт є безпечним - Я хочу <a>оцінити його</a>
-warning_goto = Ігнорувати попередження і зайти на сайт
+warning_goto = Перейти на сайт
+warning_leave = Залишити сайт
+warning_back = Повернутися назад
warning_desc_normal = Цей сайт має погану репутацію
warning_desc_userrated = Ви дали цьому сайту низький рейтинг
warning_desc_unknown = Цей сайт має невідомий рейтинг
diff --git a/locale/zh-CN/blocked.html b/locale/zh-CN/blocked.html
index d9699b3..410978a 100644
--- a/locale/zh-CN/blocked.html
+++ b/locale/zh-CN/blocked.html
@@ -1,107 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="zh-CN" lang="zh-CN">
-<head>
- <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
- <style type="text/css">
- @import "chrome://wot/skin/include/blocked.css";
- </style>
- <title>WOT: 已阻止</title>
-</head>
-<body id="wotblocked" onload="blocked_load();">
- <table id="wotcontainer" cellspacing="0" lang="zh-CN" class="wotblocked">
- <tr id="wotheadline">
- <td colspan="2"></td>
- </tr>
- <tr id="wotcontainertop">
- <td colspan="2"></td>
- </tr>
- <tr id="wotdescription" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotdescriptiontext" class="wotlimitwidth">此网站的声誉较差。</div>
- </td>
- </tr>
- <tr id="wottarget" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotwebsite" class="wotlimitwidth" title=""> </div>
- </td>
- </tr>
- <tr id="wotinfo" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotinfobutton">
- <span id="wotinfotext" onclick="blocked_info();">查看评级详情和评论</span>
- </div>
- </td>
- </tr>
- <tr id="wotratingtop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingareatop" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotrating0" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">可信程度</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl0" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating1" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">供应商可靠性</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl1" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating2" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">隐私</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl2" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating4" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">儿童安全性</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl4" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotratingareabottom" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingbottom" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttonstop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttons" class="wotcontainermiddle">
- <td id="wotbuttonrate">
- <span id="wotratebutton" class="wotbutton">此网站是安全的 - 我想对其进行评级</span>
- </td>
- <td id="wotbuttongoto">
- <span id="wotgotobutton" class="wotbutton">忽略警告并进入该网站</span>
- </td>
- </tr>
- <tr id="wotcontainerbottom">
- <td colspan="2"></td>
- </tr>
- <tr id="wotlogo">
- <td colspan="2"></td>
- </tr>
- </table>
- <div id="wottextdescunknown" style="display: none;">此网站的评级未知。</div>
- <div id="wottextdescuserrat" style="display: none;">您已将此网站评为较差等级，<br/>该评级触发了警告。</div>
- <div id="wottextreputation5" style="display: none;">极佳</div>
- <div id="wottextreputation4" style="display: none;">较好</div>
- <div id="wottextreputation3" style="display: none;">令人不满意</div>
- <div id="wottextreputation2" style="display: none;">较差</div>
- <div id="wottextreputation1" style="display: none;">极差</div>
-</body>
+ <head>
+ <meta charset="utf-8">
+ <script type="text/javascript" src="chrome://wot/content/config.js"></script>
+ <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
+ <script type="text/javascript" src="chrome://wot/content/warning.js"></script>
+ <style type="text/css">
+ @import "chrome://wot/skin/include/blocked.css";
+ </style>
+ <title>WOT: 已阻止</title>
+ </head>
+ <body id="wotblocked" onload="blocked_load();">
+ </body>
</html>
diff --git a/locale/zh-CN/blocked.png b/locale/zh-CN/blocked.png
deleted file mode 100644
index 7ac4ea4..0000000
Binary files a/locale/zh-CN/blocked.png and /dev/null differ
diff --git a/locale/zh-CN/warning.png b/locale/zh-CN/warning.png
deleted file mode 100644
index 668c399..0000000
Binary files a/locale/zh-CN/warning.png and /dev/null differ
diff --git a/locale/zh-CN/wot.dtd b/locale/zh-CN/wot.dtd
index c0354f8..02d8af8 100644
--- a/locale/zh-CN/wot.dtd
+++ b/locale/zh-CN/wot.dtd
@@ -32,8 +32,8 @@
<!ENTITY wotRating.app1 "供应商可靠性:">
<!ENTITY wotRating.app2 "隐私:">
<!ENTITY wotRating.app4 "儿童安全性:">
-<!ENTITY wotRating.scorecard "查看登记卡上的评级详情。">
-<!ENTITY wotRating.comment "添加评论。">
+<!ENTITY wotRating.scorecard "查看登记卡上的评级详情">
+<!ENTITY wotRating.comment "添加评论">
<!ENTITY wotRating.guide "指南">
<!ENTITY wotRating.prefs "设置">
<!ENTITY wotRating.link "www.mywot.com">
diff --git a/locale/zh-CN/wot.properties b/locale/zh-CN/wot.properties
index bea05a0..8ce3c52 100644
--- a/locale/zh-CN/wot.properties
+++ b/locale/zh-CN/wot.properties
@@ -19,6 +19,7 @@ description_rating_1 = 极差
description_rating_0 = 该网站没有足够数目的评级
description_restart = 重启浏览器激活WOT。
description_uninstall = 重启后将卸载WOT。
+help_0 =
help_1 = 极差
help_2 = 较差
help_3 = 令人不满意
@@ -27,16 +28,20 @@ help_5 = 极佳
help_comment = 您的评级不一致。
help_comment_link = 留下评论?
warning = WOT 警告: %S
+warning_warning = 警告!
+warning_blocked = 已阻止
warning_button = 评级详情
warning_message_normal = 此网站的声誉较差。
warning_message_userrated = 您已将此网站评为较差等级。
warning_message_unknown = 此网站的评级未知。
warning_info = 查看评级详情和评论
-warning_rate = 此网站是安全的 - 我想对其进行评级
-warning_goto = 忽略警告并进入该网站
-warning_desc_normal = 此网站的声誉较差。
-warning_desc_userrated = 您已将此网站评为较差等级，<br/>该评级触发了警告。
-warning_desc_unknown = 此网站的评级未知。
+warning_rate = 此网站是安全的 - <a>我想对其进行评级</a>
+warning_goto = 进入该网站
+warning_leave = 离开工地
+warning_back = 回去
+warning_desc_normal = 此网站的声誉较差
+warning_desc_userrated = 您已将此网站评为较差等级，该评级触发了警告
+warning_desc_unknown = 此网站的评级未知
rating_0 = 可信程度
rating_1 = 供应商可靠性
rating_2 = 隐私
diff --git a/locale/zh-TW/blocked.html b/locale/zh-TW/blocked.html
index 63e3f28..2ec0a2c 100644
--- a/locale/zh-TW/blocked.html
+++ b/locale/zh-TW/blocked.html
@@ -1,107 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="zh-TW" lang="zh-TW">
-<head>
- <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
- <style type="text/css">
- @import "chrome://wot/skin/include/blocked.css";
- </style>
- <title>WOT: 已封鎖</title>
-</head>
-<body id="wotblocked" onload="blocked_load();">
- <table id="wotcontainer" cellspacing="0" lang="zh-TW" class="wotblocked">
- <tr id="wotheadline">
- <td colspan="2"></td>
- </tr>
- <tr id="wotcontainertop">
- <td colspan="2"></td>
- </tr>
- <tr id="wotdescription" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotdescriptiontext" class="wotlimitwidth">這個網站聲譽不佳。</div>
- </td>
- </tr>
- <tr id="wottarget" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotwebsite" class="wotlimitwidth" title=""> </div>
- </td>
- </tr>
- <tr id="wotinfo" class="wotcontainermiddle">
- <td colspan="2">
- <div id="wotinfobutton">
- <span id="wotinfotext" onclick="blocked_info();">檢視評等詳細內容與評語</span>
- </div>
- </td>
- </tr>
- <tr id="wotratingtop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingareatop" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotrating0" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">可靠性</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl0" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating1" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">供應者可信賴性</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl1" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating2" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">隱私性</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl2" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotrating4" class="wotratingarea wotratingrow">
- <td class="wotratingcol wotratingcolleft">
- <span class="wotratingname">兒童安全</span>
- </td>
- <td class="wotratingcol wotratingcolright">
- <span id="wotratingexpl4" class="wotratingexpl"> </span>
- </td>
- </tr>
- <tr id="wotratingareabottom" class="wotratingarea">
- <td colspan="2"></td>
- </tr>
- <tr id="wotratingbottom" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttonstop" class="wotcontainermiddle">
- <td colspan="2"></td>
- </tr>
- <tr id="wotbuttons" class="wotcontainermiddle">
- <td id="wotbuttonrate">
- <span id="wotratebutton" class="wotbutton">這個網站是安全的 - 我要評等</span>
- </td>
- <td id="wotbuttongoto">
- <span id="wotgotobutton" class="wotbutton">忽略警告，前往網站</span>
- </td>
- </tr>
- <tr id="wotcontainerbottom">
- <td colspan="2"></td>
- </tr>
- <tr id="wotlogo">
- <td colspan="2"></td>
- </tr>
- </table>
- <div id="wottextdescunknown" style="display: none;">這個網站的評等不詳。</div>
- <div id="wottextdescuserrat" style="display: none;">您給了這個網站會觸動警告的不佳評等。</div>
- <div id="wottextreputation5" style="display: none;">極佳</div>
- <div id="wottextreputation4" style="display: none;">佳</div>
- <div id="wottextreputation3" style="display: none;">不符要求</div>
- <div id="wottextreputation2" style="display: none;">不佳</div>
- <div id="wottextreputation1" style="display: none;">非常差</div>
-</body>
+ <head>
+ <meta charset="utf-8">
+ <script type="text/javascript" src="chrome://wot/content/config.js"></script>
+ <script type="text/javascript" src="chrome://wot/skin/include/blocked.js"></script>
+ <script type="text/javascript" src="chrome://wot/content/warning.js"></script>
+ <style type="text/css">
+ @import "chrome://wot/skin/include/blocked.css";
+ </style>
+ <title>WOT: 已封鎖</title>
+ </head>
+ <body id="wotblocked" onload="blocked_load();">
+ </body>
</html>
diff --git a/locale/zh-TW/blocked.png b/locale/zh-TW/blocked.png
deleted file mode 100644
index ce9551d..0000000
Binary files a/locale/zh-TW/blocked.png and /dev/null differ
diff --git a/locale/zh-TW/warning.png b/locale/zh-TW/warning.png
deleted file mode 100644
index 06d3558..0000000
Binary files a/locale/zh-TW/warning.png and /dev/null differ
diff --git a/locale/zh-TW/wot.dtd b/locale/zh-TW/wot.dtd
index 2f7c236..9c67c7d 100644
--- a/locale/zh-TW/wot.dtd
+++ b/locale/zh-TW/wot.dtd
@@ -32,8 +32,8 @@
<!ENTITY wotRating.app1 "供應者可信賴性：">
<!ENTITY wotRating.app2 "隱私性：">
<!ENTITY wotRating.app4 "兒童安全：">
-<!ENTITY wotRating.scorecard "檢視評等詳細內容計分表。">
-<!ENTITY wotRating.comment "加入您的評語。">
+<!ENTITY wotRating.scorecard "檢視評等詳細內容計分表">
+<!ENTITY wotRating.comment "加入您的評語">
<!ENTITY wotRating.guide "指南">
<!ENTITY wotRating.prefs "設定">
<!ENTITY wotRating.link "www.mywot.com">
diff --git a/locale/zh-TW/wot.properties b/locale/zh-TW/wot.properties
index 80f26e9..aecca28 100644
--- a/locale/zh-TW/wot.properties
+++ b/locale/zh-TW/wot.properties
@@ -19,6 +19,7 @@ description_rating_1 = 非常差
description_rating_0 = 此網站評等數量不足
description_restart = 重新開啟瀏覽器以啟動 WOT。
description_uninstall = WOT 將於重新開啟後解除安裝。
+help_0 =
help_1 = 非常差
help_2 = 不佳
help_3 = 不符要求
@@ -27,16 +28,20 @@ help_5 = 極佳
help_comment = 您的評等不一致。
help_comment_link = 要留下評語嗎？
warning = WOT 警告： %S
+warning_warning = 警告!
+warning_blocked = 已封鎖
warning_button = 評等詳細內容
warning_message_normal = 這個網站聲譽不佳。
warning_message_userrated = 您給了這個網站不佳的評等。
warning_message_unknown = 這個網站的評等不詳。
warning_info = 檢視評等詳細內容與評語
-warning_rate = 這個網站是安全的 - 我要評等
-warning_goto = 忽略警告，前往網站
-warning_desc_normal = 這個網站聲譽不佳。
-warning_desc_userrated = 您給了這個網站會觸動警告的不佳評等。
-warning_desc_unknown = 這個網站的評等不詳。
+warning_rate = 這個網站是安全的 - <a>我要評等</a>
+warning_goto = 前往網站
+warning_leave = Leave the site
+warning_back = Go back
+warning_desc_normal = 這個網站聲譽不佳
+warning_desc_userrated = 您給了這個網站會觸動警告的不佳評等
+warning_desc_unknown = 這個網站的評等不詳
rating_0 = 可靠性
rating_1 = 供應者可信賴性
rating_2 = 隱私性
diff --git a/skin/b/accessible/logo.png b/skin/b/accessible/logo.png
new file mode 100644
index 0000000..b1501b1
Binary files /dev/null and b/skin/b/accessible/logo.png differ
diff --git a/skin/b/accessible/r0.png b/skin/b/accessible/r0.png
new file mode 100644
index 0000000..aad1238
Binary files /dev/null and b/skin/b/accessible/r0.png differ
diff --git a/skin/b/accessible/r1.png b/skin/b/accessible/r1.png
new file mode 100644
index 0000000..e542494
Binary files /dev/null and b/skin/b/accessible/r1.png differ
diff --git a/skin/b/accessible/r2.png b/skin/b/accessible/r2.png
new file mode 100644
index 0000000..28e4d3c
Binary files /dev/null and b/skin/b/accessible/r2.png differ
diff --git a/skin/b/accessible/r3.png b/skin/b/accessible/r3.png
new file mode 100644
index 0000000..86b051f
Binary files /dev/null and b/skin/b/accessible/r3.png differ
diff --git a/skin/b/accessible/r4.png b/skin/b/accessible/r4.png
new file mode 100644
index 0000000..e4b9988
Binary files /dev/null and b/skin/b/accessible/r4.png differ
diff --git a/skin/b/accessible/r5.png b/skin/b/accessible/r5.png
new file mode 100644
index 0000000..90eebe1
Binary files /dev/null and b/skin/b/accessible/r5.png differ
diff --git a/skin/b/i.png b/skin/b/i.png
new file mode 100644
index 0000000..3ac7ed9
Binary files /dev/null and b/skin/b/i.png differ
diff --git a/skin/b/logo.png b/skin/b/logo.png
new file mode 100644
index 0000000..138371e
Binary files /dev/null and b/skin/b/logo.png differ
diff --git a/skin/b/r0.png b/skin/b/r0.png
new file mode 100644
index 0000000..0211477
Binary files /dev/null and b/skin/b/r0.png differ
diff --git a/skin/b/r1.png b/skin/b/r1.png
new file mode 100644
index 0000000..510d7b7
Binary files /dev/null and b/skin/b/r1.png differ
diff --git a/skin/b/r2.png b/skin/b/r2.png
new file mode 100644
index 0000000..518c6fd
Binary files /dev/null and b/skin/b/r2.png differ
diff --git a/skin/b/r3.png b/skin/b/r3.png
new file mode 100644
index 0000000..9838dbd
Binary files /dev/null and b/skin/b/r3.png differ
diff --git a/skin/b/r4.png b/skin/b/r4.png
new file mode 100644
index 0000000..d0c15d1
Binary files /dev/null and b/skin/b/r4.png differ
diff --git a/skin/b/r5.png b/skin/b/r5.png
new file mode 100644
index 0000000..80262f6
Binary files /dev/null and b/skin/b/r5.png differ
diff --git a/skin/fusion/warnings/bg_rating_bottom.png b/skin/fusion/warnings/bg_rating_bottom.png
deleted file mode 100644
index b452082..0000000
Binary files a/skin/fusion/warnings/bg_rating_bottom.png and /dev/null differ
diff --git a/skin/fusion/warnings/bg_rating_tile1px_center.png b/skin/fusion/warnings/bg_rating_tile1px_center.png
deleted file mode 100644
index 664571a..0000000
Binary files a/skin/fusion/warnings/bg_rating_tile1px_center.png and /dev/null differ
diff --git a/skin/fusion/warnings/bg_rating_top.png b/skin/fusion/warnings/bg_rating_top.png
deleted file mode 100644
index e3f51bb..0000000
Binary files a/skin/fusion/warnings/bg_rating_top.png and /dev/null differ
diff --git a/skin/fusion/warnings/bg_warning_bottom.png b/skin/fusion/warnings/bg_warning_bottom.png
deleted file mode 100644
index 3a730bf..0000000
Binary files a/skin/fusion/warnings/bg_warning_bottom.png and /dev/null differ
diff --git a/skin/fusion/warnings/bg_warning_tile1px_center.png b/skin/fusion/warnings/bg_warning_tile1px_center.png
deleted file mode 100644
index 6fcc3e5..0000000
Binary files a/skin/fusion/warnings/bg_warning_tile1px_center.png and /dev/null differ
diff --git a/skin/fusion/warnings/bg_warning_top.png b/skin/fusion/warnings/bg_warning_top.png
deleted file mode 100644
index 443bb63..0000000
Binary files a/skin/fusion/warnings/bg_warning_top.png and /dev/null differ
diff --git a/skin/fusion/warnings/go_to_button.png b/skin/fusion/warnings/go_to_button.png
deleted file mode 100644
index f207820..0000000
Binary files a/skin/fusion/warnings/go_to_button.png and /dev/null differ
diff --git a/skin/fusion/warnings/info_button_left.png b/skin/fusion/warnings/info_button_left.png
deleted file mode 100644
index 19ec507..0000000
Binary files a/skin/fusion/warnings/info_button_left.png and /dev/null differ
diff --git a/skin/fusion/warnings/info_button_right.png b/skin/fusion/warnings/info_button_right.png
deleted file mode 100644
index d36b584..0000000
Binary files a/skin/fusion/warnings/info_button_right.png and /dev/null differ
diff --git a/skin/fusion/warnings/rate_button.png b/skin/fusion/warnings/rate_button.png
deleted file mode 100644
index 6965e1a..0000000
Binary files a/skin/fusion/warnings/rate_button.png and /dev/null differ
diff --git a/skin/fusion/warnings/wot_logo_bottom.png b/skin/fusion/warnings/wot_logo_bottom.png
deleted file mode 100644
index d93a1bc..0000000
Binary files a/skin/fusion/warnings/wot_logo_bottom.png and /dev/null differ
diff --git a/skin/include/blocked.css b/skin/include/blocked.css
index 0fca4ee..20c5af5 100644
--- a/skin/include/blocked.css
+++ b/skin/include/blocked.css
@@ -1,326 +1,372 @@
+/*
+ warning.css
+ Copyright © 2009 - 2012 WOT Services Oy <info at mywot.com>
+
+ This file is part of WOT.
+
+ WOT is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ WOT is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with WOT. If not, see <http://www.gnu.org/licenses/>.
+*/
+
/* ! important in an attempt to override conflicting styles on websites where this is included */
+
+/* body of the page which show "Blocked" message */
#wotblocked {
- background-color: #333333 ! important;
+ margin: 0;
+ padding: 0;
+ background-color: #333333 !important;
}
+
#wotwarning, #wotwrapper {
- display: block;
- height: 100% ! important;
- left: 0 ! important;
- margin: 0 ! important;
- position: fixed ! important;
- top: 0 ! important;
- width: 100% ! important;
-}
+ position: fixed ! important;
+ left: 0 ! important;
+ top: 0 ! important;
+ height: 100% ! important;
+ width: 100% ! important;
+ margin: 0 ! important;
+ display: block;
+ cursor: default;
+}
+
#wotwarning {
- background-color: #000000 ! important;
- opacity: 0.8 ! important;
- z-index: 2147483645 ! important;
+ z-index: 2147483645 ! important;
+ background-color: #000000 ! important;
+ opacity: 0.8 ! important;
}
+
#wotwrapper {
- background-color: transparent ! important;
- opacity: 1.0 ! important;
- z-index: 2147483646 ! important;
+ z-index: 2147483646 !important;
+ background-color: transparent !important;
+ opacity: 1.0 !important;
}
+
#wotcontainer {
- background-color: transparent ! important;
- border: 0 ! important;
- border-collapse: collapse ! important;
- border-spacing: 0 ! important;
- cursor: default ! important;
- font-family: "Tahoma", "Arial", sans-serif ! important;
- font-size: 100% ! important;
- font-weight: normal ! important;
- letter-spacing: 0 ! important;
- margin: 47px auto 0 ! important;
- outline: 0 ! important;
- padding: 0 ! important;
- text-align: center ! important;
- text-decoration: none ! important;
- vertical-align: baseline ! important;
- width: 657px ! important;
- word-spacing: 0 ! important;
- z-index: 2147483647 ! important;
-}
-#wotcontainer * {
- background-color: transparent ! important;
- border: 0 ! important;
- cursor: default ! important;
- font-family: "Tahoma", "Arial", sans-serif ! important;
- font-size: 100% ! important;
- letter-spacing: 0 ! important;
- margin: 0 ! important;
- opacity: 1.0 ! important;
- outline: 0 ! important;
- padding: 0 ! important;
- text-decoration: none ! important;
- vertical-align: baseline ! important;
- word-spacing: 0 ! important;
-}
-#wotcontainer #wotheadline {
- background: url("chrome://wot/locale/warning.png") top center no-repeat ! important;
- height: 136px ! important;
-}
-#wotcontainer.wotblocked #wotheadline {
- background: url("chrome://wot/locale/blocked.png") top center no-repeat ! important;
-}
-#wotcontainer.wotunknown #wotheadline {
- background: none ! important;
-}
-#wotcontainer #wotcontainertop {
- background: url("chrome://wot/skin/fusion/warnings/bg_warning_top.png") top center no-repeat ! important;
- height: 11px ! important;
-}
-#wotcontainer .wotcontainermiddle {
- background: url("chrome://wot/skin/fusion/warnings/bg_warning_tile1px_center.png") top center repeat-y ! important;
-}
-#wotcontainer #wotcontainerbottom {
- background: url("chrome://wot/skin/fusion/warnings/bg_warning_bottom.png") top center no-repeat ! important;
- height: 15px ! important;
-}
-#wotcontainer .wotlimitwidth {
- display: block;
- margin-left: 10px ! important;
- margin-right: 10px ! important;
- overflow: hidden ! important;
- text-align: center ! important;
- width: 637px ! important;
-}
-#wotcontainer #wotdescriptiontext {
- color: #222222 ! important;
- font-family: "Tahoma", "Arial", sans-serif ! important;
- font-size: 25px ! important;
- line-height: 27px ! important;
- height: 36px ! important;
-}
-#wotcontainer #wotdescriptiontext.wotlongdescription {
- height: 65px ! important;
-}
-#wotcontainer #wotwebsite {
- color: #666666 ! important;
- font-family: "Tahoma", "Arial", sans-serif ! important;
- font-size: 14px ! important;
- line-height: 14px ! important;
- height: 29px ! important;
-}
-#wotcontainer #wotinfo {
- height: 33px ! important;
-}
-#wotcontainer.wotnoratings #wotinfo {
- height: 71px ! important;
-}
-#wotcontainer.wotnoratings.wotblocked #wotinfo {
- height: 42px ! important;
-}
-#wotcontainer #wotinfobutton {
- background: url("chrome://wot/skin/fusion/warnings/info_button_left.png") no-repeat left -46px ! important;
- cursor: pointer ! important;
- display: block;
- height: 23px ! important;
- margin: 0 auto ! important;
- padding-left: 30px ! important;
- text-align: center ! important;
-}
-#wotcontainer #wotinfotext {
- background: url("chrome://wot/skin/fusion/warnings/info_button_right.png") no-repeat right -46px ! important;
- color: #0355a5 ! important;
- cursor: pointer ! important;
- display: block;
- float: left ! important;
- font-family: "Tahoma", "Arial", sans-serif ! important;
- font-size: 12px ! important;
- height: 23px ! important;
- line-height: 23px ! important;
- overflow: hidden ! important;
-}
-#wotcontainer #wotinfobutton, #wotcontainer #wotinfotext {
- width: 350px ! important;
-}
-#wotcontainer[lang="en-US"] #wotinfobutton, #wotcontainer[lang="en-US"] #wotinfotext {
- width: 230px ! important;
-}
-#wotcontainer[lang="cs-CZ"] #wotinfobutton, #wotcontainer[lang="cs-CZ"] #wotinfotext {
- width: 350px ! important;
-}
-#wotcontainer[lang="de-DE"] #wotinfobutton, #wotcontainer[lang="de-DE"] #wotinfotext {
- width: 310px ! important;
-}
-#wotcontainer[lang="es-ES"] #wotinfobutton, #wotcontainer[lang="es-ES"] #wotinfotext {
- width: 280px ! important;
-}
-#wotcontainer[lang="fi-FI"] #wotinfobutton, #wotcontainer[lang="fi-FI"] #wotinfotext {
- width: 250px ! important;
-}
-#wotcontainer[lang="fr-FR"] #wotinfobutton, #wotcontainer[lang="fr-FR"] #wotinfotext {
- width: 320px ! important;
-}
-#wotcontainer[lang="it-IT"] #wotinfobutton, #wotcontainer[lang="it-IT"] #wotinfotext {
- width: 300px ! important;
-}
-#wotcontainer[lang="ja-JP"] #wotinfobutton, #wotcontainer[lang="ja-JP"] #wotinfotext {
- width: 220px ! important;
-}
-#wotcontainer[lang="pl-PL"] #wotinfobutton, #wotcontainer[lang="pl-PL"] #wotinfotext {
- width: 250px ! important;
-}
-#wotcontainer[lang="pt-BR"] #wotinfobutton, #wotcontainer[lang="pt-BR"] #wotinfotext {
- width: 300px ! important;
-}
-#wotcontainer[lang="ru-RU"] #wotinfobutton, #wotcontainer[lang="ru-RU"] #wotinfotext {
- width: 340px ! important;
-}
-#wotcontainer[lang="sv-SE"] #wotinfobutton, #wotcontainer[lang="sv-SE"] #wotinfotext {
- width: 340px ! important;
-}
-#wotcontainer[lang="zh-CN"] #wotinfobutton, #wotcontainer[lang="zh-CN"] #wotinfotext {
- width: 200px ! important;
-}
-#wotcontainer[lang="zh-TW"] #wotinfobutton, #wotcontainer[lang="zh-TW"] #wotinfotext {
- width: 200px ! important;
-}
-#wotcontainer #wotinfobutton:hover {
- background-position: left -23px ! important;
-}
-#wotcontainer #wotinfobutton:hover #wotinfotext, #wotinfotext:hover {
- background-position: right -23px ! important;
-}
-#wotcontainer #wotinfobutton:active {
- background-position: left 0px ! important;
-}
-#wotcontainer #wotinfobutton:active #wotinfotext, #wotcontainer #wotinfotext:active {
- background-position: right 0px ! important;
-}
-#wotcontainer #wotratingtop {
- background: url("chrome://wot/skin/fusion/warnings/bg_rating_top.png") top center no-repeat ! important;
- height: 2px ! important;
-}
-#wotcontainer #wotratingareatop {
- height: 23px ! important;
-}
-#wotcontainer #wotratingareabottom {
- height: 12px ! important;
-}
-#wotcontainer .wotratingarea {
- background: url("chrome://wot/skin/fusion/warnings/bg_rating_tile1px_center.png") top center repeat-y ! important;
-}
-#wotcontainer .wotratingrow {
- height: 40px ! important;
-}
-#wotcontainer .wotratingname, #wotcontainer .wotratingexpl {
- color: #474747 ! important;
- display: block;
- height: 28px ! important;
- line-height: 28px ! important;
- vertical-align: middle ! important;
-}
-#wotcontainer .wotratingname {
- display: block;
- background: url("chrome://wot/skin/fusion/28_28/no_rep_available.png") top left no-repeat ! important;
- padding-left: 38px ! important;
- margin-left: 37px ! important;
-}
-#wotcontainer .wotratingrow.wotreputation5 .wotratingname {
- background-image: url("chrome://wot/skin/fusion/28_28/trusted.png") ! important;
-}
-#wotcontainer .wotratingrow.wotreputation4 .wotratingname {
- background-image: url("chrome://wot/skin/fusion/28_28/alright.png") ! important;
-}
-#wotcontainer .wotratingrow.wotreputation3 .wotratingname {
- background-image: url("chrome://wot/skin/fusion/28_28/caution.png") ! important;
-}
-#wotcontainer .wotratingrow.wotreputation2 .wotratingname {
- background-image: url("chrome://wot/skin/fusion/28_28/not_safe.png") ! important;
-}
-#wotcontainer .wotratingrow.wotreputation1 .wotratingname {
- background-image: url("chrome://wot/skin/fusion/28_28/danger.png") ! important;
-}
-#wotcontainer .wotratingrow.wotreputationx .wotratingname {
- background-image: url("chrome://wot/skin/fusion/28_28/excluded.png") ! important;
-}
-#wotcontainer .wotratingrow.wotaccessible .wotratingname {
- background-image: url("chrome://wot/skin/fusion/accessible/28_28/no_rep_available.png") ! important;
-}
-#wotcontainer .wotratingrow.wotreputation5.wotaccessible .wotratingname {
- background-image: url("chrome://wot/skin/fusion/accessible/28_28/trusted.png") ! important;
-}
-#wotcontainer .wotratingrow.wotreputation4.wotaccessible .wotratingname {
- background-image: url("chrome://wot/skin/fusion/accessible/28_28/alright.png") ! important;
-}
-#wotcontainer .wotratingrow.wotreputation3.wotaccessible .wotratingname {
- background-image: url("chrome://wot/skin/fusion/accessible/28_28/caution.png") ! important;
-}
-#wotcontainer .wotratingrow.wotreputation2.wotaccessible .wotratingname {
- background-image: url("chrome://wot/skin/fusion/accessible/28_28/not_safe.png") ! important;
-}
-#wotcontainer .wotratingrow.wotreputation1.wotaccessible .wotratingname {
- background-image: url("chrome://wot/skin/fusion/accessible/28_28/danger.png") ! important;
-}
-#wotcontainer .wotratingrow.wotreputationx.wotaccessible .wotratingname {
- background-image: url("chrome://wot/skin/fusion/28_28/excluded.png") ! important;
-}
-#wotcontainer .wotratingexpl {
- padding-left: 10px ! important;
-}
-#wotcontainer .wotratingcol {
- font-family: "Tahoma", "Arial", sans-serif ! important;
- font-size: 14px ! important;
- text-align: left ! important;
- width: 327px ! important;
-}
-#wotcontainer .wotratingcolleft {
- font-weight: bold ! important;
-}
-#wotcontainer.wotnoratings #wotratingtop, #wotcontainer.wotnoratings .wotratingarea {
- display: none ! important;
-}
-#wotcontainer #wotratingbottom {
- background: url("chrome://wot/skin/fusion/warnings/bg_rating_bottom.png") top center no-repeat ! important;
- height: 1px ! important;
-}
-#wotcontainer.wotblocked.wotnoratings #wotratingbottom {
- display: none ! important;
-}
-#wotcontainer #wotbuttonstop {
- height: 11px ! important;
-}
-#wotcontainer #wotbuttons {
- height: 40px ! important;
-}
-#wotcontainer.wotblocked #wotbuttonstop, #wotcontainer.wotblocked #wotbuttons {
- display: none ! important;
-}
-#wotcontainer .wotbutton {
- color: #055ab2 ! important;
- cursor: pointer ! important;
- display: block;
- font-family: "Tahoma", "Arial", sans-serif ! important;
- font-size: 11px ! important;
- font-weight: bold ! important;
- height: 40px ! important;
- line-height: 40px ! important;
- overflow: hidden ! important;
- text-align: center ! important;
-}
-#wotcontainer #wotratebutton {
- background: url("chrome://wot/skin/fusion/warnings/rate_button.png") no-repeat center -80px ! important;
- float: right ! important;
- margin-right: 4px ! important;
- padding-left: 30px ! important;
- width: 284px ! important;
-}
-#wotcontainer #wotgotobutton {
- background: url("chrome://wot/skin/fusion/warnings/go_to_button.png") no-repeat center -80px ! important;
- float: left ! important;
- margin-left: 3px ! important;
- padding-right: 30px ! important;
- width: 283px ! important;
-}
-#wotcontainer #wotratebutton:hover, #wotcontainer #wotgotobutton:hover {
- background-position: center -40px ! important;
-}
-#wotcontainer #wotratebutton:active, #wotcontainer #wotgotobutton:active {
- background-position: center 0px ! important;
-}
-#wotcontainer #wotlogo {
- background: url("chrome://wot/skin/fusion/warnings/wot_logo_bottom.png") bottom center no-repeat ! important;
- height: 98px ! important;
+ width: 420px ! important; /* fixed width */
+ margin: 0 auto 0 !important;
+ outline: 0 !important;
+ padding: 0 0 17px !important;
+ z-index: 2147483647 !important;
+ text-align: center !important;
+ font-family: "Verdana", sans-serif !important;
+ border-bottom-left-radius: 16px;
+ border-bottom-right-radius: 16px;
+ border: #babbbb solid 1px;
+ box-shadow: 5px 5px 20px #111;
+ background-color: #e9e9e9 !important;
+ background: -moz-linear-gradient(left, #bdbdbd 0%, #e0e0e0 15%, #f1f1f1 50%, #e0e0e0 85%, #bdbdbd 100%);
+ cursor: default !important;
+ color: #504f4f !important;
+}
+
+.wotcontainer * {
+ line-height: normal !important;
+ font-family: "Verdana", sans-serif !important;
+ font-weight: normal !important;
+ cursor: default !important;
+ font-size: 10pt !important;
+ letter-spacing: 0 !important;
+ opacity: 1.0 !important;
+ outline: 0 !important;
+ border: 0 !important;
+ vertical-align: baseline !important;
+ word-spacing: 0 !important;
+ padding: 0 0 0 0 !important;
+ text-decoration: none !important;
+ background-color: transparent !important;
+ text-align: center !important;
+ margin: 0 !important;
+ color: #504f4f !important;
+ -moz-user-select: none;
+ user-select: none;
+}
+
+.wot-logo {
+ position: relative !important;
+ top: 14px !important;
+ left: 19px !important;
+ width: 66px !important;
+ height: 28px !important;
+ background: url("chrome://wot/skin/b/logo.png") top left no-repeat !important;
+}
+
+.accessible .wot-logo {
+ background-image: url("chrome://wot/skin/b/accessible/logo.png") !important;
+}
+
+.wot-warning {
+ margin-top: 0.2em !important;
+ width: 100% !important;
+ text-align: center !important;
+ font-size: 26pt !important;
+ font-weight: 800 !important;
+ color: #504f4f !important;
+ text-shadow: 1px 1px 1px #fff !important;
+}
+
+.wot-title {
+ margin-top: 17px !important;
+ width: 400px !important;
+ font-size: 10pt !important;
+ font-weight: bold !important;
+ color: #504f4f !important;
+ text-shadow: 1px 1px 1px #fff !important;
+ overflow: hidden !important;
+ white-space: nowrap !important;
+ padding: 0 0.5em 0.5em 0.5em !important
+}
+
+.wot-desc {
+ margin-top: 11px !important;
+ width: 100% !important;
+ font-size: 11pt !important;
+ text-shadow: 1px 1px 1px #fff !important;
+ color: black !important;
+}
+
+.wot-openscorecard-wrap {
+ margin-top: 1.5em !important;
+ width: 100% !important;
+}
+
+#wotinfobutton,
+.wot-openscorecard {
+ padding: 0.25em 0 0.3em 30px !important;
+ font-size: 10pt !important;
+ background: url("chrome://wot/skin/b/i.png") no-repeat !important;
+ text-shadow: 2px 2px 2px #fff !important;
+}
+
+.wot-link {
+ cursor: pointer !important;
+ color: #2353ce !important;
+ text-decoration: none !important;
+}
+
+.wot-link:hover {
+ text-decoration: underline !important;
+}
+
+/* Section of ratings */
+#wot-ratings {
+ width: 63% !important;
+ margin: 0.5em auto !important;
+}
+
+#wotcontainer.wotnoratings #wot-ratings {
+ display: none !important;
+}
+
+.wot-component {
+ position: relative !important;
+ margin-top: 1.2em !important;
+ text-align: left !important;
+}
+
+.wot-comp-name {
+ padding: 0 0 0.5em 1em !important;
+ color: #4f4f4e !important;
+ text-shadow: 2px 2px 2px #fff !important;
+ text-align: left !important;
+ font-size: 10pt !important;
+}
+
+.wot-comp-level {
+ padding: 0.2em 0 0.3em 1em !important;
+ margin-right: 38px !important;
+ border-top-left-radius: 10px !important;
+ border-bottom-left-radius: 10px !important;
+ color: #ffffff !important;
+ box-shadow: 2px 2px 6px #b6b6b6 !important;
+ text-align: left !important;
+ font-size: 10pt !important;
+}
+
+/* Colors for reputation's levels */
+.wot-comp-level[r="r0"]{
+ background-image: -moz-linear-gradient(left, #aeafb0, #dddede) !important;
+}
+
+.wot-comp-level[r="r1"]{
+ background-image: -moz-linear-gradient(left, #fd0000, #ff6464) !important;
+}
+
+.wot-comp-level[r="r2"]{
+ background-image: -moz-linear-gradient(left, #ff5933, #ff9f75) !important;
+}
+
+.wot-comp-level[r="r3"]{
+ background-image: -moz-linear-gradient(left, #de7c1b, #ffd100) !important;
+}
+
+.wot-comp-level[r="r4"]{
+ background-image: -moz-linear-gradient(left, #5bab28, #a7df21) !important;
+}
+
+.wot-comp-level[r="r5"]{
+ background-image: -moz-linear-gradient(left, #3b9013, #68c800) !important;
+}
+
+/* Accessible mode */
+.accessible .wot-comp-level[r="r0"]{
+ /* angled stripes */
+ background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAT0lEQVQYV2N88fTFfwYgeP7qOYhCAZJikmA+I0gRPgVgRefPnwebhAxgJsDEMBShKwDZgqIImwIU63ApgCvCpwDuO2RHY/MpOAhginAFBQCXxzf2ZTB/RwAAAABJRU5ErkJggg==) !important;
+}
+
+.accessible .wot-comp-level[r="r1"]{
+ background-image: -moz-linear-gradient(left, #000000, #b2b2b2) !important;
+}
+
+.accessible .wot-comp-level[r="r2"]{
+ background-image: -moz-linear-gradient(left, #6b5a1a, #948345) !important;
+}
+
+.accessible .wot-comp-level[r="r3"]{
+ background-image: -moz-linear-gradient(left, #e0bb2f, #ffe37f) !important;
+}
+
+.accessible .wot-comp-level[r="r4"]{
+ background-image: -moz-linear-gradient(left, #b6ad88, #f2e9b2) !important;
+}
+
+.accessible .wot-comp-level[r="r5"] {
+ background-image: -moz-linear-gradient(left, #BEBDBD, rgba(255, 255, 255, 0.9) 96%, rgba(255, 255, 255, 0) 100%) !important;
+ /* mask right part of label under the thin "green" donut */
+ -moz-border-top-right-radius: 13px !important;
+ box-shadow: -1px 2px 6px #B6B6B6 !important;
+}
+
+
+/* Donuts icons */
+.wot-comp-icon {
+ background-image: url("chrome://wot/skin/b/r0.png") !important;
+ background-repeat: no-repeat !important;
+ width: 49px !important;
+ height: 46px !important;
+ position: absolute !important;
+ bottom: -7px !important;
+ right: 2px !important;
+}
+
+.accessible .wot-comp-icon {
+ background-image: url("chrome://wot/skin/b/accessible/r0.png") !important;
+}
+
+.wot-comp-icon[r="r1"] {
+ background-image: url("chrome://wot/skin/b/r1.png") !important;
+}
+
+.wot-comp-icon[r="r2"] {
+ background-image: url("chrome://wot/skin/b/r2.png") !important;
+}
+
+.wot-comp-icon[r="r3"] {
+ background-image: url("chrome://wot/skin/b/r3.png") !important;
+}
+
+.wot-comp-icon[r="r4"] {
+ background-image: url("chrome://wot/skin/b/r4.png") !important;
+}
+
+.wot-comp-icon[r="r5"] {
+ background-image: url("chrome://wot/skin/b/r5.png") !important;
+}
+
+.accessible .wot-comp-icon[r="r1"] {
+ background-image: url("chrome://wot/skin/b/accessible/r1.png") !important;
+}
+
+.accessible .wot-comp-icon[r="r2"] {
+ background-image: url("chrome://wot/skin/b/accessible/r2.png") !important;
+}
+
+.accessible .wot-comp-icon[r="r3"] {
+ background-image: url("chrome://wot/skin/b/accessible/r3.png") !important;
+}
+
+.accessible .wot-comp-icon[r="r4"] {
+ background-image: url("chrome://wot/skin/b/accessible/r4.png") !important;
+}
+
+.accessible .wot-comp-icon[r="r5"] {
+ background-image: url("chrome://wot/skin/b/accessible/r5.png") !important;
+}
+
+.wot-rateit-wrap {
+ margin-top: 2em !important;
+ font-size: 10pt !important;
+ text-shadow: 1px 1px 1px #fff !important;
+ text-decoration: none !important;
+}
+
+/* bottom buttons row */
+.wot-buttons {
+ margin-top: 1.3em !important;
+ margin-bottom: 1.2em !important;
+ position: relative !important;
+ height: 32px !important;
+}
+/* button's style */
+.wot-button {
+ border: #babbbb solid 1px !important;
+ border-radius: 8px !important;
+ height: 24px !important;
+ color: #5a5a5a !important;
+ min-width: 130px !important;
+ padding: 0.7em 0.5em 0 0.5em !important;
+ box-shadow: 2px 2px 2px #838181;
+ text-shadow: 1px 1px 1px #fff !important;
+
+ background-image: -moz-linear-gradient(top, #f9f9f9 60%, #d5d5d5) !important;
+ font-size: 10pt !important;
+ font-weight: bold !important;
+
+ -moz-transition: box-shadow 0.1s !important;
+}
+
+.wot-button:hover {
+ box-shadow: 0px 0px 20px rgba(121, 180, 42, 0.8) !important;
+ border-color: #80ba33 !important;
+}
+
+.accessible .wot-button:hover {
+ box-shadow: 0px 0px 20px rgba(145, 145, 145, 0.8) !important;
+ border-color: #8c8d8c !important;
+}
+
+.wot-button:active {
+ border-color: #babbbb !important;
+ /*box-shadow: 0px 0px 20px rgba(#88, #89, #89, 0.8);*/
+ box-shadow: none !important;
+ top: 1px !important;
+ background-image: -moz-linear-gradient(top, #e2e1e1 71%, #b0afaf) !important;
+}
+
+#wot-btn-hide, #wot-btn-leave {
+ position: absolute !important;
+}
+
+#wot-btn-hide {
+ left: 50px !important;
+}
+
+#wot-btn-hide:active {
+ left: 51px !important;
+}
+
+#wot-btn-leave {
+ right: 50px !important;
+}
+
+#wot-btn-leave:active {
+ right: 49px !important;
}
diff --git a/skin/include/blocked.js b/skin/include/blocked.js
index 5de8e10..95c27ca 100644
--- a/skin/include/blocked.js
+++ b/skin/include/blocked.js
@@ -1,65 +1,155 @@
+/*
+ warning.js
+ Copyright © 2012 - WOT Services Oy <info at mywot.com>
+
+ This file is part of WOT.
+
+ WOT is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ WOT is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with WOT. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+var WOT_QUERY_OK = 1;
+
var blocked_target = null;
+var l10n = {};
+var wot_modules = [];
+
+function load_l10n() {
+ // loads locale stings for add-on, parse them and store in l10n object
+ try {
+ xhr = new XMLHttpRequest();
+ xhr.open("GET", "chrome://wot/locale/wot.properties", false);
+ xhr.send();
+ var text = xhr.responseText;
+
+ var lines = text.split("\r\n");
+ for(var i=0; i < lines.length; i++) {
+ var pair = lines[i].split(" = ", 2);
+ l10n[pair[0]] = pair[1];
+ }
+ } catch (e) {
+ console.log("Exception in blocked.js / load_l10n()");
+ }
+}
+
+// emulation of original wot_util module
+var wot_util = {
+ getstring: function(str)
+ {
+ return l10n[str] || "?!";
+ }
+};
+
+// stub
+var wot_prefs = {
+ accessible: false,
+ warning_opacity: 1,
+ min_confidence_level: 1
+};
+
+// stub
+var wot_shared = {
+ decodehostname: function(s)
+ {
+ return s;
+ }
+};
+
+var wot_cache = {
+ data: {},
+ get: function(name, property)
+ {
+ return wot_cache.data[property];
+ }
+};
+
+var wot_browser = {
+ show_warning: function(){} // pure stub. Does nothing.
+};
+
+// copy-pasted from core.js - not a best way, I know.
+var wot_core = {
+ get_level: function(r) {
+ if (r >= WOT_MIN_REPUTATION_5) {
+ return 5;
+ } else if (r >= WOT_MIN_REPUTATION_4) {
+ return 4;
+ } else if (r >= WOT_MIN_REPUTATION_3) {
+ return 3;
+ } else if (r >= WOT_MIN_REPUTATION_2) {
+ return 2;
+ } else if (r >= 0) {
+ return 1;
+ } else if (r == -1){
+ return 0;
+ } else {
+ return "x";
+ }
+ }
+};
+
function blocked_info()
{
if (blocked_target) {
location.href = "http://www.mywot.com/scorecard/" + blocked_target;
}
}
-
-function blocked_addclass(elem, name)
-{
- elem.setAttribute("class", elem.getAttribute("class") + " " + name);
-}
-
-function blocked_sethtml(a, b) {
- document.getElementById(a).innerHTML =
- document.getElementById(b).innerHTML;
-}
-
function blocked_load()
{
if (!window.location.search) {
return;
}
+ load_l10n();
+
var query = atob(decodeURIComponent(window.location.search.substr(1)));
var m = /target=([^&]*)/.exec(query);
if (m && m[1]) {
blocked_target = m[1];
-
- var elem = document.getElementById("wotwebsite");
- elem.innerHTML = blocked_target;
- elem.setAttribute("title", blocked_target);
}
- var ratings = false;
var reasons = {
reputation: false,
- userrating: false
+ userrating: false,
+ reason: WOT_REASON_RATING // will be set to reason of showing warning
};
var apps = [ 0, 1, 2, 4 ];
for (var i = 0; i < apps.length; ++i) {
- var rating = document.getElementById("wotrating" + apps[i]);
+
+ var app = apps[i];
+ wot_prefs["warning_type_" + app] = WOT_WARNING_BLOCK;
+ wot_prefs["warning_level_" + app] = 40;
+
var r = -1;
-
+
m = RegExp(apps[i] + "=([^&]*)").exec(query);
if (m && m[1] != null) {
for (r = 5; r > 0; --r) {
if (m[1].indexOf(r) >= 0) {
- blocked_addclass(rating, "wotreputation" + r);
- blocked_sethtml("wotratingexpl" + apps[i],
- "wottextreputation" + r);
+ wot_cache.data["reputation_" + app] = r * 20 - 1; //already mapped reputation, unmap it back
+ wot_cache.data["confidence_" + app] = 99; // dummy confidence
+ wot_prefs["show_application_" + app] = true;
break;
}
}
if (m[1].indexOf("x") >= 0) {
- blocked_addclass(rating, "wotreputationx");
+ wot_cache.data["excluded_" + app] = true;
}
if (m[1].indexOf("y") >= 0) {
@@ -69,29 +159,25 @@ function blocked_load()
}
if (m[1].indexOf("a") >= 0) {
- blocked_addclass(rating, "wotaccessible");
+ wot_prefs.accessible = true;
}
}
-
- if (r < 0) {
- rating.style.display = "none";
- } else {
- ratings = true;
- }
- }
-
- if (!ratings || (reasons.userrating && !reasons.reputation)) {
- blocked_addclass(document.getElementById("wotcontainer"),
- "wotnoratings");
}
if (!reasons.reputation) {
if (reasons.userrating) {
- blocked_addclass(document.getElementById("wotdescriptiontext"),
- "wotlongdescription");
- blocked_sethtml("wotdescriptiontext", "wottextdescuserrat");
+ reasons.reason = WOT_REASON_TESTIMONY;
} else {
- blocked_sethtml("wotdescriptiontext", "wottextdescunknown");
+ reasons.reason = WOT_REASON_UNKNOWN;
}
}
+
+ var el_wotblocked = document.getElementById("wotblocked");
+
+ if (el_wotblocked) {
+ wot_warning.is_blocked = true;
+ el_wotblocked.setAttribute("exit_mode", wot_warning.set_exitmode(document));
+ wot_warning.load_delayed(true); // init warning with blocked=true flag to hide "Goto the site" button
+ wot_warning.add(blocked_target, document, WOT_WARNING_DOM, reasons.reason);
+ }
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/wot.git
More information about the Pkg-mozext-commits
mailing list