diff --git a/src/js/matrix.js b/src/js/matrix.js index 55bcaf6..607cf6a 100644 --- a/src/js/matrix.js +++ b/src/js/matrix.js @@ -378,7 +378,7 @@ Matrix.prototype.evaluateCellZXY = function(srcHostname, desHostname, type) { r = this.evaluateCellZ(srcHostname, d, type); if ( r === 1 ) { return Matrix.RedIndirect; } if ( r === 2 ) { return Matrix.GreenIndirect; } - // Do not override narrower rule + // Do not override a narrower rule if ( rl !== 2 ) { rl = this.evaluateCellZ(srcHostname, d, '*'); if ( rl === 1 ) { return Matrix.RedIndirect; } diff --git a/tools/_locales/hi/messages.json b/tools/_locales/hi/messages.json index 9bda63c..eed09dc 100644 --- a/tools/_locales/hi/messages.json +++ b/tools/_locales/hi/messages.json @@ -1,6 +1,6 @@ { "extName":{ - "message":"µMatrix", + "message":"µमैट्रिक्स", "description":"" }, "extShortDesc":{ @@ -8,47 +8,47 @@ "description":"this will be used as short description in web stores: MUST BE 132 characters OR LESS" }, "dashboardPageName":{ - "message":"µMatrix — Dashboard", + "message":"µमैट्रिक्स— डैशबोर्ड", "description":"" }, "settingsPageName":{ - "message":"Settings", + "message":"सेटिंग्स", "description":"a tab in dashboard" }, "privacyPageName":{ - "message":"Privacy", + "message":"गोपनीयता", "description":"a tab in dashboard" }, "statsPageName":{ - "message":"Statistics", + "message":"आंकड़े", "description":"a tab in dashboard" }, "userRulesPageName":{ - "message":"My rules", + "message":"मेरे नियम", "description":"a tab in dashboard" }, "ubiquitousRulesPageName":{ - "message":"Hosts files", + "message":"होस्ट फ़ाइलें", "description":"a tab in dashboard" }, "aboutPageName":{ - "message":"About", + "message":"जानकारी", "description":"a tab in dashboard" }, "allPrettyName":{ - "message":"all", + "message":"सभी", "description":"HAS TO FIT IN MATRIX HEADER!" }, "cookiePrettyName":{ - "message":"cookie", + "message":"कुकीज़", "description":"HAS TO FIT IN MATRIX HEADER!" }, "cssPrettyName":{ - "message":"css", + "message":"सीएसएस", "description":"HAS TO FIT IN MATRIX HEADER!" }, "imagePrettyName":{ - "message":"image", + "message":"छवि", "description":"HAS TO FIT IN MATRIX HEADER!" }, "pluginPrettyName":{ @@ -56,7 +56,7 @@ "description":"HAS TO FIT IN MATRIX HEADER!" }, "scriptPrettyName":{ - "message":"script", + "message":"लिपि", "description":"HAS TO FIT IN MATRIX HEADER!" }, "xhrPrettyName":{ @@ -64,11 +64,11 @@ "description":"HAS TO FIT IN MATRIX HEADER!" }, "framePrettyName":{ - "message":"frame", + "message":"ढांचा", "description":"HAS TO FIT IN MATRIX HEADER!" }, "otherPrettyName":{ - "message":"other", + "message":"अन्य", "description":"HAS TO FIT IN MATRIX HEADER!" }, "matrixNoNetTrafficPrompt":{ @@ -140,7 +140,7 @@ "description":"" }, "statsPageDetailedAllPages":{ - "message":"All", + "message":"सभी", "description":"" }, "statsPageDetailedBehindTheScenePage":{ @@ -148,7 +148,7 @@ "description":"" }, "statsPageOverview":{ - "message":"Overview", + "message":"संक्षिप्त अवलोकन", "description":"" }, "statsPageRequests":{ @@ -156,7 +156,7 @@ "description":"header for the stat type column" }, "statsPageAllowed":{ - "message":"Allowed", + "message":"अनुमति है", "description":"header for the allowed requests column" }, "statsPageBlocked":{ @@ -164,11 +164,11 @@ "description":"header for the blocked requests column" }, "statsPageDetailed":{ - "message":"Request log", + "message":"अनुरोध प्रवेश", "description":"" }, "statsPageLogSizePrompt1":{ - "message":"Remember the last", + "message":"पिछले याद रखें", "description":"First part of Remember the last [n] HTTP requests per page" }, "statsPageLogSizePrompt2":{ @@ -180,27 +180,27 @@ "description":"To help user understand the purpose of the log size value" }, "statsPageRefresh":{ - "message":"Refresh", + "message":"रिफ्रेश", "description":"" }, "settingsPageTitle":{ - "message":"µMatrix – Settings", + "message":"µMatrix – सेटिंग्स", "description":"" }, "settingsMatrixDisplayHeader":{ - "message":"Appearance", + "message":"दिखावट", "description":"" }, "settingsMatrixDisplayTextSizePrompt":{ - "message":"Text size:", + "message":"पाठ का आकार", "description":"" }, "settingsMatrixDisplayTextSizeNormal":{ - "message":"Normal", + "message":"नोर्मल", "description":"" }, "settingsMatrixDisplayTextSizeLarge":{ - "message":"Large", + "message":"बड़ा", "description":"" }, "settingsMatrixDisplayColorBlind":{ @@ -216,7 +216,7 @@ "description":"" }, "settingsMatrixAutoReloadNone":{ - "message":"None", + "message":"कोई नहीं", "description":"" }, "settingsMatrixAutoReloadCurrent":{ diff --git a/tools/_locales/pt_BR/messages.json b/tools/_locales/pt_BR/messages.json index 4a5e6f9..441f26d 100644 --- a/tools/_locales/pt_BR/messages.json +++ b/tools/_locales/pt_BR/messages.json @@ -96,7 +96,7 @@ "description":"Tool tip for the reload button" }, "matrix1stPartyLabel":{ - "message":"1-parte", + "message":"1° Nível", "description":"1st-party" }, "matrixBlacklistedHostnames":{ diff --git a/tools/_locales/ru/messages.json b/tools/_locales/ru/messages.json index 9bda63c..61dc76f 100644 --- a/tools/_locales/ru/messages.json +++ b/tools/_locales/ru/messages.json @@ -12,23 +12,23 @@ "description":"" }, "settingsPageName":{ - "message":"Settings", + "message":"Настройки", "description":"a tab in dashboard" }, "privacyPageName":{ - "message":"Privacy", + "message":"Безопасность", "description":"a tab in dashboard" }, "statsPageName":{ - "message":"Statistics", + "message":"Статистика", "description":"a tab in dashboard" }, "userRulesPageName":{ - "message":"My rules", + "message":"Мои правила", "description":"a tab in dashboard" }, "ubiquitousRulesPageName":{ - "message":"Hosts files", + "message":"Файлы хостов", "description":"a tab in dashboard" }, "aboutPageName":{ @@ -36,11 +36,11 @@ "description":"a tab in dashboard" }, "allPrettyName":{ - "message":"all", + "message":"все", "description":"HAS TO FIT IN MATRIX HEADER!" }, "cookiePrettyName":{ - "message":"cookie", + "message":"куки", "description":"HAS TO FIT IN MATRIX HEADER!" }, "cssPrettyName":{ @@ -48,15 +48,15 @@ "description":"HAS TO FIT IN MATRIX HEADER!" }, "imagePrettyName":{ - "message":"image", + "message":"изображение", "description":"HAS TO FIT IN MATRIX HEADER!" }, "pluginPrettyName":{ - "message":"plugin", + "message":"плагин", "description":"HAS TO FIT IN MATRIX HEADER!" }, "scriptPrettyName":{ - "message":"script", + "message":"скрипт", "description":"HAS TO FIT IN MATRIX HEADER!" }, "xhrPrettyName":{ @@ -64,11 +64,11 @@ "description":"HAS TO FIT IN MATRIX HEADER!" }, "framePrettyName":{ - "message":"frame", + "message":"фрейм", "description":"HAS TO FIT IN MATRIX HEADER!" }, "otherPrettyName":{ - "message":"other", + "message":"другое", "description":"HAS TO FIT IN MATRIX HEADER!" }, "matrixNoNetTrafficPrompt":{ @@ -92,7 +92,7 @@ "description":"Tool tip for the revert all permissions button" }, "matrixReloadButton":{ - "message":"Reload the page.", + "message":"Перезагрузить страницу.", "description":"Tool tip for the reload button" }, "matrix1stPartyLabel":{ @@ -136,11 +136,11 @@ "description":"" }, "statsPageDetailedStats":{ - "message":"Detailed statistics", + "message":"Детальная статистика", "description":"" }, "statsPageDetailedAllPages":{ - "message":"All", + "message":"Все", "description":"" }, "statsPageDetailedBehindTheScenePage":{ @@ -148,23 +148,23 @@ "description":"" }, "statsPageOverview":{ - "message":"Overview", + "message":"Общие сведения", "description":"" }, "statsPageRequests":{ - "message":"Requests", + "message":"Запросы", "description":"header for the stat type column" }, "statsPageAllowed":{ - "message":"Allowed", + "message":"Разрешено", "description":"header for the allowed requests column" }, "statsPageBlocked":{ - "message":"Blocked", + "message":"Блокировано", "description":"header for the blocked requests column" }, "statsPageDetailed":{ - "message":"Request log", + "message":"Лог запросов", "description":"" }, "statsPageLogSizePrompt1":{ @@ -180,7 +180,7 @@ "description":"To help user understand the purpose of the log size value" }, "statsPageRefresh":{ - "message":"Refresh", + "message":"Обновить", "description":"" }, "settingsPageTitle":{ @@ -188,19 +188,19 @@ "description":"" }, "settingsMatrixDisplayHeader":{ - "message":"Appearance", + "message":"Внешний вид", "description":"" }, "settingsMatrixDisplayTextSizePrompt":{ - "message":"Text size:", + "message":"Размер текста:", "description":"" }, "settingsMatrixDisplayTextSizeNormal":{ - "message":"Normal", + "message":"Нормальный", "description":"" }, "settingsMatrixDisplayTextSizeLarge":{ - "message":"Large", + "message":"Большой", "description":"" }, "settingsMatrixDisplayColorBlind":{ @@ -220,11 +220,11 @@ "description":"" }, "settingsMatrixAutoReloadCurrent":{ - "message":"Current", + "message":"Текущий", "description":"" }, "settingsMatrixAutoReloadAll":{ - "message":"All", + "message":"Все", "description":"" }, "settingsMatrixAutoReloadInfo":{ @@ -236,7 +236,7 @@ "description":"English: Blocked frames: Color" }, "settingsSubframeOpacity":{ - "message":"Opacity", + "message":"Непрозрачность", "description":"English: Opacity" }, "privacyPageTitle":{ @@ -244,7 +244,7 @@ "description":"" }, "privacyDeleteBlockedCookiesPrompt":{ - "message":"Delete blocked cookies.", + "message":"Удалить заблокированные куки.", "description":"" }, "privacyDeleteBlockedCookiesHelp":{ @@ -256,7 +256,7 @@ "description":"First part of 'Delete non-blocked session cookies [n] minutes after the last time they have been used'" }, "privacyDeleteNonBlockedSessionCookiesPrompt2":{ - "message":" minutes after the last time they have been used.", + "message":" минут после последнего использования.", "description":"Second part of 'Delete non-blocked session cookies [n] minutes after the last time they have been used'" }, "privacyDeleteNonBlockedSessionCookiesHelp":{ @@ -268,15 +268,15 @@ "description":"" }, "privacyDeleteBlockedLocalStorageHelp":{ - "message":"TODO", + "message":"СДЕЛАТЬ", "description":"" }, "privacyClearCachePrompt1":{ - "message":"Clear browser cache every", + "message":"Очищать кэш браузера каждые", "description":"First part of 'Clear browser cache every [n] minutes'" }, "privacyClearCachePrompt2":{ - "message":"minutes.", + "message":"минут.", "description":"Second part of 'Clear browser cache every [n] minutes'" }, "privacyClearCacheHelp":{ @@ -304,7 +304,7 @@ "description":"First part of UA-spoofing prompt" }, "privacySpoofUserAgentPrompt2":{ - "message":"minutes.", + "message":"минут.", "description":"Second part" }, "privacySpoofUserAgentHelp":{ @@ -320,15 +320,15 @@ "description":"" }, "userRulesPermanentHeader":{ - "message":"Permanent rules", + "message":"Постоянные правила", "description":"" }, "userRulesTemporaryHeader":{ - "message":"Temporary rules", + "message":"Временные правила", "description":"" }, "userRulesRevert":{ - "message":"Revert", + "message":"Сброс", "description":"Will remove all temporary rules" }, "userRulesCommit":{ @@ -336,23 +336,23 @@ "description":"Will save all temporary rules" }, "userRulesEdit":{ - "message":"Edit", + "message":"Изменить", "description":"Will enable manual-edit mode (textarea)" }, "userRulesEditSave":{ - "message":"Save", + "message":"Сохранить", "description":"Will save manually-edited content and exit manual-edit mode" }, "userRulesEditDicard":{ - "message":"Discard", + "message":"Отклонить", "description":"Will discard manually-edited content and exit manual-edit mode" }, "userRulesImport":{ - "message":"Import from file...", + "message":"Импорт из файла...", "description":"" }, "userRulesExport":{ - "message":"Export to file...", + "message":"Экспорт в файл...", "description":"" }, "userRulesFormatHint":{ @@ -376,7 +376,7 @@ "description":"" }, "hostsFilesApplyChanges":{ - "message":"Apply changes", + "message":"Применить изменения", "description":"" }, "hostsFilesAutoUpdatePrompt":{ @@ -384,7 +384,7 @@ "description":"" }, "hostsFilesUpdateNow":{ - "message":"Update now", + "message":"Обновить сейчас", "description":"" }, "hostsFilesPurgeAll":{ @@ -436,19 +436,19 @@ "description":"" }, "aboutContributors":{ - "message":"Contributors", + "message":"Имена разработчиков", "description":"English: Contributors" }, "aboutCodeContributors":{ - "message":"Code:", + "message":"Код:", "description":"" }, "aboutIssueContributors":{ - "message":"Issues:", + "message":"Вопросы:", "description":"" }, "aboutTranslationContributors":{ - "message":"Translations:", + "message":"Переводы:", "description":"" }, "aboutUserDataHeader":{ @@ -456,7 +456,7 @@ "description":"" }, "aboutBackupButton":{ - "message":"Backup to file...", + "message":"Резервировать в файл...", "description":"" }, "aboutBackupFilename":{ @@ -464,7 +464,7 @@ "description":"default filename to use" }, "aboutRestoreButton":{ - "message":"Restore from file...", + "message":"Восстановить из файла...", "description":"" }, "aboutRestoreConfirm":{ @@ -476,19 +476,19 @@ "description":"" }, "aboutOr":{ - "message":"... or ...", + "message":"... или ...", "description":"English: ... or ..." }, "aboutResetButton":{ - "message":"Reset to default settings", + "message":"Сброс до настроек по умолчанию", "description":"English: Reset to default settings" }, "aboutResetConfirm":{ - "message":"Caution! this will remove all your custom settings. Are you sure you want to proceed?", + "message":"Внимание! Это сбросит все ваши ручные настройки. Вы уверены?", "description":"Message asking user to confirm reset" }, "commandRevertAll":{ - "message":"Remove all temporary changes", + "message":"Удалить все временные изменения", "description":"" }, "commandWhitelistPageDomain":{ diff --git a/tools/_locales/tr/messages.json b/tools/_locales/tr/messages.json index a19cf22..7b15894 100644 --- a/tools/_locales/tr/messages.json +++ b/tools/_locales/tr/messages.json @@ -392,7 +392,7 @@ "description":"" }, "hostsFilesExternalListsHint":{ - "message":"Satır başına tek URL. ‘!’ işareti ile başlayan satırlar yok sayılacaktır. Geçersiz URL'ler sessizcene yok sayılacaktır.", + "message":"Satır başına tek URL. ‘#’ işareti ile başlayan satırlar yok sayılacaktır. Geçersiz URL'ler sessizcene yok sayılacaktır.", "description":"" }, "hostsFilesExternalListsParse":{ diff --git a/tools/_locales/zh_CN/messages.json b/tools/_locales/zh_CN/messages.json index ee2c850..6ecd4d4 100644 --- a/tools/_locales/zh_CN/messages.json +++ b/tools/_locales/zh_CN/messages.json @@ -96,7 +96,7 @@ "description":"Tool tip for the reload button" }, "matrix1stPartyLabel":{ - "message":"1st-party", + "message":"第一方", "description":"1st-party" }, "matrixBlacklistedHostnames":{ @@ -440,15 +440,15 @@ "description":"English: Contributors" }, "aboutCodeContributors":{ - "message":"Code:", + "message":"代码:", "description":"" }, "aboutIssueContributors":{ - "message":"Issues:", + "message":"问题:", "description":"" }, "aboutTranslationContributors":{ - "message":"Translations:", + "message":"翻译:", "description":"" }, "aboutUserDataHeader":{