terminoloogy fixes

CVS version numbers

english/template/debian/basic.wml: 1.33 -> 1.34 
english/template/debian/common_translation.wml: 1.53 -> 1.54 
english/template/debian/consultant.wml: 1.19 -> 1.20 
english/template/debian/countries.wml: 1.59 -> 1.60 
english/template/debian/ctime.wml: 1.37 -> 1.38 
english/template/debian/develbar.wml: 1.44 -> 1.45 
english/template/debian/event.wml: 1.34 -> 1.35 
english/template/debian/fixes_link.wml: 1.26 -> 1.27 
english/template/debian/footer.wml: 1.39 -> 1.40 
english/template/debian/install_manual.wml: 1.8 -> 1.9 
english/template/debian/language_names.wml: 1.70 -> 1.71 
english/template/debian/languages.wml: 1.44 -> 1.45 
english/template/debian/menubar.wml: 1.107 -> 1.108 
english/template/debian/navbar.wml: 1.39 -> 1.40 
english/template/debian/recent_list.wml: 1.34 -> 1.35 
english/template/debian/security.wml: 1.34 -> 1.35 
english/template/debian/votebar.wml: 1.31 -> 1.32

1 files changed, 275 insertions, 0 deletions

diff --git a/english/template/debian/event.wml b/english/template/debian/event.wml
index aca5590f6f5..f8fba386bba 100644
--- a/english/template/debian/event.wml
+++ b/english/template/debian/event.wml
@@ -1,3 +1,277 @@
+<<<<<<< event.wml
+<define-tag eventtitle whitespace=delete>
+	[EN:Upcoming Attractions:]
+	[EO:Venontaj Aferoj:]
+	[TR:Cok YakInda:]
+	[FI:Tulevia tapahtumia:]
+	[PT:Atrações Vindouras:]
+	[HR:Nadolazeæe atrakcije:]
+	[FR:Attractions à venir:]
+	[DE:Kommende Ereignisse:]
+	[IT:Upcoming Attractions:]
+	[JA:¶áÆü³«ºÅ¤µ¤ì¤ë¥¤¥Ù¥ó¥È:]
+	[PL:Nadchodz¹ce Atrakcje:]
+	[ES:Próximas Atracciones:]
+	[ZH:Upcoming Attractions:]
+	[SV:Kommande tilldragelser:]
+	[NO:Kommende begivenheter:]
+	[KO:°ð °³ÃÖµÉ À̺¥Æ(r):]
+	[AR:ÇáãáÇå ÇáÞÇÏãÉ:]
+</define-tag>
+<define-tag notvalid whitespace=delete>
+	[EN:link may no longer be valid:]
+	[EO:eble la ligo ne plu estas valida:]
+	[TR:baGlantI artIk geCerli olmayabilir:]
+	[FI:linkki voi olla vanhentunut:]
+	[PT:link pode não mais ser válido:]
+	[HR:veza mo3/4da vi¹e ne radi:]
+	[FR:le lien n'est peut-être plus valide:]
+	[DE:Link könnte veraltet sein:]
+	[IT:link may no longer be valid:]
+	[JA:¥ê¥ó¥¯¤¬ÀÚ¤ì¤Æ¤¤¤ë²ÄÇ1/2À­¤¬¤¢¤ê¤Þ¤¹:]
+	[PL:odno¶nik mo¿e nie byæ ju¿ aktualny:]
+	[ES:el enlace puede no ser ya válido:]
+	[ZH:link may no longer be valid:]
+	[SV:länken kan vara gammal:]
+	[NO:pekeren kan være utdatert:]
+	[KO:¸µÅ(c)°¡ ²÷3/4îÁ³À» 1/4öµµ ÀÖ1/2À´Ï´Ù:]
+	[AR:áÚáø ÇáÞíÏ ãÇ ÚÇÏ ÕÇáÍÇ:]
+</define-tag>
+<define-tag langwhen whitespace=delete>
+	[EN:When:]
+	[EO:Kiam:]
+	[TR:Ne Zaman:]
+	[FI:Koska:]
+	[PT:Quando:]
+	[HR:Kada:]
+	[FR:Quand:]
+	[DE:Wann:]
+	[IT:When:]
+	[JA:Æü»þ:]
+	[PL:Kiedy:]
+	[ES:Cuando:]
+	[ZH:When¡]¦ó(r)É*¡^:]
+	[SV:När:]
+	[NO:Når:]
+	[KO:¶§:]
+	[AR:ãÊÇ:]
+</define-tag>
+<define-tag langwhere whitespace=delete>
+	[EN:Where:]
+	[EO:Kie:]
+	[TR:Nerede:]
+	[FI:Missä:]
+	[PT:Onde:]
+	[HR:Gdje:]
+	[FR:Où:]
+	[DE:Wo:]
+	[IT:Where:]
+	[JA:3/4ì1/2ê:]
+	[PL:Gdzie:]
+	[ES:Dónde:]
+	[ZH:Where¡]¦ó³B*¡^:]
+	[SV:Var:]
+	[NO:Hvor:]
+	[KO:Àå1/4Ò:]
+	[AR:Ãíä:]
+</define-tag>
+<define-tag debinvolve whitespace=delete>
+	[EN:Debian Involvement:]
+	[EO:Partopreno de Debian:]
+	[TR:Debian KatIlImI:]
+	[FI:Debianin osallisuus:]
+	[PT:Envolvimento do Debian:]
+	[HR:Upletenost Debiana:]
+	[FR:Participation de Debian:]
+	[DE:Mitwirkung von Debian:]
+	[IT:Debian Involvement:]
+	[JA:Debian ´ØÏ¢3/4ðÊó:]
+	[PL:Zaanga¿owanie Debian'a:]
+	[ES:Implicación de Debian:]
+	[ZH:Debian Involvement:]
+	[SV:Debians involvering:]
+	[NO:Debian's engasjement:]
+	[KO:µ¥ºñ3/4È °ü·Ã Á¤º¸:]
+	[AR:ÅÓåÇã ÏÈíÇä:]
+</define-tag>
+<define-tag maincoordinator whitespace=delete>
+	[EN:Main Coordinator:]
+	[EO:Æefa Kunordiganto:]
+	[TR:Ba$ KoordinatOr:]
+	[FI:Pääkoordinoija:]
+	[PT:Coordenador Principal:]
+	[HR:Glavni koordinator:]
+	[FR:Principal Coordinateur:]
+	[DE:Hauptkoordinator:]
+	[IT:Main Coordinator:]
+	[JA:¥á¥¤¥ó¥³¡1/4¥Ç¥£¥Í¡1/4¥¿:]
+	[PL:G³ówny koordynator:]
+	[ES:Coordinador Principal:]
+	[ZH:¡]«ÝĶ¡GMain Coordinator¡^:]
+	[SV:Huvudkoordinatör:]
+	[NO:Hovedkoordinator:]
+	[KO:ÁÖ¿ä ÄÚµð³×ÀÌÅÍ:]
+	[AR:ÇáãäÓøÞ ÇáÚÇã:]
+</define-tag>
+<define-tag projcoordinator whitespace=delete>
+	[EN:<TH>Project</TH><TH>Coordinator</TH>:]
+	[EO:<TH>Projekto</TH><TH>Kunordiganto</TH>:]
+	[TR:<TH>Proje</TH><TH>KoordinatOrU</TH>:]
+	[FI:<TH>Projekti</TH><TH>Koordinaattori</TH>:]
+	[PT:<TH>Coordenador de</TH><TH>Projeto</TH>:]
+	[HR:<TH>Projekt</TH><TH>Koordinator</TH>:]
+	[FR:<TH>Projet</TH><TH>Coordinateur</TH>:]
+	[DE:<TH>Projekt-</TH><TH>Koordinator</TH>:]
+	[IT:<TH>Project</TH><TH>Coordinator</TH>:]
+	[JA:<TH>¥×¥í¥¸¥§¥¯¥È</TH><TH>¥³¡1/4¥Ç¥£¥Í¡1/4¥¿</TH>:]
+	[PL:<TH>Koordynatora</TH><TH>Projektu</TH>:]
+	[ES:<TH>Coordinador de</TH><TH>Proyecto</TH>:]
+	[ZH:<TH>­p¹º</TH><TH>¡]«ÝĶ¡GCoordinator¡^</TH>:]
+	[SV:<TH>Projekt</TH><TH>Koordinatör</TH>:]
+	[NO:<TH>Prosjekt</TH><TH>Koordinator</TH>:]
+	[KO:<TH>ÇÁ·ÎÁ§Æ(r)</TH><TH>ÄÚµð³×ÀÌÅÍ</TH>:]
+	[AR:ãäÓøÞ ÇáãÔÑæÚ:]
+</define-tag> 
+<define-tag relatedlinks whitespace=delete>
+	[EN:Related Links:]
+	[EO:Rilataj Ligoj:]
+	[TR:Ýlgili BaGlantIlar:]
+	[FI:Aiheeseen liittyviä linkkejä:]
+	[PT:Links Relacionados:]
+	[HR:Srodne veze:]
+	[FR:Liens connexes:]
+	[DE:Weitere Links:]
+	[IT:Related Links:]
+	[JA:´ØÏ¢¥ê¥ó¥¯:]
+	[PL:Odno¶niki do powi±zanych tematów:]
+	[ES:Enlaces Relacionados:]
+	[ZH:¬ÛÃöºô§}:]
+	[SV:Relaterade länkar:]
+	[NO:Relaterte pekere:]
+	[KO:°ü·Ã ¸µÅ(c):]
+	[AR:ÇáÞíæÏ ÇáãÊÚáøÞÉ:]
+</define-tag>
+
+#use wml::debian::basic title="<eventtitle>"
+#use wml::debian::languages
+
+# DO NOT translate anything below. If you feel something needs to be modified
+# write to debian-www first
+
+<perl>
+#############################################################################
+# grabs the date and title of the last $number news items from directory $path.
+# If $number is zero then all the news items are shown.
+sub get_recent_list 
+{
+  my ( $path, $number, $current_dir, $match ) = @_;
+
+  opendir(DIR, "$current_dir/$path");
+  @files = grep { /^$match.wml$/ && -f "$current_dir/$path/$_" } readdir(DIR);
+  @files = sort {$b cmp $a} @files;
+  closedir DIR;
+
+	$str = '<TR><TD>(<none>)</TD></TR>';
+
+  $count = 0;
+  foreach (@files) 
+  {
+     $count++;
+     open(FILE, "<$path/$_") || open(FILE, "<$current_dir/$path/$_");
+     if ( /($match).wml/ ) 
+	 {
+        $base = $1;
+     }
+     $title = ''; $date = ''; $contact = ''; $email = ''; $desc = '';
+     foreach $line (<FILE>) 
+	 {
+        if ($line =~ /^<define-tag pagetitle>(.*)<\/define-tag>$/) 
+		{
+           $title = $1;
+        }
+        elsif ($line =~ /^<define-tag date>(.*)<\/define-tag>$/) 
+		{
+           $date = $1;
+        }
+        elsif ($line =~ /^<define-tag contact>(.*)<\/define-tag>$/) 
+		{
+           $contact = $1;
+        }
+        elsif ($line =~ /^<define-tag email>(.*)<\/define-tag>$/) 
+		{
+           $email = $1;
+        }
+        elsif ($line =~ /^<define-tag desc>(.*)<\/define-tag>$/) 
+		{
+           $desc = $1;
+        }
+		if ($title && $date) 
+		{
+           $str = "<tt>[$date]</tt> <strong><a href=\"$path/$base\">$title</a></strong><br>\n";
+           last;
+		}
+		elsif ($title && $contact && $email && $desc)
+		{
+           $str = "<TR><TD><A HREF=\"$path/$base\">$title</A></TD><TD><A HREF=\"mailto:$email\">$contact</A></TD><TD>$desc</TD></TR>\n";
+		   last;
+		}
+		elsif ($title && $contact && $desc)
+		{
+           $str = "<TR><TD><A HREF=\"$path/$base\">$title</A></TD><TD>$contact</TD><TD>$desc</TD></TR>\n";
+		}
+     }
+     close FILE;
+     if ($count eq $number) { last; }
+  }
+close DIR;
+return $str;
+}
+
+#############################################################################
+# grabs the date and title of the last $number news items from directory $path.
+# If $number is zero then all the news items are shown.
+sub make_link 
+{
+  	my ( $url, $text, $temp ) = @_;
+	
+	$str = "$text - $url (<notvalid>)";
+	return $str
+}
+</perl>
+
+<HR>
+<H2><pagetitle></H2>
+	<STRONG><langwhen>:</STRONG>  <date><BR>
+	<STRONG><langwhere>:</STRONG>  <where><BR>
+	<STRONG>URL:</STRONG>  <a href="<infolink>"><infolink></a><BR>
+
+<HR>
+<intro>
+
+<HR>
+<H2><debinvolve></H2>
+<involve>
+<P><STRONG><maincoordinator>:</STRONG>  <coord>
+<TABLE>
+	<TR><projcoordinator></TR>
+	<:= get_recent_list ( '<abbr>', '0', '$(ENGLISHDIR)/events/<year>', 'project-\w+' ) :>
+</TABLE>
+
+<HR>
+<H2><latestnews></H2>
+<:= get_recent_list ( '<abbr>', '0', '$(ENGLISHDIR)/events/<year>', 'news-\d+\w*' ) :>
+
+<HR>
+<H2><relatedlinks></H2>
+<<mainbody>>
+
+<:= languages() :>
+#use wml::debian::footer
+
+..mainbody>>
+
+
+=======
 <define-tag eventtitle whitespace=delete>
 	[EN:Upcoming Attractions:]
 	[EO:Venontaj Aferoj:]
@@ -285,3 +559,4 @@ sub make_link
 
 ..mainbody>>
 
+>>>>>>> 1.34