Browse Source

Englische Uebersetzung

Scoreproblem gefixt
seba 12 years ago
parent
commit
0987d120bd
5 changed files with 76 additions and 67 deletions
  1. 2
    2
      Makefile
  2. 1
    1
      about.cpp
  3. 71
    62
      trans/viergewinnt-qt_en.ts
  4. 1
    1
      viergewinnt-qt.pro
  5. 1
    1
      viergewinnt.cpp

+ 2
- 2
Makefile View File

@@ -1,6 +1,6 @@
1 1
 #############################################################################
2 2
 # Makefile for building: viergewinnt-qt
3
-# Generated by qmake (2.01a) (Qt 4.4.3) on: Sa Nov 1 16:10:13 2008
3
+# Generated by qmake (2.01a) (Qt 4.4.3) on: Di Jan 20 23:09:39 2009
4 4
 # Project:  viergewinnt-qt.pro
5 5
 # Template: app
6 6
 # Command: /usr/bin/qmake -unix -o Makefile viergewinnt-qt.pro
@@ -173,7 +173,7 @@ qmake:  FORCE
173 173
 
174 174
 dist: 
175 175
 	@$(CHK_DIR_EXISTS) .tmp/viergewinnt-qt1.0.0 || $(MKDIR) .tmp/viergewinnt-qt1.0.0 
176
-	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/viergewinnt-qt1.0.0/ && $(COPY_FILE) --parents about.h creategame.h findserver.h newgame.h playerwait.h renderarea.h selectmaster.h viergewinnt.h .tmp/viergewinnt-qt1.0.0/ && $(COPY_FILE) --parents about.cpp creategame.cpp findserver.cpp main.cpp newgame.cpp playerwait.cpp renderarea.cpp selectmaster.cpp viergewinnt.cpp .tmp/viergewinnt-qt1.0.0/ && $(COPY_FILE) --parents viergewinnt-qt_en.ts .tmp/viergewinnt-qt1.0.0/ && (cd `dirname .tmp/viergewinnt-qt1.0.0` && $(TAR) viergewinnt-qt1.0.0.tar viergewinnt-qt1.0.0 && $(COMPRESS) viergewinnt-qt1.0.0.tar) && $(MOVE) `dirname .tmp/viergewinnt-qt1.0.0`/viergewinnt-qt1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/viergewinnt-qt1.0.0
176
+	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/viergewinnt-qt1.0.0/ && $(COPY_FILE) --parents about.h creategame.h findserver.h newgame.h playerwait.h renderarea.h selectmaster.h viergewinnt.h .tmp/viergewinnt-qt1.0.0/ && $(COPY_FILE) --parents about.cpp creategame.cpp findserver.cpp main.cpp newgame.cpp playerwait.cpp renderarea.cpp selectmaster.cpp viergewinnt.cpp .tmp/viergewinnt-qt1.0.0/ && $(COPY_FILE) --parents trans/viergewinnt-qt_en.ts .tmp/viergewinnt-qt1.0.0/ && (cd `dirname .tmp/viergewinnt-qt1.0.0` && $(TAR) viergewinnt-qt1.0.0.tar viergewinnt-qt1.0.0 && $(COMPRESS) viergewinnt-qt1.0.0.tar) && $(MOVE) `dirname .tmp/viergewinnt-qt1.0.0`/viergewinnt-qt1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/viergewinnt-qt1.0.0
177 177
 
178 178
 
179 179
 clean:compiler_clean 

+ 1
- 1
about.cpp View File

@@ -28,7 +28,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent) {
28 28
 	
29 29
 	ok = new QPushButton(tr("Ok"));
30 30
 	connect(ok, SIGNAL(clicked()), this, SLOT(accept()));
31
-	head = new QLabel(tr("Netzwerk-VierGewinnt Client\nProgrammiert von seba\nwww.seba-geek.de"));
31
+	head = new QLabel(tr("Netzwerk-VierGewinnt Client V0.8\nProgrammiert von seba\nwww.seba-geek.de"));
32 32
 	head->setAlignment(Qt::AlignHCenter);
33 33
 	body = new QLabel(tr("Erstes QT-Programm!\nDies ist ein Client für das VierGewinnt-Modul vom \"Generic Network-Server\". Endlich eine Verbesserung zum SDL-Client..."));
34 34
 	body->setWordWrap(true);

+ 71
- 62
trans/viergewinnt-qt_en.ts View File

@@ -4,12 +4,12 @@
4 4
 <context>
5 5
     <name>AboutDialog</name>
6 6
     <message>
7
-        <location filename="about.cpp" line="26"/>
7
+        <location filename="../about.cpp" line="26"/>
8 8
         <source>&#xdc;ber</source>
9 9
         <translation>About</translation>
10 10
     </message>
11 11
     <message>
12
-        <location filename="about.cpp" line="29"/>
12
+        <location filename="../about.cpp" line="29"/>
13 13
         <source>Ok</source>
14 14
         <translation>Ok</translation>
15 15
     </message>
@@ -18,42 +18,51 @@
18 18
         <source>Netzwerk-VierGewinnt Client
19 19
 Programmiert von seba
20 20
 www.seba-geek.de</source>
21
-        <translation>Network-VierGewinnt Client
21
+        <translation type="obsolete">Network-VierGewinnt Client
22 22
 Programmed by seba
23 23
 www.seba-geek.de</translation>
24 24
     </message>
25 25
     <message>
26
-        <location filename="about.cpp" line="33"/>
26
+        <location filename="../about.cpp" line="33"/>
27 27
         <source>Erstes QT-Programm!
28 28
 Dies ist ein Client f&#xfc;r das VierGewinnt-Modul vom &quot;Generic Network-Server&quot;. Endlich eine Verbesserung zum SDL-Client...</source>
29 29
         <translation>First QT-Programm!
30 30
 This is a client for the VierGewinnt-Module from the &quot;Generic Network-Server&quot;. At last an improvement to the SDL-Client...</translation>
31 31
     </message>
32
+    <message>
33
+        <location filename="../about.cpp" line="31"/>
34
+        <source>Netzwerk-VierGewinnt Client V0.8
35
+Programmiert von seba
36
+www.seba-geek.de</source>
37
+        <translation>Network-VierGewinnt Client V0.8
38
+Programmed by seba
39
+www.seba-geek.de</translation>
40
+    </message>
32 41
 </context>
33 42
 <context>
34 43
     <name>CreateGameDialog</name>
35 44
     <message>
36
-        <location filename="creategame.cpp" line="26"/>
45
+        <location filename="../creategame.cpp" line="26"/>
37 46
         <source>Neues Spiel</source>
38 47
         <translation>New Game</translation>
39 48
     </message>
40 49
     <message>
41
-        <location filename="creategame.cpp" line="29"/>
50
+        <location filename="../creategame.cpp" line="29"/>
42 51
         <source>Spielname</source>
43 52
         <translation>Gamename</translation>
44 53
     </message>
45 54
     <message>
46
-        <location filename="creategame.cpp" line="31"/>
55
+        <location filename="../creategame.cpp" line="31"/>
47 56
         <source>Ok</source>
48 57
         <translation>Ok</translation>
49 58
     </message>
50 59
     <message>
51
-        <location filename="creategame.cpp" line="33"/>
60
+        <location filename="../creategame.cpp" line="33"/>
52 61
         <source>Abbrechen</source>
53 62
         <translation>Cancel</translation>
54 63
     </message>
55 64
     <message>
56
-        <location filename="creategame.cpp" line="55"/>
65
+        <location filename="../creategame.cpp" line="55"/>
57 66
         <source>Unbenanntes Spiel</source>
58 67
         <translation>Unknown Game</translation>
59 68
     </message>
@@ -61,147 +70,147 @@ This is a client for the VierGewinnt-Module from the &quot;Generic Network-Serve
61 70
 <context>
62 71
     <name>FindServerWidget</name>
63 72
     <message>
64
-        <location filename="findserver.cpp" line="30"/>
73
+        <location filename="../findserver.cpp" line="30"/>
65 74
         <source>Sebas Netzwerk-VierGewinnt Client</source>
66 75
         <translation>Sebas Network-VierGewinnt Client</translation>
67 76
     </message>
68 77
     <message>
69
-        <location filename="findserver.cpp" line="30"/>
78
+        <location filename="../findserver.cpp" line="30"/>
70 79
         <source>Serverliste</source>
71 80
         <translation>Serverlist</translation>
72 81
     </message>
73 82
     <message>
74
-        <location filename="findserver.cpp" line="52"/>
83
+        <location filename="../findserver.cpp" line="52"/>
75 84
         <source>Id</source>
76 85
         <translation>Id</translation>
77 86
     </message>
78 87
     <message>
79
-        <location filename="findserver.cpp" line="52"/>
88
+        <location filename="../findserver.cpp" line="52"/>
80 89
         <source>Spielname</source>
81 90
         <translation>Gamename</translation>
82 91
     </message>
83 92
     <message>
84
-        <location filename="findserver.cpp" line="52"/>
93
+        <location filename="../findserver.cpp" line="52"/>
85 94
         <source>Spieler</source>
86 95
         <translation>Players</translation>
87 96
     </message>
88 97
     <message>
89
-        <location filename="findserver.cpp" line="52"/>
98
+        <location filename="../findserver.cpp" line="52"/>
90 99
         <source>Spielfeld</source>
91 100
         <translation>Field</translation>
92 101
     </message>
93 102
     <message>
94
-        <location filename="findserver.cpp" line="52"/>
103
+        <location filename="../findserver.cpp" line="52"/>
95 104
         <source>Gewinnt</source>
96 105
         <translation>Wins</translation>
97 106
     </message>
98 107
     <message>
99
-        <location filename="findserver.cpp" line="60"/>
108
+        <location filename="../findserver.cpp" line="60"/>
100 109
         <source>Erneuern</source>
101 110
         <translation>Refresh</translation>
102 111
     </message>
103 112
     <message>
104
-        <location filename="findserver.cpp" line="62"/>
113
+        <location filename="../findserver.cpp" line="62"/>
105 114
         <source>Erstellen</source>
106 115
         <translation>Create</translation>
107 116
     </message>
108 117
     <message>
109
-        <location filename="findserver.cpp" line="64"/>
118
+        <location filename="../findserver.cpp" line="64"/>
110 119
         <source>Beitreten</source>
111 120
         <translation>Join</translation>
112 121
     </message>
113 122
     <message>
114
-        <location filename="findserver.cpp" line="66"/>
123
+        <location filename="../findserver.cpp" line="66"/>
115 124
         <source>Anderer Masterserver</source>
116 125
         <translation>Change masterserver</translation>
117 126
     </message>
118 127
     <message>
119
-        <location filename="findserver.cpp" line="68"/>
128
+        <location filename="../findserver.cpp" line="68"/>
120 129
         <source>&#xdc;ber</source>
121 130
         <translation>About</translation>
122 131
     </message>
123 132
     <message>
124
-        <location filename="findserver.cpp" line="85"/>
133
+        <location filename="../findserver.cpp" line="85"/>
125 134
         <source>Dr&#xfc;cke Erneuern um eine Serverliste zu erhalten</source>
126 135
         <translation>Press Refresh to get the serverlist</translation>
127 136
     </message>
128 137
     <message>
129
-        <location filename="findserver.cpp" line="107"/>
138
+        <location filename="../findserver.cpp" line="107"/>
130 139
         <source>Fordere Liste an...</source>
131 140
         <translation>Requesting list...</translation>
132 141
     </message>
133 142
     <message>
134
-        <location filename="findserver.cpp" line="133"/>
143
+        <location filename="../findserver.cpp" line="133"/>
135 144
         <source>Spiel erstellt</source>
136 145
         <translation>Game created</translation>
137 146
     </message>
138 147
     <message>
139
-        <location filename="findserver.cpp" line="147"/>
148
+        <location filename="../findserver.cpp" line="147"/>
140 149
         <source>Es wurde kein Spiel zum beitreten ausgew&#xe4;hlt</source>
141 150
         <translation>No Game was selected</translation>
142 151
     </message>
143 152
     <message>
144
-        <location filename="findserver.cpp" line="160"/>
153
+        <location filename="../findserver.cpp" line="160"/>
145 154
         <source>Trete Spiel bei..</source>
146 155
         <translation>Joining game..</translation>
147 156
     </message>
148 157
     <message>
149
-        <location filename="findserver.cpp" line="176"/>
158
+        <location filename="../findserver.cpp" line="176"/>
150 159
         <source>Version akzeptiert</source>
151 160
         <translation>Version accepted</translation>
152 161
     </message>
153 162
     <message>
154
-        <location filename="findserver.cpp" line="180"/>
163
+        <location filename="../findserver.cpp" line="180"/>
155 164
         <source>Version nicht akzeptiert, kein GNS-Server!</source>
156 165
         <translation>Version rejected, not a GNS-Server!</translation>
157 166
     </message>
158 167
     <message>
159
-        <location filename="findserver.cpp" line="188"/>
168
+        <location filename="../findserver.cpp" line="188"/>
160 169
         <source>Modul ausgew&#xe4;hlt</source>
161 170
         <translation>Module selected</translation>
162 171
     </message>
163 172
     <message>
164
-        <location filename="findserver.cpp" line="195"/>
173
+        <location filename="../findserver.cpp" line="195"/>
165 174
         <source>VierGewinnt-Modul nicht gefunden!</source>
166 175
         <translation>VierGewinnt-Module not found!</translation>
167 176
     </message>
168 177
     <message>
169
-        <location filename="findserver.cpp" line="213"/>
178
+        <location filename="../findserver.cpp" line="213"/>
170 179
         <source>Keine Spiele offen :(</source>
171 180
         <translation>No games open :(</translation>
172 181
     </message>
173 182
     <message>
174
-        <location filename="findserver.cpp" line="215"/>
183
+        <location filename="../findserver.cpp" line="215"/>
175 184
         <source>Konnte nicht beitreten: Spiel voll</source>
176 185
         <translation>Could not join: Game full</translation>
177 186
     </message>
178 187
     <message>
179
-        <location filename="findserver.cpp" line="217"/>
188
+        <location filename="../findserver.cpp" line="217"/>
180 189
         <source>Spiel konnte nicht gefunden werden</source>
181 190
         <translation>Could not find game</translation>
182 191
     </message>
183 192
     <message>
184
-        <location filename="findserver.cpp" line="309"/>
193
+        <location filename="../findserver.cpp" line="309"/>
185 194
         <source>Fehler: Der Master-Server Hostname konnte nicht aufgel&#xf6;st werden!</source>
186 195
         <translation>Error: The masterserver hostname could not be resolved!</translation>
187 196
     </message>
188 197
     <message>
189
-        <location filename="findserver.cpp" line="312"/>
198
+        <location filename="../findserver.cpp" line="312"/>
190 199
         <source>Fehler: Verbindungsversuch zum Master-Server ist fehlgeschlagen!</source>
191 200
         <translation>Error: Could not connect to masterserver!</translation>
192 201
     </message>
193 202
     <message>
194
-        <location filename="findserver.cpp" line="318"/>
203
+        <location filename="../findserver.cpp" line="318"/>
195 204
         <source>Netzwerkfehler: &apos;%1&apos;</source>
196 205
         <translation>Networkerror: &apos;%1&apos;</translation>
197 206
     </message>
198 207
     <message>
199
-        <location filename="findserver.cpp" line="328"/>
208
+        <location filename="../findserver.cpp" line="328"/>
200 209
         <source>Die Verbindung zum Masterserver wurde getrennt.</source>
201 210
         <translation>Disconnected from masterserver.</translation>
202 211
     </message>
203 212
     <message>
204
-        <location filename="findserver.cpp" line="339"/>
213
+        <location filename="../findserver.cpp" line="339"/>
205 214
         <source>Versuche Verbindung zu </source>
206 215
         <translation>Trying to connect to </translation>
207 216
     </message>
@@ -209,42 +218,42 @@ This is a client for the VierGewinnt-Module from the &quot;Generic Network-Serve
209 218
 <context>
210 219
     <name>NewGameDialog</name>
211 220
     <message>
212
-        <location filename="newgame.cpp" line="28"/>
221
+        <location filename="../newgame.cpp" line="28"/>
213 222
         <source>Ein neues Spiel?</source>
214 223
         <translation>A new game?</translation>
215 224
     </message>
216 225
     <message>
217
-        <location filename="newgame.cpp" line="30"/>
226
+        <location filename="../newgame.cpp" line="30"/>
218 227
         <source>Ok</source>
219 228
         <translation>Ok</translation>
220 229
     </message>
221 230
     <message>
222
-        <location filename="newgame.cpp" line="32"/>
231
+        <location filename="../newgame.cpp" line="32"/>
223 232
         <source>Abbrechen</source>
224 233
         <translation>Cancel</translation>
225 234
     </message>
226 235
     <message>
227
-        <location filename="newgame.cpp" line="35"/>
236
+        <location filename="../newgame.cpp" line="35"/>
228 237
         <source>Neues Spiel?</source>
229 238
         <translation>New game?</translation>
230 239
     </message>
231 240
     <message>
232
-        <location filename="newgame.cpp" line="65"/>
241
+        <location filename="../newgame.cpp" line="65"/>
233 242
         <source>Dein Mispieler hat bisher noch nicht zugestimmt.</source>
234 243
         <translation>Your opponent did not agree to a new game right now.</translation>
235 244
     </message>
236 245
     <message>
237
-        <location filename="newgame.cpp" line="68"/>
246
+        <location filename="../newgame.cpp" line="68"/>
238 247
         <source>Whee, du hast gewonnen! :)</source>
239 248
         <translation>Whee, you won! :)</translation>
240 249
     </message>
241 250
     <message>
242
-        <location filename="newgame.cpp" line="70"/>
251
+        <location filename="../newgame.cpp" line="70"/>
243 252
         <source>Du hast verloren -.-</source>
244 253
         <translation>You have lost -.-</translation>
245 254
     </message>
246 255
     <message>
247
-        <location filename="newgame.cpp" line="75"/>
256
+        <location filename="../newgame.cpp" line="75"/>
248 257
         <source>Dein Mispieler hat zugestimmt.</source>
249 258
         <translation>Your opponent agreed.</translation>
250 259
     </message>
@@ -252,17 +261,17 @@ This is a client for the VierGewinnt-Module from the &quot;Generic Network-Serve
252 261
 <context>
253 262
     <name>PlayerWaitDialog</name>
254 263
     <message>
255
-        <location filename="playerwait.cpp" line="26"/>
264
+        <location filename="../playerwait.cpp" line="26"/>
256 265
         <source>Abbrechen</source>
257 266
         <translation>Cancel</translation>
258 267
     </message>
259 268
     <message>
260
-        <location filename="playerwait.cpp" line="29"/>
269
+        <location filename="../playerwait.cpp" line="29"/>
261 270
         <source>Warte auf anderen Spieler...</source>
262 271
         <translation>Waiting for other player...</translation>
263 272
     </message>
264 273
     <message>
265
-        <location filename="playerwait.cpp" line="30"/>
274
+        <location filename="../playerwait.cpp" line="30"/>
266 275
         <source>Auf Spieler warten</source>
267 276
         <translation>Waiting for other player</translation>
268 277
     </message>
@@ -270,32 +279,32 @@ This is a client for the VierGewinnt-Module from the &quot;Generic Network-Serve
270 279
 <context>
271 280
     <name>SelectMasterDialog</name>
272 281
     <message>
273
-        <location filename="selectmaster.cpp" line="25"/>
282
+        <location filename="../selectmaster.cpp" line="25"/>
274 283
         <source>Bitte gib einen anderen Masterserver an</source>
275 284
         <translation>Please enter another masterserver</translation>
276 285
     </message>
277 286
     <message>
278
-        <location filename="selectmaster.cpp" line="26"/>
287
+        <location filename="../selectmaster.cpp" line="26"/>
279 288
         <source>Master-Server:</source>
280 289
         <translation>Masterserver:</translation>
281 290
     </message>
282 291
     <message>
283
-        <location filename="selectmaster.cpp" line="27"/>
292
+        <location filename="../selectmaster.cpp" line="27"/>
284 293
         <source>Master-Port:</source>
285 294
         <translation>Masterport:</translation>
286 295
     </message>
287 296
     <message>
288
-        <location filename="selectmaster.cpp" line="44"/>
297
+        <location filename="../selectmaster.cpp" line="44"/>
289 298
         <source>Master-Server &#xe4;ndern</source>
290 299
         <translation>Change masterserver</translation>
291 300
     </message>
292 301
     <message>
293
-        <location filename="selectmaster.cpp" line="52"/>
302
+        <location filename="../selectmaster.cpp" line="52"/>
294 303
         <source>Der Master-Server ist ung&#xfc;ltig</source>
295 304
         <translation>The masterserver is invalid</translation>
296 305
     </message>
297 306
     <message>
298
-        <location filename="selectmaster.cpp" line="60"/>
307
+        <location filename="../selectmaster.cpp" line="60"/>
299 308
         <source>Der Master-Port ist ung&#xfc;ltig</source>
300 309
         <translation>The masterport is invalid</translation>
301 310
     </message>
@@ -303,37 +312,37 @@ This is a client for the VierGewinnt-Module from the &quot;Generic Network-Serve
303 312
 <context>
304 313
     <name>VierGewinntWidget</name>
305 314
     <message>
306
-        <location filename="viergewinnt.cpp" line="29"/>
315
+        <location filename="../viergewinnt.cpp" line="27"/>
307 316
         <source>Sebas Netzwerk-VierGewinnt Client</source>
308 317
         <translation>Sebas Network-VierGewinnt Client</translation>
309 318
     </message>
310 319
     <message>
311
-        <location filename="viergewinnt.cpp" line="29"/>
320
+        <location filename="../viergewinnt.cpp" line="27"/>
312 321
         <source>Spielfenster</source>
313 322
         <translation>Gamewindow</translation>
314 323
     </message>
315 324
     <message>
316
-        <location filename="viergewinnt.cpp" line="36"/>
325
+        <location filename="../viergewinnt.cpp" line="34"/>
317 326
         <source>Spiel ist gestartet</source>
318 327
         <translation>The game has been started</translation>
319 328
     </message>
320 329
     <message>
321
-        <location filename="viergewinnt.cpp" line="41"/>
330
+        <location filename="../viergewinnt.cpp" line="39"/>
322 331
         <source>zu</source>
323 332
         <translation>to</translation>
324 333
     </message>
325 334
     <message>
326
-        <location filename="viergewinnt.cpp" line="43"/>
335
+        <location filename="../viergewinnt.cpp" line="41"/>
327 336
         <source>Spiel Beenden</source>
328 337
         <translation>Quit game</translation>
329 338
     </message>
330 339
     <message>
331
-        <location filename="viergewinnt.cpp" line="133"/>
340
+        <location filename="../viergewinnt.cpp" line="131"/>
332 341
         <source>Du bist am Zug</source>
333 342
         <translation>It&apos;s your move</translation>
334 343
     </message>
335 344
     <message>
336
-        <location filename="viergewinnt.cpp" line="135"/>
345
+        <location filename="../viergewinnt.cpp" line="133"/>
337 346
         <source>Dein Mitspieler ist am Zug</source>
338 347
         <translation>It&apos;s your opponents move</translation>
339 348
     </message>

+ 1
- 1
viergewinnt-qt.pro View File

@@ -11,7 +11,7 @@ QT += network
11 11
 CONFIG += qt warn_on release
12 12
 
13 13
 # Input
14
-TRANSLATIONS = viergewinnt-qt_en.ts
14
+TRANSLATIONS = trans/viergewinnt-qt_en.ts
15 15
 CODECFORTR      = ISO-8859-15
16 16
 
17 17
 HEADERS += about.h \

+ 1
- 1
viergewinnt.cpp View File

@@ -94,7 +94,7 @@ void VierGewinntWidget::startGame() {
94 94
 	cleanFeld();
95 95
 	QTextStream sockstream(mysock);
96 96
 	sockstream << "TURN\n";
97
-	sockstream << "SHOWSCORE\n";
97
+	sockstream << "SHOWMYSCORE\n";
98 98
 }
99 99
 
100 100
 void VierGewinntWidget::add(int row, Stein st) {

Loading…
Cancel
Save