July 2013 - tor-commits - lists.torproject.org

r26239: {website} update copyright and trademark links/statement, see ticket 9 (in website/trunk: docs/en include)
by Andrew Lewman 06 Jul '13

06 Jul '13

Author: phobos Date: 2013-07-06 02:35:51 +0000 (Sat, 06 Jul 2013) New Revision: 26239 Modified: website/trunk/docs/en/trademark-faq.wml website/trunk/include/foot.wmi Log: update copyright and trademark links/statement, see ticket 9203 Modified: website/trunk/docs/en/trademark-faq.wml =================================================================== --- website/trunk/docs/en/trademark-faq.wml 2013-07-05 17:23:26 UTC (rev 26238) +++ website/trunk/docs/en/trademark-faq.wml 2013-07-06 … [View More]02:35:51 UTC (rev 26239) @@ -11,9 +11,16 @@ </div> <div id="maincol">  + + <h1>General Statement of Trademark and Copyright</h1> + + <p>Content on this site is Copyright The Tor Project, Inc.. Reproduction of content is permitted under a <a href="https://creativecommons.org/licenses/by/3.0/us/">Creative Commons Attribution 3.0 United States License</a>. All use under such license must be accompanied by a clear and prominent attribution that identifies The Tor Project, Inc. as the owner and originator of such content. The Tor Project Inc. reserves the right to revoke the foregoing licenses and permissions at any time in its sole discretion.</p> + + <p>The Tor&#174 software is licensed in various ways. Learn more about the <a href="<page docs/faq>#DistributingTor">various licenses</a>. + <h1>Tor Trademark Frequently Asked Questions</h1> <hr> - + <a id="usage"></a> <h2>How can I use the name "Tor"?</h2> <p>The Tor Project encourages developers to use the name Tor in ways that @@ -27,7 +34,7 @@ sponsored by The Tor Project. For example, “This product is produced independently from the Tor® anonymity software and carries no guarantee from The Tor Project about quality, suitability or anything else.”</p> - + <a id="onionlogo"></a> <h2>Can I use the Tor onion logo?</h2> <p>If you're making non-commercial use of Tor software, you may also use @@ -36,7 +43,7 @@ can use items that look like the Tor onion logo to illustrate a point (e.g. an exploded onion with layers, for instance), so long as they're not used as logos in ways that would confuse people.</p> - + <a id="combining"></a> <h2>Can I use the word "Tor" as part of the name of my product or my domain name?</h2> <p>Please don't use Tor in your product name or domain name. Instead, @@ -91,12 +98,12 @@ and network and actively encourage researchers to document attacks to help us strengthen its anonymity protection further. We distribute the software itself freely, but require correct attribution. </p> - + <a id="commercial"></a> <h2>What if I produce non-open source, commercial products based on Tor?</h2> <p>Contact us, and let's talk.</p> - + <a id="licensee"></a> <h2>Are there official licensees of the Tor trademarks?</h2> <p>Yes. A few open source, non-commercial projects are Tor trademark @@ -115,4 +122,4 @@  </div>  -#include <foot.wmi> +#include <foot.wmi> Modified: website/trunk/include/foot.wmi =================================================================== --- website/trunk/include/foot.wmi 2013-07-05 17:23:26 UTC (rev 26238) +++ website/trunk/include/foot.wmi 2013-07-06 02:35:51 UTC (rev 26239) @@ -4,12 +4,8 @@ <div id="footer"> <div class="onion"><img src="$(IMGROOT)/onion.jpg" alt="Tor"></div> <div class="about"> - <p>"Tor" and the "Onion Logo" are registered trademarks of - <a href="<page docs/trademark-faq>">The Tor Project, Inc.</a> - Content on this site is licensed under a <a - href="http://creativecommons.org/licenses/by/3.0/us/">Creative - Commons Attribution 3.0 United States License</a>, unless - otherwise noted.</p> + <p>Trademark, copyright notices, and rules for use by third parties can be found + <a href="<page docs/trademark-faq>">in our FAQ</a>.</p> <!-- # This will grab the date from svn info/git # REQUIRES svn or git for this to work @@ -82,7 +78,7 @@ # <: }; :> # </div> -# LANGUAGE SWITCH CGI +# LANGUAGE SWITCH CGI # <div class="col wider"> # <h4>Languages</h4> # # this is a cgi trampoline to bounce us to the right page @@ -90,7 +86,7 @@ # # noscript does not block onclick but clients may have disabled javascript completely # # # # for this to work we need to know the relative path from the document root -# # to the current directory that wml is in. +# # to the current directory that wml is in. # <form action="$(DOCROOT)/cgi-bin/languageswitch.cgi"> # <select name="Language" id="lang"> # <:{ [View Less]

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 05 Jul '13

05 Jul '13

commit 566ad7e02d7429dc65a3c04bc18fb5cc0c95dcd3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 5 20:16:01 2013 +0000 Update translations for torcheck_completed --- da/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/da/torcheck.po b/da/torcheck.po index 4bf9f58..bd4c1db 100644 --- a/da/torcheck.po +++ b/da/torcheck.po @@ -3,15 +3,16 @@ # # Translators: # Aputsiaĸ Niels Janussen <aj(a)isit.gl>, 2011 +# … [View More]

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 05 Jul '13

05 Jul '13

commit dc1450046c546a506c96e37613d98a100cd788d0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 5 20:15:58 2013 +0000 Update translations for torcheck --- da/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/da/torcheck.po b/da/torcheck.po index 4bf9f58..bd4c1db 100644 --- a/da/torcheck.po +++ b/da/torcheck.po @@ -3,15 +3,16 @@ # # Translators: # Aputsiaĸ Niels Janussen <aj(a)isit.gl>, 2011 +# … [View More]

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 05 Jul '13

05 Jul '13

commit d9a0f7c8c3571f17b6519dc7a538cdf0242d9265 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 5 20:15:08 2013 +0000 Update translations for orbot --- values-da/strings.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/values-da/strings.xml b/values-da/strings.xml index 001743a..67c4a9e 100644 --- a/values-da/strings.xml +++ b/values-da/strings.xml @@ -77,17 +77,27 @@ <string name="wizard_warning_title">Advarsel</string&… [View More]gt;  <string name="wizard_permissions_title">Tilladelser</string> + <string name="wizard_permissions_root_msg1">Du kan eventuelt give Orbot \'Superuser\' adgang for at aktivere funktioner som f.eks. Transparent Proxying.</string> + <string name="wizard_permissions_root_msg2">Hvis du ikke vil dette, så vær sikker på at du bruger apps som fungerer med Orbot</string>  + <string name="wizard_tips_title">Orbot-aktiverede apps</string> + <string name="wizard_tips_orweb">Orweb: Privatlivs-forbedret browser der virker gennem Tor</string>   <string name="wizard_transproxy_title">Transperant Proxying</string> + <string name="wizard_transproxy_msg">Dette tillader at dine apps automatisk kører gennem Tor netværket uden nogen konfiguration.</string> + <string name="wizard_transproxy_hint">(Check denne boks hvis du ikke aner hvad vi snakker om)</string> <string name="wizard_transproxy_none">Ingen</string> + <string name="button_grant_superuser">Anmod om Superuser adgang</string> + <string name="pref_select_apps">Vælg apps</string> + <string name="pref_select_apps_summary">Vælg apps som føres gennem Tor</string>  <string name="status">Status</string> + <string name="transparent_proxying_enabled">Transparent proxying AKTIVERET</string> <string name="error">Fejl</string> <string name="default_bridges"></string> <string name="powered_by">drevet af The Tor Project</string> [View Less]

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 05 Jul '13

05 Jul '13

commit 6ec418985176b344e712c5b9d0a6e778a0ddf808 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 5 19:46:19 2013 +0000 Update translations for mat-gui --- bg.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bg.po b/bg.po index 5c6267f..cccb77d 100644 --- a/bg.po +++ b/bg.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# paya4ko <iliev2012(a)gmail.com… [View More]

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 05 Jul '13

05 Jul '13

commit b0a1e72a3a3a3b3298c61236d4c4bdd90e461c3d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 5 19:45:09 2013 +0000 Update translations for orbot --- values-da/strings.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/values-da/strings.xml b/values-da/strings.xml index 2c322be..001743a 100644 --- a/values-da/strings.xml +++ b/values-da/strings.xml @@ -39,22 +39,44 @@ <string name="… [View More]pref_transparent_port_fallback_title">Tilbagefaldsport for proxy</string> <string name="pref_transparent_port_title">Portliste</string> <string name="pref_has_root">Forespørg om Root-adgang</string> + <string name="status_install_success">Tor\'s binære filer succesfuldt installeret!</string> + <string name="status_install_fail">Tor\'s binære filer kunne ikke installeres. Læs venligst loggen og underret tor-assistants(a)torproject.org</string> <string name="title_error">Programfejl</string> <string name="wizard_title">Orbot</string> <string name="wizard_btn_tell_me_more">Om Orbot</string> <string name="btn_next">Næste</string> <string name="btn_back">Tilbage</string> <string name="btn_finish">Afslut</string> + <string name="btn_okay">Okay</string> <string name="btn_cancel">Fortryd</string>  + <string name="wizard_details">Nogle Orbot detaljer</string> + <string name="wizard_permissions_root">Tilladelse givet</string> + <string name="wizard_permissions_stock">Orbot tilladelser</string> + <string name="wizard_premissions_msg_root">Fremragende! Vi kan se at du har givet root tilladelser til Orbot . Vi vil bruge denne magt med omtanke.</string> + <string name="wizard_permissions_msg_stock">Selvom det ikke er påkrævet, kan Orbot blive et mere nyttigt værktøj, hvis din enhed har root adgang. Benyt knappen herunder for at tildele Orbot superkræfter!</string> + <string name="wizard_permissions_no_root">Hvis du ikke har root adgang eller ikke aner hvad vi snakker om, skal du være sikker på at du benytter dig af apps som kan fungere med Orbot.</string> + <string name="wizard_permissions_consent">Jeg forstår og vil gerne fortsætte uden Superuser</string> + <string name="wizard_permission_enable_root">Tillad root for Orbot</string> + <string name="wizard_configure">Indstil Torifikation</string> + <string name="wizard_configure_msg">Orbot giver dig mulighed for at føre al app-trafik igennem Tor ELLER vælge individuelt imellem apps.</string> + <string name="wizard_configure_select_apps">Vælg individuelle apps for Tor</string> + <string name="wizard_tips_tricks">Orbot-aktiverede apps</string> + <string name="wizard_tips_otrchat">Gibberbot - Sikker instant messaging klient til Android</string> + <string name="wizard_tips_proxy">Proxy indstillinger - Lær hvordan du konfigurerer apps til at fungere med Orbot</string> <string name="wizard_proxy_help_info">Proxy-indstillinger</string> + <string name="wizard_final">Orbot er klar!</string>  + <string name="tor_check">Dette vil åbne din browser på https://check.torproject.org for at se om Orbot er korrekt konfigureret og at du er forbundet til Tor.</string> <string name="pref_general_group">Generelt</string> + <string name="pref_start_boot_title">Start Orbot ved opstart</string> + <string name="pref_start_boot_summary">Start automatisk Orbot og forbind til Tor når din android enhed starter</string>    <string name="wizard_warning_title">Advarsel</string>  + <string name="wizard_permissions_title">Tilladelser</string>  <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string> <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string> [View Less]

1 0

r26238: {website} update phone number and remove qr code. (in website/trunk: images press/en)
by Andrew Lewman 05 Jul '13

05 Jul '13

Author: phobos Date: 2013-07-05 17:23:26 +0000 (Fri, 05 Jul 2013) New Revision: 26238 Removed: website/trunk/images/contact-info.png Modified: website/trunk/press/en/info.wmi Log: update phone number and remove qr code. Deleted: website/trunk/images/contact-info.png =================================================================== (Binary files differ) Modified: website/trunk/press/en/info.wmi =================================================================== --- website/trunk/… [View More]

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 05 Jul '13

05 Jul '13

commit b1248fd1906fca68f4333b7392bc47add8dd1c5c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 5 10:46:26 2013 +0000 Update translations for tor-launcher-network-settings --- da/network-settings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/da/network-settings.dtd b/da/network-settings.dtd index 24fe6fa..1269d59 100644 --- a/da/network-settings.dtd +++ b/da/network-settings.dtd @@ -18,8 +18,8 @@ <!ENTITY … [View More]

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 05 Jul '13

05 Jul '13

commit bbcea838c0b741b9875210b3d7afec964747a5ff Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 5 10:16:34 2013 +0000 Update translations for tor-launcher-network-settings --- da/network-settings.dtd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/da/network-settings.dtd b/da/network-settings.dtd index b239f37..24fe6fa 100644 --- a/da/network-settings.dtd +++ b/da/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY … [View More]torsettings.dialog.title ""> +<!ENTITY torsettings.dialog.title "Tor netværksindstillinger">  @@ -7,17 +7,17 @@ <!ENTITY torSettings.yes "Ja"> <!ENTITY torSettings.no "Nej"> -<!ENTITY torSettings.firstQuestion ""> +<!ENTITY torSettings.firstQuestion "Hvilke af de følgende beskriver bedst din situation?"> <!ENTITY torSettings.configurePrompt1 ""> <!ENTITY torSettings.configurePrompt2 ""> <!ENTITY torSettings.configure ""> -<!ENTITY torSettings.connectPrompt1 ""> -<!ENTITY torSettings.connectPrompt2 ""> +<!ENTITY torSettings.connectPrompt1 "Denne computers internetforbindelse er ryddet for forhindringer."> +<!ENTITY torSettings.connectPrompt2 "Jeg vil forbinde direkte til Tor netværket."> <!ENTITY torSettings.connect ""> -<!ENTITY torSettings.proxyQuestion ""> +<!ENTITY torSettings.proxyQuestion "Skal denne computer bruge en proxy for at forbinde til internettet?">  -<!ENTITY torSettings.proxyHelp ""> +<!ENTITY torSettings.proxyHelp "Hvis du ikke kender svaret på dette spørgsmål, så kig på internetindstillingerne i en anden browser for at se om den er konfigureret til at bruge en proxy."> <!ENTITY torSettings.enterProxy ""> <!ENTITY torSettings.firewallQuestion ""> <!ENTITY torSettings.firewallHelp ""> @@ -26,9 +26,9 @@  -<!ENTITY torsettings.startingTor ""> +<!ENTITY torsettings.startingTor "Venter på at Tor starter..."> -<!ENTITY torsettings.optional ""> +<!ENTITY torsettings.optional "Valgfri"> <!ENTITY torsettings.useProxy.checkbox ""> <!ENTITY torsettings.useProxy.type ""> @@ -42,7 +42,7 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox ""> <!ENTITY torsettings.firewall.allowedPorts "Tilladte Porte:"> -<!ENTITY torsettings.useBridges.checkbox ""> +<!ENTITY torsettings.useBridges.checkbox "Min udbyder (ISP) blokerer forbindelse til Tor netværket"> <!ENTITY torsettings.useBridges.label ""> <!ENTITY torsettings.useBridges.placeholder ""> [View Less]

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 05 Jul '13

05 Jul '13

commit 9fce597e4fcc093c057ae3886e173e1d148c94c7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 5 10:16:24 2013 +0000 Update translations for mat-gui --- da.po | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/da.po b/da.po index 5fcec7c..ab27c52 100644 --- a/da.po +++ b/da.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# … [View More]klovnecaspar, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-05 20:03+0100\n" -"PO-Revision-Date: 2013-02-04 18:44+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2013-07-05 10:10+0000\n" +"Last-Translator: klovnecaspar\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,15 +20,15 @@ msgstr "" #: mat-gui:95 mat-gui:563 mat-gui:579 msgid "Ready" -msgstr "" +msgstr "Klar" #: mat-gui:107 msgid "Add" -msgstr "" +msgstr "Tilføj" #: mat-gui:109 mat-gui:183 msgid "Add files" -msgstr "" +msgstr "Tilføj filer" #: mat-gui:113 mat-gui:203 mat-gui:308 mat-gui:311 mat-gui:555 mat-gui:557 #: mat-gui:573 mat-gui:575 @@ -44,7 +45,7 @@ msgstr "Tjek" #: mat-gui:121 msgid "Check selected files for harmful meta" -msgstr "" +msgstr "Gennemgå valgte filer for skadelig meta" #: mat-gui:125 mat-gui:185 msgid "Quit" @@ -72,15 +73,15 @@ msgstr "" #: mat-gui:182 msgid "Files" -msgstr "" +msgstr "Filer" #: mat-gui:188 msgid "Edit" -msgstr "" +msgstr "Rediger" #: mat-gui:189 msgid "Clear the filelist" -msgstr "" +msgstr "Ryd fil-listen" #: mat-gui:192 mat-gui:447 msgid "Preferences" @@ -104,11 +105,11 @@ msgstr "Om" #: mat-gui:241 msgid "Choose files" -msgstr "" +msgstr "Vælg filer" #: mat-gui:248 msgid "All files" -msgstr "" +msgstr "Alle filer" #: mat-gui:255 msgid "Supported files" @@ -124,15 +125,15 @@ msgstr "" #: mat-gui:343 msgid "Not-supported" -msgstr "" +msgstr "Ikke understøttet" #: mat-gui:381 msgid "This software was coded during the GSoC 2011" -msgstr "" +msgstr "Denne software blev kodet under GSoC 2011" #: mat-gui:386 msgid "Website" -msgstr "" +msgstr "Hjemmeside" #: mat-gui:461 msgid "Force Clean" @@ -144,27 +145,27 @@ msgstr "" #: mat-gui:468 msgid "Backup" -msgstr "" +msgstr "Sikkerhedskopiér" #: mat-gui:471 msgid "Keep a backup copy" -msgstr "" +msgstr "Gem en sikkerhedskopi" #: mat-gui:474 msgid "Reduce PDF quality" -msgstr "" +msgstr "Reducer PDF kvalitet" #: mat-gui:477 msgid "Reduce the produced PDF size and quality" -msgstr "" +msgstr "Reducer den producerede PDF størrelse og kvalitet" #: mat-gui:480 msgid "Add unsupported file to archives" -msgstr "" +msgstr "Tilføj ikke understøttede filer til arkiver" #: mat-gui:484 msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "" +msgstr "Tilføj ikke understøttet (og derfor ikke anonymiseret) fil til output arkiv " #: mat-gui:554 #, python-format [View Less]

1 0