1
0
mirror of https://github.com/gorhill/uBlock.git synced 2024-09-04 01:59:38 +02:00

Merge branch 'master' of github.com:gorhill/uBlock into fix-433

This commit is contained in:
gorhill 2015-01-07 17:45:47 -05:00
commit 4415bb60ef
17 changed files with 28 additions and 28 deletions

BIN
doc/img/df-qg-01.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 86 KiB

BIN
doc/img/df-qg-02.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

BIN
doc/img/df-qg-03.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

BIN
doc/img/df-qg-04.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

BIN
doc/img/df-qg-05.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 75 KiB

BIN
doc/img/df-qg-06.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

BIN
doc/img/df-qg-07.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 KiB

BIN
doc/img/df-qg-08.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 KiB

BIN
doc/img/df-qg-09.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 88 KiB

BIN
doc/img/df-qg-10.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

BIN
doc/img/df-qg-11.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 KiB

View File

@ -216,7 +216,7 @@
"description":"English: Make use of context menu where appropriate" "description":"English: Make use of context menu where appropriate"
}, },
"settingsAdvancedUserPrompt":{ "settingsAdvancedUserPrompt":{
"message":"I am an advanced user (<a href='https:\/\/github.com\/gorhill\/uBlock\/wiki\/Advanced-user-features'>Required reading<\/a>)", "message":"إظهار الإعدادات المتقدمة (<a href='https:\/\/github.com\/gorhill\/uBlock\/wiki\/Advanced-user-features'>يجب القراءة<\/a>)",
"description":"English: " "description":"English: "
}, },
"settingsExperimentalPrompt":{ "settingsExperimentalPrompt":{
@ -460,7 +460,7 @@
"description":"English: Network error: unable to connect to {{url}}" "description":"English: Network error: unable to connect to {{url}}"
}, },
"dummy":{ "dummy":{
"message":"This entry must be the last one", "message":"يجب أن يكون هذا الإدخال آخر واحد",
"description":"so we dont need to deal with comma for last entry" "description":"so we dont need to deal with comma for last entry"
} }
} }

View File

@ -172,7 +172,7 @@
"description":"" "description":""
}, },
"popupHitDomainCountPrompt":{ "popupHitDomainCountPrompt":{
"message":"Připojeno k {{count}} různým doménám", "message":"Připojeno k {{count}} různým doménám z {{total}}",
"description":"appear in dynamic filtering pane" "description":"appear in dynamic filtering pane"
}, },
"pickerCreate":{ "pickerCreate":{

View File

@ -92,15 +92,15 @@
"description":"" "description":""
}, },
"popupSite3pScriptDisabled":{ "popupSite3pScriptDisabled":{
"message":"3rd-party scripts are <b>blocked<\/b> on this site", "message":"3-part scripts er <b>blokeret<\/b> på denne side",
"description":"" "description":""
}, },
"popupSite1pFrameEnabled":{ "popupSite1pFrameEnabled":{
"message":"1st-party frames are <b>allowed<\/b> on this site", "message":"1-part rammer er <b>tilladte<\/b> på denne side",
"description":"" "description":""
}, },
"popupSite1pFrameDisabled":{ "popupSite1pFrameDisabled":{
"message":"1st-party frames are <b>blocked<\/b> on this site", "message":"1-part frames er <b>blokerede<\/b> på denne hjemmeside",
"description":"" "description":""
}, },
"popupSite3pFrameEnabled":{ "popupSite3pFrameEnabled":{
@ -432,7 +432,7 @@
"description":"English: Backup to file" "description":"English: Backup to file"
}, },
"aboutBackupFilename":{ "aboutBackupFilename":{
"message":"my-ublock-backup_{{datetime}}.txt", "message":"ublock-sikkerhedskopi_{{datetime}}.txt",
"description":"English: my-ublock-backup_{{datetime}}.txt" "description":"English: my-ublock-backup_{{datetime}}.txt"
}, },
"aboutRestoreDataButton":{ "aboutRestoreDataButton":{
@ -444,7 +444,7 @@
"description":"English: Reset to default settings..." "description":"English: Reset to default settings..."
}, },
"aboutRestoreDataConfirm":{ "aboutRestoreDataConfirm":{
"message":"All your settings will be overwritten using data backed up on {{time}}, and µBlock will restart.\n\nOverwrite all existing settings using backed up data?", "message":"Alle dine indstillinger vil blive overskrevet med data sikkerhedskopieret {{time}}, og µBlock vil genstarte.\n\nOverskriv alle indstillinger med sikkerhedskopieret data?",
"description":"Message asking user to confirm restore" "description":"Message asking user to confirm restore"
}, },
"aboutRestoreDataError":{ "aboutRestoreDataError":{
@ -460,7 +460,7 @@
"description":"English: Network error: unable to connect to {{url}}" "description":"English: Network error: unable to connect to {{url}}"
}, },
"dummy":{ "dummy":{
"message":"This entry must be the last one", "message":"Denne indskrivning må være den sidste",
"description":"so we dont need to deal with comma for last entry" "description":"so we dont need to deal with comma for last entry"
} }
} }

View File

@ -172,7 +172,7 @@
"description":"" "description":""
}, },
"popupHitDomainCountPrompt":{ "popupHitDomainCountPrompt":{
"message":"מחובר ל {{count}} דומיין\/ים שונה\/ים", "message":"מחובר ל {{count}} דומיין\/ים שונה\/ים מתוך {{total}}",
"description":"appear in dynamic filtering pane" "description":"appear in dynamic filtering pane"
}, },
"pickerCreate":{ "pickerCreate":{

View File

@ -172,7 +172,7 @@
"description":"" "description":""
}, },
"popupHitDomainCountPrompt":{ "popupHitDomainCountPrompt":{
"message":"Povezani sa {{count}} različitih domena", "message":"Povezani sa {{count}} različitih domena od ukupno {{total}}",
"description":"appear in dynamic filtering pane" "description":"appear in dynamic filtering pane"
}, },
"pickerCreate":{ "pickerCreate":{
@ -320,7 +320,7 @@
"description":"English: Export" "description":"English: Export"
}, },
"1pExportFilename":{ "1pExportFilename":{
"message":"ublock-custom-filters_{{datetime}}.txt", "message":"moji-ublock-staticni-filteri_{{datetime}}.txt",
"description":"English: my-ublock-static-filters_{{datetime}}.txt" "description":"English: my-ublock-static-filters_{{datetime}}.txt"
}, },
"1pApplyChanges":{ "1pApplyChanges":{
@ -348,7 +348,7 @@
"description":"" "description":""
}, },
"rulesDefaultFileName":{ "rulesDefaultFileName":{
"message":"my-ublock-dynamic-rules.txt", "message":"moja-ublock-dinamicna-pravila_{{datetime}}.txt",
"description":"default file name to use" "description":"default file name to use"
}, },
"whitelistPrompt":{ "whitelistPrompt":{
@ -364,7 +364,7 @@
"description":"English: Export" "description":"English: Export"
}, },
"whitelistExportFilename":{ "whitelistExportFilename":{
"message":"ublock-whitelist_{{datetime}}.txt", "message":"moja-ublock-lista_dopustenog_{{datetime}}.txt",
"description":"English: my-ublock-whitelist_{{datetime}}.txt" "description":"English: my-ublock-whitelist_{{datetime}}.txt"
}, },
"whitelistApply":{ "whitelistApply":{
@ -432,7 +432,7 @@
"description":"English: Backup to file" "description":"English: Backup to file"
}, },
"aboutBackupFilename":{ "aboutBackupFilename":{
"message":"ublock-backup_{{datetime}}.txt", "message":"moja-ublock-sig_kopija_{{datetime}}.txt",
"description":"English: my-ublock-backup_{{datetime}}.txt" "description":"English: my-ublock-backup_{{datetime}}.txt"
}, },
"aboutRestoreDataButton":{ "aboutRestoreDataButton":{

View File

@ -24,7 +24,7 @@
"description":"appears as tab name in dashboard" "description":"appears as tab name in dashboard"
}, },
"rulesPageName":{ "rulesPageName":{
"message":"My rules", "message":"Мої правила",
"description":"appears as tab name in dashboard" "description":"appears as tab name in dashboard"
}, },
"whitelistPageName":{ "whitelistPageName":{
@ -152,27 +152,27 @@
"description":"" "description":""
}, },
"popupImageRulePrompt":{ "popupImageRulePrompt":{
"message":"images", "message":"зображення",
"description":"" "description":""
}, },
"popupInlineScriptRulePrompt":{ "popupInlineScriptRulePrompt":{
"message":"inline scripts", "message":"вбудовані сценарії",
"description":"" "description":""
}, },
"popup1pScriptRulePrompt":{ "popup1pScriptRulePrompt":{
"message":"1st-party scripts", "message":"Основні скрипти",
"description":"" "description":""
}, },
"popup3pScriptRulePrompt":{ "popup3pScriptRulePrompt":{
"message":"3rd-party scripts", "message":"Сторонні скрипти",
"description":"" "description":""
}, },
"popup3pFrameRulePrompt":{ "popup3pFrameRulePrompt":{
"message":"3rd-party frames", "message":"Сторонні фрейми",
"description":"" "description":""
}, },
"popupHitDomainCountPrompt":{ "popupHitDomainCountPrompt":{
"message":"Connected to {{count}} distinct domain(s) out of {{total}}", "message":"Підключено до {{count}} різних доменів({{total}} всього доменів)",
"description":"appear in dynamic filtering pane" "description":"appear in dynamic filtering pane"
}, },
"pickerCreate":{ "pickerCreate":{
@ -216,7 +216,7 @@
"description":"English: Make use of context menu where appropriate" "description":"English: Make use of context menu where appropriate"
}, },
"settingsAdvancedUserPrompt":{ "settingsAdvancedUserPrompt":{
"message":"I am an advanced user (<a href='https:\/\/github.com\/gorhill\/uBlock\/wiki\/Advanced-user-features'>Required reading<\/a>)", "message":"Я досвідчений користувач (<a href='https:\/\/github.com\/gorhill\/uBlock\/wiki\/Advanced-user-features'>Обов’язково для прочитання<\/a>)",
"description":"English: " "description":"English: "
}, },
"settingsExperimentalPrompt":{ "settingsExperimentalPrompt":{
@ -328,23 +328,23 @@
"description":"English: Apply changes" "description":"English: Apply changes"
}, },
"rulesEdit":{ "rulesEdit":{
"message":"Edit", "message":"Редагувати",
"description":"Will enable manual-edit mode (textarea)" "description":"Will enable manual-edit mode (textarea)"
}, },
"rulesEditSave":{ "rulesEditSave":{
"message":"Save", "message":"Зберегти",
"description":"Will save manually-edited content and exit manual-edit mode" "description":"Will save manually-edited content and exit manual-edit mode"
}, },
"rulesEditDiscard":{ "rulesEditDiscard":{
"message":"Discard", "message":"Відкинути",
"description":"Will discard manually-edited content and exit manual-edit mode" "description":"Will discard manually-edited content and exit manual-edit mode"
}, },
"rulesImport":{ "rulesImport":{
"message":"Import from file...", "message":" Імпортувати з файлу...",
"description":"" "description":""
}, },
"rulesExport":{ "rulesExport":{
"message":"Export to file...", "message":"Експорт до файлу...",
"description":"" "description":""
}, },
"rulesDefaultFileName":{ "rulesDefaultFileName":{