s/hellas/greek/

CVS version numbers

Makefile: 1.27 -> 1.28 
stattrans.pl: 1.18 -> 1.19 
touch_translations.pl: 1.6 -> 1.7 
english/template/debian/language_names.wml: 1.157 -> 1.158 
english/template/debian/languages.wml: 1.89 -> 1.90

5 files changed, 31 insertions, 35 deletions

diff --git a/Makefile b/Makefile
index 17097875c07..712d2f8adcb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 # Top-level Makefile for the Debian Web pages
 
 LANGUAGES := english catalan chinese croatian danish dutch esperanto \
-             finnish french german hungarian italian japanese korean \
+             finnish french german greek hungarian italian japanese korean \
              norwegian polish portuguese romanian russian spanish swedish \
-             turkish hellas
+             turkish
 # existing translations that have been removed due to neglect:
 # arabic
 
diff --git a/english/template/debian/language_names.wml b/english/template/debian/language_names.wml
index 2aee7883a36..59b399b1daa 100644
--- a/english/template/debian/language_names.wml
+++ b/english/template/debian/language_names.wml
@@ -35,7 +35,7 @@ my %trans = (
 		hungarian  => "unkari",
 		romanian   => "romania",
 		slovak     => "slovakki",
-		hellas     => "kreikka",
+		greek      => "kreikka",
 		catalan    => "katalaani",
 	},
 	hr => {
@@ -63,7 +63,7 @@ my %trans = (
 		hungarian  => "maðarski",
 		romanian   => "rumunjski",
                 slovak     => "slovaèki",
-		hellas     => "grèki",
+		greek      => "grèki",
 		catalan    => "katalonski",
 	},
 	en => {
@@ -91,7 +91,7 @@ my %trans = (
 		hungarian  => "Hungarian",
 		romanian   => "Romanian",
                 slovak     => "Slovak",
-		hellas     => "Hellenic",
+		greek      => "Hellenic",
   		catalan    => "catalan",
 	},
 	el => {
@@ -119,7 +119,7 @@ my %trans = (
 		romanian   => "ÑïõìÜíéêá",
 		hungarian  => "ÏõããáñÝæéêá",
 		slovak     => "ÓëïâÜêéêá",
-		hellas     => "Ελληνικά",
+		greek      => "Ελληνικά",
 		catalan    => "catalan",
 	},
 	ro => {
@@ -147,7 +147,7 @@ my %trans = (
 		romanian   => "română",
 		hungarian  => "maghiară",
                 slovak     => "slovacă",
-		hellas     => "greacă",
+		greek      => "greacă",
 		catalan    => "catalan",
 	},
 	eo => {
@@ -174,7 +174,7 @@ my %trans = (
 		hungarian  => "Hungara",
 		romanian   => "Romana",
                 slovak     => "Slovaka",
-		hellas     => "Greka",
+		greek      => "Greka",
 		catalan    => "catalan",
 	},
 	pt => {
@@ -201,7 +201,7 @@ my %trans = (
 		hungarian  => "Húngaro",
 		romanian   => "Romeno",
                 slovak     => "Eslovaco",
-		hellas     => "Grego",
+		greek      => "Grego",
 		catalan    => "catalan",
 	},
 	da => {
@@ -228,7 +228,7 @@ my %trans = (
 		hungarian  => "ungarsk",
 		romanian   => "romænsk",
                 slovak     => "slovakisk",
-		hellas     => "græsk",
+		greek      => "græsk",
 		catalan    => "catalansk",
 	},
 	no => {
@@ -255,7 +255,7 @@ my %trans = (
 		hungarian  => "ungarsk",
 		romanian   => "romansk",
                 slovak     => "slovakisk",
-		hellas     => "gresk",
+		greek      => "gresk",
 		catalan    => "katalansk",
 	},
 	fr => {
@@ -282,7 +282,7 @@ my %trans = (
 		hungarian  => "hongrois",
 		romanian   => "roumain",
                 slovak     => "Slovak",
-		hellas     => "Greek",
+		greek      => "Greek",
 		catalan    => "catalan",
 	},
 	nl => {
@@ -310,7 +310,7 @@ my %trans = (
 		turkish    => "Turks",
 		romanian   => "Roemense",
                 slovak     => "Slovak",
-		hellas     => "Greek",
+		greek      => "Greek",
 		catalan    => "catalan",
 	},
 	de => {
@@ -324,7 +324,7 @@ my %trans = (
 		finnish    => "Finnisch",
 		french     => "Französisch",
 		german     => "Deutsch",
-		hellas     => "Griechisch",
+		greek      => "Griechisch",
 		hungarian  => "Ungarisch",
 		italian    => "Italienisch",
 		japanese   => "Japanisch",
@@ -350,7 +350,6 @@ my %trans = (
 		faeroese   => "Färöeresisch",
 		'gaelic (scots)'	   => "Gaelisch",
 		gallegan   => "Galizisch",
-		greek	   => "Griechisch",
 		hebrew	   => "Hebräisch",
 		icelandic  => "Isländisch",
 		indonesian => "Indonesisch",
@@ -388,7 +387,7 @@ my %trans = (
 		hungarian  => "Ungherese",
 		romanian   => "Rumeno",
                 slovak     => "Slovak",
-		hellas     => "Greek",
+		greek      => "Greek",
 		catalan    => "catalan",
 	},
 	ja => {
@@ -415,7 +414,7 @@ my %trans = (
 		hungarian  => "¥Ï¥ó¥¬¥ê¡¼¸ì",
 		romanian   => "¥ë¡¼¥Þ¥Ë¥¢¸ì",
                 slovak     => "¥¹¥í¥Ð¥­¥¢¸ì",
-		hellas     => "Greek",
+		greek      => "Greek",
 		catalan    => "catalan",
 	},
 	ko => {
@@ -443,7 +442,7 @@ my %trans = (
 		hungarian  => "hungarian",
 		romanian   => "Romanian",
                 slovak     => "Slovak",
-		hellas     => "Greek",
+		greek      => "Greek",
 		catalan    => "catalan",
 	},
 	es => {
@@ -470,7 +469,7 @@ my %trans = (
 		hungarian  => "Hungaro",
 		romanian   => "Rumano",
                 slovak     => "Eslovaco",
-		hellas     => "Griego",
+		greek      => "Griego",
 		catalan    => "Catalán",
 	},
 	zh => {
@@ -497,7 +496,7 @@ my %trans = (
 		hungarian  => "¦I¤ú§Q»y",
 		romanian   => "ù°¨¥§¨È»y",
                 slovak     => "´µ¬¥ªk§J»y",
-		hellas     => "§Æþ»y",
+		greek      => "§Æþ»y",
 		catalan    => "catalan",
 	},
 	sv => {
@@ -524,7 +523,7 @@ my %trans = (
 		hungarian  => "ungerska",
 		romanian   => "rumänska",
                 slovak     => "slovakiska",
-		hellas     => "grekiska",
+		greek      => "grekiska",
 # The following is only needed for /international/l10n/, at least at
 # the moment, so I don't add it to all possible languages  -Joey
 		arabic	   => "arabiska",
@@ -576,7 +575,7 @@ my %trans = (
 		hungarian  => "wêgierski",
 		romanian   => "rumuñski",
                 slovak     => "s³owacki",
-		hellas     => "grecki",
+		greek      => "grecki",
 		catalan    => "catalan",
 	},
 	tr => {
@@ -603,7 +602,7 @@ my %trans = (
 		hungarian  => "Macarca",
 		romanian   => "Romence",
                 slovak     => "Slovak",
-		hellas     => "Greek",
+		greek      => "Greek",
 		catalan    => "catalan",
 	},
 	ru => {
@@ -630,7 +629,7 @@ my %trans = (
 		esperanto  => "üÓÐÅÒÁÎÔÏ",
 		romanian   => "òÕÍÙÎÓËÉÊ",
                 slovak     => "óÌÏ×ÁÃËÉÊ",
-		hellas     => "Greek",
+		greek      => "Greek",
 		catalan    => "catalan",
 	},
 	hu => {
@@ -658,7 +657,7 @@ my %trans = (
 		hungarian  => "magyar",
 		romanian   => "román",
                 slovak     => "szlovák",
-		hellas     => "görög",
+		greek      => "görög",
 		catalan    => "catalan",
 	},
 	ar => {
@@ -686,7 +685,7 @@ my %trans = (
 		hungarian  => "Hungarian",
 		romanian   => "Romanian",
                 slovak     => "Slovak",
-		hellas     => "Greek",
+		greek      => "Greek",
 		catalan    => "catalan",
 	},
 	sk => {
@@ -714,7 +713,7 @@ my %trans = (
 		hungarian  => "Hungarian",
 		romanian   => "Romanian",
                 slovak     => "Slovak",
-		hellas     => "Greek",
+		greek      => "Greek",
 		catalan    => "catalan",
 	},
 	ca => {
@@ -743,7 +742,7 @@ my %trans = (
 		hungarian  => "hongarès",
 		romanian   => "romanès",
 		slovak     => "eslovac",
-		hellas     => "grec",
+		greek      => "grec",
 	},
 );
 </perl>
diff --git a/english/template/debian/languages.wml b/english/template/debian/languages.wml
index 9673e99c42b..9c69bbb0849 100644
--- a/english/template/debian/languages.wml
+++ b/english/template/debian/languages.wml
@@ -64,7 +64,7 @@ my %langs = ( english    => "en",
               catalan    => "ca",
               danish     => "da",
               german     => "de",
-              hellas     => "el",
+              greek      => "el",
               esperanto  => "eo",
               spanish    => "es",
               finnish    => "fi",
@@ -92,7 +92,7 @@ my %langs = ( english    => "en",
 my %translit = (
   arabic   => "Arbytm",
   chinese  => "Zhongzu",
-  hellas   => "Ellynika",
+  greek    => "Ellynika",
   japanese => "Nihongo",
   korean   => "Hangul", # Not sure. "Hanguk-Mal" (=Spoken Korean)?
   russian  => "Russkij",
@@ -145,9 +145,6 @@ sub languages {
   $rel_dir = &relpath($full_base_url, $cwd);
   $rel_dir =~ s,/$,,;
 
-  # Special case: Greek is not in a directory called "greek"
-  $cur_lang = "hellas" if $cur_lang eq "Greek";
-
   # printf STDERR "base_url=$base_url rel_dir=$rel_dir file=$file cur_lang=$cur_lang\n";
 
   foreach(keys %langs) {
diff --git a/stattrans.pl b/stattrans.pl
index 987e690b548..defa9ec6e25 100755
--- a/stattrans.pl
+++ b/stattrans.pl
@@ -48,7 +48,7 @@ my %langs = ( english    => "en",
               catalan    => "ca",
               danish     => "da",
               german     => "de",
-              hellas     => "el",
+              greek      => "el",
               esperanto  => "eo",
               spanish    => "es",
               finnish    => "fi",
diff --git a/touch_translations.pl b/touch_translations.pl
index 5b55835220c..c44dc4d100b 100755
--- a/touch_translations.pl
+++ b/touch_translations.pl
@@ -35,7 +35,7 @@
 	"fi" => "finnish",
 	"fr" => "french",
 	"de" => "german",
-	"el" => "hellas",
+	"el" => "greek",
 	"hu" => "hungarian",
 	"it" => "italian",
 	"ja" => "japanese",