Skip to content
Snippets Groups Projects
Commit cde77f2a authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch 'patch-1' into 'development'

Update faq.php

Zeilen aufgetrennt und überflüssige Escapes entfernt

See merge request !540
parents fe6ea2c4 c1af4806
No related branches found
No related tags found
2 merge requests!619Development,!540Update faq.php
...@@ -36,11 +36,13 @@ return [ ...@@ -36,11 +36,13 @@ return [
"faq.13.b.4" => "Please use the Tor-network or the MetaGer Tor-branch for advanced anonymization. Please click \"Tools\" for further information.", "faq.13.b.4" => "Please use the Tor-network or the MetaGer Tor-branch for advanced anonymization. Please click \"Tools\" for further information.",
"faq.13.b.5" => "Needless to say: we use the https protocoll at any time. All your queries are safe between your personal computer and the MetaGer servers.", "faq.13.b.5" => "Needless to say: we use the https protocoll at any time. All your queries are safe between your personal computer and the MetaGer servers.",
"faq.14.h" => "How can one match data to indviduals ?", "faq.14.h" => "How can one match data to indviduals ?",
"faq.14.b" => "1.) This could be done by using cookies. For example a cookie can be set as a part of making an account. You give your data, a cookie is made out of it and is stored on your PC. Next time using the same service it will know you very well. This kind of data is managed by the webbrowser. It is easy to find and erase all cookies. You should do this routinely. \r\n\r\n2.) The webproviders manage internet connections by assigning IP-addresses to individuals. This is ruled by law and is different in all countries. \r\n\r\n3.) The webbrowser sends a heap of data to a website, like the user agent, exact version numbers, the work invironment, the operating system and so on. Maybe there is a matching of data to individuals possible, too.", "faq.14.b.1" => "1.) This could be done by using cookies. For example a cookie can be set as a part of making an account. You give your data, a cookie is made out of it and is stored on your PC. Next time using the same service it will know you very well. This kind of data is managed by the webbrowser. It is easy to find and erase all cookies. You should do this routinely. ",
"faq.14.b.2" => "2.) The webproviders manage internet connections by assigning IP-addresses to individuals. This is ruled by law and is different in all countries.",
"faq.14.b.3" => "3.) The webbrowser sends a heap of data to a website, like the user agent, exact version numbers, the work invironment, the operating system and so on. Maybe there is a matching of data to individuals possible, too.",
"faq.15.h" => "How was MetaGer started, what is the story behind MetaGer?", "faq.15.h" => "How was MetaGer started, what is the story behind MetaGer?",
"faq.15.b" => "It was started in 1996. Take a look at the historically documented origin story here: <a href=\"http://blog.suma-ev.de/node/207\" target=\"_blank\" rel=\"noopener\">http://blog.suma-ev.de/node/207</a>.", "faq.15.b" => "It was started in 1996. Take a look at the historically documented origin story here: <a href=\"http://blog.suma-ev.de/node/207\" target=\"_blank\" rel=\"noopener\">http://blog.suma-ev.de/node/207</a>.",
"faq.16.h" => "Is it allowed to hyperlink MetaGer ?", "faq.16.h" => "Is it allowed to hyperlink MetaGer ?",
"faq.16.b" => "Yes, sure. You can do this as you like. This refers to all pages of our site. But: we would like it more if you would use our widget (for the improvement of your own website). See \\\"Tools\"\\.", "faq.16.b" => "Yes, sure. You can do this as you like. This refers to all pages of our site. But: we would like it more if you would use our widget (for the improvement of your own website). See \"Tools\".",
"faq.17.h" => "How to add MetaGer as a standard search engine (using the plugin)", "faq.17.h" => "How to add MetaGer as a standard search engine (using the plugin)",
"faq.17.b.1" => "A short instruction how to add the metager plugin to your webbrowser (includes deinstallation if necessary):", "faq.17.b.1" => "A short instruction how to add the metager plugin to your webbrowser (includes deinstallation if necessary):",
"faq.17.b.2" => "<b>For the Firefox webbrowser:</b>", "faq.17.b.2" => "<b>For the Firefox webbrowser:</b>",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment