revert r21309 and r21310
Andrew Lewman

Andrew Lewman commited on 2009-12-22 04:42:35
Zeige 34 geänderte Dateien mit 8 Einfügungen und 8 Löschungen.

... ...
@@ -16,7 +16,7 @@ WMLOPT  = \
16 16
           -D TORSVNSTABLE=$(TORSVNSTABLE) \
17 17
           -D TORSVNHEAD=$(TORSVNHEAD)
18 18
 
19
-LANGS=de en es it fi fr ja ko nl nb pl pt ru sv tr zh-cn fa ar
19
+LANGS=de en es it fi fr ja ko nl no pl pt ru se tr zh-cn fa ar
20 20
 
21 21
 WMLFILES=$(wildcard $(patsubst %, %/*.wml, $(LANGS)))
22 22
 WMIFILES=$(wildcard $(patsubst %, %/*.wmi, $(LANGS)) $(WMLBASE)/include/*.wmi )
... ...
@@ -60,7 +60,7 @@ all: $(HTMLFILES)
60 60
 %.html.nl: nl/%.wml en/%.wml
61 61
 	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@
62 62
 
63
-%.html.nb: nb/%.wml en/%.wml
63
+%.html.no: no/%.wml en/%.wml
64 64
 	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@
65 65
 
66 66
 %.html.pl: pl/%.wml en/%.wml
... ...
@@ -72,7 +72,7 @@ all: $(HTMLFILES)
72 72
 %.html.ru: ru/%.wml en/%.wml
73 73
 	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@
74 74
 
75
-%.html.sv: sv/%.wml en/%.wml
75
+%.html.se: se/%.wml en/%.wml
76 76
 	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@
77 77
 
78 78
 %.html.tr: tr/%.wml en/%.wml
... ...
@@ -158,7 +158,7 @@ all: $(HTMLFILES)
158 158
 	wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \
159 159
 	sed -e s',\(^[^ ]*\):,.deps/\1.d:,' < $$tmpfile >> $@ && \
160 160
 	rm -f $$tmpfile
161
-.deps/%.html.nb.d: nb/%.wml .deps/.stamp
161
+.deps/%.html.no.d: no/%.wml .deps/.stamp
162 162
 	tmpfile=`tempfile` \
163 163
 	lang=`dirname $<` && \
164 164
 	OUT=`echo $@ | sed -e 's,\.deps/\(.*\)\.d$$,\1,'` && \
... ...
@@ -186,7 +186,7 @@ all: $(HTMLFILES)
186 186
 	wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \
187 187
 	sed -e s',\(^[^ ]*\):,.deps/\1.d:,' < $$tmpfile >> $@ && \
188 188
 	rm -f $$tmpfile
189
-.deps/%.html.sv.d: sv/%.wml .deps/.stamp
189
+.deps/%.html.se.d: se/%.wml .deps/.stamp
190 190
 	tmpfile=`tempfile` \
191 191
 	lang=`dirname $<` && \
192 192
 	OUT=`echo $@ | sed -e 's,\.deps/\(.*\)\.d$$,\1,'` && \
... ...
@@ -2,7 +2,7 @@
2 2
 <:
3 3
 	# Change both.  The array is ordered (for pages like translation status, order of flags, etc).
4 4
 
5
-	my @LANGUAGES = qw{de en es fa fi fr it ja ko nl nb pl pt ru sv tr zh-cn};
5
+	my @LANGUAGES = qw{de en es fa fi fr it ja ko nl no pl pt ru se tr zh-cn};
6 6
 	my %LANGUAGES = (
7 7
 		'en' => "English",
8 8
 		'de' => "Deutsch",
... ...
@@ -14,11 +14,11 @@
14 14
 		'ja' => "&#26085;&#26412;&#35486;&nbsp;(Nihongo)",
15 15
 		'ko' => "&#54620;&#44397;&#50612;&nbsp;(Hangul)",
16 16
 		'nl' => "Nederlands",
17
-		'nb' => "norsk",
17
+		'no' => "norsk",
18 18
 		'pl' => "polski",
19 19
 		'pt' => "Portugu&ecirc;s",
20 20
 		'ru' => "&#1056;&#1091;&#1089;&#1089;&#1082;&#1080;&#1081;&nbsp;(Russkij)",
21
-		'sv' => "svenska",
21
+		'se' => "svenska",
22 22
 		'tr' => "T&uuml;rk&ccedil;e",
23 23
 		'zh-cn' => "&#20013;&#25991;(&#31616;) (Simplified Chinese)",
24 24