Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: Warzone2100/warzone2100
base: v3.1_beta9
...
head fork: Warzone2100/warzone2100
compare: v3.1_beta10
  • 18 commits
  • 45 files changed
  • 0 commit comments
  • 4 contributors
Commits on May 04, 2012
cybersphinx cybersphinx Revert "Update version numbers for 3.1 beta9."
This reverts commit e705adb.

Revert "Update translations."

This reverts commit ab9c729.
778a426
Commits on May 05, 2012
vexed vexed Fix Fastplay
Fixes ticket:3447
c3218e7
vexed vexed Fix Skirmish loading
fixes ticket:3451
18216c6
Commits on May 06, 2012
Cyp Cyp Don't report desynch when player names don't match.
Host sometimes considers empty slots to have names, while other clients consider the
empty slots unnamed. Since the player names don't affect the game state, this is safe
to ignore.
1ef4fc6
Cyp Cyp Clear player names iff game not started, instead of iff not host.
This seems more logical, and matches the comment on the next line. Clients no longer
disagree with the host on whether an empty slot has a name, when a player joins and
leaves before the game starts.
ef685d0
Commits on May 07, 2012
vexed vexed Update the building textures.
Thanks to Berg for the update.
4a9ac7f
vexed vexed Don't pretend that everyone is a winner when they have failed.
fixes ticket:3449
25e118c
automerge Merge branch 'bugfixes' into 3.1 a31b9ab
cybersphinx cybersphinx Hungarian translation update by mtomi78.
Closes #3458.
0def252
Cyp Cyp Fix tcmask on Plasmite Flamer, Sunburst AA and AA Flak Cannon.
Fixed by running simplipie.

Could not fix Naval propulsion, which seems to be missing the tcmask.

Fixes ticket:3433.
e36cdf1
Commits on May 10, 2012
vexed vexed Fix tutorial that was broken in a6fa286 and e862a99
Fixes ticket:3058
7079ad2
Commits on May 11, 2012
automerge Merge branch 'bugfixes' into 3.1 2a794be
Commits on May 12, 2012
cybersphinx cybersphinx Hungarian translation update by mtomi78.
Closes #3470.
9bed66e
cybersphinx cybersphinx Spanich translation update by Saberuneko.
Closes #3473.
baa1438
Commits on May 13, 2012
cybersphinx cybersphinx Update ChangeLog. 1055b18
cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update ChangeLog.
  Spanich translation update by Saberuneko.
  Hungarian translation update by mtomi78.
805c254
cybersphinx cybersphinx Update translations. 29a0bd7
cybersphinx cybersphinx Update version numbers for 3.1 beta10. 968172d
Showing with 4,407 additions and 4,410 deletions.
  1. +16 −0 ChangeLog
  2. +1 −1  configure.ac
  3. +72 −72 data/base/components/weapons/trmair2.pie
  4. +32 −32 data/base/components/weapons/trmair3.pie
  5. BIN  data/base/texpages/page-31-features-urban.png
  6. +26 −26 data/mp/structs/trmflmrp.pie
  7. +12 −2 lib/netplay/netplay.cpp
  8. +2 −0  lib/netplay/netplay.h
  9. +138 −138 po/ca_ES.po
  10. +138 −138 po/cs.po
  11. +138 −138 po/da.po
  12. +138 −138 po/de.po
  13. +138 −138 po/en_GB.po
  14. +156 −164 po/es.po
  15. +138 −138 po/et_EE.po
  16. +138 −138 po/fi.po
  17. +138 −138 po/fr.po
  18. +138 −138 po/fy.po
  19. +138 −138 po/ga.po
  20. +138 −138 po/hr.po
  21. +198 −226 po/hu.po
  22. +138 −138 po/it.po
  23. +138 −138 po/ko.po
  24. +138 −138 po/la.po
  25. +138 −138 po/lt.po
  26. +138 −138 po/nb.po
  27. +138 −138 po/nl.po
  28. +138 −138 po/pl.po
  29. +138 −138 po/pt.po
  30. +138 −138 po/pt_BR.po
  31. +138 −138 po/ro.po
  32. +138 −138 po/ru.po
  33. +138 −138 po/sk.po
  34. +138 −138 po/sl.po
  35. +138 −138 po/tr.po
  36. +138 −138 po/uk_UA.po
  37. +138 −138 po/zh_CN.po
  38. +138 −138 po/zh_TW.po
  39. +2 −0  src/frontend.cpp
  40. +0 −3  src/loop.cpp
  41. +1 −1  src/qtscriptfuncs.cpp
  42. +16 −11 src/scriptfuncs.cpp
  43. +4 −3 src/template.cpp
  44. +1 −1  src/version.cpp
  45. +4 −4 win32/warzone2100.rc
16 ChangeLog
View
@@ -1,3 +1,19 @@
+2012-05-13: Version 3.1 beta10
+ * General:
+ * Fix: Loading of skirmish games (ticket:3451, commit:18216c60e76d05ad0fe2bf7d860347f76f70c8f8)
+ * Fix: Scavengers in Fast Play are on their own team again (ticket:3447, commit:c3218e7ecce6eaca4f4f2620cf42cce61cc9ff5c)
+ * Fix: Allow building the designed unit in the tutorial (ticket:3058, commit:7079ad295112abcd83e6be1e7c172d36aec64c25)
+ * Multiplayer:
+ * Fix: Don't desync occasionally when some player slots are empty (commit:1ef4fc6cfdf05435bbaaa95155c23ea1a76d6409, commit:ef685d0b892327b6e8af90da0ade792575925e3d)
+ * Fix: Don't tell players who lost that they won (ticket:3449, commit:25e118c628881f20411d027ff2d48e8a63a44730)
+ * Graphics:
+ * Change: Updated texture for the urban building features (commit:4a9ac7fc3ed17ee9b63e829b10de3791c0ee7bd9)
+ * Fix: Team colour mask on Plasmite Flamer, Sunburst AA and AA Flak Cannon (ticket:3433, commit:e36cdf11e827e85c79cbd9319507809c1fae838b)
+ * Translations:
+ * Update: Hungarian (ticket:3458, ticket:3470, commit:0def25206b7d23788919a2aa067e880626e542fc, commit:9bed66e764a176b7b4b448df5e1f534e1991c450)
+ * Update: Spanish (ticket:3473, commit:baa143872208ba54bec2dc41213ca622209e4868)
+
+
2012-05-04: Version 3.1_beta9
* General:
* Change: Save campaign and skirmish games separately (ticket:3377, commit:d8789661fbffe2f648a06a0689de3a9350bbe8b0)
2  configure.ac
View
@@ -1,5 +1,5 @@
AC_PREREQ([2.56])
-AC_INIT([Warzone 2100],[3.1_beta9],[http://wz2100.net/],[warzone2100])
+AC_INIT([Warzone 2100],[3.1_beta10],[http://wz2100.net/],[warzone2100])
AM_INIT_AUTOMAKE([1.10 tar-ustar])
144 data/base/components/weapons/trmair2.pie
View
@@ -3,86 +3,86 @@ TYPE 10200
TEXTURE 0 page-17-droid-weapons.png 256 256
LEVELS 1
LEVEL 1
-POINTS 32
- -12 1 -7
- -12 12 -3
- 11 12 1
- 11 0 -19
- 14 0 15
- 13 2 2
- 12 9 18
- 16 30 23
- 17 5 15
- 16 4 17
- 11 6 -3
- -12 6 -3
- 11 1 -7
- 11 3 -14
- -12 3 -14
- -12 12 1
- -12 12 10
- 11 12 -3
- -15 0 18
- -15 0 -1
- 14 0 -1
- -12 0 -19
- 14 0 18
- -12 12 20
- 12 12 20
- 12 12 5
- 22 11 3
- 19 9 16
- 21 1 14
- 24 4 2
- 14 4 16
+POINTS 32
+ -12 1 -7
+ -12 12 -3
+ 11 12 1
+ 11 0 -19
+ 14 0 15
+ 13 2 2
+ 12 9 18
+ 16 30 23
+ 17 5 15
+ 16 4 17
+ 11 6 -3
+ -12 6 -3
+ 11 1 -7
+ 11 3 -14
+ -12 3 -14
+ -12 12 1
+ -12 12 10
+ 11 12 -3
+ -15 0 18
+ -15 0 -1
+ 14 0 -1
+ -12 0 -19
+ 14 0 18
+ -12 12 20
+ 12 12 20
+ 12 12 5
+ 22 11 3
+ 19 9 16
+ 21 1 14
+ 24 4 2
+ 14 4 16
12 12 10
POLYGONS 49
- 4200 3 12 10 13 8 1 8 1 174 217 171 218 175 221
- 4200 3 13 10 17 8 1 8 1 175 221 171 218 170 221
- 4200 3 0 14 11 8 1 8 1 174 217 175 221 171 218
- 4200 3 11 14 1 8 1 8 1 171 218 175 221 170 221
+ 200 3 12 10 13 174 217 171 218 175 221
+ 200 3 13 10 17 175 221 171 218 170 221
+ 200 3 0 14 11 174 217 175 221 171 218
+ 200 3 11 14 1 171 218 175 221 170 221
200 3 2 10 15 35 176 42 176 35 191
200 3 15 10 11 35 191 42 176 42 191
200 3 0 11 12 45 191 42 191 45 176
200 3 12 11 10 45 176 42 191 42 176
- 4200 3 13 0 12 8 1 16 1 129 204 143 201 129 201
- 4200 3 0 13 14 8 1 16 1 143 201 129 204 143 204
- 4200 3 1 14 19 8 1 25 1 9 20 3 24 10 27
- 4200 3 19 14 21 8 1 25 1 10 27 3 24 0 27
- 4200 3 1 19 15 8 1 25 1 9 20 10 27 13 20
- 4200 3 15 19 16 8 1 25 1 13 20 10 27 19 20
- 4200 3 13 3 14 8 1 16 1 129 204 129 207 143 204
- 4200 3 14 3 21 8 1 16 1 143 204 129 207 143 207
- 4200 3 10 2 17 8 1 8 1 171 218 168 218 170 221
- 4200 3 1 15 11 8 1 8 1 170 221 168 218 171 218
+ 200 3 13 0 12 129 204 143 201 129 201
+ 200 3 0 13 14 143 201 129 204 143 204
+ 200 3 1 14 19 9 20 3 24 10 27
+ 200 3 19 14 21 10 27 3 24 0 27
+ 200 3 1 19 15 9 20 10 27 13 20
+ 200 3 15 19 16 13 20 10 27 19 20
+ 200 3 13 3 14 129 204 129 207 143 204
+ 200 3 14 3 21 143 204 129 207 143 207
+ 200 3 10 2 17 171 218 168 218 170 221
+ 200 3 1 15 11 170 221 168 218 171 218
200 3 15 16 2 35 191 30 191 35 176
200 3 2 16 31 35 176 30 191 30 176
- 4200 3 17 20 13 8 1 25 1 9 20 10 27 3 24
- 4200 3 13 20 3 8 1 25 1 3 24 10 27 0 27
- 4200 3 17 2 20 8 1 25 1 9 20 13 20 10 27
- 4200 3 20 2 31 8 1 25 1 10 27 13 20 19 20
- 4200 3 18 23 19 8 1 25 1 23 27 24 20 10 27
- 4200 3 3 20 21 8 1 16 1 26 174 24 168 35 174
- 4200 3 18 19 22 8 1 16 1 37 160 37 168 24 160
- 4200 3 22 19 20 8 1 16 1 24 160 37 168 24 168
- 4200 3 19 21 20 8 1 16 1 37 168 35 174 24 168
- 4200 3 20 24 22 8 1 25 1 10 27 24 20 23 27
- 4200 3 22 24 18 8 1 18 1 0 47 2 38 17 47
- 4200 3 18 24 23 8 1 18 1 17 47 2 38 16 38
- 4200 3 4 5 28 8 1 16 1 10 131 0 131 9 137
- 4200 3 28 5 29 8 1 16 1 9 137 0 131 0 139
- 4200 3 25 26 5 8 1 18 1 4 28 13 30 4 37
- 4200 3 5 26 29 8 1 18 1 4 37 13 30 13 36
- 4200 3 6 27 25 8 1 16 1 10 131 9 137 0 131
- 4200 3 25 27 26 8 1 16 1 0 131 9 137 0 139
- 4200 3 6 4 27 8 1 16 1 4 14 4 3 11 12
- 4200 3 27 4 28 8 1 16 1 11 12 4 3 11 3
- 4200 3 28 29 27 8 1 15 1 6 120 5 126 0 120
- 4200 3 27 29 26 8 1 15 1 0 120 5 126 0 126
+ 200 3 17 20 13 9 20 10 27 3 24
+ 200 3 13 20 3 3 24 10 27 0 27
+ 200 3 17 2 20 9 20 13 20 10 27
+ 200 3 20 2 31 10 27 13 20 19 20
+ 200 3 18 23 19 23 27 24 20 10 27
+ 200 3 3 20 21 26 174 24 168 35 174
+ 200 3 18 19 22 37 160 37 168 24 160
+ 200 3 22 19 20 24 160 37 168 24 168
+ 200 3 19 21 20 37 168 35 174 24 168
+ 200 3 20 24 22 10 27 24 20 23 27
+ 200 3 22 24 18 0 47 2 38 17 47
+ 200 3 18 24 23 17 47 2 38 16 38
+ 200 3 4 5 28 10 131 0 131 9 137
+ 200 3 28 5 29 9 137 0 131 0 139
+ 200 3 25 26 5 4 28 13 30 4 37
+ 200 3 5 26 29 4 37 13 30 13 36
+ 200 3 6 27 25 10 131 9 137 0 131
+ 200 3 25 27 26 0 131 9 137 0 139
+ 200 3 6 4 27 4 14 4 3 11 12
+ 200 3 27 4 28 11 12 4 3 11 3
+ 200 3 28 29 27 6 120 5 126 0 120
+ 200 3 27 29 26 0 120 5 126 0 126
200 3 7 8 30 97 72 96 61 101 61
200 3 7 30 9 97 72 96 61 99 61
200 3 7 9 8 97 72 99 61 101 61
- 4200 3 31 23 24 8 1 13 1 12 211 8 223 8 211
- 4200 3 20 31 24 8 1 25 1 10 27 19 20 24 20
- 4200 3 16 23 31 8 1 13 1 12 223 8 223 12 211
- 4200 3 16 19 23 8 1 25 1 19 20 10 27 24 20
+ 200 3 31 23 24 12 211 8 223 8 211
+ 200 3 20 31 24 10 27 19 20 24 20
+ 200 3 16 23 31 12 223 8 223 12 211
+ 200 3 16 19 23 19 20 10 27 24 20
64 data/base/components/weapons/trmair3.pie
View
@@ -3,37 +3,37 @@ TYPE 10200
TEXTURE 0 page-17-droid-weapons.png 256 256
LEVELS 1
LEVEL 1
-POINTS 12
- -10 13 6
- -10 0 6
- -10 13 -6
- 0 0 12
- 10 0 6
- 10 0 -6
- 10 13 6
- 10 13 -6
- -10 0 -6
- 0 0 -12
- 0 13 -12
+POINTS 12
+ -10 13 6
+ -10 0 6
+ -10 13 -6
+ 0 0 12
+ 10 0 6
+ 10 0 -6
+ 10 13 6
+ 10 13 -6
+ -10 0 -6
+ 0 0 -12
+ 0 13 -12
0 13 12
POLYGONS 20
- 4200 3 0 2 1 8 1 16 1 129 192 143 192 129 207
- 4200 3 1 2 8 8 1 16 1 129 207 143 192 143 207
- 4200 3 11 0 3 8 1 13 1 6 241 12 241 6 254
- 4200 3 3 0 1 8 1 13 1 6 254 12 241 12 254
- 4200 3 6 11 4 8 1 13 1 0 241 6 241 0 254
- 4200 3 4 11 3 8 1 13 1 0 254 6 241 6 254
- 4200 3 7 6 5 8 1 16 1 129 192 143 192 129 207
- 4200 3 5 6 4 8 1 16 1 129 207 143 192 143 207
- 4200 3 10 7 9 8 1 16 1 8 0 15 0 8 18
- 4200 3 9 7 5 8 1 16 1 8 18 15 0 15 18
- 4200 3 2 10 8 8 1 16 1 0 0 8 0 0 18
- 4200 3 8 10 9 8 1 16 1 0 18 8 0 8 18
- 4200 3 8 9 3 8 1 11 1 34 104 36 108 26 108
- 4200 3 8 3 1 8 1 11 1 34 104 26 108 28 104
- 4200 3 3 9 4 8 1 11 1 26 108 36 108 28 112
- 4200 3 4 9 5 8 1 11 1 28 112 36 108 34 112
- 4200 3 2 0 10 8 1 11 1 34 104 28 104 36 108
- 4200 3 0 11 10 8 1 11 1 28 104 26 108 36 108
- 4200 3 6 7 11 8 1 11 1 28 112 34 112 26 108
- 4200 3 7 10 11 8 1 11 1 34 112 36 108 26 108
+ 200 3 0 2 1 129 192 143 192 129 207
+ 200 3 1 2 8 129 207 143 192 143 207
+ 200 3 11 0 3 6 241 12 241 6 254
+ 200 3 3 0 1 6 254 12 241 12 254
+ 200 3 6 11 4 0 241 6 241 0 254
+ 200 3 4 11 3 0 254 6 241 6 254
+ 200 3 7 6 5 129 192 143 192 129 207
+ 200 3 5 6 4 129 207 143 192 143 207
+ 200 3 10 7 9 8 0 15 0 8 18
+ 200 3 9 7 5 8 18 15 0 15 18
+ 200 3 2 10 8 0 0 8 0 0 18
+ 200 3 8 10 9 0 18 8 0 8 18
+ 200 3 8 9 3 34 104 36 108 26 108
+ 200 3 8 3 1 34 104 26 108 28 104
+ 200 3 3 9 4 26 108 36 108 28 112
+ 200 3 4 9 5 28 112 36 108 34 112
+ 200 3 2 0 10 34 104 28 104 36 108
+ 200 3 0 11 10 28 104 26 108 36 108
+ 200 3 6 7 11 28 112 34 112 26 108
+ 200 3 7 10 11 34 112 36 108 26 108
BIN  data/base/texpages/page-31-features-urban.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 data/mp/structs/trmflmrp.pie
View
@@ -3,24 +3,24 @@ TYPE 10200
TEXTURE 0 page-17-droid-weapons.png 256 256
LEVELS 1
LEVEL 1
-POINTS 18
- 14 7 30
- 16 0 21
- 0 0 21
- 3 7 30
- -2 7 30
- -15 0 21
- -13 7 30
- -2 29 12
- -13 29 12
- -16 22 3
- 0 22 3
- 14 29 12
- 16 22 3
- 3 29 12
- -7 0 -18
- -6 17 -9
- 8 0 -18
+POINTS 18
+ 14 7 30
+ 16 0 21
+ 0 0 21
+ 3 7 30
+ -2 7 30
+ -15 0 21
+ -13 7 30
+ -2 29 12
+ -13 29 12
+ -16 22 3
+ 0 22 3
+ 14 29 12
+ 16 22 3
+ 3 29 12
+ -7 0 -18
+ -6 17 -9
+ 8 0 -18
7 17 -9
POLYGONS 28
200 3 3 2 1 46 177 46 192 60 192
@@ -43,11 +43,11 @@ POLYGONS 28
200 3 7 6 4 226 23 245 1 226 1
200 3 11 13 3 226 23 245 23 245 1
200 3 11 3 0 226 23 245 1 226 1
- 4200 3 5 9 15 8 1 25 7 25 27 25 20 0 20
- 4200 3 5 15 14 8 1 25 7 25 27 0 20 0 27
- 4200 3 17 12 1 8 1 25 7 0 20 25 20 25 27
- 4200 3 17 1 16 8 1 25 7 0 20 25 27 0 27
- 4200 3 12 17 15 8 1 16 19 16 0 0 0 0 19
- 4200 3 12 15 9 8 1 16 19 16 0 0 19 16 19
- 4200 3 17 16 14 8 1 18 9 18 28 0 28 0 37
- 4200 3 17 14 15 8 1 18 9 18 28 0 37 18 37
+ 200 3 5 9 15 25 27 25 20 0 20
+ 200 3 5 15 14 25 27 0 20 0 27
+ 200 3 17 12 1 0 20 25 20 25 27
+ 200 3 17 1 16 0 20 25 27 0 27
+ 200 3 12 17 15 16 0 0 0 0 19
+ 200 3 12 15 9 16 0 0 19 16 19
+ 200 3 17 16 14 18 28 0 28 0 37
+ 200 3 17 14 15 18 28 0 37 18 37
14 lib/netplay/netplay.cpp
View
@@ -175,7 +175,7 @@ unsigned NET_PlayerConnectionStatus[CONNECTIONSTATUS_NORMAL][MAX_PLAYERS];
**/
static char const *versionString = version_getVersionString();
static int NETCODE_VERSION_MAJOR = 6;
-static int NETCODE_VERSION_MINOR = 20120504;
+static int NETCODE_VERSION_MINOR = 20120513;
bool NETisCorrectVersion(uint32_t game_version_major, uint32_t game_version_minor)
{
@@ -280,7 +280,7 @@ void NET_InitPlayer(int i, bool initPosition)
NetPlay.players[i].heartattacktime = 0;
NetPlay.players[i].heartbeat = true; // we always start with a hearbeat
NetPlay.players[i].kick = false;
- if (!NetPlay.isHost)
+ if (ingame.localJoiningInProgress)
{ // only clear name outside of games.
NetPlay.players[i].name[0] = '\0';
}
@@ -3407,6 +3407,16 @@ void _syncDebugBacktrace(const char *function)
syncDebugLog[syncDebugNext].setCrc(backupCrc);
}
+uint32_t syncDebugGetCrc()
+{
+ return syncDebugLog[syncDebugNext].getCrc();
+}
+
+void syncDebugSetCrc(uint32_t crc)
+{
+ syncDebugLog[syncDebugNext].setCrc(crc);
+}
+
void resetSyncDebug()
{
for (unsigned i = 0; i < MAX_SYNC_HISTORY; ++i)
2  lib/netplay/netplay.h
View
@@ -351,6 +351,8 @@ void _syncDebug(const char *function, const char *str, ...)
void _syncDebugIntList(const char *function, const char *str, int *ints, size_t numInts);
#define syncDebugBacktrace() do { _syncDebugBacktrace(__FUNCTION__); } while(0)
void _syncDebugBacktrace(const char *function); ///< Adds a backtrace to syncDebug, if the platform supports it. Can be a bit slow, don't call way too often, unless desperate.
+uint32_t syncDebugGetCrc(); ///< syncDebug() calls between uint32_t crc = syncDebugGetCrc(); and syncDebugSetCrc(crc); appear in synch debug logs, but without triggering a desynch if different.
+void syncDebugSetCrc(uint32_t crc); ///< syncDebug() calls between uint32_t crc = syncDebugGetCrc(); and syncDebugSetCrc(crc); appear in synch debug logs, but without triggering a desynch if different.
typedef uint16_t GameCrcType; // Truncate CRC of game state to 16 bits, to save a bit of bandwidth.
void resetSyncDebug(); ///< Resets the syncDebug, so syncDebug from a previous game doesn't cause a spurious desynch dump.
276 po/ca_ES.po
View
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: warzone2100-master_20110320qt\n"
"Report-Msgid-Bugs-To: warzone2100-project@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-05-04 21:53+0200\n"
+"POT-Creation-Date: 2012-05-13 20:05+0200\n"
"PO-Revision-Date: 2011-04-03 19:45+0200\n"
"Last-Translator: Àngel Mompó <mecatxis@gmail.com>\n"
"Language-Team: <ca@dodds.net>\n"
@@ -12468,356 +12468,356 @@ msgstr "APRENENTATGE"
#. TRANSLATORS: "Return", in this context, means "return to previous screen/menu"
#: src/frontend.cpp:190
-#: src/frontend.cpp:251
-#: src/frontend.cpp:390
-#: src/frontend.cpp:462
-#: src/frontend.cpp:603
-#: src/frontend.cpp:749
-#: src/frontend.cpp:883
-#: src/frontend.cpp:1118
-#: src/frontend.cpp:1272
-#: src/frontend.cpp:1292
+#: src/frontend.cpp:252
+#: src/frontend.cpp:392
+#: src/frontend.cpp:464
+#: src/frontend.cpp:605
+#: src/frontend.cpp:751
+#: src/frontend.cpp:885
+#: src/frontend.cpp:1120
+#: src/frontend.cpp:1274
+#: src/frontend.cpp:1294
msgctxt "menu"
msgid "Return"
msgstr "Torna"
-#: src/frontend.cpp:244
+#: src/frontend.cpp:245
msgid "New Campaign"
msgstr "Campanya nova"
-#: src/frontend.cpp:245
+#: src/frontend.cpp:246
msgid "Start Skirmish Game"
msgstr "Escaramussa"
-#: src/frontend.cpp:246
+#: src/frontend.cpp:247
msgid "Challenges"
msgstr "Desafiaments"
-#: src/frontend.cpp:247
+#: src/frontend.cpp:248
#, fuzzy
msgid "Load Campaign Game"
msgstr "Carrega una part."
-#: src/frontend.cpp:248
+#: src/frontend.cpp:249
#, fuzzy
msgid "Load Skirmish Game"
msgstr "Escaramussa"
-#: src/frontend.cpp:250
+#: src/frontend.cpp:251
msgid "SINGLE PLAYER"
msgstr "UN JUGADOR"
-#: src/frontend.cpp:326
+#: src/frontend.cpp:327
#: src/ingameop.cpp:504
#, fuzzy
msgid "Load Campaign Saved Game"
msgstr "Carrega una partida desada"
-#: src/frontend.cpp:331
+#: src/frontend.cpp:333
#: src/ingameop.cpp:508
#, fuzzy
msgid "Load Skirmish Saved Game"
msgstr "Carrega una partida desada"
-#: src/frontend.cpp:385
+#: src/frontend.cpp:387
msgid "MULTI PLAYER"
msgstr "JOC EN XARXA"
-#: src/frontend.cpp:387
+#: src/frontend.cpp:389
msgid "Host Game"
msgstr "Crea una partida"
-#: src/frontend.cpp:388
+#: src/frontend.cpp:390
msgid "Join Game"
msgstr "Uneix-te a una partida"
-#: src/frontend.cpp:393
+#: src/frontend.cpp:395
msgid "TCP PORT 2100 MUST BE OPENED IN YOUR FIREWALL / ROUTER TO HOST GAMES!"
msgstr ""
-#: src/frontend.cpp:455
+#: src/frontend.cpp:457
#: src/multiint.cpp:1400
msgid "OPTIONS"
msgstr "OPCIONS"
-#: src/frontend.cpp:456
+#: src/frontend.cpp:458
msgid "Game Options"
msgstr "Opcions del joc"
-#: src/frontend.cpp:457
+#: src/frontend.cpp:459
msgid "Graphics Options"
msgstr "Opcions dels gràfics"
-#: src/frontend.cpp:458
+#: src/frontend.cpp:460
msgid "Video Options"
msgstr "Opcions dels vídeos"
-#: src/frontend.cpp:459
+#: src/frontend.cpp:461
#: src/ingameop.cpp:268
msgid "Audio Options"
msgstr "Opcions de l'àudio"
-#: src/frontend.cpp:460
+#: src/frontend.cpp:462
msgid "Mouse Options"
msgstr "Opcions del ratolí"
-#: src/frontend.cpp:461
+#: src/frontend.cpp:463
msgid "Key Mappings"
msgstr "Mapatge de tecles"
-#: src/frontend.cpp:521
+#: src/frontend.cpp:523
msgid "Video Playback"
msgstr "Reprod. dels vídeos"
-#: src/frontend.cpp:525
-#: src/frontend.cpp:677
+#: src/frontend.cpp:527
+#: src/frontend.cpp:679
msgid "1X"
msgstr "1X"
-#: src/frontend.cpp:529
-#: src/frontend.cpp:667
+#: src/frontend.cpp:531
+#: src/frontend.cpp:669
msgid "2X"
msgstr "2X"
-#: src/frontend.cpp:533
-#: src/frontend.cpp:672
-#: src/frontend.cpp:823
-#: src/frontend.cpp:906
+#: src/frontend.cpp:535
+#: src/frontend.cpp:674
+#: src/frontend.cpp:825
+#: src/frontend.cpp:908
msgid "Fullscreen"
msgstr "Pant. completa"
-#: src/frontend.cpp:542
+#: src/frontend.cpp:544
msgid "Scanlines"
msgstr ""
-#: src/frontend.cpp:546
-#: src/frontend.cpp:567
-#: src/frontend.cpp:575
-#: src/frontend.cpp:591
-#: src/frontend.cpp:621
-#: src/frontend.cpp:639
-#: src/frontend.cpp:657
-#: src/frontend.cpp:702
-#: src/frontend.cpp:848
-#: src/frontend.cpp:858
-#: src/frontend.cpp:930
-#: src/frontend.cpp:991
-#: src/frontend.cpp:1034
-#: src/frontend.cpp:1075
-#: src/frontend.cpp:1087
-#: src/frontend.cpp:1099
-#: src/frontend.cpp:1134
-#: src/frontend.cpp:1147
-#: src/frontend.cpp:1161
+#: src/frontend.cpp:548
+#: src/frontend.cpp:569
+#: src/frontend.cpp:577
+#: src/frontend.cpp:593
+#: src/frontend.cpp:623
+#: src/frontend.cpp:641
+#: src/frontend.cpp:659
+#: src/frontend.cpp:704
+#: src/frontend.cpp:850
+#: src/frontend.cpp:860
+#: src/frontend.cpp:932
+#: src/frontend.cpp:993
+#: src/frontend.cpp:1036
+#: src/frontend.cpp:1077
+#: src/frontend.cpp:1089
+#: src/frontend.cpp:1101
+#: src/frontend.cpp:1136
+#: src/frontend.cpp:1149
+#: src/frontend.cpp:1163
msgid "Off"
msgstr "Inactiu"
-#: src/frontend.cpp:550
-#: src/frontend.cpp:692
+#: src/frontend.cpp:552
+#: src/frontend.cpp:694
msgid "50%"
msgstr ""
-#: src/frontend.cpp:554
-#: src/frontend.cpp:697
+#: src/frontend.cpp:556
+#: src/frontend.cpp:699
#: src/multiplay.cpp:1999
msgid "Black"
msgstr "Negre"
-#: src/frontend.cpp:560
+#: src/frontend.cpp:562
msgid "Screen Shake"
msgstr "Tremolor de pant."
-#: src/frontend.cpp:563
-#: src/frontend.cpp:579
-#: src/frontend.cpp:587
-#: src/frontend.cpp:626
-#: src/frontend.cpp:644
-#: src/frontend.cpp:653
-#: src/frontend.cpp:844
-#: src/frontend.cpp:996
-#: src/frontend.cpp:1030
-#: src/frontend.cpp:1071
-#: src/frontend.cpp:1083
-#: src/frontend.cpp:1095
-#: src/frontend.cpp:1139
-#: src/frontend.cpp:1152
-#: src/frontend.cpp:1166
+#: src/frontend.cpp:565
+#: src/frontend.cpp:581
+#: src/frontend.cpp:589
+#: src/frontend.cpp:628
+#: src/frontend.cpp:646
+#: src/frontend.cpp:655
+#: src/frontend.cpp:846
+#: src/frontend.cpp:998
+#: src/frontend.cpp:1032
+#: src/frontend.cpp:1073
+#: src/frontend.cpp:1085
+#: src/frontend.cpp:1097
+#: src/frontend.cpp:1141
+#: src/frontend.cpp:1154
+#: src/frontend.cpp:1168
msgid "On"
msgstr "Actiu"
-#: src/frontend.cpp:572
+#: src/frontend.cpp:574
msgid "Subtitles"
msgstr "Subtitols"
-#: src/frontend.cpp:584
+#: src/frontend.cpp:586
msgid "Shadows"
msgstr "Ombres"
-#: src/frontend.cpp:595
-#: src/frontend.cpp:1299
+#: src/frontend.cpp:597
+#: src/frontend.cpp:1301
msgid "Radar"
msgstr "Radar"
-#: src/frontend.cpp:596
-#: src/frontend.cpp:709
-#: src/frontend.cpp:1300
+#: src/frontend.cpp:598
+#: src/frontend.cpp:711
+#: src/frontend.cpp:1302
msgid "Rotating"
msgstr "Giratori"
-#: src/frontend.cpp:596
-#: src/frontend.cpp:709
-#: src/frontend.cpp:1300
+#: src/frontend.cpp:598
+#: src/frontend.cpp:711
+#: src/frontend.cpp:1302
msgid "Fixed"
msgstr "Fixe"
-#: src/frontend.cpp:599
+#: src/frontend.cpp:601
msgid "GRAPHICS OPTIONS"
msgstr "OPCIONS DELS GRÀFICS"
-#: src/frontend.cpp:737
+#: src/frontend.cpp:739
#: src/ingameop.cpp:168
msgid "Voice Volume"
msgstr "Volum veu"
-#: src/frontend.cpp:741
+#: src/frontend.cpp:743
#: src/ingameop.cpp:173
msgid "FX Volume"
msgstr "Volum efectes"
-#: src/frontend.cpp:745
+#: src/frontend.cpp:747
#: src/ingameop.cpp:178
msgid "Music Volume"
msgstr "Volum música"
-#: src/frontend.cpp:752
+#: src/frontend.cpp:754
msgid "AUDIO OPTIONS"
msgstr "OPCIONS DE L'ÀUDIO"
-#: src/frontend.cpp:816
+#: src/frontend.cpp:818
msgid "* Takes effect on game restart"
msgstr "* Té efecte quan reinicieu"
-#: src/frontend.cpp:819
+#: src/frontend.cpp:821
msgid "Graphics Mode*"
msgstr "Mode gràfic*"
-#: src/frontend.cpp:827
-#: src/frontend.cpp:901
+#: src/frontend.cpp:829
+#: src/frontend.cpp:903
msgid "Windowed"
msgstr "Finestra"
-#: src/frontend.cpp:831
+#: src/frontend.cpp:833
msgid "Resolution*"
msgstr "Resolució*"
-#: src/frontend.cpp:836
+#: src/frontend.cpp:838
msgid "Texture size"
msgstr "Mida de la textura"
-#: src/frontend.cpp:840
+#: src/frontend.cpp:842
#, fuzzy
msgid "Vertical sync"
msgstr "Sincro. vertical*"
-#: src/frontend.cpp:875
-#: src/frontend.cpp:936
+#: src/frontend.cpp:877
+#: src/frontend.cpp:938
#, fuzzy
msgid "Unsupported"
msgstr "Transport"
-#: src/frontend.cpp:880
+#: src/frontend.cpp:882
msgid "VIDEO OPTIONS"
msgstr "OPCIONS DE VIDEO"
-#: src/frontend.cpp:1068
+#: src/frontend.cpp:1070
msgid "Reverse Rotation"
msgstr "Rotació inversa"
-#: src/frontend.cpp:1079
+#: src/frontend.cpp:1081
msgid "Trap Cursor"
msgstr "Captura el cursor"
-#: src/frontend.cpp:1092
+#: src/frontend.cpp:1094
msgid "Switch Mouse Buttons"
msgstr "Intercanvia els botons"
-#: src/frontend.cpp:1104
+#: src/frontend.cpp:1106
msgid "Rotate Screen"
msgstr "Rota la pantalla"
-#: src/frontend.cpp:1107
-#: src/frontend.cpp:1180
+#: src/frontend.cpp:1109
+#: src/frontend.cpp:1182
msgid "Middle Mouse"
msgstr "Botó del mig"
-#: src/frontend.cpp:1111
-#: src/frontend.cpp:1175
+#: src/frontend.cpp:1113
+#: src/frontend.cpp:1177
msgid "Right Mouse"
msgstr "Botó dret"
-#: src/frontend.cpp:1115
+#: src/frontend.cpp:1117
msgid "MOUSE OPTIONS"
msgstr "OPCIONS DEL RATOLÍ"
-#: src/frontend.cpp:1215
-#: src/frontend.cpp:1293
+#: src/frontend.cpp:1217
+#: src/frontend.cpp:1295
msgid "Language"
msgstr "Idioma"
-#: src/frontend.cpp:1219
-#: src/frontend.cpp:1297
+#: src/frontend.cpp:1221
+#: src/frontend.cpp:1299
msgid "Difficulty"
msgstr "Dificultat"
-#: src/frontend.cpp:1223
-#: src/frontend.cpp:1304
-#: src/frontend.cpp:1336
+#: src/frontend.cpp:1225
+#: src/frontend.cpp:1306
+#: src/frontend.cpp:1338
#: src/multiint.cpp:214
msgid "Easy"
msgstr "Fàcil"
-#: src/frontend.cpp:1226
-#: src/frontend.cpp:1307
-#: src/frontend.cpp:1328
+#: src/frontend.cpp:1228
+#: src/frontend.cpp:1309
+#: src/frontend.cpp:1330
msgid "Normal"
msgstr "Normal"
-#: src/frontend.cpp:1230
-#: src/frontend.cpp:1310
-#: src/frontend.cpp:1332
+#: src/frontend.cpp:1232
+#: src/frontend.cpp:1312
+#: src/frontend.cpp:1334
#: src/multiint.cpp:214
msgid "Hard"
msgstr "Difícil"
-#: src/frontend.cpp:1235
-#: src/frontend.cpp:1298
+#: src/frontend.cpp:1237
+#: src/frontend.cpp:1300
msgid "Scroll Speed"
msgstr "Veloc. desplaçament"
-#: src/frontend.cpp:1239
-#: src/frontend.cpp:1294
+#: src/frontend.cpp:1241
+#: src/frontend.cpp:1296
#, fuzzy
msgid "Unit Colour:"
msgstr "Color de les unitats"
-#: src/frontend.cpp:1259
-#: src/frontend.cpp:1295
+#: src/frontend.cpp:1261
+#: src/frontend.cpp:1297
#, fuzzy
msgid "Campaign"
msgstr "Campanya nova"
-#: src/frontend.cpp:1269
-#: src/frontend.cpp:1296
+#: src/frontend.cpp:1271
+#: src/frontend.cpp:1298
#, fuzzy
msgid "Skirmish/Multiplayer"
msgstr "Partida en xarxa"
-#: src/frontend.cpp:1275
-#: src/frontend.cpp:1291
+#: src/frontend.cpp:1277
+#: src/frontend.cpp:1293
msgid "GAME OPTIONS"
msgstr "OPCIONS DE JOC"
-#: src/frontend.cpp:1436
+#: src/frontend.cpp:1438
#: src/multiint.cpp:2538
msgid "Mod: "
msgstr "Mod:"
@@ -14871,12 +14871,12 @@ msgstr "Temps de joc total - %s"
msgid "You cheated!"
msgstr "Feu trampes!"
-#: src/scriptfuncs.cpp:9373
+#: src/scriptfuncs.cpp:9378
#, c-format
msgid "Beacon received from %s!"
msgstr "Heu rebut una balisa de %s!"
-#: src/scriptfuncs.cpp:9410
+#: src/scriptfuncs.cpp:9415
#, c-format
msgid "Beacon %d"
msgstr "Balisa %d"
276 po/cs.po
View
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: warzone2100\n"
"Report-Msgid-Bugs-To: warzone2100-project@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-05-04 21:53+0200\n"
+"POT-Creation-Date: 2012-05-13 20:05+0200\n"
"PO-Revision-Date: 2008-05-09 16:05+0000\n"
"Last-Translator: Lubos <alvinx12@centrum.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -12573,366 +12573,366 @@ msgstr "TUTORIÁLY"
#. TRANSLATORS: "Return", in this context, means "return to previous screen/menu"
#: src/frontend.cpp:190
-#: src/frontend.cpp:251
-#: src/frontend.cpp:390
-#: src/frontend.cpp:462
-#: src/frontend.cpp:603
-#: src/frontend.cpp:749
-#: src/frontend.cpp:883
-#: src/frontend.cpp:1118
-#: src/frontend.cpp:1272
-#: src/frontend.cpp:1292
+#: src/frontend.cpp:252
+#: src/frontend.cpp:392
+#: src/frontend.cpp:464
+#: src/frontend.cpp:605
+#: src/frontend.cpp:751
+#: src/frontend.cpp:885
+#: src/frontend.cpp:1120
+#: src/frontend.cpp:1274
+#: src/frontend.cpp:1294
msgctxt "menu"
msgid "Return"
msgstr "Zpět"
-#: src/frontend.cpp:244
+#: src/frontend.cpp:245
msgid "New Campaign"
msgstr "Nová kampaň"
-#: src/frontend.cpp:245
+#: src/frontend.cpp:246
#, fuzzy
msgid "Start Skirmish Game"
msgstr "Začni hostovat hru"
-#: src/frontend.cpp:246
+#: src/frontend.cpp:247
msgid "Challenges"
msgstr ""
-#: src/frontend.cpp:247
+#: src/frontend.cpp:248
#, fuzzy
msgid "Load Campaign Game"
msgstr "Nahrát kampaň"
-#: src/frontend.cpp:248
+#: src/frontend.cpp:249
#, fuzzy
msgid "Load Skirmish Game"
msgstr "Začni hostovat hru"
-#: src/frontend.cpp:250
+#: src/frontend.cpp:251
msgid "SINGLE PLAYER"
msgstr "HRA JEDNOHO HRÁČE"
-#: src/frontend.cpp:326
+#: src/frontend.cpp:327
#: src/ingameop.cpp:504
#, fuzzy
msgid "Load Campaign Saved Game"
msgstr "Načti Uloženou Hru"
-#: src/frontend.cpp:331
+#: src/frontend.cpp:333
#: src/ingameop.cpp:508
#, fuzzy
msgid "Load Skirmish Saved Game"
msgstr "Načti Uloženou Hru"
-#: src/frontend.cpp:385
+#: src/frontend.cpp:387
msgid "MULTI PLAYER"
msgstr "HRA VÍCE HRÁČŮ"
-#: src/frontend.cpp:387
+#: src/frontend.cpp:389
msgid "Host Game"
msgstr ""
-#: src/frontend.cpp:388
+#: src/frontend.cpp:390
msgid "Join Game"
msgstr "Připojit se ke hře"
-#: src/frontend.cpp:393
+#: src/frontend.cpp:395
msgid "TCP PORT 2100 MUST BE OPENED IN YOUR FIREWALL / ROUTER TO HOST GAMES!"
msgstr ""
-#: src/frontend.cpp:455
+#: src/frontend.cpp:457
#: src/multiint.cpp:1400
msgid "OPTIONS"
msgstr "NASTAVENÍ"
-#: src/frontend.cpp:456
+#: src/frontend.cpp:458
msgid "Game Options"
msgstr "Herní nastavení"
-#: src/frontend.cpp:457
+#: src/frontend.cpp:459
msgid "Graphics Options"
msgstr "Grafická nastavení"
-#: src/frontend.cpp:458
+#: src/frontend.cpp:460
#, fuzzy
msgid "Video Options"
msgstr "Zvuková nastavení"
-#: src/frontend.cpp:459
+#: src/frontend.cpp:461
#: src/ingameop.cpp:268
msgid "Audio Options"
msgstr "Zvuková nastavení"
-#: src/frontend.cpp:460
+#: src/frontend.cpp:462
#, fuzzy
msgid "Mouse Options"
msgstr "Herní nastavení"
-#: src/frontend.cpp:461
+#: src/frontend.cpp:463
msgid "Key Mappings"
msgstr "Mapování kláves"
-#: src/frontend.cpp:521
+#: src/frontend.cpp:523
msgid "Video Playback"
msgstr "Přehrávání videa"
-#: src/frontend.cpp:525
-#: src/frontend.cpp:677
+#: src/frontend.cpp:527
+#: src/frontend.cpp:679
msgid "1X"
msgstr ""
-#: src/frontend.cpp:529
-#: src/frontend.cpp:667
+#: src/frontend.cpp:531
+#: src/frontend.cpp:669
msgid "2X"
msgstr ""
-#: src/frontend.cpp:533
-#: src/frontend.cpp:672
-#: src/frontend.cpp:823
-#: src/frontend.cpp:906
+#: src/frontend.cpp:535
+#: src/frontend.cpp:674
+#: src/frontend.cpp:825
+#: src/frontend.cpp:908
msgid "Fullscreen"
msgstr "Celá obrazovka"
-#: src/frontend.cpp:542
+#: src/frontend.cpp:544
msgid "Scanlines"
msgstr ""
-#: src/frontend.cpp:546
-#: src/frontend.cpp:567
-#: src/frontend.cpp:575
-#: src/frontend.cpp:591
-#: src/frontend.cpp:621
-#: src/frontend.cpp:639
-#: src/frontend.cpp:657
-#: src/frontend.cpp:702
-#: src/frontend.cpp:848
-#: src/frontend.cpp:858
-#: src/frontend.cpp:930
-#: src/frontend.cpp:991
-#: src/frontend.cpp:1034
-#: src/frontend.cpp:1075
-#: src/frontend.cpp:1087
-#: src/frontend.cpp:1099
-#: src/frontend.cpp:1134
-#: src/frontend.cpp:1147
-#: src/frontend.cpp:1161
+#: src/frontend.cpp:548
+#: src/frontend.cpp:569
+#: src/frontend.cpp:577
+#: src/frontend.cpp:593
+#: src/frontend.cpp:623
+#: src/frontend.cpp:641
+#: src/frontend.cpp:659
+#: src/frontend.cpp:704
+#: src/frontend.cpp:850
+#: src/frontend.cpp:860
+#: src/frontend.cpp:932
+#: src/frontend.cpp:993
+#: src/frontend.cpp:1036
+#: src/frontend.cpp:1077
+#: src/frontend.cpp:1089
+#: src/frontend.cpp:1101
+#: src/frontend.cpp:1136
+#: src/frontend.cpp:1149
+#: src/frontend.cpp:1163
msgid "Off"
msgstr "Vypnuto"
-#: src/frontend.cpp:550
-#: src/frontend.cpp:692
+#: src/frontend.cpp:552
+#: src/frontend.cpp:694
msgid "50%"
msgstr ""
-#: src/frontend.cpp:554
-#: src/frontend.cpp:697
+#: src/frontend.cpp:556
+#: src/frontend.cpp:699
#: src/multiplay.cpp:1999
msgid "Black"
msgstr "Černá"
-#: src/frontend.cpp:560
+#: src/frontend.cpp:562
msgid "Screen Shake"
msgstr ""
-#: src/frontend.cpp:563
-#: src/frontend.cpp:579
-#: src/frontend.cpp:587
-#: src/frontend.cpp:626
-#: src/frontend.cpp:644
-#: src/frontend.cpp:653
-#: src/frontend.cpp:844
-#: src/frontend.cpp:996
-#: src/frontend.cpp:1030
-#: src/frontend.cpp:1071
-#: src/frontend.cpp:1083
-#: src/frontend.cpp:1095
-#: src/frontend.cpp:1139
-#: src/frontend.cpp:1152
-#: src/frontend.cpp:1166
+#: src/frontend.cpp:565
+#: src/frontend.cpp:581
+#: src/frontend.cpp:589
+#: src/frontend.cpp:628
+#: src/frontend.cpp:646
+#: src/frontend.cpp:655
+#: src/frontend.cpp:846
+#: src/frontend.cpp:998
+#: src/frontend.cpp:1032
+#: src/frontend.cpp:1073
+#: src/frontend.cpp:1085
+#: src/frontend.cpp:1097
+#: src/frontend.cpp:1141
+#: src/frontend.cpp:1154
+#: src/frontend.cpp:1168
msgid "On"
msgstr "Zapnuto"
-#: src/frontend.cpp:572
+#: src/frontend.cpp:574
msgid "Subtitles"
msgstr "Titulky"
-#: src/frontend.cpp:584
+#: src/frontend.cpp:586
msgid "Shadows"
msgstr "Stíny"
-#: src/frontend.cpp:595
-#: src/frontend.cpp:1299
+#: src/frontend.cpp:597
+#: src/frontend.cpp:1301
msgid "Radar"
msgstr ""
-#: src/frontend.cpp:596
-#: src/frontend.cpp:709
-#: src/frontend.cpp:1300
+#: src/frontend.cpp:598
+#: src/frontend.cpp:711
+#: src/frontend.cpp:1302
#, fuzzy
msgid "Rotating"
msgstr "Otočit doprava"
-#: src/frontend.cpp:596
-#: src/frontend.cpp:709
-#: src/frontend.cpp:1300
+#: src/frontend.cpp:598
+#: src/frontend.cpp:711
+#: src/frontend.cpp:1302
msgid "Fixed"
msgstr ""
-#: src/frontend.cpp:599
+#: src/frontend.cpp:601
#, fuzzy
msgid "GRAPHICS OPTIONS"
msgstr "HERNÍ NASTAVENÍ"
-#: src/frontend.cpp:737
+#: src/frontend.cpp:739
#: src/ingameop.cpp:168
msgid "Voice Volume"
msgstr "Hlasitost řeči"
-#: src/frontend.cpp:741
+#: src/frontend.cpp:743
#: src/ingameop.cpp:173
msgid "FX Volume"
msgstr "Hlasitost efektů"
-#: src/frontend.cpp:745
+#: src/frontend.cpp:747
#: src/ingameop.cpp:178
msgid "Music Volume"
msgstr "Hlasitost hudby"
-#: src/frontend.cpp:752
+#: src/frontend.cpp:754
#, fuzzy
msgid "AUDIO OPTIONS"
msgstr "HERNÍ NASTAVENÍ"
-#: src/frontend.cpp:816
+#: src/frontend.cpp:818
msgid "* Takes effect on game restart"
msgstr "* Projeví se až po restartu hry"
-#: src/frontend.cpp:819
+#: src/frontend.cpp:821
msgid "Graphics Mode*"
msgstr "Grafický mód*"
-#: src/frontend.cpp:827
-#: src/frontend.cpp:901
+#: src/frontend.cpp:829
+#: src/frontend.cpp:903
msgid "Windowed"
msgstr ""
-#: src/frontend.cpp:831
+#: src/frontend.cpp:833
msgid "Resolution*"
msgstr "Rozlišení*"
-#: src/frontend.cpp:836
+#: src/frontend.cpp:838
msgid "Texture size"
msgstr "Velikost textury"
-#: src/frontend.cpp:840
+#: src/frontend.cpp:842
msgid "Vertical sync"
msgstr ""
-#: src/frontend.cpp:875
-#: src/frontend.cpp:936
+#: src/frontend.cpp:877
+#: src/frontend.cpp:938
#, fuzzy
msgid "Unsupported"
msgstr "Transportér"
-#: src/frontend.cpp:880
+#: src/frontend.cpp:882
#, fuzzy
msgid "VIDEO OPTIONS"
msgstr "HERNÍ NASTAVENÍ"
-#: src/frontend.cpp:1068
+#: src/frontend.cpp:1070
#, fuzzy
msgid "Reverse Rotation"
msgstr "Obrať myš"
-#: src/frontend.cpp:1079
+#: src/frontend.cpp:1081
msgid "Trap Cursor"
msgstr ""
-#: src/frontend.cpp:1092
+#: src/frontend.cpp:1094
#, fuzzy
msgid "Switch Mouse Buttons"
msgstr "Herní nastavení"
-#: src/frontend.cpp:1104
+#: src/frontend.cpp:1106
#, fuzzy
msgid "Rotate Screen"
msgstr "Otočit doleva"
-#: src/frontend.cpp:1107
-#: src/frontend.cpp:1180
+#: src/frontend.cpp:1109
+#: src/frontend.cpp:1182
msgid "Middle Mouse"
msgstr ""
-#: src/frontend.cpp:1111
-#: src/frontend.cpp:1175
+#: src/frontend.cpp:1113
+#: src/frontend.cpp:1177
msgid "Right Mouse"
msgstr ""
-#: src/frontend.cpp:1115
+#: src/frontend.cpp:1117
#, fuzzy
msgid "MOUSE OPTIONS"
msgstr "HERNÍ NASTAVENÍ"
-#: src/frontend.cpp:1215
-#: src/frontend.cpp:1293
+#: src/frontend.cpp:1217
+#: src/frontend.cpp:1295
msgid "Language"
msgstr "Jazyk"
-#: src/frontend.cpp:1219
-#: src/frontend.cpp:1297
+#: src/frontend.cpp:1221
+#: src/frontend.cpp:1299
msgid "Difficulty"
msgstr "Obtížnost"
-#: src/frontend.cpp:1223
-#: src/frontend.cpp:1304
-#: src/frontend.cpp:1336
+#: src/frontend.cpp:1225
+#: src/frontend.cpp:1306
+#: src/frontend.cpp:1338
#: src/multiint.cpp:214
msgid "Easy"
msgstr "Snadná"
-#: src/frontend.cpp:1226
-#: src/frontend.cpp:1307
-#: src/frontend.cpp:1328
+#: src/frontend.cpp:1228
+#: src/frontend.cpp:1309
+#: src/frontend.cpp:1330
msgid "Normal"
msgstr "Normální"
-#: src/frontend.cpp:1230
-#: src/frontend.cpp:1310
-#: src/frontend.cpp:1332
+#: src/frontend.cpp:1232
+#: src/frontend.cpp:1312
+#: src/frontend.cpp:1334
#: src/multiint.cpp:214
msgid "Hard"
msgstr "Těžká"
-#: src/frontend.cpp:1235
-#: src/frontend.cpp:1298
+#: src/frontend.cpp:1237
+#: src/frontend.cpp:1300
msgid "Scroll Speed"
msgstr "Rychlost rolování"
-#: src/frontend.cpp:1239
-#: src/frontend.cpp:1294
+#: src/frontend.cpp:1241
+#: src/frontend.cpp:1296
#, fuzzy
msgid "Unit Colour:"
msgstr "Barva jednotky"
-#: src/frontend.cpp:1259
-#: src/frontend.cpp:1295
+#: src/frontend.cpp:1261
+#: src/frontend.cpp:1297
#, fuzzy
msgid "Campaign"
msgstr "Nová kampaň"
-#: src/frontend.cpp:1269
-#: src/frontend.cpp:1296
+#: src/frontend.cpp:1271
+#: src/frontend.cpp:1298
#, fuzzy
msgid "Skirmish/Multiplayer"
msgstr "Hra pro Více Hráčů"
-#: src/frontend.cpp:1275
-#: src/frontend.cpp:1291
+#: src/frontend.cpp:1277
+#: src/frontend.cpp:1293
msgid "GAME OPTIONS"
msgstr "HERNÍ NASTAVENÍ"
-#: src/frontend.cpp:1436
+#: src/frontend.cpp:1438
#: src/multiint.cpp:2538
msgid "Mod: "
msgstr ""
@@ -15047,12 +15047,12 @@ msgstr "Celkový Čas Hry - %s"
msgid "You cheated!"
msgstr ""
-#: src/scriptfuncs.cpp:9373
+#: src/scriptfuncs.cpp:9378
#, c-format
msgid "Beacon received from %s!"
msgstr ""
-#: src/scriptfuncs.cpp:9410
+#: src/scriptfuncs.cpp:9415
#, c-format
msgid "Beacon %d"
msgstr ""
276 po/da.po
View
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: warzone2100\n"
"Report-Msgid-Bugs-To: warzone2100-project@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-05-04 21:53+0200\n"
+"POT-Creation-Date: 2012-05-13 20:05+0200\n"
"PO-Revision-Date: 2011-09-11 13:13+0100\n"
"Last-Translator: Cyp <Cyp>\n"
"Language-Team: Dansk <da@li.org>\n"
@@ -12712,358 +12712,358 @@ msgstr "TUTORIALS"
#. TRANSLATORS: "Return", in this context, means "return to previous screen/menu"
#: src/frontend.cpp:190
-#: src/frontend.cpp:251
-#: src/frontend.cpp:390
-#: src/frontend.cpp:462
-#: src/frontend.cpp:603
-#: src/frontend.cpp:749
-#: src/frontend.cpp:883
-#: src/frontend.cpp:1118
-#: src/frontend.cpp:1272
-#: src/frontend.cpp:1292
+#: src/frontend.cpp:252
+#: src/frontend.cpp:392
+#: src/frontend.cpp:464
+#: src/frontend.cpp:605
+#: src/frontend.cpp:751
+#: src/frontend.cpp:885
+#: src/frontend.cpp:1120
+#: src/frontend.cpp:1274
+#: src/frontend.cpp:1294
msgctxt "menu"
msgid "Return"
msgstr "Tilbage"
-#: src/frontend.cpp:244
+#: src/frontend.cpp:245
msgid "New Campaign"
msgstr "Ny kampange"
-#: src/frontend.cpp:245
+#: src/frontend.cpp:246
#, fuzzy
msgid "Start Skirmish Game"
msgstr "Værten starter spillet"
-#: src/frontend.cpp:246
+#: src/frontend.cpp:247
msgid "Challenges"
msgstr "Udfordringer"
-#: src/frontend.cpp:247
+#: src/frontend.cpp:248
#, fuzzy
msgid "Load Campaign Game"
msgstr "Indlæs kampange"
-#: src/frontend.cpp:248
+#: src/frontend.cpp:249
#, fuzzy
msgid "Load Skirmish Game"
msgstr "Værten starter spillet"
-#: src/frontend.cpp:250
+#: src/frontend.cpp:251
msgid "SINGLE PLAYER"
msgstr "SOLO SPILLER"
-#: src/frontend.cpp:326
+#: src/frontend.cpp:327
#: src/ingameop.cpp:504
#, fuzzy
msgid "Load Campaign Saved Game"
msgstr "Indlæs gemt spil"
-#: src/frontend.cpp:331
+#: src/frontend.cpp:333
#: src/ingameop.cpp:508
#, fuzzy
msgid "Load Skirmish Saved Game"
msgstr "Indlæs gemt spil"
-#: src/frontend.cpp:385
+#: src/frontend.cpp:387
msgid "MULTI PLAYER"
msgstr "FLER SPILLER"
-#: src/frontend.cpp:387
+#: src/frontend.cpp:389
msgid "Host Game"
msgstr "Udbyd spil"
-#: src/frontend.cpp:388
+#: src/frontend.cpp:390
msgid "Join Game"
msgstr "Forbind til vært"
-#: src/frontend.cpp:393
+#: src/frontend.cpp:395
msgid "TCP PORT 2100 MUST BE OPENED IN YOUR FIREWALL / ROUTER TO HOST GAMES!"
msgstr ""
-#: src/frontend.cpp:455
+#: src/frontend.cpp:457
#: src/multiint.cpp:1400
msgid "OPTIONS"
msgstr "TILVALG"
-#: src/frontend.cpp:456
+#: src/frontend.cpp:458
msgid "Game Options"
msgstr "Spil indstillinger"
-#: src/frontend.cpp:457
+#: src/frontend.cpp:459
msgid "Graphics Options"
msgstr "Grafik indstillinger"
-#: src/frontend.cpp:458
+#: src/frontend.cpp:460
msgid "Video Options"
msgstr "Videoindstillinger"
-#: src/frontend.cpp:459
+#: src/frontend.cpp:461
#: src/ingameop.cpp:268
msgid "Audio Options"
msgstr "Lyd indstillinger"
-#: src/frontend.cpp:460
+#: src/frontend.cpp:462
msgid "Mouse Options"
msgstr "Musindstillinger"
-#: src/frontend.cpp:461
+#: src/frontend.cpp:463
msgid "Key Mappings"
msgstr "Tastatur indstillinger"
-#: src/frontend.cpp:521
+#: src/frontend.cpp:523
msgid "Video Playback"
msgstr "Videoafspilning"
-#: src/frontend.cpp:525
-#: src/frontend.cpp:677
+#: src/frontend.cpp:527
+#: src/frontend.cpp:679
msgid "1X"
msgstr "1X"
-#: src/frontend.cpp:529
-#: src/frontend.cpp:667
+#: src/frontend.cpp:531
+#: src/frontend.cpp:669
msgid "2X"
msgstr "2X"
-#: src/frontend.cpp:533
-#: src/frontend.cpp:672
-#: src/frontend.cpp:823
-#: src/frontend.cpp:906
+#: src/frontend.cpp:535
+#: src/frontend.cpp:674
+#: src/frontend.cpp:825
+#: src/frontend.cpp:908
msgid "Fullscreen"
msgstr "Fuldskærm"
-#: src/frontend.cpp:542
+#: src/frontend.cpp:544
msgid "Scanlines"
msgstr "Skanlinjer"
-#: src/frontend.cpp:546
-#: src/frontend.cpp:567
-#: src/frontend.cpp:575
-#: src/frontend.cpp:591
-#: src/frontend.cpp:621
-#: src/frontend.cpp:639
-#: src/frontend.cpp:657
-#: src/frontend.cpp:702
-#: src/frontend.cpp:848
-#: src/frontend.cpp:858
-#: src/frontend.cpp:930
-#: src/frontend.cpp:991
-#: src/frontend.cpp:1034
-#: src/frontend.cpp:1075
-#: src/frontend.cpp:1087
-#: src/frontend.cpp:1099
-#: src/frontend.cpp:1134
-#: src/frontend.cpp:1147
-#: src/frontend.cpp:1161
+#: src/frontend.cpp:548
+#: src/frontend.cpp:569
+#: src/frontend.cpp:577
+#: src/frontend.cpp:593
+#: src/frontend.cpp:623
+#: src/frontend.cpp:641
+#: src/frontend.cpp:659
+#: src/frontend.cpp:704
+#: src/frontend.cpp:850
+#: src/frontend.cpp:860
+#: src/frontend.cpp:932
+#: src/frontend.cpp:993
+#: src/frontend.cpp:1036
+#: src/frontend.cpp:1077
+#: src/frontend.cpp:1089
+#: src/frontend.cpp:1101
+#: src/frontend.cpp:1136
+#: src/frontend.cpp:1149
+#: src/frontend.cpp:1163
msgid "Off"
msgstr "Fra"
-#: src/frontend.cpp:550
-#: src/frontend.cpp:692
+#: src/frontend.cpp:552
+#: src/frontend.cpp:694
msgid "50%"
msgstr "50%"
-#: src/frontend.cpp:554
-#: src/frontend.cpp:697
+#: src/frontend.cpp:556
+#: src/frontend.cpp:699
#: src/multiplay.cpp:1999
msgid "Black"
msgstr "Sort"
-#: src/frontend.cpp:560
+#: src/frontend.cpp:562
msgid "Screen Shake"
msgstr "Ryst skærm"
-#: src/frontend.cpp:563
-#: src/frontend.cpp:579
-#: src/frontend.cpp:587
-#: src/frontend.cpp:626
-#: src/frontend.cpp:644
-#: src/frontend.cpp:653
-#: src/frontend.cpp:844
-#: src/frontend.cpp:996
-#: src/frontend.cpp:1030
-#: src/frontend.cpp:1071
-#: src/frontend.cpp:1083
-#: src/frontend.cpp:1095
-#: src/frontend.cpp:1139
-#: src/frontend.cpp:1152
-#: src/frontend.cpp:1166
+#: src/frontend.cpp:565
+#: src/frontend.cpp:581
+#: src/frontend.cpp:589
+#: src/frontend.cpp:628
+#: src/frontend.cpp:646
+#: src/frontend.cpp:655
+#: src/frontend.cpp:846
+#: src/frontend.cpp:998
+#: src/frontend.cpp:1032
+#: src/frontend.cpp:1073
+#: src/frontend.cpp:1085
+#: src/frontend.cpp:1097
+#: src/frontend.cpp:1141
+#: src/frontend.cpp:1154
+#: src/frontend.cpp:1168
msgid "On"
msgstr "Til"
-#: src/frontend.cpp:572
+#: src/frontend.cpp:574
msgid "Subtitles"
msgstr "Undertekster"
-#: src/frontend.cpp:584
+#: src/frontend.cpp:586
msgid "Shadows"
msgstr "Skygger"
-#: src/frontend.cpp:595
-#: src/frontend.cpp:1299
+#: src/frontend.cpp:597
+#: src/frontend.cpp:1301
msgid "Radar"
msgstr "Radar"
-#: src/frontend.cpp:596
-#: src/frontend.cpp:709
-#: src/frontend.cpp:1300
+#: src/frontend.cpp:598
+#: src/frontend.cpp:711
+#: src/frontend.cpp:1302
msgid "Rotating"
msgstr "Drejer"
-#: src/frontend.cpp:596
-#: src/frontend.cpp:709
-#: src/frontend.cpp:1300
+#: src/frontend.cpp:598
+#: src/frontend.cpp:711
+#: src/frontend.cpp:1302
msgid "Fixed"
msgstr "Forudvalgt"
-#: src/frontend.cpp:599
+#: src/frontend.cpp:601
msgid "GRAPHICS OPTIONS"
msgstr "GRAFIKINDSTILLINGER"
-#: src/frontend.cpp:737
+#: src/frontend.cpp:739
#: src/ingameop.cpp:168
msgid "Voice Volume"
msgstr "Stemme volume"
-#: src/frontend.cpp:741
+#: src/frontend.cpp:743
#: src/ingameop.cpp:173
msgid "FX Volume"
msgstr "Effekt volume"
-#: src/frontend.cpp:745
+#: src/frontend.cpp:747
#: src/ingameop.cpp:178
msgid "Music Volume"
msgstr "Musik volume"
-#: src/frontend.cpp:752
+#: src/frontend.cpp:754
msgid "AUDIO OPTIONS"
msgstr "AUDIOINDSTILLINGER"
-#: src/frontend.cpp:816
+#: src/frontend.cpp:818
msgid "* Takes effect on game restart"
msgstr "* Tager effekt, når spillet genstartes"
-#: src/frontend.cpp:819
+#: src/frontend.cpp:821
msgid "Graphics Mode*"
msgstr "Grafik indstillinger"
-#: src/frontend.cpp:827
-#: src/frontend.cpp:901
+#: src/frontend.cpp:829
+#: src/frontend.cpp:903
msgid "Windowed"
msgstr "Vindue"
-#: src/frontend.cpp:831
+#: src/frontend.cpp:833
msgid "Resolution*"
msgstr "Opløsning*"
-#: src/frontend.cpp:836
+#: src/frontend.cpp:838
msgid "Texture size"
msgstr "Mønsteropløsning"
-#: src/frontend.cpp:840
+#: src/frontend.cpp:842
msgid "Vertical sync"
msgstr ""
-#: src/frontend.cpp:875
-#: src/frontend.cpp:936
+#: src/frontend.cpp:877
+#: src/frontend.cpp:938
#, fuzzy
msgid "Unsupported"
msgstr "Transportskib"
-#: src/frontend.cpp:880
+#: src/frontend.cpp:882
msgid "VIDEO OPTIONS"
msgstr "VIDEOINDSTILLINGER"
-#: src/frontend.cpp:1068
+#: src/frontend.cpp:1070
msgid "Reverse Rotation"
msgstr "Omvendt drejning"
-#: src/frontend.cpp:1079
+#: src/frontend.cpp:1081
msgid "Trap Cursor"
msgstr "Fang musepointer"
-#: src/frontend.cpp:1092
+#: src/frontend.cpp:1094
msgid "Switch Mouse Buttons"
msgstr "Byt museknapper"
-#: src/frontend.cpp:1104
+#: src/frontend.cpp:1106
msgid "Rotate Screen"
msgstr "Drej skærm"
-#: src/frontend.cpp:1107
-#: src/frontend.cpp:1180
+#: src/frontend.cpp:1109
+#: src/frontend.cpp:1182
#, fuzzy
msgid "Middle Mouse"
msgstr "Mellemknap"
-#: src/frontend.cpp:1111
-#: src/frontend.cpp:1175
+#: src/frontend.cpp:1113
+#: src/frontend.cpp:1177
#, fuzzy
msgid "Right Mouse"
msgstr "Højreknap"
-#: src/frontend.cpp:1115
+#: src/frontend.cpp:1117
msgid "MOUSE OPTIONS"
msgstr "MUSINDSTILLINGER"
-#: src/frontend.cpp:1215
-#: src/frontend.cpp:1293
+#: src/frontend.cpp:1217
+#: src/frontend.cpp:1295
msgid "Language"
msgstr "Sprog"
-#: src/frontend.cpp:1219
-#: src/frontend.cpp:1297
+#: src/frontend.cpp:1221
+#: src/frontend.cpp:1299
msgid "Difficulty"
msgstr "Sværhedsgræd"
-#: src/frontend.cpp:1223
-#: src/frontend.cpp:1304
-#: src/frontend.cpp:1336
+#: src/frontend.cpp:1225
+#: src/frontend.cpp:1306
+#: src/frontend.cpp:1338
#: src/multiint.cpp:214
msgid "Easy"
msgstr "Begynder"
-#: src/frontend.cpp:1226
-#: src/frontend.cpp:1307
-#: src/frontend.cpp:1328
+#: src/frontend.cpp:1228
+#: src/frontend.cpp:1309
+#: src/frontend.cpp:1330
msgid "Normal"
msgstr "Øvet"
-#: src/frontend.cpp:1230
-#: src/frontend.cpp:1310
-#: src/frontend.cpp:1332
+#: src/frontend.cpp:1232
+#: src/frontend.cpp:1312
+#: src/frontend.cpp:1334
#: src/multiint.cpp:214
msgid "Hard"
msgstr "Svær"
-#: src/frontend.cpp:1235
-#: src/frontend.cpp:1298
+#: src/frontend.cpp:1237
+#: src/frontend.cpp:1300
msgid "Scroll Speed"
msgstr "Kamera hastighed"
-#: src/frontend.cpp:1239
-#: src/frontend.cpp:1294
+#: src/frontend.cpp:1241
+#: src/frontend.cpp:1296
#, fuzzy
msgid "Unit Colour:"
msgstr "Holdfarve"
-#: src/frontend.cpp:1259
-#: src/frontend.cpp:1295
+#: src/frontend.cpp:1261
+#: src/frontend.cpp:1297
#, fuzzy
msgid "Campaign"
msgstr "Ny kampange"
-#: src/frontend.cpp:1269
-#: src/frontend.cpp:1296
+#: src/frontend.cpp:1271
+#: src/frontend.cpp:1298
#, fuzzy
msgid "Skirmish/Multiplayer"
msgstr "Flerspiller"
-#: src/frontend.cpp:1275
-#: src/frontend.cpp:1291
+#: src/frontend.cpp:1277
+#: src/frontend.cpp:1293
msgid "GAME OPTIONS"
msgstr "SPIL INDSTILLINGER"
-#: src/frontend.cpp:1436
+#: src/frontend.cpp:1438
#: src/multiint.cpp:2538
msgid "Mod: "
msgstr ""
@@ -15146,12 +15146,12 @@ msgstr "Total anvendt tid: %s"
msgid "You cheated!"
msgstr "Du snød!"
-#: src/scriptfuncs.cpp:9373
+#: src/scriptfuncs.cpp:9378
#, c-format
msgid "Beacon received from %s!"
msgstr ""
-#: src/scriptfuncs.cpp:9410
+#: src/scriptfuncs.cpp:9415
#, c-format
msgid "Beacon %d"
msgstr ""
276 po/de.po
View
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: warzone2100\n"
"Report-Msgid-Bugs-To: warzone2100-project@lists.sourceforge.net\n"