[or-cvs] r23627: {website} updated with a few tags (in website/trunk: . docs/en)

[Runa Sandvik]

Author: runa
Date: 2010-10-17 15:33:54 +0000 (Sun, 17 Oct 2010)
New Revision: 23627

Modified:
   website/trunk/docs/en/android.wml
   website/trunk/docs/en/faq.wml
   website/trunk/wml2po.sh
Log:
updated with a few tags

Modified: website/trunk/docs/en/android.wml
===================================================================
--- website/trunk/docs/en/android.wml	2010-10-17 14:34:51 UTC (rev 23626)
+++ website/trunk/docs/en/android.wml	2010-10-17 15:33:54 UTC (rev 23627)
@@ -37,10 +37,7 @@
     </p>
     
     <p>
-    <a href="$(IMGROOT)/android/orbot-qr-code-latest.png">
-    <img alt="Android QR code"
-    src="$(IMGROOT)/android/orbot-qr-code-latest.png"/>
-    </a>
+    <a href="$(IMGROOT)/android/orbot-qr-code-latest.png"><img alt="Android QR code" src="$(IMGROOT)/android/orbot-qr-code-latest.png"/></a>
     </p>
     
     <a id="Market"></a>
@@ -63,12 +60,10 @@
     <br>
     <p>
     <a href="$(IMGROOT)/android/android-off.jpg">
-    <img alt="Android Tor off"
-    src="$(IMGROOT)/android/android-off-150x150.jpg"/>
+    <img alt="Android Tor off" src="$(IMGROOT)/android/android-off-150x150.jpg"/>
     </a>
     <a href="$(IMGROOT)/android/android-bootstrapping.jpg">
-    <img alt="Android Tor bootstrapping"
-    src="$(IMGROOT)/android/android-bootstrapping-150x150.jpg"/>
+    <img alt="Android Tor bootstrapping" src="$(IMGROOT)/android/android-bootstrapping-150x150.jpg"/>
     </a>
     <a href="$(IMGROOT)/android/android-activated.jpg">
     <img alt="Android Tor activated"

Modified: website/trunk/docs/en/faq.wml
===================================================================
--- website/trunk/docs/en/faq.wml	2010-10-17 14:34:51 UTC (rev 23626)
+++ website/trunk/docs/en/faq.wml	2010-10-17 15:33:54 UTC (rev 23627)
@@ -705,8 +705,7 @@
     <li>Virtual Privacy Machine is a Linux LiveCD that includes Firefox, Privoxy,
     Tor, some IRC and IM applications, and a set of ipchains rules aimed to prevent
     non-Tor traffic from accidentally leaving your computer. More information at
-    <a
-    href="<wiki>VirtualPrivacyMachine"><wiki>VirtualPrivacyMachine</a>.</li>
+    <a href="<wiki>VirtualPrivacyMachine"><wiki>VirtualPrivacyMachine</a>.</li>
     <li>Anonym.OS is a LiveCD similar to the above but is based on OpenBSD rather
     than Linux for maximum security. It was designed to be anonymous and secure
     from the ground up, and thus has some features and limitations not found in

Modified: website/trunk/wml2po.sh
===================================================================
--- website/trunk/wml2po.sh	2010-10-17 14:34:51 UTC (rev 23626)
+++ website/trunk/wml2po.sh	2010-10-17 15:33:54 UTC (rev 23627)
@@ -22,7 +22,7 @@
 
 # Location of the pot files.
 # Assuming that the translation directory is relative to the website
-podir="`dirname $wmldir`/translation/projects/website/po/templates"
+podir="`dirname $wmldir`/translation/projects/website/pot/templates"
 
 # Set the copyright holder of the files,
 # for example "The Tor Project, Inc"
@@ -32,7 +32,7 @@
 # in website/include/versions.wmi. Tags that people usually forget to close,
 # as well as tags that are not defined in versions.wmi, have been added.
 # See: https://svn.torproject.org/svn/website/trunk/include/versions.wmi
-customtag=`echo $(cat "$wmldir/include/versions.wmi" | awk '{ printf "<%s> " , $2 }' | sed 's/<>//g') "<svnsandbox> <svnwebsite> <svnprojects> <input> <hr> <br> <img> <gitblob> <package-androidbundle-alpha> <package-androidbundle-alpha-sig> <version-androidbundle-tor> <video controls>"`
+customtag=`echo $(cat "$wmldir/include/versions.wmi" | awk '{ printf "<%s> " , $2 }' | sed 's/<>//g') "<svnsandbox> <svnwebsite> <svnprojects> <input> <hr> <br> <img> <gitblob> <package-androidbundle-alpha> <package-androidbundle-alpha-sig> <version-androidbundle-tor> <video controls> <version-androidbundle-privoxy> <version-androidbundle-libevent> <wiki>"`
 
 # We also need to use the nodefault option of po4a; space separated list
 # of tags that the module should not try to set by default in any