@@ -2,7 +2,7 @@

 #

 # Author: Runa Sandvik, <runa.sandvik@gmail.com>

 # Google Summer of Code 2009

-# 

+#

 # This is Free Software (GPLv3)

 # http://www.gnu.org/licenses/gpl-3.0.txt

 #

@@ -38,7 +38,7 @@ nodefault='<input>'

 # can run at any time.

 LOCKFILE=po2wml.lock

-if lockfile -! -l 60 -r 3 "$LOCKFILE"; 

+if lockfile -! -l 60 -r 3 "$LOCKFILE";

 then

 	echo "unable to acquire lock" >2

 	exit 1

@@ -66,13 +66,13 @@ for file in $po ; do

 	validate_script="`dirname $wmldir`/translation/tools/validate.py"

 	validate_log="`dirname $wmldir`/validate/website-validate.log"

 	python "$validate_script" -i "$file" -l	"$validate_log"

-	

+

 	# Get the basename of the file we are dealing with

 	pofile=`basename $file`

 	# Strip the file for its original extension and the translation

 	# priority, and add .wml

-	wmlfile="`echo $pofile | cut -d . -f 2`.wml"	

+	wmlfile="`echo $pofile | cut -d . -f 2`.wml"

 	# Find out what directory the file is in.

 	indir=`dirname $file`

@@ -168,7 +168,7 @@ for file in $po ; do

                                 then

                                         new_side=`echo '#include "de/side.wmi"'`

                                         sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$wmlfile"

-                                fi  

+                                fi

                                 # Info (not all files include this)

                                 orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$wmlfile"`

@@ -176,11 +176,11 @@ for file in $po ; do

                                 then

                                         new_info=`echo '#include "de/info.wmi"'`

                                         sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$wmlfile"

-                                fi  

+                                fi

                                 # Footer

                                 echo '#include "de/foot.wmi"' >> "$wmldir/$subdir/$wmlfile"

-                        fi  

+                        fi

 			# If the translation is Arabic, include the

 			# correct header, css, menu files and footer

@@ -189,7 +189,7 @@ for file in $po ; do

 				# 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"'`

+				new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.min.css"'`

 				sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$wmlfile"

 				# Side (not all files include this)

@@ -219,7 +219,7 @@ for file in $po ; do

 				# Head

 				orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"`

 				temp_head=`echo $orig_head | sed s@head.wmi@fa/head.wmi@`

-				new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.css"'`

+				new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.min.css"'`

 				sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$wmlfile"

 				# Side (not all files include this)

@@ -250,7 +250,7 @@ for file in $po ; do

 				cp "$wmldir/en/sidenav.wmi" "$wmldir/$subdir"

 			fi

 		fi

-	}	

+	}

 	# Convert translations to directories such as website/torbrowser/nb/.

 	# Again, po4a will write the file and then delete it if less than 80% has been translated

@@ -273,7 +273,7 @@ for file in $po ; do

 			sed -i -e :a -e '$d;N;2,3ba' -e 'P;D' "$wmldir/$subdir/$lang/$wmlfile"

 			# Remove a specific comment from a specific file

-			if [ $wmlfile == "download-easy.wml" ]			

+			if [ $wmlfile == "download-easy.wml" ]

 			then

 				translator_comment="# Translators: please point to the version of TBB in your language, if there is one."

 				sed -i "s/$translator_comment//" "$wmldir/$subdir/$lang/$wmlfile"

@@ -289,7 +289,7 @@ for file in $po ; do

 			fi

 			# Include the English footer for most of the

-			# translations 

+			# translations

 			if [[ $lang != "ar" && $lang != "pl" && $lang != "de" && $lang != "fa" ]]

 			then

 				echo '#include "foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile"

@@ -297,8 +297,8 @@ for file in $po ; do

 			# If the file is overview.wml, make sure we

 			# include the correct set of images

-			if [ $wmlfile = "overview.wml" ] && [[ $lang = "de" || $lang = "es" || $lang = "fr" || 

-				$lang = "ja" || $lang = "nl" || $lang = "no" || $lang = "pl" || $lang = "ru" || 

+			if [ $wmlfile = "overview.wml" ] && [[ $lang = "de" || $lang = "es" || $lang = "fr" ||

+				$lang = "ja" || $lang = "nl" || $lang = "no" || $lang = "pl" || $lang = "ru" ||

 				$lang = "zh" ]]

 			then

 				sed -i "s/htw1.png/htw1_$lang.png/" "$wmldir/$subdir/$lang/$wmlfile"

@@ -368,7 +368,7 @@ for file in $po ; do

 					orig_video=`grep src=\"https:\/\/media.torproject.org\/video\/2009-install-and-use-tor.ogv\" "$wmldir/$subdir/$lang/$wmlfile"`

 					translated_video=`echo "<p>Das nachfolgende Video, wurde von SemperVideo erstellt.</p> <p><video id=\"v1\" src=\"https://media.torproject.org/video/2011-install-and-use-tor-de.ogv\" autobuffer=\"true\" controls=\"controls\"></video></p>"`

 					new_video=`echo "$orig_video $translated_video"`

-				

+

 					sed -i "s@$orig_video@$new_video@" "$wmldir/$subdir/$lang/$wmlfile"

 				fi

                         fi

@@ -380,7 +380,7 @@ for file in $po ; do

 				# 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"'`

+				new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.min.css"'`

 				sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$lang/$wmlfile"

 				# Side (not all files include this)

@@ -410,7 +410,7 @@ for file in $po ; do

                                 # Head

                                 orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"`

                                 temp_head=`echo $orig_head | sed s@head.wmi@fa/head.wmi@`

-                                new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.css"'`

+                                new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.min.css"'`

                                 sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$lang/$wmlfile"

                                 # Side (not all files include this)

@@ -434,7 +434,7 @@ for file in $po ; do

                         fi

 			# If the directory does not include sidenav.wmi,

-			# copy it from the English directory (only if 

+			# 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

@@ -474,7 +474,7 @@ for file in $po ; do

                 then

                         subdir="`echo $subdir | sed s/_/-/ | tr '[A-Z]' '[a-z]'`"

                         nosubdir

-                fi  

+                fi

 		# Convert everything else

 		if [[ $subdir != "en" && $subdir != "pl_PL" && ! ($subdir =~ "_") && $subdir != "nb" && $subdir != "sv" ]]

@@ -259,7 +259,12 @@ for file in $po ; do

                 english="$wmldir/$subdir/en/$wmlfile"

 		# Convert the files

-		po4a-translate -f wml -m "$english" -p "$file" -l "$wmldir/$subdir/$lang/$wmlfile" --master-charset utf-8 -L utf-8 -o customtag="$customtag" -o nodefault="$nodefault"

+		if [ $wmlfile = "download.wml" ]

+		then

+			po4a-translate -f wml -m "$english" -p "$file" -l "$wmldir/$subdir/$lang/$wmlfile" --master-charset utf-8 -L utf-8 -o customtag="$customtag" -o nodefault="$nodefault" -o ontagerror="silent"

+		else

+			po4a-translate -f wml -m "$english" -p "$file" -l "$wmldir/$subdir/$lang/$wmlfile" --master-charset utf-8 -L utf-8 -o customtag="$customtag" -o nodefault="$nodefault"

+		fi

 		# Check to see if the file was written

 		if [ -e "$wmldir/$subdir/$lang/$wmlfile" ]

@@ -274,6 +279,15 @@ for file in $po ; do

 				sed -i "s/$translator_comment//" "$wmldir/$subdir/$lang/$wmlfile"

 			fi

+			# Fix download.wml

+                        if [ $wmlfile = "download.wml" ]

+			then

+				sed -i 's/<!--PO4ASHARPBEGINinclude <lang.wmi>/#include <lang.wmi>/g' "$wmldir/$subdir/$lang/$wmlfile"

+				sed -i 's/<!--PO4ASHARPBEGINinclude <foot.wmi>//g' "$wmldir/$subdir/$lang/$wmlfile"

+				sed -i 's/<!--PO4ASHARPBEGIN//g;s/PO4ASHARPEND-->//g' "$wmldir/$subdir/$lang/$wmlfile"

+				echo "#include <foot.wmi>" >> "$wmldir/$subdir/$lang/$wmlfile"

+			fi

+

 			# Include the English footer for most of the

 			# translations 

 			if [[ $lang != "ar" && $lang != "pl" && $lang != "de" && $lang != "fa" ]]

@@ -119,7 +119,7 @@ for file in $po ; do

 			# Include the English footer for most of the

 			# translations

-			if [[ $subdir != "ar" && $subdir != "pl" && $subdir != "de" ]]

+			if [[ $subdir != "ar" && $subdir != "pl" && $subdir != "de" && $subdir != "fa" ]]

 			then

 				echo '#include "foot.wmi"' >> "$wmldir/$subdir/$wmlfile"

 			fi

@@ -276,7 +276,7 @@ for file in $po ; do

 			# Include the English footer for most of the

 			# translations 

-			if [[ $lang != "ar" && $lang != "pl" && $lang != "de" ]]

+			if [[ $lang != "ar" && $lang != "pl" && $lang != "de" && $lang != "fa" ]]

 			then

 				echo '#include "foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile"

 			fi

@@ -389,6 +389,36 @@ for file in $po ; do

 				echo '#include "ar/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile"

 			fi

+                        # If the file is a Farsi translation, include the

+                        # correct header, css, menu files and footer

+                        if [ $lang = "fa" ]

+                        then

+                                # Head

+                                orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"`

+                                temp_head=`echo $orig_head | sed s@head.wmi@fa/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 "fa/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 "fa/info.wmi"'`

+                                        sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$lang/$wmlfile"

+                                fi

+

+                                # Footer

+                                echo '#include "fa/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)

@@ -212,6 +212,36 @@ for file in $po ; do

 				echo '#include "ar/foot.wmi"' >> "$wmldir/$subdir/$wmlfile"

 			fi

+			# If the translation is Farsi, include the

+			# correct header, css, menu files and footer

+			if [ $subdir = "fa" ]

+			then

+				# Head

+				orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"`

+				temp_head=`echo $orig_head | sed s@head.wmi@fa/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 "fa/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 "fa/info.wmi"'`

+					sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$wmlfile"

+				fi

+

+				# Footer

+				echo '#include "fa/foot.wmi"' >> "$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)

@@ -373,14 +373,6 @@ for file in $po ; do

 	# subdirectory.

 	if [ $onedirup == $lang ]

 	then

-		# If the current subdirectory is of the form "xx_XX",

-		# rename to "xx-xx" instead (except for pl_PL)

-		if [[ $subdir =~ "_" && $subdir != "pl_PL" ]]

-		then

-			subdir="`echo $subdir | sed s/_/-/ | tr '[A-Z]'	'[a-z]'`"

-			nosubdir

-		fi

-

 		# If the current directory is "pl_PL" use "pl" instead

 		if [ $subdir = "pl_PL" ]

 		then

@@ -402,20 +394,20 @@ for file in $po ; do

 			nosubdir

 		fi

+                # If the current subdirectory is of the form "xx_XX",

+                # rename to "xx-xx" instead (except for pl_PL)

+                if [[ $subdir =~ "_" && $subdir != "pl_PL" ]]

+                then

+                        subdir="`echo $subdir | sed s/_/-/ | tr '[A-Z]' '[a-z]'`"

+                        nosubdir

+                fi  

+

 		# Convert everything else

 		if [[ $subdir != "en" && $subdir != "pl_PL" && ! ($subdir =~ "_") && $subdir != "nb" && $subdir != "sv" ]]

 		then

 			nosubdir

 		fi

 	else

-		# If the current languge is of the form "xx_XX", rename

-		# to "xx-xx" instead (except for pl_PL)

-		if [[ $lang =~ "_" && $lang != "pl_PL" ]]

-		then

-			lang="`echo $lang | sed s/_/-/ | tr '[A-Z]' '[a-z]'`"

-			subdir

-		fi

-

 		# If the current language is "pl_PL" use "pl" instead

 		if [ $lang = "pl_PL" ]

 		then

@@ -436,7 +428,15 @@ for file in $po ; do

 			lang="se"

 			subdir

 		fi

-	

+

+                # If the current languge is of the form "xx_XX", rename

+                # to "xx-xx" instead (except for pl_PL)

+                if [[ $lang =~ "_" && $lang != "pl_PL" ]]

+                then

+                        lang="`echo $lang | sed s/_/-/ | tr '[A-Z]' '[a-z]'`"

+                        subdir

+                fi

+

 		# Convert everything else

 		if [[ $lang != "en" && $lang != "pl_PL" && ! ($lang =~ "_") && $lang != "nb" && $lang != "sv" ]]

 		then

@@ -419,7 +419,7 @@ for file in $po ; do

 		# If the current language is "pl_PL" use "pl" instead

 		if [ $lang = "pl_PL" ]

 		then

-			$lang="pl"

+			lang="pl"

 			subdir

 		fi

@@ -410,7 +410,7 @@ for file in $po ; do

 	else

 		# If the current languge is of the form "xx_XX", rename

 		# to "xx-xx" instead (except for pl_PL)

-		if [[ $lang =~ "_" && $subdir != "pl_PL" ]]

+		if [[ $lang =~ "_" && $lang != "pl_PL" ]]

 		then

 			lang="`echo $lang | sed s/_/-/ | tr '[A-Z]' '[a-z]'`"

 			subdir

@@ -373,20 +373,21 @@ for file in $po ; do

 	# subdirectory.

 	if [ $onedirup == $lang ]

 	then

-		# If the current subdirectory is "zh_CN" use "zh-cn" instead

-		if [ $subdir = "zh_CN" ]

+		# If the current subdirectory is of the form "xx_XX",

+		# rename to "xx-xx" instead (except for pl_PL)

+		if [[ $subdir =~ "_" && $subdir != "pl_PL" ]]

 		then

-			subdir="zh-cn"

+			subdir="`echo $subdir | sed s/_/-/ | tr '[A-Z]'	'[a-z]'`"

 			nosubdir

 		fi

-		# If the current subdirectory is "pt_BR" use "pt-br" instead

-		if [ $subdir = "pt_BR" ]

+		# If the current directory is "pl_PL" use "pl" instead

+		if [ $subdir = "pl_PL" ]

 		then

-			subdir="pt-br"

+			subdir="pl"

 			nosubdir

 		fi

-		

+

 		# If the current directory is "nb" use "no" instead

 		if [ $subdir = "nb" ]

 		then

@@ -401,30 +402,24 @@ for file in $po ; do

 			nosubdir

 		fi

-		# If the current directory is "pl_PL" use "pl" instead

-		if [ $subdir = "pl_PL" ]

-		then

-			subdir="pl"

-			nosubdir

-		fi

-

 		# Convert everything else

-		if [[ $subdir != "en" && $subdir != "zh_CN" && $subdir != "pt_BR" && $subdir != "nb" && $subdir != "sv" && $subdir != "pl_PL" ]]

+		if [[ $subdir != "en" && $subdir != "pl_PL" && ! ($subdir =~ "_") && $subdir != "nb" && $subdir != "sv" ]]

 		then

 			nosubdir

 		fi

 	else

-		# If the current language is "zh_CN" use "zh-cn" instead

-		if [ $lang = "zh_CN" ]

+		# If the current languge is of the form "xx_XX", rename

+		# to "xx-xx" instead (except for pl_PL)

+		if [[ $lang =~ "_" && $subdir != "pl_PL" ]]

 		then

-			lang="zh-cn"

+			lang="`echo $lang | sed s/_/-/ | tr '[A-Z]' '[a-z]'`"

 			subdir

 		fi

-		# If the current language is "pt_BR" use "pt-br" instead

-		if [ $lang = "pt_BR" ]

+		# If the current language is "pl_PL" use "pl" instead

+		if [ $lang = "pl_PL" ]

 		then

-			lang="pt-br"

+			$lang="pl"

 			subdir

 		fi

@@ -442,15 +437,8 @@ for file in $po ; do

 			subdir

 		fi

-		# If the current language is "pl_PL" use "pl" instead

-		if [ $lang = "pl_PL" ]

-		then

-			lang="pl"

-			subdir

-		fi

-

 		# Convert everything else

-		if [[ $lang != "en" && $lang != "zh_CN" && $lang != "pt_BR" && $lang != "nb" && $lang != "sv" && $lang != "pl_PL" ]]

+		if [[ $lang != "en" && $lang != "pl_PL" && ! ($lang =~ "_") && $lang != "nb" && $lang != "sv" ]]

 		then

 			subdir

 		fi

@@ -322,10 +322,10 @@ for file in $po ; do

 				if [ $wmlfile = "tor-doc-windows.wml" ]

 				then

 					orig_video=`grep src=\"https:\/\/media.torproject.org\/video\/2009-install-and-use-tor.ogv\" "$wmldir/$subdir/$lang/$wmlfile"`

-					new_video=`echo "<p>Das nachfolgende Video, wurde von <a href=\"http://www.sempervideo.de/\">SemperVideo</a> erstellt.</p> $orig_video"`

+					translated_video=`echo "<p>Das nachfolgende Video, wurde von SemperVideo erstellt.</p> <p><video id=\"v1\" src=\"https://media.torproject.org/video/2011-install-and-use-tor-de.ogv\" autobuffer=\"true\" controls=\"controls\"></video></p>"`

+					new_video=`echo "$orig_video $translated_video"`

 					sed -i "s@$orig_video@$new_video@" "$wmldir/$subdir/$lang/$wmlfile"

-					sed -i "s@src\=\"https://media.torproject.org/video/2009-install-and-use-tor.ogv\"@src\=\"https://media.torproject.org/video/2011-install-and-use-tor-de.ogv\"@" "$wmldir/$subdir/$lang/$wmlfile"

 				fi

                         fi

@@ -379,6 +379,13 @@ for file in $po ; do

 			subdir="zh-cn"

 			nosubdir

 		fi

+

+		# If the current subdirectory is "pt_BR" use "pt-br" instead

+		if [ $subdir = "pt_BR" ]

+		then

+			subdir="pt-br"

+			nosubdir

+		fi

 		# If the current directory is "nb" use "no" instead

 		if [ $subdir = "nb" ]

@@ -402,7 +409,7 @@ for file in $po ; do

 		fi

 		# Convert everything else

-		if [[ $subdir != "en" && $subdir != "zh_CN" && $subdir != "nb" && $subdir != "sv" && $subdir != "pl_PL" ]]

+		if [[ $subdir != "en" && $subdir != "zh_CN" && $subdir != "pt_BR" && $subdir != "nb" && $subdir != "sv" && $subdir != "pl_PL" ]]

 		then

 			nosubdir

 		fi

@@ -414,6 +421,13 @@ for file in $po ; do

 			subdir

 		fi

+		# If the current language is "pt_BR" use "pt-br" instead

+		if [ $lang = "pt_BR" ]

+		then

+			lang="pt-br"

+			subdir

+		fi

+

 		# If the current language is "nb" use "no" instead

 		if [ $lang = "nb" ]

 		then

@@ -436,7 +450,7 @@ for file in $po ; do

 		fi

 		# Convert everything else

-		if [[ $lang != "en" && $lang != "zh_CN" && $lang != "nb" && $lang != "sv" && $lang != "pl_PL" ]]

+		if [[ $lang != "en" && $lang != "zh_CN" && $lang != "pt_BR" && $lang != "nb" && $lang != "sv" && $lang != "pl_PL" ]]

 		then

 			subdir

 		fi

@@ -321,7 +321,11 @@ for file in $po ; do

 				# sure we include the German video

 				if [ $wmlfile = "tor-doc-windows.wml" ]

 				then

-					sed -i "s@src\=\"https://media.torproject.org/video/2009-install-and-use-tor.ogv\"@src\=\"https://media.torproject.org/video/2011-install-and-use-tor-de.mp4@" "$wmldir/$subdir/$lang/$wmlfile"

+					orig_video=`grep src=\"https:\/\/media.torproject.org\/video\/2009-install-and-use-tor.ogv\" "$wmldir/$subdir/$lang/$wmlfile"`

+					new_video=`echo "<p>Das nachfolgende Video, wurde von <a href=\"http://www.sempervideo.de/\">SemperVideo</a> erstellt.</p> $orig_video"`

+				

+					sed -i "s@$orig_video@$new_video@" "$wmldir/$subdir/$lang/$wmlfile"

+					sed -i "s@src\=\"https://media.torproject.org/video/2009-install-and-use-tor.ogv\"@src\=\"https://media.torproject.org/video/2011-install-and-use-tor-de.ogv\"@" "$wmldir/$subdir/$lang/$wmlfile"

 				fi

                         fi

@@ -316,6 +316,13 @@ for file in $po ; do

                                 # Footer

                                 echo '#include "de/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile"

+

+				# If the file is tor-doc-windows, make

+				# sure we include the German video

+				if [ $wmlfile = "tor-doc-windows.wml" ]

+				then

+					sed -i "s@src\=\"https://media.torproject.org/video/2009-install-and-use-tor.ogv\"@src\=\"https://media.torproject.org/video/2011-install-and-use-tor-de.mp4@" "$wmldir/$subdir/$lang/$wmlfile"

+				fi

                         fi

 			# If the file is an Arabic translation, include the

@@ -251,6 +251,17 @@ for file in $po ; do

 				echo '#include "foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile"

 			fi

+			# If the file is overview.wml, make sure we

+			# include the correct set of images

+			if [ $wmlfile = "overview.wml" ] && [[ $lang = "de" || $lang = "es" || $lang = "fr" || 

+				$lang = "ja" || $lang = "nl" || $lang = "no" || $lang = "pl" || $lang = "ru" || 

+				$lang = "zh" ]]

+			then

+				sed -i "s/htw1.png/htw1_$lang.png/" "$wmldir/$subdir/$lang/$wmlfile"

+				sed -i "s/htw2.png/htw2_$lang.png/" "$wmldir/$subdir/$lang/$wmlfile"

+				sed -i "s/htw3.png/htw3_$lang.png/" "$wmldir/$subdir/$lang/$wmlfile"

+			fi

+

                         # If the translation is Polish, include the

                         # correct header, menu files and footer

 			if [ $lang = "pl" ]

@@ -246,7 +246,7 @@ for file in $po ; do

 			# Include the English footer for most of the

 			# translations 

-			if [[ $lang != "ar" && $lang != "pl" && $subdir != "de" ]]

+			if [[ $lang != "ar" && $lang != "pl" && $lang != "de" ]]

 			then

 				echo '#include "foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile"

 			fi

@@ -119,7 +119,7 @@ for file in $po ; do

 			# Include the English footer for most of the

 			# translations

-			if [[ $subdir != "ar" && $subdir != "pl" ]]

+			if [[ $subdir != "ar" && $subdir != "pl" && $subdir != "de" ]]

 			then

 				echo '#include "foot.wmi"' >> "$wmldir/$subdir/$wmlfile"

 			fi

@@ -153,6 +153,35 @@ for file in $po ; do

 				echo '#include "pl/foot.wmi"' >> "$wmldir/$subdir/$wmlfile"

 			fi

+                        # If the translation is German, include the

+                        # correct header, menu files and footer

+                        if [ $subdir = "de" ]

+                        then

+                                # Head

+                                orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"`

+                                new_head=`echo $orig_head | sed s@head.wmi@de/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 "de/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 "de/info.wmi"'`

+                                        sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$wmlfile"

+                                fi  

+

+                                # Footer

+                                echo '#include "de/foot.wmi"' >> "$wmldir/$subdir/$wmlfile"

+                        fi  

+

 			# If the translation is Arabic, include the

 			# correct header, css, menu files and footer

 			if [ $subdir = "ar" ]

@@ -217,7 +246,7 @@ for file in $po ; do

 			# Include the English footer for most of the

 			# translations 

-			if [[ $lang != "ar" && $lang != "pl" ]]

+			if [[ $lang != "ar" && $lang != "pl" && $subdir != "de" ]]

 			then

 				echo '#include "foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile"

 			fi

@@ -250,6 +279,34 @@ for file in $po ; do

 				echo '#include "pl/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile"

 			fi

+                        # If the translation is German, include the

+                        # correct header, menu files and footer

+                        if [ $lang = "de" ]

+                        then

+                                orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"`

+                                new_head=`echo $orig_head | sed s@head.wmi@de/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 "de/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 "de/info.wmi"'`

+                                        sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$lang/$wmlfile"

+                                fi

+

+                                # Footer

+                                echo '#include "de/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile"

+                        fi

+

 			# If the file is an Arabic translation, include the

 			# correct header, css, menu files and footer

 			if [ $lang = "ar" ]

@@ -124,6 +124,65 @@ for file in $po ; do

 				echo '#include "foot.wmi"' >> "$wmldir/$subdir/$wmlfile"

 			fi

+			# If the translation is Polish, include the

+			# correct header, menu files and footer

+			if [ $subdir = "pl" ]

+			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

+

+			# If the translation is Arabic, include the

+			# correct header, css, menu files and footer

+			if [ $subdir = "ar" ]

+			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

+

 			# If the directory does not include sidenav.wmi,

 			# copy it from the English directory (only if

 			# the English directory has this file)

@@ -131,7 +190,6 @@ for file in $po ; do

 			then

 				cp "$wmldir/en/sidenav.wmi" "$wmldir/$subdir"

 			fi

-

 		fi

 	}	

@@ -164,6 +222,64 @@ for file in $po ; do

 				echo '#include "foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile"

 			fi

+                        # If the translation is Polish, include the

+                        # correct header, menu files and footer

+			if [ $lang = "pl" ]

+			then

+				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

+

+			# If the file is an Arabic translation, include the

+			# correct header, css, menu files and footer

+			if [ $lang = "ar" ]

+			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

+

 			# If the directory does not include sidenav.wmi,

 			# copy it from the English directory (only if 

 			# the English directory has this file)

@@ -204,76 +320,10 @@ for file in $po ; do

 		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