Browse code

revert r21309 and r21310

Andrew Lewman authored on 22/12/2009 04:42:35
Showing 34 changed files
... ...
@@ -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,'` && \
193 193
similarity index 100%
194 194
rename from images/nb.png
195 195
rename to images/no.png
196 196
similarity index 100%
197 197
rename from images/sv.png
198 198
rename to images/se.png
... ...
@@ -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
 
25 25
similarity index 100%
26 26
rename from nb/contact.wml
27 27
rename to no/contact.wml
28 28
similarity index 100%
29 29
rename from nb/donate.wml
30 30
rename to no/donate.wml
31 31
similarity index 100%
32 32
rename from nb/download-osx.wml
33 33
rename to no/download-osx.wml
34 34
similarity index 100%
35 35
rename from nb/download-unix.wml
36 36
rename to no/download-unix.wml
37 37
similarity index 100%
38 38
rename from nb/download-windows.wml
39 39
rename to no/download-windows.wml
40 40
similarity index 100%
41 41
rename from nb/download.wml
42 42
rename to no/download.wml
43 43
similarity index 100%
44 44
rename from nb/foot.wmi
45 45
rename to no/foot.wmi
46 46
similarity index 100%
47 47
rename from nb/index.wml
48 48
rename to no/index.wml
49 49
similarity index 100%
50 50
rename from nb/navigation.wmi
51 51
rename to no/navigation.wmi
52 52
similarity index 100%
53 53
rename from nb/overview.wml
54 54
rename to no/overview.wml
55 55
similarity index 100%
56 56
rename from nb/people.wml
57 57
rename to no/people.wml
58 58
similarity index 100%
59 59
rename from sv/contact.wml
60 60
rename to se/contact.wml
61 61
similarity index 100%
62 62
rename from sv/contribute.wml
63 63
rename to se/contribute.wml
64 64
similarity index 100%
65 65
rename from sv/developers.wml
66 66
rename to se/developers.wml
67 67
similarity index 100%
68 68
rename from sv/documentation.wml
69 69
rename to se/documentation.wml
70 70
similarity index 100%
71 71
rename from sv/donate.wml
72 72
rename to se/donate.wml
73 73
similarity index 100%
74 74
rename from sv/download-osx.wml
75 75
rename to se/download-osx.wml
76 76
similarity index 100%
77 77
rename from sv/download-unix.wml
78 78
rename to se/download-unix.wml
79 79
similarity index 100%
80 80
rename from sv/download-windows.wml
81 81
rename to se/download-windows.wml
82 82
similarity index 100%
83 83
rename from sv/download.wml
84 84
rename to se/download.wml
85 85
similarity index 100%
86 86
rename from sv/faq-abuse.wml
87 87
rename to se/faq-abuse.wml
88 88
similarity index 100%
89 89
rename from sv/faq.wml
90 90
rename to se/faq.wml
91 91
similarity index 100%
92 92
rename from sv/foot.wmi
93 93
rename to se/foot.wmi
94 94
similarity index 100%
95 95
rename from sv/howitworks.wml
96 96
rename to se/howitworks.wml
97 97
similarity index 100%
98 98
rename from sv/index.wml
99 99
rename to se/index.wml
100 100
similarity index 100%
101 101
rename from sv/navigation.wmi
102 102
rename to se/navigation.wmi
103 103
similarity index 100%
104 104
rename from sv/overview.wml
105 105
rename to se/overview.wml
106 106
similarity index 100%
107 107
rename from sv/people.wml
108 108
rename to se/people.wml
109 109
similarity index 100%
110 110
rename from sv/support.wml
111 111
rename to se/support.wml
112 112
similarity index 100%
113 113
rename from sv/users.wml
114 114
rename to se/users.wml