March 2011 - tor-commits - lists.torproject.org

[tor/maint-0.2.2] Implement replacements for timer(add, cmp, sub) on platforms lacking them.
by nickm＠torproject.org 30 Mar '11

30 Mar '11

commit 5eaba5ac2128eebf095441e23b6b7516ce35dd5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 30 14:29:57 2011 -0400 Implement replacements for timer(add,cmp,sub) on platforms lacking them. --- src/common/compat.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index 35829e1..550c08b 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -333,6 +333,48 @@ struct tm *tor_localtime_r(const time_t *timep, struct tm *result); struct tm *tor_gmtime_r(const time_t *timep, struct tm *result); #endif +#ifndef timeradd +/** Replacement for timeradd on platforms that do not have it: sets tvout to + * the sum of tv1 and tv2. */ +#define timeradd(tv1,tv2,tvout) \ + do { \ + (tvout)->tv_sec = (tv1)->tv_sec + (tv2)->tv_sec; \ + (tvout)->tv_usec = (tv2)->tv_usec + (tv2)->tv_usec; \ + if ((tvout)->tv_usec >= 1000000) { \ + (tvout)->tv_usec -= 1000000; \ + (tvout)->tv_sec++; \ + } \ + } while (0) +#endif + +#ifndef timersub +/** Replacement for timersub on platforms that do not have it: sets tvout to + * tv1 minus tv2. */ +#define timersub(tv1,tv2,tvout) \ + do { \ + (tvout)->tv_sec = (tv1)->tv_sec - (tv2)->tv_sec; \ + (tvout)->tv_usec = (tv2)->tv_usec - (tv2)->tv_usec; \ + if ((tvout)->tv_usec < 0) { \ + (tvout)->tv_usec += 1000000; \ + (tvout)->tv_sec--; \ + } \ + } while (0) +#endif + +#ifndef timercmp +/** Replacement for timersub on platforms that do not have it: returns true + * iff the relational operator "op" makes the expression tv1 op tv2 true. + * + * Note that while this definition should work for all boolean opeators, some + * platforms' native timercmp definitions do not support >=, <=, or ==. So + * don't use those. + */ +#define timercmp(tv1,tv2,op) \ + (((tv1)->tv_sec == (tv2)->tv_sec) ? \ + ((tv1)->tv_usec op (tv2)->tv_usec) : \ + ((tv1)->tv_sec op (tv2)->tv_sec)) +#endif + /* ===== File compatibility */ int replace_file(const char *from, const char *to); int touch_file(const char *fname);

1 0

r24513: {website} fixed a tag in polish translation of info.wmi (website/trunk/donate/pl)
by Runa Sandvik 30 Mar '11

30 Mar '11

Author: runa Date: 2011-03-30 15:06:36 +0000 (Wed, 30 Mar 2011) New Revision: 24513 Modified: website/trunk/donate/pl/info.wmi Log: fixed a tag in polish translation of info.wmi Modified: website/trunk/donate/pl/info.wmi =================================================================== --- website/trunk/donate/pl/info.wmi 2011-03-30 14:08:39 UTC (rev 24512) +++ website/trunk/donate/pl/info.wmi 2011-03-30 15:06:36 UTC (rev 24513) @@ -7,7 +7,7 @@ <h2>Co dzieje się z moimi dotacjami?</h2> <p>Jeśli właśnie złożyłeś/aś dotację, dziękujemy Ci za nią. Twoje dary są deponowane w naszym funduszu ogólnym. Dołączasz do tysięcy innych - indywidualnych <a href=\"<page sponsors>\">sponsorów</a>, + indywidualnych <a href="<page about/sponsors>">sponsorów</a>, fundując przyszłość Tora i anonimowości on-line. </p> <p>Nasze <a href="<page about/financials>">dokumenty finansowe</a> są dostępne do Twojego przeglądu.</p>

1 0

r24512: {website} update po2wml to include Polish *.wmi for Polish *.wml (website/trunk)
by Runa Sandvik 30 Mar '11

30 Mar '11

Author: runa Date: 2011-03-30 14:08:39 +0000 (Wed, 30 Mar 2011) New Revision: 24512 Modified: website/trunk/po2wml.sh Log: update po2wml to include Polish *.wmi for Polish *.wml Modified: website/trunk/po2wml.sh =================================================================== --- website/trunk/po2wml.sh 2011-03-30 13:47:46 UTC (rev 24511) +++ website/trunk/po2wml.sh 2011-03-30 14:08:39 UTC (rev 24512) @@ -117,38 +117,21 @@ sed -i 's/PO4ASHARPEND-->//' "$wmldir/$subdir/$wmlfile" fi - # If the file is an Arabic translation, include - # the right header, css, menu files and footer - if [ $subdir = "ar" ] + # Include the English footer for most of the + # translations + if [[ $subdir != "ar" && $subdir != "pl" ]] then - # Head - orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"` - temp_head=`echo $orig_head | sed s@head.wmi@ar/head.wmi@` - new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.css"'` - sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$wmlfile" + echo '#include "foot.wmi"' >> "$wmldir/$subdir/$wmlfile" + fi - # Side (not all files include this) - orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$wmlfile"` - if [ -n "$orig_side" ] - then - new_side=`echo '#include "ar/side.wmi"'` - sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$wmlfile" - fi + # If the directory does not include sidenav.wmi, + # copy it from the English directory (only if + # the English directory has this file) + if [[ ! -e "$wmldir/$subdir/sidenav.wmi" && -e "$wmldir/en/sidenav.wmi" ]] + then + cp "$wmldir/en/sidenav.wmi" "$wmldir/$subdir" + fi - # Info (not all files include this) - orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$wmlfile"` - if [ -n "$orig_info" ] - then - new_info=`echo '#include "ar/info.wmi"'` - sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$wmlfile" - fi - - # Footer - echo '#include "ar/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" - else - # Include the English footer - echo '#include "foot.wmi"' >> "$wmldir/$subdir/$wmlfile" - fi fi } @@ -174,38 +157,20 @@ sed -i "s/$translator_comment//" "$wmldir/$subdir/$lang/$wmlfile" fi - # If the file is an Arabic translation, include the - # right header, css, menu files and footer - if [ $lang = "ar" ] + # Include the English footer for most of the + # translations + if [[ $lang != "ar" && $lang != "pl" ]] then - # Head - orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` - temp_head=`echo $orig_head | sed s@head.wmi@ar/head.wmi@` - new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.css"'` - sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$lang/$wmlfile" - - # Side (not all files include this) - orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` - if [ -n "$orig_side" ] - then - new_side=`echo '#include "ar/side.wmi"'` - sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$lang/$wmlfile" - fi - - # Info (not all files include this) - orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` - if [ -n "$orig_info" ] - then - new_info=`echo '#include "ar/info.wmi"'` - sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$lang/$wmlfile" - fi - - # Footer - echo '#include "ar/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" - else - # Include the English footer echo '#include "foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" fi + + # If the directory does not include sidenav.wmi, + # copy it from the English directory (only if + # the English directory has this file) + if [[ ! -e "$wmldir/$subdir/$lang/sidenav.wmi" && -e "$wmldir/$subdir/en/sidenav.wmi" ]] + then + cp "$wmldir/$subdir/en/sidenav.wmi" "$wmldir/$subdir/$lang/" + fi fi } @@ -239,10 +204,76 @@ then subdir="pl" nosubdir + + # If the file was written, include the right + # header, menu files and footer + if [ -e "$wmldir/$subdir/$wmlfile" ] + then + # Head + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"` + new_head=`echo $orig_head | sed s@head.wmi@pl/head.wmi@` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "pl/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "pl/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$wmlfile" + fi + + # Footer + echo '#include "pl/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" + fi fi + # If the file is an Arabic translation, include + # the right header, css, menu files and footer + if [ $subdir = "ar" ] + then + # Convert the file first + nosubdir + + # If it was written, do the following + if [ -e "$wmldir/$subdir/$wmlfile" ] + then + # Head + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"` + temp_head=`echo $orig_head | sed s@head.wmi@ar/head.wmi@` + new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.css"'` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "ar/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "ar/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$wmlfile" + fi + + # Footer + echo '#include "ar/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" + fi + fi + # Convert everything else - if [[ $subdir != "en" && $subdir != "zh_CN" && $subdir != "nb" && $subdir != "sv" ]] + if [[ $subdir != "en" && $subdir != "zh_CN" && $subdir != "nb" && $subdir != "sv" && $subdir != "ar" ]] then nosubdir fi @@ -273,10 +304,77 @@ then lang="pl" subdir + + # If the file was written, include the right + # header, menu files and footer + if [ -e "$wmldir/$subdir/$lang/$wmlfile" ] + then + # Head + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + new_head=`echo $orig_head | sed s@head.wmi@pl/head.wmi@` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$lang/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "pl/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "pl/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Footer + echo '#include "pl/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" + fi + fi + # If the file is an Arabic translation, include the + # right header, css, menu files and footer + if [ $lang = "ar" ] + then + # Convert the file first + subdir + + # If it was written, do the following + if [ -e "$wmldir/$subdir/$lang/$wmlfile" ] + then + # Head + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + temp_head=`echo $orig_head | sed s@head.wmi@ar/head.wmi@` + new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.css"'` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$lang/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "ar/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "ar/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Footer + echo '#include "ar/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" + fi + fi + # Convert everything else - if [[ $lang != "en" && $lang != "zh_CN" && $lang != "nb" && $lang != "sv" ]] + if [[ $lang != "en" && $lang != "zh_CN" && $lang != "nb" && $lang != "sv" && $lang != "ar" ]] then subdir fi

1 0

r24511: {website} include *.wmi files translated into Polish by Bogdan (in website/trunk: . about/pl docs/pl donate/pl getinvolved/pl include include/pl pl press/pl projects/pl torbutton/pl)
by Runa Sandvik 30 Mar '11

30 Mar '11

Author: runa Date: 2011-03-30 13:47:46 +0000 (Wed, 30 Mar 2011) New Revision: 24511 Added: website/trunk/include/pl/ website/trunk/include/pl/foot.wmi website/trunk/include/pl/info.wmi website/trunk/include/pl/navigation.wmi Modified: website/trunk/Makefile website/trunk/about/pl/sidenav.wmi website/trunk/docs/pl/sidenav.wmi website/trunk/donate/pl/info.wmi website/trunk/donate/pl/sidenav.wmi website/trunk/getinvolved/pl/sidenav.wmi website/trunk/pl/navigation.wmi website/trunk/press/pl/info.wmi website/trunk/press/pl/sidenav.wmi website/trunk/projects/pl/sidenav.wmi website/trunk/torbutton/pl/sidenav.wmi Log: include *.wmi files translated into Polish by Bogdan Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/Makefile 2011-03-30 13:47:46 UTC (rev 24511) @@ -10,7 +10,7 @@ # 4. make # 5. ./publish -export TORGIT=/home/phobos/onionrouter/onionrouter/tor.git/.git +export TORGIT=/home/runa/test/tor/.git export STABLETAG=tor-0.2.2.23-alpha export DEVTAG=tor-0.2.2.23-alpha Modified: website/trunk/about/pl/sidenav.wmi =================================================================== --- website/trunk/about/pl/sidenav.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/about/pl/sidenav.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,5 +1,5 @@ ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision$ # Translation-Priority: 2-medium # this structure defines the side nav bar for the /about pages @@ -9,7 +9,7 @@ # # url - the path to the wml page, as used the the <page> tag. This tag ensures # that links will point to the current language if supported, and alternately -# the english version +# the english version # # txt - the link text to be displayed. Different translations will # need to supply alternate txt @@ -18,39 +18,39 @@ my $sidenav; $sidenav = [ {'url' => 'about/overview', - 'txt' => 'Tor Overview', + 'txt' => 'Wprowadzenie do Tora', }, {'url' => 'about/torusers', - 'txt' => 'Users of Tor', + 'txt' => 'Użytkownicy Tora', }, {'url' => 'about/corepeople', - 'txt' => 'Tor People', + 'txt' => 'Ludzie Tora', 'subelements' => [ {'url' => 'about/board', - 'txt' => 'Board of Directors', - }, + 'txt' => 'Rada Dyrektorów', + }, {'url' => 'about/translators', - 'txt' => 'Translators', - }, + 'txt' => 'Tłumacze', + }, {'url' => 'about/volunteers', - 'txt' => 'Volunteers', - }, + 'txt' => 'Ochotnicy', + }, {'url' => 'about/contributors', - 'txt' => 'Past Contributors', + 'txt' => 'Dawni uczestnicy', }] }, {'url' => 'about/sponsors', - 'txt' => 'Sponsors', + 'txt' => 'Sponsorzy', }, {'url' => 'about/financials', - 'txt' => 'Financial Reports', + 'txt' => 'Raporty Finansowe', }, {'url' => 'projects/projects', - 'txt' => 'Projects', - }, + 'txt' => 'Projekty', + }, {'url' => 'docs/documentation', - 'txt' => 'Documentation', - }, + 'txt' => 'Dokumentacja', + }, ]; :> Modified: website/trunk/docs/pl/sidenav.wmi =================================================================== --- website/trunk/docs/pl/sidenav.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/docs/pl/sidenav.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,97 +1,97 @@ ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision$ # Translation-Priority: 2-medium -# this structure defines the side nav bar for the /about pages +# this structure defines the side nav bar for the /docs pages # and is the input for include/side.wmi # fields: # # url - the path to the wml page, as used the the <page> tag. This tag ensures # that links will point to the current language if supported, and alternately -# the english version +# the english version # # txt - the link text to be displayed. Different translations will -# need to supply alternate txt +# need to supply alternate txt <: my $sidenav; $sidenav = [ {'url' => 'docs/documentation', - 'txt' => 'Documentation Overview', - }, + 'txt' => 'Przegląd dokumentacji', + }, { 'url' => 'docs/installguide', - 'txt' => 'Installation Guides', + 'txt' => 'Przewodniki instalacji', 'subelements' => [ {'url' => 'docs/tor-doc-windows', - 'txt' => 'Installing on Windows', + 'txt' => 'Instalacja na Windows', }, {'url' => 'docs/tor-doc-unix', - 'txt' => 'Installing on Linux/BSD/Unix', + 'txt' => 'nstalacja na Linux/BSD/Unix', }, {'url' => 'docs/tor-doc-osx', - 'txt' => 'Installing on Mac OS X', + 'txt' => 'nstalacja na Mac OS X', }, {'url' => 'docs/android', - 'txt' => 'Installing on Android', + 'txt' => 'nstalacja na Androidzie', }, {'url' => 'docs/N900', - 'txt' => 'Installing on Maemo/N900', + 'txt' => 'nstalacja na Maemo/N900', }, {'url' => 'docs/verifying-signatures', - 'txt' => 'Verify our GPG signatures', + 'txt' => 'Weryfikacja naszych podpisów GPG', }, {'url' => 'docs/tor-doc-web', - 'txt' => 'Configuring your browser to use Tor', + 'txt' => 'Konfiguracja przegladarki, by używała Tora', }], }, {'url' => 'docs/manual', - 'txt' => 'Manuals', + 'txt' => 'Podręczniki', 'subelements' => [ {'url' => 'docs/tor-doc-relay', - 'txt' => 'Configuring a Relay', + 'txt' => 'Konfiguracja przekaźnika', }, {'url' => 'docs/tor-hidden-service', - 'txt' => 'Configuring a Hidden Service', - }, + 'txt' => 'Konfiguracja Usługi Ukrytej', + }, {'url' => 'docs/bridges', - 'txt' => 'Configuring a Bridge Relay', - }, + 'txt' => 'Konfiguracja przekaźnika mostkowego', + }, {'url' => 'docs/running-a-mirror', - 'txt' => 'Configuring a Mirror', + 'txt' => 'Konfiguracja mirrora', }, {'url' => 'docs/tor-manual', - 'txt' => 'Tor -stable Manual', + 'txt' => 'Podręcznik wersji stabilnej Tora', }, {'url' => 'docs/tor-manual-dev', - 'txt' => 'Tor -alpha Manual', + 'txt' => 'Podręcznik wersji alfa Tora', }, {'url' => 'docs/proxychain', - 'txt' => 'Configuring Tor to use a Proxy Server', + 'txt' => 'Konfiguracja Tora do używania proxy', }], }, { 'url' => '<wiki>', - 'txt' => 'Tor Wiki', - }, + 'txt' => 'Wiki Tora', + }, {'url' => 'docs/faq', - 'txt' => 'General FAQ', + 'txt' => 'Ogólne FAQ', }, {'url' => 'torbutton/torbutton-faq', - 'txt' => 'Torbutton FAQ', + 'txt' => 'FAQ Torbuttona', }, {'url' => 'docs/faq-abuse', - 'txt' => 'Abuse FAQ', + 'txt' => 'FAQ o nadużyciach', }, {'url' => 'docs/trademark-faq', - 'txt' => 'Trademark FAQ', + 'txt' => 'FAQ o znaku handlowym', }, {'url' => 'eff/tor-legal-faq', - 'txt' => 'Tor Legal FAQ', + 'txt' => 'Prawne FAQ Tora', }, {'url' => 'eff/tor-dmca-response', - 'txt' => 'Tor DMCA Response', - }, + 'txt' => 'Odpowiedź Tora na DMCA', + }, ]; :> Modified: website/trunk/donate/pl/info.wmi =================================================================== --- website/trunk/donate/pl/info.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/donate/pl/info.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,16 +1,16 @@ ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision$ # Translation-Priority: 2-medium <div class="img-shadow"> <div class="important-infoblock"> - <h2>What happens to my donation?</h2> - <p>If you've just donated, thank you for your donation. Your funds - are deposited into our general fund. You join thousands of other - individual <a href="<page about/sponsors>">sponsors</a> in funding - the future of Tor and online anonymity. </p> - <p>Our <a href="<page about/financials>">financial documents</a> - are available for your review.</p> + <h2>Co dzieje się z moimi dotacjami?</h2> + <p>Jeśli właśnie złożyłeś/aś dotację, dziękujemy Ci za nią. Twoje dary są + deponowane w naszym funduszu ogólnym. Dołączasz do tysięcy innych + indywidualnych <a href=\"<page sponsors>\">sponsorów</a>, + fundując przyszłość Tora i anonimowości on-line. </p> + <p>Nasze <a href="<page about/financials>">dokumenty finansowe</a> + są dostępne do Twojego przeglądu.</p> </div> </div> - + Modified: website/trunk/donate/pl/sidenav.wmi =================================================================== --- website/trunk/donate/pl/sidenav.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/donate/pl/sidenav.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,38 +1,38 @@ #!/usr/bin/wml ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision$ # Translation-Priority: 2-medium -# this structure defines the side nav bar for the /about pages +# this structure defines the side nav bar for the /donate pages # and is the input for include/side.wmi # fields: # # url - the path to the wml page, as used the the <page> tag. This tag ensures # that links will point to the current language if supported, and alternately -# the english version +# the english version # # txt - the link text to be displayed. Different translations will -# need to supply alternate txt +# need to supply alternate txt <: my $sidenav; $sidenav = [ {'url' => 'donate/donate', - 'txt' => 'Monetary Donations', + 'txt' => 'Dotacje pieniężne', }, {'url' => 'donate/donate-hardware', - 'txt' => 'Hardware Donations', + 'txt' => 'Dotacje sprzętu', }, {'url' => 'donate/donate-service', - 'txt' => 'Service Donations', - }, + 'txt' => 'Dotacje usług', + }, {'url' => 'donate/matching-program', - 'txt' => 'Matching Program', - }, + 'txt' => 'Program partnerski', + }, {'url' => 'donate/become-sponsor', - 'txt' => 'Become a Sponsor', - }, + 'txt' => 'Zostań Sponsorem', + }, ]; :> Modified: website/trunk/getinvolved/pl/sidenav.wmi =================================================================== --- website/trunk/getinvolved/pl/sidenav.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/getinvolved/pl/sidenav.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,32 +1,32 @@ #!/usr/bin/wml ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision$ # Translation-Priority: 2-medium -# this structure defines the side nav bar for the /about pages +# this structure defines the side nav bar for the /getinvolved pages # and is the input for include/side.wmi # fields: # # url - the path to the wml page, as used the the <page> tag. This tag ensures # that links will point to the current language if supported, and alternately -# the english version +# the english version # # txt - the link text to be displayed. Different translations will -# need to supply alternate txt +# need to supply alternate txt <: my $sidenav; $sidenav = [ {'url' => 'getinvolved/volunteer', - 'txt' => 'Get Involved', + 'txt' => 'Weź udział', }, {'url' => 'getinvolved/research', - 'txt' => 'Research', + 'txt' => 'Badania', }, {'url' => 'donate/donate', - 'txt' => 'Donate', + 'txt' => 'Dotacje', }, ]; :> Added: website/trunk/include/pl/foot.wmi =================================================================== --- website/trunk/include/pl/foot.wmi (rev 0) +++ website/trunk/include/pl/foot.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -0,0 +1,130 @@ +#!/usr/bin/env wml +#use "functions.wmi" + + <div id="footer"> + <div class="onion"><img src="$(IMGROOT)/onion.jpg" alt="Tor"></div> + <div class="about"> + <p>"Tor" i "Onion Logo" (logo cebuli) są zarejestrowanymi znakami handlowymi <a href="<page + docs/trademark-faq>">The Tor Project, Inc.</a> + Zawartość tej strony jest pod licencją + <a href="http://creativecommons.org/licenses/by/3.0/us/">Creative Commons Attribution + 3.0 United States License</a>, chyba że napisano inaczej.</p> + + </div> +  +  + <div class="col first"> + <h4>About Tor</h4> + <ul> + <li><a href="<page about/overview>">Co robi Tor</a></li> + <li><a href="<page about/torusers>">Użytkownicy Tora</a></li> + <li><a href="<page about/corepeople>">Główni ludzie Tora</a></li> + <li><a href="<page about/sponsors>">Sponsorzy</a></li> + <li><a href="<page about/contact>">Kontakt</a></li> + </ul> + </div> +  + <div class="col"> + <h4>Get Involved</h4> + <ul> + <li><a href="<page donate/donate>">Dotacje</a></li> + <li><a href="<page docs/documentation>#MailingLists">Listy mailingowe</a></li> + <li><a href="<page getinvolved/mirrors>">Mirrory</a></li> + <li><a href="<page docs/hidden-services>">Usługi Ukryte</a></li> + <li><a href="<page getinvolved/translation>">Tłumaczenia</a></li> + <li><a href="<page getinvolved/open-positions>">Kariery</a></li> + </ul> + </div> +  + <div class="col"> + <h4>Documentation</h4> + <ul> + <li><a href="<page docs/tor-manual>">Podręczniki</a></li> + <li><a href="<page docs/documentation>">Przewodniki instalacji</a></li> + <li><a href="<wiki>">Wiki Tora</a></li> + <li><a href="<page docs/faq>">Ogólne FAQ Tora</a></li> + </ul> + </div> +  + +  + <div class="col wider"> + <h4>Languages</h4> + <: if (has_translations()) { :> + <p> + Ta strona jest także dostępna w następujących językach: + <: print list_translations() :>.<br /> + Jak ustawić <a href="http://www.debian.org/intro/cn#howtoset">domyślny język dokumentu</a>. + </p> + <: }; :> + </div> + + + </div> +  + + </div> +  +</body> +</html> Added: website/trunk/include/pl/info.wmi =================================================================== --- website/trunk/include/pl/info.wmi (rev 0) +++ website/trunk/include/pl/info.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -0,0 +1,10 @@ +#!/usr/bin/env wml +<div class="img-shadow"> + <div class="infoblock"> + <h2 class="bulb">Wskazówka Tora</h2> + <p>Tor jest pisany dla i wspierany przez ludzi takich, jak Ty. <a href="<page +donate/donate>">Złóż dotację już dziś</a>!</p> + </div> +  +</div> + Added: website/trunk/include/pl/navigation.wmi =================================================================== --- website/trunk/include/pl/navigation.wmi (rev 0) +++ website/trunk/include/pl/navigation.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -0,0 +1,24 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 22069 $ +# Translation-Priority: 1-high + +<: + # path link text + my @navigation = ( + 'index' , 'Start', + 'about/overview' , 'O Torze', + 'docs/documentation' , 'Dokumentacja', + 'projects/projects' , 'Projekty', + 'press/press' , 'Prasa', + '<blog>' , 'Blog', + 'http://printfection.com/torprojectstore' , 'Sklep', + ); + my @calltoaction = ( + 'download/download' , 'Pobierz', + 'donate/donate' , 'Dotacje', + 'getinvolved/volunteer' , 'Weź udział', + ); + +:> Modified: website/trunk/pl/navigation.wmi =================================================================== --- website/trunk/pl/navigation.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/pl/navigation.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,24 +1,24 @@ #!/usr/bin/wml ## translation metadata -# Revision: $Revision: 22069 $ +# Revision: $Revision$ # Translation-Priority: 1-high <: # path link text my @navigation = ( - 'index' , 'Home', - 'about/overview' , 'About Tor', - 'docs/documentation' , 'Documentation', - 'projects/projects' , 'Projects', - 'press/press' , 'Press', + 'index' , 'Start', + 'about/overview' , 'O Torze', + 'docs/documentation' , 'Dokumentacja', + 'projects/projects' , 'Projekty', + 'press/press' , 'Prasa', '<blog>' , 'Blog', - 'http://printfection.com/torprojectstore' , 'Store', + 'http://printfection.com/torprojectstore' , 'Sklep', ); my @calltoaction = ( - 'download/download' , 'Download', - 'donate/donate' , 'Donate', - 'getinvolved/volunteer' , 'Get Involved', - ); + 'download/download' , 'Pobierz', + 'donate/donate' , 'Dotacje', + 'getinvolved/volunteer' , 'Weź udział', + ); :> Modified: website/trunk/press/pl/info.wmi =================================================================== --- website/trunk/press/pl/info.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/press/pl/info.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,10 +1,10 @@ ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision$ # Translation-Priority: 2-medium #!/usr/bin/env wml <div class="img-shadow"> <div class="infoblock"> - <h2 class="media">Press Contact</h2> + <h2 class="media">Kontakt prasowy</h2> <p> <b>Andrew Lewman</b><br> Executive Director<br> @@ -12,6 +12,6 @@ +1-781-424-9877<br> </p> </div> -  +  </div>  Modified: website/trunk/press/pl/sidenav.wmi =================================================================== --- website/trunk/press/pl/sidenav.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/press/pl/sidenav.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,32 +1,32 @@ #!/usr/bin/wml ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision$ # Translation-Priority: 2-medium -# this structure defines the side nav bar for the /about pages +# this structure defines the side nav bar for the /press pages # and is the input for include/side.wmi # fields: # # url - the path to the wml page, as used the the <page> tag. This tag ensures # that links will point to the current language if supported, and alternately -# the english version +# the english version # # txt - the link text to be displayed. Different translations will -# need to supply alternate txt +# need to supply alternate txt <: my $sidenav; $sidenav = [ {'url' => 'press/press', - 'txt' => 'Press Releases', - }, + 'txt' => 'Informacje prasowe', + }, {'url' => 'press/inthemedia', - 'txt' => 'Tor in the Media', - }, + 'txt' => 'Tor w mediach', + }, {'url' => 'https://blog.torproject.org/', - 'txt' => 'Tor Blog', - }, + 'txt' => 'Blog Tora', + }, ]; :> Modified: website/trunk/projects/pl/sidenav.wmi =================================================================== --- website/trunk/projects/pl/sidenav.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/projects/pl/sidenav.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,10 +1,10 @@ #!/usr/bin/wml ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision$ # Translation-Priority: 2-medium -# this structure defines the side nav bar for the /about pages +# this structure defines the side nav bar for the /projects pages # and is the input for include/side.wmi # fields: @@ -15,22 +15,22 @@ # # url - the path to the wml page, as used the the <page> tag. This tag ensures # that links will point to the current language if supported, and alternately -# the english version +# the english version # # txt - the link text to be displayed. Different translations will -# need to supply alternate txt - +# need to supply alternate txt + <: my $sidenav; $sidenav = [ {'url' => 'projects/projects', - 'txt' => 'Software & Services', + 'txt' => 'Oprogramowanie i Usługi', 'subelements' => [ {'url' => 'torbutton/index', 'txt' => 'TorButton', }, {'url' => 'projects/torbrowser', - 'txt' => 'Tor Browser Bundle', + 'txt' => 'Paczka Tora z Przeglądarką', }, {'url' => 'projects/vidalia', 'txt' => 'Vidalia', @@ -38,14 +38,17 @@ {'url' => 'projects/arm', 'txt' => 'Arm', }, - {'url' => '<wiki>projects/TorBulkExitlist', - 'txt' => 'TorBEL', + {'url' => 'https://guardianproject.info/apps/orbot/', + 'txt' => 'Orbot', }, - {'url' => 'https://check.torproject.org', - 'txt' => 'TorCheck', + {'url' => 'https://tails.boum.org/', + 'txt' => 'Tails', }, - {'url' => 'projects/gettor', - 'txt' => 'GetTor', + {'url' => 'http://torstatus.blutmagie.de/', + 'txt' => 'TorStatus', + }, + {'url' => 'https://metrics.torproject.org/', + 'txt' => 'Portal Pomiarów', } ] }]; Modified: website/trunk/torbutton/pl/sidenav.wmi =================================================================== --- website/trunk/torbutton/pl/sidenav.wmi 2011-03-30 02:52:30 UTC (rev 24510) +++ website/trunk/torbutton/pl/sidenav.wmi 2011-03-30 13:47:46 UTC (rev 24511) @@ -1,10 +1,10 @@ #!/usr/bin/wml ## translation metadata -# Revision: $Revision: 0 $ +# Revision: $Revision$ # Translation-Priority: 2-medium -# this structure defines the side nav bar for the /about pages +# this structure defines the side nav bar for the /torbutton pages # and is the input for include/side.wmi # fields: @@ -15,11 +15,11 @@ # # url - the path to the wml page, as used the the <page> tag. This tag ensures # that links will point to the current language if supported, and alternately -# the english version +# the english version # # txt - the link text to be displayed. Different translations will -# need to supply alternate txt - +# need to supply alternate txt + <: my $sidenav; $sidenav = [ @@ -27,10 +27,10 @@ 'txt' => 'Torbutton', 'subelements' => [ {'url' => 'torbutton/torbutton-options', - 'txt' => 'Torbutton Options', + 'txt' => 'Opcje Torbuttona', }, {'url' => 'torbutton/torbutton-faq', - 'txt' => 'Torbutton FAQ', + 'txt' => 'FAQ Torbuttona', }] }] :>

1 0

r24510: {website} add CNN interview and segment. (website/trunk/press/en)
by Andrew Lewman 30 Mar '11

30 Mar '11

Author: phobos Date: 2011-03-30 02:52:30 +0000 (Wed, 30 Mar 2011) New Revision: 24510 Modified: website/trunk/press/en/inthemedia.wml Log: add CNN interview and segment. Modified: website/trunk/press/en/inthemedia.wml =================================================================== --- website/trunk/press/en/inthemedia.wml 2011-03-30 01:45:47 UTC (rev 24509) +++ website/trunk/press/en/inthemedia.wml 2011-03-30 02:52:30 UTC (rev 24510) @@ -32,6 +32,13 @@ <th>Topic</th> </tr> </thead> +<tr> +<td>2011 March 29</td> +<td>CNN: Situation Room</td> +<td><a href="http://edition.cnn.com/CNN/Programs/situation.room/">Tor +featured in a segment about US companies providing censorship to +repressive regimes and those circumventing their products.</a></td> +</tr> <tr style="background-color: #e5e5e5;"> <td>2011 March 18</td> <td>Telegraph</td>

1 0

r24509: {website} make the overview h3 just say overview. (website/trunk/about/en)
by Andrew Lewman 30 Mar '11

30 Mar '11

Author: phobos Date: 2011-03-30 01:45:47 +0000 (Wed, 30 Mar 2011) New Revision: 24509 Modified: website/trunk/about/en/overview.wml Log: make the overview h3 just say overview. Modified: website/trunk/about/en/overview.wml =================================================================== --- website/trunk/about/en/overview.wml 2011-03-30 00:54:38 UTC (rev 24508) +++ website/trunk/about/en/overview.wml 2011-03-30 01:45:47 UTC (rev 24509) @@ -41,7 +41,7 @@ others. </p> <a name="overview"></a> - <h3><a class="anchor" href="#overview">Tor: Overview</a></h3> + <h3><a class="anchor" href="#overview">Overview</a></h3> <p> Tor is a network of virtual tunnels that allows people and groups to

1 0

r24508: {website} make the overview section logically flow after inception, up (website/trunk/about/en)
by Andrew Lewman 30 Mar '11

30 Mar '11

Author: phobos Date: 2011-03-30 00:54:38 +0000 (Wed, 30 Mar 2011) New Revision: 24508 Modified: website/trunk/about/en/overview.wml Log: make the overview section logically flow after inception, update the nav and title. Modified: website/trunk/about/en/overview.wml =================================================================== --- website/trunk/about/en/overview.wml 2011-03-30 00:37:04 UTC (rev 24507) +++ website/trunk/about/en/overview.wml 2011-03-30 00:54:38 UTC (rev 24508) @@ -9,14 +9,13 @@ <a href="<page about/overview>">About » </a> </div> <div id="maincol"> - <a name="overview"></a> - <h2><a class="anchor" href="#overview">Tor: Overview</a></h2> + <h2>Tor: Overview</h2>  <div class="sidebar-left"> <h3>Topics</h3> <ul> + <li><a href="<page about/overview>#inception">Inception</a></li> <li><a href="<page about/overview>#overview">Overview</a></li> - <li><a href="<page about/overview>#inception">Inception</a></li> <li><a href="<page about/overview>#whyweneedtor">Why we need Tor</a></li> <li><a href="<page about/overview>#thesolution">The Solution</a></li> <li><a href="<page about/overview>#hiddenservices">Hidden services</a></li> @@ -41,6 +40,9 @@ journalists, law enforcement officers, activists, and many others. </p> + <a name="overview"></a> + <h3><a class="anchor" href="#overview">Tor: Overview</a></h3> + <p> Tor is a network of virtual tunnels that allows people and groups to improve their privacy and security on the Internet. It also enables

1 0

r24507: {arm} Extra gotcha with socket shutdowns - throws an error if the (arm/resources/TorCtl)
by Damian Johnson 30 Mar '11

30 Mar '11

Author: atagar Date: 2011-03-30 00:37:04 +0000 (Wed, 30 Mar 2011) New Revision: 24507 Modified: arm/resources/TorCtl/TorCtl.py Log: Extra gotcha with socket shutdowns - throws an error if the socket wasn't available. Modified: arm/resources/TorCtl/TorCtl.py =================================================================== --- arm/resources/TorCtl/TorCtl.py 2011-03-30 00:19:31 UTC (rev 24506) +++ arm/resources/TorCtl/TorCtl.py 2011-03-30 00:37:04 UTC (rev 24507) @@ -133,10 +133,14 @@ print "Connection refused. Is the ControlPort enabled?" else: print "Failed to establish socket: %s" % exc - if s: s.shutdown(socket.SHUT_RDWR) + if s: + try: s.shutdown(socket.SHUT_RDWR) + except socket.error: pass return None except Exception, exc: - if s: s.shutdown(socket.SHUT_RDWR) + if s: + try: s.shutdown(socket.SHUT_RDWR) + except socket.error: pass if passphrase and str(exc) == "Unable to authenticate: password incorrect": # provide a warning that the provided password didn't work, then try

1 0

r24506: {website} copy the inception paragraph from torusers over to overview, (website/trunk/about/en)
by Andrew Lewman 30 Mar '11

30 Mar '11

Author: phobos Date: 2011-03-30 00:19:31 +0000 (Wed, 30 Mar 2011) New Revision: 24506 Modified: website/trunk/about/en/overview.wml Log: copy the inception paragraph from torusers over to overview, since clearly paranoids don't read anything but what they want to read. Modified: website/trunk/about/en/overview.wml =================================================================== --- website/trunk/about/en/overview.wml 2011-03-29 21:18:00 UTC (rev 24505) +++ website/trunk/about/en/overview.wml 2011-03-30 00:19:31 UTC (rev 24506) @@ -16,6 +16,7 @@ <h3>Topics</h3> <ul> <li><a href="<page about/overview>#overview">Overview</a></li> + <li><a href="<page about/overview>#inception">Inception</a></li> <li><a href="<page about/overview>#whyweneedtor">Why we need Tor</a></li> <li><a href="<page about/overview>#thesolution">The Solution</a></li> <li><a href="<page about/overview>#hiddenservices">Hidden services</a></li> @@ -26,6 +27,19 @@  <hr> + + <a name="inception"></a> + <h3><a class="anchor" href="#inception">Inception</a></h3> + + <p> + Tor was originally designed, implemented, and deployed as a + third-generation <a href="http://www.onion-router.net/">onion routing + project of the U.S. Naval Research Laboratory</a>. It was originally + developed with the U.S. Navy in mind, for the primary purpose of + protecting government communications. Today, it is used every day + for a wide variety of purposes by normal people, the military, + journalists, law enforcement officers, activists, and many + others. </p> <p> Tor is a network of virtual tunnels that allows people and groups to

1 0

r24505: {website} Remove an extra period (website/trunk/download/en)
by Robert Ransom 29 Mar '11

29 Mar '11

Author: rransom Date: 2011-03-29 21:18:00 +0000 (Tue, 29 Mar 2011) New Revision: 24505 Modified: website/trunk/download/en/download.wml Log: Remove an extra period Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-03-29 21:17:50 UTC (rev 24504) +++ website/trunk/download/en/download.wml 2011-03-29 21:18:00 UTC (rev 24505) @@ -118,7 +118,7 @@ <td class="intro">The Tor Software comes bundled in two different ways: <ul> <li>The <strong>Tor Browser Bundle</strong> contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></li> -<li>Read how to use <a href="<page download/download-unix>">our repositories for the Tor software.</a>.</li> +<li>Read how to use <a href="<page download/download-unix>">our repositories for the Tor software</a>.</li> </ul> </td> </tr>

1 0