diff options
| author | James A. Treacy <treacy> | 1999-12-06 21:16:31 +0000 |
|---|---|---|
| committer | James A. Treacy <treacy> | 1999-12-06 21:16:31 +0000 |
| commit | 78f1a2396fe4bea5b52bf48e9651bf0ea34fa005 (patch) | |
| tree | 4c909cdb4398a799b696dc7ee3339af06e66acb8 /english/template/debian/consultant.wml | |
| parent | fcd0d75eeeda048a06204258d1af60ae99bd1c08 (diff) | |
fixed the conflicts caused by improper commit by the new Arabic translation
CVS version numbers
english/template/debian/basic.wml: 1.30 -> 1.31
english/template/debian/common_translation.wml: 1.48 -> 1.49
english/template/debian/consultant.wml: 1.16 -> 1.17
english/template/debian/countries.wml: 1.56 -> 1.57
english/template/debian/ctime.wml: 1.31 -> 1.32
english/template/debian/develbar.wml: 1.38 -> 1.39
english/template/debian/event.wml: 1.31 -> 1.32
english/template/debian/fixes_link.wml: 1.23 -> 1.24
english/template/debian/footer.wml: 1.35 -> 1.36
english/template/debian/language_names.wml: 1.60 -> 1.61
english/template/debian/languages.wml: 1.41 -> 1.42
english/template/debian/menubar.wml: 1.102 -> 1.103
english/template/debian/navbar.wml: 1.37 -> 1.38
english/template/debian/recent_list.wml: 1.32 -> 1.33
english/template/debian/security.wml: 1.31 -> 1.32
english/template/debian/votebar.wml: 1.28 -> 1.29
Diffstat (limited to 'english/template/debian/consultant.wml')
| -rw-r--r-- | english/template/debian/consultant.wml | 73 |
1 files changed, 2 insertions, 71 deletions
diff --git a/english/template/debian/consultant.wml b/english/template/debian/consultant.wml index ade18c897f3..7f487928b9a 100644 --- a/english/template/debian/consultant.wml +++ b/english/template/debian/consultant.wml @@ -1,73 +1,3 @@ -<<<<<<< consultant.wml -#use wml::std::tags -#use wml::std::info -#use wml::std::box -#use wml::debian::common_translation - -<define-tag consultanttitle whitespace=delete> - [EN:List of Consultants:] - [EO:Listo de Konsultatoj:] - [TR:Dani$man Listesi:] - [FI:Konsulttilista:] - [PT:Lista de Consultores:] - [HR:Popis konzultanata:] - [FR:Liste des consultants:] - [DE:Liste der Berater:] - [IT:List of Consultants:] - [JA:¥³¥ó¥µ¥ë¥¿¥ó¥È°ìÍ÷:] - [PL:Lista Konsultantów:] - [ES:Lista de Consultores:] - [DA:Konsulent Oversigt:] - [NO:Konsulentliste:] - [ZH:List of Consultants:] - [SV:Konsultöversikt:] - [KO:ÄÁ1/4³ÅÏÆ(r) ¸(r)1/2ºÆ(r):] - [AR:ÞÇÆãÉ ÇáãÓÊÔíÑíä:] -</define-tag> -<define-tag returnconsult whitespace=delete> - [EN:Back to the <A HREF="./">Debian consultants page</A>.:] - [EO:Reen al la <A HREF="./">Paøo de konsultatoj de Debian</A>.:] - [TR:<A HREF="./">Debian dani$manlar sayfasi</A>'na donu$.:] - [FI:Takaisin <A HREF="./">Debian-konsulttisivulle</A>.:] - [PT:Volta para a <A HREF="./">página de consultores Debian</A>.:] - [HR:Natrag na stranicu <A HREF="./">Debian konzultanti</A>.:] - [FR:Retour à la <A HREF="./">page des consultants Debian</A>.:] - [DE:Zurück zur <A HREF="./">Debian Beraterseite</A>.:] - [IT:Back to the <A HREF="./">Debian consultants page</A>.:] - [JA:<A HREF="./">Debian ¥³¥ó¥µ¥ë¥¿¥ó¥È¤Î¥Ú¡1/4¥¸</A>¤ËÌá¤ë¡£:] - [PL:Powrót do <A HREF="./">strony konsultantów Debian'a</A>.:] - [ES:Volver a la <A HREF="./">página de consultores de Debian</A>.:] - [DA:Tilbage til <A HREF="./">Debian konsulent oversigten</A>.:] - [NO:Tilbake til <A HREF="./">Debian's konsulentliste</A>.:] - [ZH:ªð¦^ <A HREF="./">Debian consultants page</A>.:] - [SV:Åter till <A HREF="./">Debians konsultöverikt</A>.:] - [KO:<A HREF="./">Debian ÄÁ1/4³ÅÏÆ(r) ÆäÀÌÁö</A>·Î:] - [AR:ÕÝÍÉ ãÓÊÔíÑíä ÏÈÇíä:] -</define-tag> - -# DO NOT translate anything below this line. If you feel something needs to be modified -# write to debian-www first. - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> -<html> -<head> -<title>Debian GNU/Linux — <consultanttitle></title> -<link rev="made" href="mailto:webmaster@debian.org"> -<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=$(CHARSET)"> -</head> - -<body text="#000000" bgcolor="#FFFFFF" link="#0000FF" vlink="#800080" alink="#FF0000"> - -<<mainbody>> - -<hr> -<p><returnconsult> -#use wml::debian::footer NOCOMMENTS="yes" NOCOPYRIGHT="yes" - -..mainbody>> - - -======= #use wml::std::tags #use wml::std::info #use wml::std::box @@ -92,6 +22,7 @@ [SV:Konsultöversikt:] [KO:ÄÁ¼³ÅÏÆ® ¸®½ºÆ®:] [HU:Konzultánsok névsora:] + [AR:ÞÇÆãÉ ÇáãÓÊÔíÑíä:] </define-tag> <define-tag returnconsult whitespace=delete> [EN:Back to the <A HREF="./">Debian consultants page</A>.:] @@ -112,6 +43,7 @@ [SV:Åter till <A HREF="./">Debians konsultöverikt</A>.:] [KO:<A HREF="./">Debian ÄÁ¼³ÅÏÆ® ÆäÀÌÁö</A>·Î:] [HU:Vissza a <A HREF="./">Debian-konzultánsok oldalára</A>.:] + [AR:ÕÝÍÉ ãÓÊÔíÑíä ÏÈÇíä:] </define-tag> # DO NOT translate anything below this line. If you feel something needs to be modified @@ -135,4 +67,3 @@ ..mainbody>> ->>>>>>> 1.15 |