# HG changeset patch # User unc0rr # Date 1368734885 -14400 # Node ID e9d88f2522f4f4ead260eb86151aa8fff3d4fc2a # Parent 15a6ed0bd074832a50721c846df0b07da7ce833d# Parent 9705ac06bab4e3154d19b9d2e24f0f863dbc3edf merge diff -r 15a6ed0bd074 -r e9d88f2522f4 hedgewars/uAmmos.pas --- a/hedgewars/uAmmos.pas Fri May 17 00:07:37 2013 +0400 +++ b/hedgewars/uAmmos.pas Fri May 17 00:08:05 2013 +0400 @@ -278,9 +278,7 @@ PackAmmo(Ammo, Ammoz[AmmoType].Slot); //SwitchNotHeldAmmo(Hedgehog); if CurAmmoType = amKnife then LoadHedgehogHat(Hedgehog, Hedgehog.Hat); - if CurAmmoGear <> nil then - CurAmmoType:= CurAmmoGear^.AmmoType - else CurAmmoType:= amNothing; + CurAmmoType:= amNothing end end end; diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_ar.ts --- a/share/hedgewars/Data/Locale/hedgewars_ar.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_ar.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -255,6 +255,18 @@ <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -354,6 +366,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -473,10 +489,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished"></translation> </message> @@ -492,6 +504,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -536,7 +552,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 انضم</translation> + <translation type="obsolete">%1 *** %2 انضم</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -730,6 +746,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1958,6 +1985,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3059,119 +3090,4 @@ <translation type="unfinished"></translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_bg.ts --- a/share/hedgewars/Data/Locale/hedgewars_bg.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_bg.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -254,6 +254,18 @@ <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -353,6 +365,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -472,10 +488,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished">Зареждане на начертана карта</translation> </message> @@ -491,6 +503,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -535,7 +551,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 се присъедини</translation> + <translation type="obsolete">%1 *** %2 се присъедини</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -729,6 +745,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1973,6 +2000,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3075,119 +3106,4 @@ <translation type="unfinished"></translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_cs.ts --- a/share/hedgewars/Data/Locale/hedgewars_cs.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_cs.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -260,6 +260,18 @@ <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -359,6 +371,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -478,10 +494,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished">Nahrát nakreslenou mapu</translation> </message> @@ -497,6 +509,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -541,7 +557,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 se připojil</translation> + <translation type="obsolete">%1 *** %2 se připojil</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -735,6 +751,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1987,6 +2014,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3090,119 +3121,4 @@ <translation type="unfinished"></translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_da.ts --- a/share/hedgewars/Data/Locale/hedgewars_da.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_da.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> + <source>Send us feedback!</source> <translation type="unfinished"></translation> </message> <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -258,6 +258,18 @@ <source>Failed to save StyleSheet to %1</source> <translation>Mislykkedes at gemme typografiark til %1</translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -357,6 +369,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -476,10 +492,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished">Indlæs tegnet bane</translation> </message> @@ -495,6 +507,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -539,7 +555,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 har tilsluttet sig</translation> + <translation type="obsolete">%1 *** %2 har tilsluttet sig</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -733,6 +749,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1981,6 +2008,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3083,119 +3114,4 @@ <translation>DPad</translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_de.ts --- a/share/hedgewars/Data/Locale/hedgewars_de.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_de.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> + <source>Send us feedback!</source> <translation type="unfinished"></translation> </message> <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -261,6 +261,18 @@ <source>Failed to save StyleSheet to %1</source> <translation>Style-Sheet konnte nich nach %1 gesichert werden</translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -360,6 +372,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -479,10 +495,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished">Gezeichnete Karte laden</translation> </message> @@ -498,6 +510,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -542,7 +558,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 ist beigetreten</translation> + <translation type="obsolete">%1 *** %2 ist beigetreten</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -736,6 +752,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1986,6 +2013,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3116,119 +3147,4 @@ <translation>Steuerkreuz</translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_el.ts --- a/share/hedgewars/Data/Locale/hedgewars_el.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_el.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -254,6 +254,18 @@ <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -355,6 +367,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -474,10 +490,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished"></translation> </message> @@ -493,6 +505,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -537,7 +553,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation type="unfinished">%1 *** %2 εισήλθε</translation> + <translation type="obsolete">%1 *** %2 εισήλθε</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -731,6 +747,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Eraser</source> @@ -1975,6 +2002,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3077,119 +3108,4 @@ <translation type="unfinished">DPad</translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_en.ts --- a/share/hedgewars/Data/Locale/hedgewars_en.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_en.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -254,6 +254,18 @@ <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -353,6 +365,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -472,10 +488,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished"></translation> </message> @@ -491,6 +503,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -535,7 +551,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 has joined</translation> + <translation type="obsolete">%1 *** %2 has joined</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -729,6 +745,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1957,6 +1984,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3059,119 +3090,4 @@ <translation type="unfinished"></translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_es.ts --- a/share/hedgewars/Data/Locale/hedgewars_es.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_es.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> + <source>Send us feedback!</source> <translation type="unfinished"></translation> </message> <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -258,6 +258,18 @@ <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -357,6 +369,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -476,10 +492,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished">Cargar mapa</translation> </message> @@ -495,6 +507,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -539,7 +555,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 ha entrado</translation> + <translation type="obsolete">%1 *** %2 ha entrado</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -733,6 +749,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1977,6 +2004,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3079,119 +3110,4 @@ <translation>DPad</translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_fi.ts --- a/share/hedgewars/Data/Locale/hedgewars_fi.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_fi.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -254,6 +254,18 @@ <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -353,6 +365,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -472,10 +488,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished"></translation> </message> @@ -491,6 +503,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -535,7 +551,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 liittyi</translation> + <translation type="obsolete">%1 *** %2 liittyi</translation> </message> <message> <source>%1 *** %2 has left</source> @@ -729,6 +745,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1973,6 +2000,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3075,119 +3106,4 @@ <translation>Hiiri: Vasen nappi</translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_fr.ts --- a/share/hedgewars/Data/Locale/hedgewars_fr.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_fr.ts Fri May 17 00:08:05 2013 +0400 @@ -100,7 +100,7 @@ </message> <message> <source>Please give us feedback!</source> - <translation>Nous avons besoin de votre avis!</translation> + <translation type="obsolete">Nous avons besoin de votre avis!</translation> </message> <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> @@ -108,11 +108,23 @@ </message> <message> <source>If you found a bug, you can see if it's already known here (english): </source> - <translation>Si vous trouvez un bug, vous pouvez vérifier si il est déjà connu ici (anglais): </translation> + <translation type="obsolete">Si vous trouvez un bug, vous pouvez vérifier si il est déjà connu ici (anglais): </translation> </message> <message> <source>Your email address is optional, but we may want to contact you.</source> - <translation>Votre adresse email est optionelle, mais il est possible que nous essayons de vous contacter.</translation> + <translation type="obsolete">Votre adresse email est optionelle, mais il est possible que nous essayons de vous contacter.</translation> + </message> + <message> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -227,11 +239,11 @@ </message> <message> <source>%1 has been removed from your friends list</source> - <translation>%1 a été retiré de votre liste d'amis</translation> + <translation>%1 a été retiré de votre liste d'amis</translation> </message> <message> <source>%1 has been added to your friends list</source> - <translation>%1 a été ajouté à votre liste d'amis</translation> + <translation>%1 a été ajouté à votre liste d'amis</translation> </message> <message> <source>Stylesheet imported from %1</source> @@ -239,7 +251,7 @@ </message> <message> <source>Enter %1 if you want to use the current StyleSheet in future, enter %2 to reset!</source> - <translation>Entrez %1 si vous voulez utiliser cette Feuille de style (Stylesheet) à l'avenir, entrez %2 pour rétablir l'ancienne apparence!</translation> + <translation>Entrez %1 si vous voulez utiliser cette Feuille de style (Stylesheet) à l'avenir, entrez %2 pour rétablir l'ancienne apparence!</translation> </message> <message> <source>Couldn't read %1</source> @@ -255,14 +267,26 @@ </message> <message> <source>Failed to save StyleSheet to %1</source> - <translation>Impossible d'enregistrer la feuille de style (Stylesheet) dans %1</translation> + <translation>Impossible d'enregistrer la feuille de style (Stylesheet) dans %1</translation> + </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> </message> </context> <context> <name>HWForm</name> <message> <source>Cannot save record to file %1</source> - <translation>Impossible de sauvegarder l'enregistrement dans le fichier %1</translation> + <translation>Impossible de sauvegarder l'enregistrement dans le fichier %1</translation> </message> <message> <source>DefaultTeam</source> @@ -301,7 +325,7 @@ <message> <source>Someone already uses your nickname %1 on the server. Please pick another nickname:</source> - <translation>Quelqu'un utilise déjà le pseudo %1 sur le serveur + <translation>Quelqu'un utilise déjà le pseudo %1 sur le serveur Veuillez choisir un autre pseudo:</translation> </message> <message> @@ -318,9 +342,9 @@ If this nick isn't yours, please register your own nick at www.hedgewars.org Password:</source> - <translation>Ce pseudo est enregistré, vous n'avez spécifié aucun mot de passe. + <translation>Ce pseudo est enregistré, vous n'avez spécifié aucun mot de passe. -Si ce pseudo n'est pas le votre, veuillez enregistrer votre propre pseudo sur www.hedgewars.org +Si ce pseudo n'est pas le votre, veuillez enregistrer votre propre pseudo sur www.hedgewars.org Mot de passe:</translation> </message> @@ -328,9 +352,9 @@ <source>Your nickname is not registered. To prevent someone else from using it, please register it at www.hedgewars.org</source> - <translation>Votre pseudo n'est pas enregistré. -Pour éviter que d'autre joueurs l'utilisent, -veuillez l'enregistrer sur www.hedgewars.org</translation> + <translation>Votre pseudo n'est pas enregistré. +Pour éviter que d'autre joueurs l'utilisent, +veuillez l'enregistrer sur www.hedgewars.org</translation> </message> <message> <source> @@ -338,7 +362,7 @@ Your password wasn't saved either.</source> <translation> -Votre mot de passe non plus n'a pas été sauvegardé.</translation> +Votre mot de passe non plus n'a pas été sauvegardé.</translation> </message> <message> <source>Hedgewars - Empty nickname</source> @@ -358,7 +382,7 @@ </message> <message> <source>Hedgewars - Connection error</source> - <translation >Hedgewars - Erreur de connexion</translation> + <translation>Hedgewars - Erreur de connexion</translation> </message> <message> <source>You reconnected too fast. @@ -366,6 +390,10 @@ <translation>Vous vous êtes reconnecté trop rapidement. Attendez quelques secondes et réessayez.</translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -486,7 +514,7 @@ </message> <message> <source>Theme: </source> - <translation>Theme: </translation> + <translation type="obsolete">Theme: </translation> </message> <message> <source>Load drawn map</source> @@ -504,6 +532,10 @@ <source>Large tunnels</source> <translation>Grands tunnels</translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -548,7 +580,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 vient d'arriver</translation> + <translation type="obsolete">%1 *** %2 vient d'arriver</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -560,7 +592,7 @@ </message> <message> <source>User quit</source> - <translation>S'est déconnecté</translation> + <translation>S'est déconnecté</translation> </message> <message> <source>Remote host has closed connection</source> @@ -568,7 +600,7 @@ </message> <message> <source>The server is too old. Disconnecting now.</source> - <translation>La version du serveur n'est pas à jour. Déconnexion.</translation> + <translation>La version du serveur n'est pas à jour. Déconnexion.</translation> </message> </context> <context> @@ -583,7 +615,7 @@ If you don't have an account on www.hedgewars.org, just enter your nickname.</source> <translation>Pour vous connecter sur le serveur, veuillez entrer vos identifiants. -Si vous n'avez pas de compte sur www.hedgewars.org, +Si vous n'avez pas de compte sur www.hedgewars.org, entrez juste votre pseudo.</translation> </message> <message> @@ -744,6 +776,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -790,7 +833,7 @@ </message> <message> <source>Select an action to choose a custom key bind for this team</source> - <translation>Choisissez une action afin d'y attribuer une touche pour cette équipe</translation> + <translation>Choisissez une action afin d'y attribuer une touche pour cette équipe</translation> </message> <message> <source>Use my default</source> @@ -897,7 +940,7 @@ <name>PageInfo</name> <message> <source>Open the snapshot folder</source> - <translation>Ouvrir le dossier de captures d'écran</translation> + <translation>Ouvrir le dossier de captures d'écran</translation> </message> </context> <context> @@ -1088,7 +1131,7 @@ </message> <message> <source>Select an action to change what key controls it</source> - <translation>Choisissez une action afin d'y attribuer une touche</translation> + <translation>Choisissez une action afin d'y attribuer une touche</translation> </message> <message> <source>Reset to default</source> @@ -1148,7 +1191,7 @@ </message> <message> <source>Frontend audio</source> - <translation>Son de l'interface</translation> + <translation>Son de l'interface</translation> </message> <message> <source>Account</source> @@ -1172,7 +1215,7 @@ </message> <message> <source>Video recording options</source> - <translation>Option d'enregistrement vidéo</translation> + <translation>Option d'enregistrement vidéo</translation> </message> </context> <context> @@ -1194,7 +1237,7 @@ </message> <message> <source>Join</source> - <translation>Rejoindre</translation> + <translation type="obsolete">Rejoindre</translation> </message> <message> <source>Admin features</source> @@ -1249,7 +1292,7 @@ </message> <message> <source>Open server administration page</source> - <translation>Ouvre la page d'administration du serveur</translation> + <translation>Ouvre la page d'administration du serveur</translation> </message> </context> <context> @@ -1398,11 +1441,11 @@ <name>PageSinglePlayer</name> <message> <source>Play a quick game against the computer with random settings</source> - <translation>Jouer une partie rapide contre l'ordinateur avec des règles aléatoires</translation> + <translation>Jouer une partie rapide contre l'ordinateur avec des règles aléatoires</translation> </message> <message> <source>Play a hotseat game against your friends, or AI teams</source> - <translation>Jouer une partie sur cet ordinateur contre vos amis ou l'IA</translation> + <translation>Jouer une partie sur cet ordinateur contre vos amis ou l'IA</translation> </message> <message> <source>Campaign Mode</source> @@ -1528,7 +1571,7 @@ </message> <message> <source>Restrict Unregistered Players Join</source> - <translation>Bloquer l'acces au joueurs non-enregistrés</translation> + <translation>Bloquer l'acces au joueurs non-enregistrés</translation> </message> <message> <source>Show games in lobby</source> @@ -1607,11 +1650,11 @@ </message> <message> <source>Frontend sound effects</source> - <translation>Effet sonores de l'interface</translation> + <translation>Effet sonores de l'interface</translation> </message> <message> <source>Frontend music</source> - <translation>Musique de l'interface</translation> + <translation>Musique de l'interface</translation> </message> </context> <context> @@ -1638,11 +1681,11 @@ </message> <message> <source>In lobby</source> - <translation>En attente</translation> + <translation type="obsolete">En attente</translation> </message> <message> <source>In progress</source> - <translation>En cours</translation> + <translation type="obsolete">En cours</translation> </message> <message> <source>Disabled</source> @@ -1952,7 +1995,7 @@ </message> <message> <source>This development build is 'work in progress' and may not be compatible with other versions of the game, while some features might be broken or incomplete!</source> - <translation>Cette version est "en cours de développement" il est possible qu'elle ne soit pas compatible avec les autres versions du jeu, des parties peuvent ne pas fonctionner ou être incompletes!</translation> + <translation>Cette version est "en cours de développement" il est possible qu'elle ne soit pas compatible avec les autres versions du jeu, des parties peuvent ne pas fonctionner ou être incompletes!</translation> </message> <message> <source>Fullscreen</source> @@ -1990,6 +2033,10 @@ <source>This program is distributed under the %1</source> <translation>Ce programme est distribué par %1</translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -2034,7 +2081,7 @@ <message> <source>Error while authenticating at google.com: </source> - <translation>Erreur lors de l'authentification à google.com: + <translation>Erreur lors de l'authentification à google.com: </translation> </message> <message> @@ -2044,7 +2091,7 @@ <message> <source>Error while sending metadata to youtube.com: </source> - <translation>Erreur lors de l'envoi des metadata à youtube.com: + <translation>Erreur lors de l'envoi des metadata à youtube.com: </translation> </message> <message> @@ -2053,11 +2100,11 @@ </message> <message> <source>Do you really want to delete the team '%1'?</source> - <translation>Voulez-vous vraiment supprimer l'équipe "%1"</translation> + <translation>Voulez-vous vraiment supprimer l'équipe "%1"</translation> </message> <message> <source>Cannot delete default scheme '%1'!</source> - <translation>Impossible de retirer la règle par défaut "%1"</translation> + <translation>Impossible de retirer la règle par défaut "%1"</translation> </message> <message> <source>Please select a record from the list</source> @@ -2077,7 +2124,7 @@ </message> <message> <source>All file associations have been set</source> - <translation>Les associations d'extensions de fichiers ont été effectuées</translation> + <translation>Les associations d'extensions de fichiers ont été effectuées</translation> </message> <message> <source>Cannot create directory %1</source> @@ -2101,11 +2148,11 @@ </message> <message> <source>Please enter room name</source> - <translation>Veuillez saisir le nom d'une room</translation> + <translation>Veuillez saisir le nom d'une room</translation> </message> <message> <source>Record Play - Error</source> - <translation>Jouer l'enregistrement - Erreur</translation> + <translation>Jouer l'enregistrement - Erreur</translation> </message> <message> <source>Please select record from the list</source> @@ -2147,7 +2194,7 @@ </message> <message> <source>Do you really want to delete the game scheme '%1'?</source> - <translation>Etes-vous sûr de vouloir supprimer cette règle : "%1" ?</translation> + <translation>Etes-vous sûr de vouloir supprimer cette règle : "%1" ?</translation> </message> <message> <source>Videos - Are you sure?</source> @@ -2155,7 +2202,7 @@ </message> <message> <source>Do you really want to delete the video '%1'?</source> - <translation>Etes-vous sûr de vouloir supprimer cette vidéo : "%1" ?</translation> + <translation>Etes-vous sûr de vouloir supprimer cette vidéo : "%1" ?</translation> </message> <message numerus="yes"> <source>Do you really want to remove %1 file(s)?</source> @@ -2166,7 +2213,7 @@ </message> <message> <source>Do you really want to cancel uploading %1?</source> - <translation>Voulez-vous arreter l'importation de %1?</translation> + <translation>Voulez-vous arreter l'importation de %1?</translation> </message> <message> <source>File error</source> @@ -2174,7 +2221,7 @@ </message> <message> <source>Cannot open '%1' for writing</source> - <translation>Impossible d'écrire le fichier %1</translation> + <translation>Impossible d'écrire le fichier %1</translation> </message> <message> <source>Cannot open '%1' for reading</source> @@ -2182,7 +2229,7 @@ </message> <message> <source>Cannot use the ammo '%1'!</source> - <translation>Impossible d'utiliser cette arme : "%1"</translation> + <translation>Impossible d'utiliser cette arme : "%1"</translation> </message> <message> <source>Weapons - Warning</source> @@ -2190,11 +2237,11 @@ </message> <message> <source>Cannot overwrite default weapon set '%1'!</source> - <translation>Impossible de remplacer le set d'arme "%1"</translation> + <translation>Impossible de remplacer le set d'arme "%1"</translation> </message> <message> <source>Cannot delete default weapon set '%1'!</source> - <translation>Impossible de supprimer le set d'arme par défaut "%1"</translation> + <translation>Impossible de supprimer le set d'arme par défaut "%1"</translation> </message> <message> <source>Weapons - Are you sure?</source> @@ -2202,7 +2249,7 @@ </message> <message> <source>Do you really want to delete the weapon set '%1'?</source> - <translation>Etes-vous sûr de vouloir supprimer le set d'arme "%1"?</translation> + <translation>Etes-vous sûr de vouloir supprimer le set d'arme "%1"?</translation> </message> <message> <source>Hedgewars - Nick not registered</source> @@ -2303,7 +2350,7 @@ </message> <message> <source>More info</source> - <translation>Plus d'info</translation> + <translation>Plus d'info</translation> </message> <message> <source>Set default options</source> @@ -2323,7 +2370,7 @@ </message> <message> <source>Cancel uploading</source> - <translation>Annuler l'importation</translation> + <translation>Annuler l'importation</translation> </message> <message> <source>Restore default coding parameters</source> @@ -3099,116 +3146,112 @@ <context> <name>server</name> <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> <source>Authentication failed</source> - <translation>Echec d'authentification</translation> + <translation type="obsolete">Echec d'authentification</translation> </message> <message> <source>60 seconds cooldown after kick</source> - <translation>Bannis pour 60 sec après un kick</translation> + <translation type="obsolete">Bannis pour 60 sec après un kick</translation> </message> <message> <source>kicked</source> - <translation>Exclus (kick)</translation> + <translation type="obsolete">Exclus (kick)</translation> </message> <message> <source>Ping timeout</source> - <translation>Met trop de temps à répondre</translation> + <translation type="obsolete">Met trop de temps à répondre</translation> </message> <message> <source>bye</source> - <translation>Aurevoir</translation> + <translation type="obsolete">Aurevoir</translation> </message> <message> <source>Empty config entry</source> - <translation>Configuration vide</translation> + <translation type="obsolete">Configuration vide</translation> </message> <message> <source>Not room master</source> - <translation>Vous n'êtes pas le propriétaire de la room</translation> + <translation type="obsolete">Vous n'êtes pas le propriétaire de la room</translation> </message> <message> <source>Corrupted hedgehogs info</source> - <translation>Info hérisson corrompus</translation> + <translation type="obsolete">Info hérisson corrompus</translation> </message> <message> <source>too many teams</source> - <translation>trop d'équipes</translation> + <translation type="obsolete">trop d'équipes</translation> </message> <message> <source>too many hedgehogs</source> - <translation>trop de hérissons</translation> + <translation type="obsolete">trop de hérissons</translation> </message> <message> <source>There's already a team with same name in the list</source> - <translation>Il y a déja une équipe avec le même nom dans la liste</translation> + <translation type="obsolete">Il y a déja une équipe avec le même nom dans la liste</translation> </message> <message> <source>round in progress</source> - <translation>La partie est en cour</translation> + <translation type="obsolete">La partie est en cour</translation> </message> <message> <source>restricted</source> - <translation>Ajout interdis</translation> + <translation type="obsolete">Ajout interdis</translation> </message> <message> <source>REMOVE_TEAM: no such team</source> - <translation>REMOVE_TEAM: aucune équipe de ce nom</translation> + <translation type="obsolete">REMOVE_TEAM: aucune équipe de ce nom</translation> </message> <message> <source>Not team owner!</source> - <translation>Vous n'êtes pas le propriétaire de cette équipe!</translation> + <translation type="obsolete">Vous n'êtes pas le propriétaire de cette équipe!</translation> </message> <message> <source>Less than two clans!</source> - <translation>Il faut 2 clans minimum!</translation> + <translation type="obsolete">Il faut 2 clans minimum!</translation> </message> <message> <source>Room with such name already exists</source> - <translation>Ce nom de room existe déjà</translation> + <translation type="obsolete">Ce nom de room existe déjà</translation> </message> <message> <source>Illegal room name</source> - <translation>Nom de room invalide</translation> + <translation type="obsolete">Nom de room invalide</translation> </message> <message> <source>No such room</source> - <translation>Cette room n'existe pas</translation> + <translation type="obsolete">Cette room n'existe pas</translation> </message> <message> <source>Joining restricted</source> - <translation>Accès interdis</translation> + <translation type="obsolete">Accès interdis</translation> </message> <message> <source>Registered users only</source> - <translation>Accès réservé aux utilisateurs enregistré</translation> + <translation type="obsolete">Accès réservé aux utilisateurs enregistré</translation> </message> <message> <source>You are banned in this room</source> - <translation>Vous avez été bannis de cette room</translation> + <translation type="obsolete">Vous avez été bannis de cette room</translation> </message> <message> <source>Nickname already chosen</source> - <translation>Pseudo déjà choisis</translation> + <translation type="obsolete">Pseudo déjà choisis</translation> </message> <message> <source>Illegal nickname</source> - <translation>Pseudo invalide</translation> + <translation type="obsolete">Pseudo invalide</translation> </message> <message> <source>Protocol already known</source> - <translation>Protocole déjà connu</translation> + <translation type="obsolete">Protocole déjà connu</translation> </message> <message> <source>Bad number</source> - <translation>Mauvais numéro</translation> + <translation type="obsolete">Mauvais numéro</translation> </message> <message> <source>Nickname is already in use</source> - <translation>Ce pseudo est actuellement utilisé sur le serveur</translation> + <translation type="obsolete">Ce pseudo est actuellement utilisé sur le serveur</translation> </message> </context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_gl.ts --- a/share/hedgewars/Data/Locale/hedgewars_gl.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_gl.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -254,6 +254,18 @@ <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -353,6 +365,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -472,10 +488,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished"></translation> </message> @@ -491,6 +503,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -535,7 +551,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 uniuse</translation> + <translation type="obsolete">%1 *** %2 uniuse</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -729,6 +745,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Eraser</source> @@ -1961,6 +1988,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3062,119 +3093,4 @@ <translation>Mando</translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_hu.ts --- a/share/hedgewars/Data/Locale/hedgewars_hu.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_hu.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -248,6 +248,18 @@ <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -347,6 +359,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -466,10 +482,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished"></translation> </message> @@ -485,6 +497,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -529,7 +545,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 csatlakozott</translation> + <translation type="obsolete">%1 *** %2 csatlakozott</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -723,6 +739,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1947,6 +1974,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3047,119 +3078,4 @@ <translation>DPad</translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_it.ts --- a/share/hedgewars/Data/Locale/hedgewars_it.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_it.ts Fri May 17 00:08:05 2013 +0400 @@ -100,7 +100,7 @@ </message> <message> <source>Please give us feedback!</source> - <translation>Per favore, inviaci un commento!</translation> + <translation type="obsolete">Per favore, inviaci un commento!</translation> </message> <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> @@ -108,11 +108,23 @@ </message> <message> <source>If you found a bug, you can see if it's already known here (english): </source> - <translation>Se torvi u nbaco, puoi vedere se è già conosciuto qui (in inglese): </translation> + <translation type="obsolete">Se torvi u nbaco, puoi vedere se è già conosciuto qui (in inglese): </translation> </message> <message> <source>Your email address is optional, but we may want to contact you.</source> - <translation>Il tuo indirizzo di posta elettronica è opzionale, ma potremmo volerti contattare.</translation> + <translation type="obsolete">Il tuo indirizzo di posta elettronica è opzionale, ma potremmo volerti contattare.</translation> + </message> + <message> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -261,6 +273,18 @@ <source>Failed to save StyleSheet to %1</source> <translation>Impossibile salvare la StyleSheet in %1! Errore interno!</translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -370,6 +394,10 @@ <translation>Ti sei ricollegato troppo velocemente. Per favore aspetta qualche secondo e prova di nuovo.</translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -490,7 +518,7 @@ </message> <message> <source>Theme: </source> - <translation>Tema: </translation> + <translation type="obsolete">Tema: </translation> </message> <message> <source>Load drawn map</source> @@ -508,6 +536,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -552,7 +584,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 è entrato</translation> + <translation type="obsolete">%1 *** %2 è entrato</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -749,6 +781,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -2001,6 +2044,10 @@ <source>This program is distributed under the %1</source> <translation>Questo programma è distribuito secondo i termini di %1</translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3139,115 +3186,111 @@ <name>server</name> <message> <source>Not room master</source> - <translation type="unfinished">Non proprietario della stanza</translation> + <translation type="obsolete">Non proprietario della stanza</translation> </message> <message> <source>Corrupted hedgehogs info</source> - <translation type="unfinished">Informazioni ricci corrotte</translation> + <translation type="obsolete">Informazioni ricci corrotte</translation> </message> <message> <source>too many teams</source> - <translation type="unfinished">troppe squadre</translation> + <translation type="obsolete">troppe squadre</translation> </message> <message> <source>too many hedgehogs</source> - <translation type="unfinished">troppi ricci</translation> + <translation type="obsolete">troppi ricci</translation> </message> <message> <source>There's already a team with same name in the list</source> - <translation type="unfinished">C'è già una quadra collo stesso nome in lista</translation> + <translation type="obsolete">C'è già una quadra collo stesso nome in lista</translation> </message> <message> <source>round in progress</source> - <translation type="unfinished">turno in corso</translation> + <translation type="obsolete">turno in corso</translation> </message> <message> <source>restricted</source> - <translation type="unfinished">proibito</translation> + <translation type="obsolete">proibito</translation> </message> <message> <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished">CANCELLA_SQUADRA: squadra non presente</translation> + <translation type="obsolete">CANCELLA_SQUADRA: squadra non presente</translation> </message> <message> <source>Not team owner!</source> - <translation type="unfinished">Non proprietario della squadra!</translation> + <translation type="obsolete">Non proprietario della squadra!</translation> </message> <message> <source>Less than two clans!</source> - <translation type="unfinished">Meno di due clan!</translation> + <translation type="obsolete">Meno di due clan!</translation> </message> <message> <source>Room with such name already exists</source> - <translation type="unfinished">Esiste già una stanza con questo nome</translation> + <translation type="obsolete">Esiste già una stanza con questo nome</translation> </message> <message> <source>Nickname already chosen</source> - <translation type="unfinished">Nome già scelto</translation> + <translation type="obsolete">Nome già scelto</translation> </message> <message> <source>Illegal nickname</source> - <translation type="unfinished">Nome non valido</translation> + <translation type="obsolete">Nome non valido</translation> </message> <message> <source>Protocol already known</source> - <translation type="unfinished">Protocollo già conosciuto</translation> + <translation type="obsolete">Protocollo già conosciuto</translation> </message> <message> <source>Bad number</source> - <translation type="unfinished">Numero non valido</translation> + <translation type="obsolete">Numero non valido</translation> </message> <message> <source>Nickname is already in use</source> - <translation type="unfinished">Nome già in uso</translation> + <translation type="obsolete">Nome già in uso</translation> </message> <message> <source>Authentication failed</source> - <translation type="unfinished">Autenticazione fallita</translation> + <translation type="obsolete">Autenticazione fallita</translation> </message> <message> <source>60 seconds cooldown after kick</source> - <translation type="unfinished">60 secondi di raffreddamento prima dell'espulsione</translation> + <translation type="obsolete">60 secondi di raffreddamento prima dell'espulsione</translation> </message> <message> <source>kicked</source> - <translation type="unfinished">espulso</translation> + <translation type="obsolete">espulso</translation> </message> <message> <source>Ping timeout</source> - <translation type="unfinished">Scadenza ping</translation> + <translation type="obsolete">Scadenza ping</translation> </message> <message> <source>bye</source> - <translation type="unfinished">ciao</translation> + <translation type="obsolete">ciao</translation> </message> <message> <source>Illegal room name</source> - <translation type="unfinished">Nome stanza non valido</translation> + <translation type="obsolete">Nome stanza non valido</translation> </message> <message> <source>No such room</source> - <translation type="unfinished">Stanza non esistente</translation> + <translation type="obsolete">Stanza non esistente</translation> </message> <message> <source>Joining restricted</source> - <translation type="unfinished">Ingresso riservato</translation> + <translation type="obsolete">Ingresso riservato</translation> </message> <message> <source>Registered users only</source> - <translation type="unfinished">Solo utenti registrati</translation> + <translation type="obsolete">Solo utenti registrati</translation> </message> <message> <source>You are banned in this room</source> - <translation type="unfinished">Sei stato espulso dalla stanza</translation> + <translation type="obsolete">Sei stato espulso dalla stanza</translation> </message> <message> <source>Empty config entry</source> - <translation type="unfinished">Configurazione vuota</translation> - </message> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> + <translation type="obsolete">Configurazione vuota</translation> </message> </context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_ja.ts --- a/share/hedgewars/Data/Locale/hedgewars_ja.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_ja.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -248,6 +248,18 @@ <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -347,6 +359,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -466,10 +482,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished"></translation> </message> @@ -485,6 +497,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -529,7 +545,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 さんは参加</translation> + <translation type="obsolete">%1 *** %2 さんは参加</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -723,6 +739,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1943,6 +1970,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3043,119 +3074,4 @@ <translation type="unfinished"></translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_ko.ts --- a/share/hedgewars/Data/Locale/hedgewars_ko.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_ko.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -248,6 +248,18 @@ <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -347,6 +359,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -466,10 +482,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished"></translation> </message> @@ -485,6 +497,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -528,10 +544,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>%1 *** %2 has joined</source> - <translation type="unfinished"></translation> - </message> - <message> <source>%1 *** %2 has left (%3)</source> <translation type="unfinished"></translation> </message> @@ -723,6 +735,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1919,6 +1942,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3011,119 +3038,4 @@ <translation type="unfinished"></translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_lt.ts --- a/share/hedgewars/Data/Locale/hedgewars_lt.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_lt.ts Fri May 17 00:08:05 2013 +0400 @@ -97,7 +97,7 @@ <context> <name>DataManager</name> <message> - <location filename="../../../../QTfrontend/util/DataManager.cpp" line="149"/> + <location filename="../../../../QTfrontend/util/DataManager.cpp" line="151"/> <source>Use Default</source> <translation type="unfinished"></translation> </message> @@ -105,37 +105,37 @@ <context> <name>FeedbackDialog</name> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="87"/> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="88"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="91"/> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="89"/> - <source>If you found a bug, you can see if it's already known here (english): </source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="90"/> - <source>Your email address is optional, but we may want to contact you.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="121"/> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="92"/> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="93"/> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="124"/> <source>View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="147"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="150"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="175"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="178"/> <source>Send Feedback</source> <translation type="unfinished"></translation> </message> @@ -267,52 +267,67 @@ <context> <name>HWChatWidget</name> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="641"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="502"/> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="523"/> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="525"/> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="652"/> <source>%1 has been removed from your ignore list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="651"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="662"/> <source>%1 has been added to your ignore list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="681"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="692"/> <source>%1 has been removed from your friends list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="690"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="701"/> <source>%1 has been added to your friends list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="756"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="767"/> <source>Stylesheet imported from %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="757"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="768"/> <source>Enter %1 if you want to use the current StyleSheet in future, enter %2 to reset!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="765"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="776"/> <source>Couldn't read %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="773"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="784"/> <source>StyleSheet discarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="797"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="808"/> <source>StyleSheet saved to %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="800"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="811"/> <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> @@ -320,44 +335,44 @@ <context> <name>HWForm</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="478"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="480"/> <source>DefaultTeam</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="632"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="638"/> <source>Game aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1102"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1123"/> <source>Nickname</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1107"/> - <location filename="../../../../QTfrontend/hwform.cpp" line="1400"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1128"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1437"/> <source>No nickname supplied.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1102"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1123"/> <source>Someone already uses your nickname %1 on the server. Please pick another nickname:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="482"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="484"/> <source>%1's Team</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1056"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1077"/> <source>Hedgewars - Nick registered</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1057"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1078"/> <source>This nick is registered, and you haven't specified a password. If this nick isn't yours, please register your own nick at www.hedgewars.org @@ -366,90 +381,95 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1085"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1106"/> <source>Your nickname is not registered. To prevent someone else from using it, please register it at www.hedgewars.org</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1090"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1111"/> <source> Your password wasn't saved either.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1107"/> - <location filename="../../../../QTfrontend/hwform.cpp" line="1400"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1128"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1437"/> <source>Hedgewars - Empty nickname</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1133"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1154"/> <source>Hedgewars - Wrong password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1133"/> - <source>You entered a wrong password.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/hwform.cpp" line="1154"/> + <source>You entered a wrong password.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/hwform.cpp" line="1175"/> <source>Try Again</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1515"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1541"/> <source>Hedgewars - Connection error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1515"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1541"/> <source>You reconnected too fast. Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1672"/> - <location filename="../../../../QTfrontend/hwform.cpp" line="1993"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1698"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="2017"/> <source>Cannot save record to file %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1923"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1947"/> <source>Hedgewars Demo File</source> <comment>File Types</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1924"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1948"/> <source>Hedgewars Save File</source> <comment>File Types</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1985"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="2009"/> <source>Demo name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1985"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="2009"/> <source>Demo name:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../../../../QTfrontend/hwform.cpp" line="2077"/> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> <message> - <location filename="../../../../QTfrontend/game.cpp" line="374"/> + <location filename="../../../../QTfrontend/game.cpp" line="386"/> <location filename="../../../../QTfrontend/net/recorder.cpp" line="112"/> <source>en.txt</source> <translation>lt.txt</translation> </message> <message> - <location filename="../../../../QTfrontend/game.cpp" line="415"/> + <location filename="../../../../QTfrontend/game.cpp" line="427"/> <source>Cannot open demofile %1</source> <translation type="unfinished"></translation> </message> @@ -457,158 +477,158 @@ <context> <name>HWMapContainer</name> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="93"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="94"/> <source>Map type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="96"/> - <source>Image map</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="97"/> - <source>Mission map</source> + <source>Image map</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="98"/> - <source>Hand-drawn</source> + <source>Mission map</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="99"/> - <source>Randomly generated</source> + <source>Hand-drawn</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="100"/> + <source>Randomly generated</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="101"/> <source>Random maze</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="110"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="111"/> <source>Random</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="133"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="135"/> <source>Map preview:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="185"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="188"/> <source>Load map drawing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="191"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="194"/> <source>Edit map drawing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="204"/> - <source>All</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="205"/> - <source>Small</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="206"/> - <source>Medium</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="207"/> - <source>Large</source> + <source>All</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="208"/> - <source>Cavern</source> + <source>Small</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="209"/> + <source>Medium</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="210"/> + <source>Large</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="211"/> + <source>Cavern</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="212"/> <source>Wacky</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="219"/> - <source>Large tunnels</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="220"/> - <source>Small islands</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="221"/> - <source>Medium islands</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="222"/> + <source>Large tunnels</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="223"/> + <source>Small islands</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="224"/> + <source>Medium islands</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="225"/> <source>Large islands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="705"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="710"/> <source>Map size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="712"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="717"/> <source>Maze style:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="725"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="730"/> <source>Mission:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="735"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="740"/> <source>Map:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="799"/> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="930"/> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="881"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="804"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="935"/> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="886"/> <source>Load drawn map</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="881"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="886"/> <source>Drawn Maps</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="881"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="886"/> <source>All files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="217"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="220"/> <source>Small tunnels</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="218"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="221"/> <source>Medium tunnels</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="124"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="126"/> <source>Seed</source> <translation type="unfinished"></translation> </message> @@ -659,40 +679,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="697"/> + <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="707"/> <source>Room destroyed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="470"/> + <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="484"/> <source>You got kicked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="641"/> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="773"/> + <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="651"/> + <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="782"/> <source>%1 *** %2 has joined the room</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="495"/> - <source>%1 *** %2 has joined</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="544"/> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="788"/> + <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="797"/> <source>%1 *** %2 has left</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="546"/> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="790"/> + <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="799"/> <source>%1 *** %2 has left (%3)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1535"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1561"/> <source>Quit reason: </source> <translation type="unfinished"></translation> </message> @@ -902,6 +915,19 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <location filename="../../../../QTfrontend/ui/page/pagedata.cpp" line="66"/> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pagedata.cpp" line="126"/> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <location filename="../../../../QTfrontend/ui/page/pagedrawmap.cpp" line="32"/> @@ -1022,12 +1048,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="174"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="182"/> <source>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="182"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="190"/> <source>The best killer is <b>%1</b> with <b>%2</b> kills in a turn.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1036,7 +1062,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="189"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="197"/> <source>A total of <b>%1</b> hedgehog(s) were killed during this round.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1045,7 +1071,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="253"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="261"/> <source>(%1 kill)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1054,7 +1080,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="264"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="272"/> <source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1063,7 +1089,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="272"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="280"/> <source><b>%1</b> killed <b>%2</b> of his own hedgehogs.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1072,7 +1098,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="280"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="288"/> <source><b>%1</b> was scared and skipped turn <b>%2</b> times.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1173,12 +1199,12 @@ <context> <name>PageMultiplayer</name> <message> - <location filename="../../../../QTfrontend/ui/page/pagemultiplayer.cpp" line="52"/> + <location filename="../../../../QTfrontend/ui/page/pagemultiplayer.cpp" line="50"/> <source>Edit game preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pagemultiplayer.cpp" line="64"/> + <location filename="../../../../QTfrontend/ui/page/pagemultiplayer.cpp" line="62"/> <source>Start</source> <translation type="unfinished"></translation> </message> @@ -1338,97 +1364,97 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="369"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="371"/> <source>Frontend</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="386"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="388"/> <source>Custom colors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="416"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="418"/> <source>Reset to default colors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="429"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="431"/> <source>Game audio</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="467"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="469"/> <source>Frontend audio</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="490"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="492"/> <source>Account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="516"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="518"/> <source>Proxy settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="522"/> - <source>Proxy host</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="523"/> - <source>Proxy port</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="524"/> - <source>Proxy login</source> + <source>Proxy host</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="525"/> + <source>Proxy port</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="526"/> + <source>Proxy login</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="527"/> <source>Proxy password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="538"/> - <source>No proxy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="539"/> - <source>System proxy settings</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="540"/> - <source>Socks5 proxy</source> + <source>No proxy</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="541"/> + <source>System proxy settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="542"/> + <source>Socks5 proxy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="543"/> <source>HTTP proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="576"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="578"/> <source>Miscellaneous</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="616"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="623"/> <source>Updates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="629"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="636"/> <source>Check for updates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="643"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="650"/> <source>Video recording options</source> <translation type="unfinished"></translation> </message> @@ -1808,23 +1834,23 @@ </message> <message> <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="269"/> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="874"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="885"/> <source>Ignore</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="273"/> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="886"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="897"/> <source>Add friend</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="869"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="880"/> <source>Unignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="881"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="892"/> <source>Remove friend</source> <translation type="unfinished"></translation> </message> @@ -1857,75 +1883,75 @@ <context> <name>QCheckBox</name> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="364"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="366"/> <source>Show ammo menu tooltips</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="358"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="360"/> <source>Alternative damage show</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="381"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="383"/> <source>Visual effects</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="454"/> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="471"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="456"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="473"/> <source>Sound</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="455"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="457"/> <source>In-game sound effects</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="461"/> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="476"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="463"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="478"/> <source>Music</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="462"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="464"/> <source>In-game music</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="472"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="474"/> <source>Frontend sound effects</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="477"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="479"/> <source>Frontend music</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="602"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="609"/> <source>Append date and time to record file name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="622"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="629"/> <source>Check for updates at startup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="375"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="377"/> <source>Fullscreen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="347"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="349"/> <source>Show FPS</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/dialog/input_password.cpp" line="55"/> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="507"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="509"/> <source>Save password</source> <translation type="unfinished"></translation> </message> @@ -1940,12 +1966,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="683"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="690"/> <source>Record audio</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="732"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="739"/> <source>Use game resolution</source> <translation type="unfinished"></translation> </message> @@ -1968,82 +1994,82 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="588"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="590"/> <source>(System default)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="311"/> - <source>Disabled</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="312"/> - <source>Red/Cyan</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="313"/> - <source>Cyan/Red</source> + <source>Disabled</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="314"/> - <source>Red/Blue</source> + <source>Red/Cyan</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="315"/> - <source>Blue/Red</source> + <source>Cyan/Red</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="316"/> - <source>Red/Green</source> + <source>Red/Blue</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="317"/> - <source>Green/Red</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="324"/> - <source>Side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="325"/> - <source>Top-Bottom</source> + <source>Blue/Red</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="318"/> - <source>Red/Cyan grayscale</source> + <source>Red/Green</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="319"/> - <source>Cyan/Red grayscale</source> + <source>Green/Red</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="326"/> + <source>Side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="327"/> + <source>Top-Bottom</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="320"/> - <source>Red/Blue grayscale</source> + <source>Red/Cyan grayscale</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="321"/> - <source>Blue/Red grayscale</source> + <source>Cyan/Red grayscale</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="322"/> - <source>Red/Green grayscale</source> + <source>Red/Blue grayscale</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="323"/> + <source>Blue/Red grayscale</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="324"/> + <source>Red/Green grayscale</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="325"/> <source>Green/Red grayscale</source> <translation type="unfinished"></translation> </message> @@ -2087,7 +2113,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/teamselect.cpp" line="255"/> + <location filename="../../../../QTfrontend/ui/widget/teamselect.cpp" line="259"/> <source>Playing teams</source> <translation type="unfinished"></translation> </message> @@ -2185,22 +2211,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="582"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="584"/> <source>Locale</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="496"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="498"/> <source>Nickname</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="708"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="598"/> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="715"/> <source>Resolution</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="293"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="295"/> <source>Quality</source> <translation type="unfinished"></translation> </message> @@ -2220,17 +2251,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="307"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="309"/> <source>Stereo rendering</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="437"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="439"/> <source>Initial sound volume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="338"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="340"/> <source>FPS limit</source> <translation type="unfinished"></translation> </message> @@ -2352,52 +2383,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="100"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="103"/> <source>Your Email</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="108"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="111"/> <source>Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="118"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="121"/> <source>Send system information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="133"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="136"/> <source>Description</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="161"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="164"/> <source>Type the security code:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="652"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="659"/> <source>Format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="672"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="679"/> <source>Audio codec</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="697"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="704"/> <source>Video codec</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="738"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="745"/> <source>Framerate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="752"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="759"/> <source>Bitrate (Kbps)</source> <translation type="unfinished"></translation> </message> @@ -2405,7 +2436,7 @@ <context> <name>QLineEdit</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="933"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="954"/> <source>unnamed</source> <translation type="unfinished"></translation> </message> @@ -2416,7 +2447,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="501"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="503"/> <source>anonymous</source> <translation type="unfinished"></translation> </message> @@ -2447,82 +2478,82 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="962"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="983"/> <location filename="../../../../QTfrontend/ui/page/pagescheme.cpp" line="500"/> <source>Cannot delete default scheme '%1'!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="988"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1009"/> <source>Please select a record from the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1083"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1104"/> <source>Hedgewars - Nick not registered</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1474"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1500"/> <source>Unable to start server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1535"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1561"/> <source>Connection to server is lost</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="2021"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="2084"/> <source>Not all players are ready</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="2022"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="2085"/> <source>Are you sure you want to start this game? Not all players are ready.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="347"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="352"/> <location filename="../../../../QTfrontend/util/MessageDialog.cpp" line="24"/> <source>Hedgewars - Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="357"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="362"/> <source>System Information Preview</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="372"/> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="383"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="377"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="388"/> <source>Failed to generate captcha</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="400"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="405"/> <source>Failed to download captcha</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="464"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="469"/> <source>Please fill out all fields. Email is optional.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1963"/> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="434"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1987"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="439"/> <source>Hedgewars - Success</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1964"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1988"/> <source>All file associations have been set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1969"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1993"/> <source>File association failed.</source> <translation type="unfinished"></translation> </message> @@ -2664,7 +2695,7 @@ <message> <location filename="../../../../QTfrontend/ui/widget/drawmapwidget.cpp" line="101"/> <location filename="../../../../QTfrontend/ui/widget/drawmapwidget.cpp" line="121"/> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="891"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="896"/> <source>File error</source> <translation type="unfinished"></translation> </message> @@ -2675,7 +2706,7 @@ </message> <message> <location filename="../../../../QTfrontend/ui/widget/drawmapwidget.cpp" line="122"/> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="892"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="897"/> <source>Cannot open '%1' for reading</source> <translation type="unfinished"></translation> </message> @@ -2791,7 +2822,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="608"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="615"/> <source>Associate file extensions</source> <translation type="unfinished"></translation> </message> @@ -2824,12 +2855,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="765"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="772"/> <source>Set default options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="766"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="773"/> <source>Restore default coding parameters</source> <translation type="unfinished"></translation> </message> @@ -3027,7 +3058,7 @@ <context> <name>TeamSelWidget</name> <message> - <location filename="../../../../QTfrontend/ui/widget/teamselect.cpp" line="260"/> + <location filename="../../../../QTfrontend/ui/widget/teamselect.cpp" line="264"/> <source>At least two teams are required to play!</source> <translation type="unfinished"></translation> </message> @@ -3426,7 +3457,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/util/DataManager.cpp" line="156"/> + <location filename="../../../../QTfrontend/util/DataManager.cpp" line="158"/> <source>Keyboard</source> <translation type="unfinished"></translation> </message> @@ -3786,147 +3817,4 @@ <translation type="unfinished"></translation> </message> </context> -<context> - <name>server</name> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="2"/> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="3"/> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="4"/> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="5"/> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="6"/> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="7"/> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="8"/> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="9"/> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="10"/> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="11"/> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="12"/> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="13"/> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="14"/> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="15"/> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="16"/> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="17"/> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="18"/> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="19"/> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="20"/> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="21"/> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="22"/> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="23"/> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="24"/> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="25"/> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="26"/> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="27"/> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="28"/> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="29"/> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_ms.ts --- a/share/hedgewars/Data/Locale/hedgewars_ms.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_ms.ts Fri May 17 00:08:05 2013 +0400 @@ -97,7 +97,7 @@ <context> <name>DataManager</name> <message> - <location filename="../../../../QTfrontend/util/DataManager.cpp" line="149"/> + <location filename="../../../../QTfrontend/util/DataManager.cpp" line="151"/> <source>Use Default</source> <translation type="unfinished"></translation> </message> @@ -105,37 +105,37 @@ <context> <name>FeedbackDialog</name> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="87"/> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="88"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="91"/> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="89"/> - <source>If you found a bug, you can see if it's already known here (english): </source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="90"/> - <source>Your email address is optional, but we may want to contact you.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="121"/> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="92"/> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="93"/> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="124"/> <source>View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="147"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="150"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="175"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="178"/> <source>Send Feedback</source> <translation type="unfinished"></translation> </message> @@ -255,52 +255,67 @@ <context> <name>HWChatWidget</name> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="641"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="502"/> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="523"/> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="525"/> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="652"/> <source>%1 has been removed from your ignore list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="651"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="662"/> <source>%1 has been added to your ignore list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="681"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="692"/> <source>%1 has been removed from your friends list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="690"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="701"/> <source>%1 has been added to your friends list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="756"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="767"/> <source>Stylesheet imported from %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="757"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="768"/> <source>Enter %1 if you want to use the current StyleSheet in future, enter %2 to reset!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="765"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="776"/> <source>Couldn't read %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="773"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="784"/> <source>StyleSheet discarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="797"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="808"/> <source>StyleSheet saved to %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="800"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="811"/> <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> @@ -308,27 +323,27 @@ <context> <name>HWForm</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="478"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="480"/> <source>DefaultTeam</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="482"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="484"/> <source>%1's Team</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="632"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="638"/> <source>Game aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1056"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1077"/> <source>Hedgewars - Nick registered</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1057"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1078"/> <source>This nick is registered, and you haven't specified a password. If this nick isn't yours, please register your own nick at www.hedgewars.org @@ -337,107 +352,112 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1085"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1106"/> <source>Your nickname is not registered. To prevent someone else from using it, please register it at www.hedgewars.org</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1090"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1111"/> <source> Your password wasn't saved either.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1102"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1123"/> <source>Nickname</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1102"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1123"/> <source>Someone already uses your nickname %1 on the server. Please pick another nickname:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1107"/> - <location filename="../../../../QTfrontend/hwform.cpp" line="1400"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1128"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1437"/> <source>No nickname supplied.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1107"/> - <location filename="../../../../QTfrontend/hwform.cpp" line="1400"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1128"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1437"/> <source>Hedgewars - Empty nickname</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1133"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1154"/> <source>Hedgewars - Wrong password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1133"/> - <source>You entered a wrong password.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/hwform.cpp" line="1154"/> + <source>You entered a wrong password.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/hwform.cpp" line="1175"/> <source>Try Again</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1515"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1541"/> <source>Hedgewars - Connection error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1515"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1541"/> <source>You reconnected too fast. Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1672"/> - <location filename="../../../../QTfrontend/hwform.cpp" line="1993"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1698"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="2017"/> <source>Cannot save record to file %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1923"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1947"/> <source>Hedgewars Demo File</source> <comment>File Types</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1924"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1948"/> <source>Hedgewars Save File</source> <comment>File Types</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1985"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="2009"/> <source>Demo name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1985"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="2009"/> <source>Demo name:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../../../../QTfrontend/hwform.cpp" line="2077"/> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> <message> - <location filename="../../../../QTfrontend/game.cpp" line="374"/> + <location filename="../../../../QTfrontend/game.cpp" line="386"/> <location filename="../../../../QTfrontend/net/recorder.cpp" line="112"/> <source>en.txt</source> <translation>ms.txt</translation> </message> <message> - <location filename="../../../../QTfrontend/game.cpp" line="415"/> + <location filename="../../../../QTfrontend/game.cpp" line="427"/> <source>Cannot open demofile %1</source> <translation type="unfinished"></translation> </message> @@ -445,158 +465,158 @@ <context> <name>HWMapContainer</name> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="93"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="94"/> <source>Map type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="96"/> - <source>Image map</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="97"/> - <source>Mission map</source> + <source>Image map</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="98"/> - <source>Hand-drawn</source> + <source>Mission map</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="99"/> - <source>Randomly generated</source> + <source>Hand-drawn</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="100"/> + <source>Randomly generated</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="101"/> <source>Random maze</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="110"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="111"/> <source>Random</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="133"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="135"/> <source>Map preview:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="185"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="188"/> <source>Load map drawing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="191"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="194"/> <source>Edit map drawing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="204"/> - <source>All</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="205"/> - <source>Small</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="206"/> - <source>Medium</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="207"/> - <source>Large</source> + <source>All</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="208"/> - <source>Cavern</source> + <source>Small</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="209"/> + <source>Medium</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="210"/> + <source>Large</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="211"/> + <source>Cavern</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="212"/> <source>Wacky</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="219"/> - <source>Large tunnels</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="220"/> - <source>Small islands</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="221"/> - <source>Medium islands</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="222"/> + <source>Large tunnels</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="223"/> + <source>Small islands</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="224"/> + <source>Medium islands</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="225"/> <source>Large islands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="705"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="710"/> <source>Map size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="712"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="717"/> <source>Maze style:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="725"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="730"/> <source>Mission:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="735"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="740"/> <source>Map:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="799"/> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="930"/> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="881"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="804"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="935"/> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="886"/> <source>Load drawn map</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="881"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="886"/> <source>Drawn Maps</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="881"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="886"/> <source>All files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="217"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="220"/> <source>Small tunnels</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="218"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="221"/> <source>Medium tunnels</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="124"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="126"/> <source>Seed</source> <translation type="unfinished"></translation> </message> @@ -622,7 +642,7 @@ <context> <name>HWNewNet</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1535"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1561"/> <source>Quit reason: </source> <translation type="unfinished"></translation> </message> @@ -652,35 +672,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="470"/> + <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="484"/> <source>You got kicked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="495"/> - <source>%1 *** %2 has joined</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="544"/> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="788"/> + <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="797"/> <source>%1 *** %2 has left</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="546"/> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="790"/> + <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="799"/> <source>%1 *** %2 has left (%3)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="641"/> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="773"/> + <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="651"/> + <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="782"/> <source>%1 *** %2 has joined the room</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="697"/> + <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="707"/> <source>Room destroyed</source> <translation type="unfinished"></translation> </message> @@ -890,6 +903,19 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <location filename="../../../../QTfrontend/ui/page/pagedata.cpp" line="66"/> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pagedata.cpp" line="126"/> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <location filename="../../../../QTfrontend/ui/page/pagedrawmap.cpp" line="32"/> @@ -1010,47 +1036,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="174"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="182"/> <source>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="182"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="190"/> <source>The best killer is <b>%1</b> with <b>%2</b> kills in a turn.</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="189"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="197"/> <source>A total of <b>%1</b> hedgehog(s) were killed during this round.</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="253"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="261"/> <source>(%1 kill)</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="264"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="272"/> <source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="272"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="280"/> <source><b>%1</b> killed <b>%2</b> of his own hedgehogs.</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="280"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="288"/> <source><b>%1</b> was scared and skipped turn <b>%2</b> times.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1149,12 +1175,12 @@ <context> <name>PageMultiplayer</name> <message> - <location filename="../../../../QTfrontend/ui/page/pagemultiplayer.cpp" line="52"/> + <location filename="../../../../QTfrontend/ui/page/pagemultiplayer.cpp" line="50"/> <source>Edit game preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pagemultiplayer.cpp" line="64"/> + <location filename="../../../../QTfrontend/ui/page/pagemultiplayer.cpp" line="62"/> <source>Start</source> <translation type="unfinished"></translation> </message> @@ -1314,97 +1340,97 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="369"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="371"/> <source>Frontend</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="386"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="388"/> <source>Custom colors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="416"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="418"/> <source>Reset to default colors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="429"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="431"/> <source>Game audio</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="467"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="469"/> <source>Frontend audio</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="490"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="492"/> <source>Account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="516"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="518"/> <source>Proxy settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="522"/> - <source>Proxy host</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="523"/> - <source>Proxy port</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="524"/> - <source>Proxy login</source> + <source>Proxy host</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="525"/> + <source>Proxy port</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="526"/> + <source>Proxy login</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="527"/> <source>Proxy password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="538"/> - <source>No proxy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="539"/> - <source>System proxy settings</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="540"/> - <source>Socks5 proxy</source> + <source>No proxy</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="541"/> + <source>System proxy settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="542"/> + <source>Socks5 proxy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="543"/> <source>HTTP proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="576"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="578"/> <source>Miscellaneous</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="616"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="623"/> <source>Updates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="629"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="636"/> <source>Check for updates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="643"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="650"/> <source>Video recording options</source> <translation type="unfinished"></translation> </message> @@ -1795,23 +1821,23 @@ </message> <message> <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="269"/> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="874"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="885"/> <source>Ignore</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="273"/> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="886"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="897"/> <source>Add friend</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="869"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="880"/> <source>Unignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="881"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="892"/> <source>Remove friend</source> <translation type="unfinished"></translation> </message> @@ -1830,7 +1856,7 @@ <name>QCheckBox</name> <message> <location filename="../../../../QTfrontend/ui/dialog/input_password.cpp" line="55"/> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="507"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="509"/> <source>Save password</source> <translation type="unfinished"></translation> </message> @@ -1845,79 +1871,79 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="622"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="629"/> <source>Check for updates at startup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="375"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="377"/> <source>Fullscreen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="358"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="360"/> <source>Alternative damage show</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="347"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="349"/> <source>Show FPS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="364"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="366"/> <source>Show ammo menu tooltips</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="381"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="383"/> <source>Visual effects</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="454"/> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="471"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="456"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="473"/> <source>Sound</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="455"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="457"/> <source>In-game sound effects</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="461"/> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="476"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="463"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="478"/> <source>Music</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="462"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="464"/> <source>In-game music</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="472"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="474"/> <source>Frontend sound effects</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="477"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="479"/> <source>Frontend music</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="602"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="609"/> <source>Append date and time to record file name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="683"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="690"/> <source>Record audio</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="732"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="739"/> <source>Use game resolution</source> <translation type="unfinished"></translation> </message> @@ -1940,82 +1966,82 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="588"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="590"/> <source>(System default)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="311"/> - <source>Disabled</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="312"/> - <source>Red/Cyan</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="313"/> - <source>Cyan/Red</source> + <source>Disabled</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="314"/> - <source>Red/Blue</source> + <source>Red/Cyan</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="315"/> - <source>Blue/Red</source> + <source>Cyan/Red</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="316"/> - <source>Red/Green</source> + <source>Red/Blue</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="317"/> - <source>Green/Red</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="324"/> - <source>Side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="325"/> - <source>Top-Bottom</source> + <source>Blue/Red</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="318"/> - <source>Red/Cyan grayscale</source> + <source>Red/Green</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="319"/> - <source>Cyan/Red grayscale</source> + <source>Green/Red</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="326"/> + <source>Side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="327"/> + <source>Top-Bottom</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="320"/> - <source>Red/Blue grayscale</source> + <source>Red/Cyan grayscale</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="321"/> - <source>Blue/Red grayscale</source> + <source>Cyan/Red grayscale</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="322"/> - <source>Red/Green grayscale</source> + <source>Red/Blue grayscale</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="323"/> + <source>Blue/Red grayscale</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="324"/> + <source>Red/Green grayscale</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="325"/> <source>Green/Red grayscale</source> <translation type="unfinished"></translation> </message> @@ -2069,7 +2095,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/teamselect.cpp" line="255"/> + <location filename="../../../../QTfrontend/ui/widget/teamselect.cpp" line="259"/> <source>Playing teams</source> <translation type="unfinished"></translation> </message> @@ -2149,27 +2175,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="100"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="103"/> <source>Your Email</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="108"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="111"/> <source>Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="118"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="121"/> <source>Send system information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="133"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="136"/> <source>Description</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="161"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="164"/> <source>Type the security code:</source> <translation type="unfinished"></translation> </message> @@ -2199,22 +2225,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="582"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="584"/> <source>Locale</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="496"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="498"/> <source>Nickname</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="708"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="598"/> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="715"/> <source>Resolution</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="293"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="295"/> <source>Quality</source> <translation type="unfinished"></translation> </message> @@ -2234,17 +2265,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="307"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="309"/> <source>Stereo rendering</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="437"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="439"/> <source>Initial sound volume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="338"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="340"/> <source>FPS limit</source> <translation type="unfinished"></translation> </message> @@ -2329,27 +2360,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="652"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="659"/> <source>Format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="672"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="679"/> <source>Audio codec</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="697"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="704"/> <source>Video codec</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="738"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="745"/> <source>Framerate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="752"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="759"/> <source>Bitrate (Kbps)</source> <translation type="unfinished"></translation> </message> @@ -2377,7 +2408,7 @@ <context> <name>QLineEdit</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="933"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="954"/> <source>unnamed</source> <translation type="unfinished"></translation> </message> @@ -2388,7 +2419,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="501"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="503"/> <source>anonymous</source> <translation type="unfinished"></translation> </message> @@ -2419,82 +2450,82 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="962"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="983"/> <location filename="../../../../QTfrontend/ui/page/pagescheme.cpp" line="500"/> <source>Cannot delete default scheme '%1'!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="988"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1009"/> <source>Please select a record from the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1083"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1104"/> <source>Hedgewars - Nick not registered</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1474"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1500"/> <source>Unable to start server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1535"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1561"/> <source>Connection to server is lost</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="2021"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="2084"/> <source>Not all players are ready</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="2022"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="2085"/> <source>Are you sure you want to start this game? Not all players are ready.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="347"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="352"/> <location filename="../../../../QTfrontend/util/MessageDialog.cpp" line="24"/> <source>Hedgewars - Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="357"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="362"/> <source>System Information Preview</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="372"/> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="383"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="377"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="388"/> <source>Failed to generate captcha</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="400"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="405"/> <source>Failed to download captcha</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="464"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="469"/> <source>Please fill out all fields. Email is optional.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1963"/> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="434"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1987"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="439"/> <source>Hedgewars - Success</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1964"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1988"/> <source>All file associations have been set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1969"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1993"/> <source>File association failed.</source> <translation type="unfinished"></translation> </message> @@ -2624,7 +2655,7 @@ <message> <location filename="../../../../QTfrontend/ui/widget/drawmapwidget.cpp" line="101"/> <location filename="../../../../QTfrontend/ui/widget/drawmapwidget.cpp" line="121"/> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="891"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="896"/> <source>File error</source> <translation type="unfinished"></translation> </message> @@ -2635,7 +2666,7 @@ </message> <message> <location filename="../../../../QTfrontend/ui/widget/drawmapwidget.cpp" line="122"/> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="892"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="897"/> <source>Cannot open '%1' for reading</source> <translation type="unfinished"></translation> </message> @@ -2766,7 +2797,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="608"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="615"/> <source>Associate file extensions</source> <translation type="unfinished"></translation> </message> @@ -2794,12 +2825,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="765"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="772"/> <source>Set default options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="766"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="773"/> <source>Restore default coding parameters</source> <translation type="unfinished"></translation> </message> @@ -2997,7 +3028,7 @@ <context> <name>TeamSelWidget</name> <message> - <location filename="../../../../QTfrontend/ui/widget/teamselect.cpp" line="260"/> + <location filename="../../../../QTfrontend/ui/widget/teamselect.cpp" line="264"/> <source>At least two teams are required to play!</source> <translation type="unfinished"></translation> </message> @@ -3714,7 +3745,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/util/DataManager.cpp" line="156"/> + <location filename="../../../../QTfrontend/util/DataManager.cpp" line="158"/> <source>Keyboard</source> <translation type="unfinished"></translation> </message> @@ -3756,147 +3787,4 @@ <translation type="unfinished"></translation> </message> </context> -<context> - <name>server</name> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="2"/> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="3"/> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="4"/> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="5"/> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="6"/> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="7"/> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="8"/> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="9"/> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="10"/> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="11"/> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="12"/> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="13"/> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="14"/> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="15"/> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="16"/> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="17"/> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="18"/> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="19"/> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="20"/> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="21"/> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="22"/> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="23"/> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="24"/> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="25"/> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="26"/> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="27"/> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="28"/> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="29"/> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_nl.ts --- a/share/hedgewars/Data/Locale/hedgewars_nl.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_nl.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -254,6 +254,18 @@ <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -353,6 +365,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -472,10 +488,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished"></translation> </message> @@ -491,6 +503,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -534,10 +550,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>%1 *** %2 has joined</source> - <translation type="unfinished"></translation> - </message> - <message> <source>%1 *** %2 has left (%3)</source> <translation type="unfinished"></translation> </message> @@ -729,6 +741,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1933,6 +1956,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3026,119 +3053,4 @@ <translation type="unfinished"></translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_pl.ts --- a/share/hedgewars/Data/Locale/hedgewars_pl.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_pl.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> + <source>Send us feedback!</source> <translation type="unfinished"></translation> </message> <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -267,6 +267,18 @@ <source>Failed to save StyleSheet to %1</source> <translation>Nie można było zapisać arkusza stylów jako %1</translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -367,6 +379,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -486,10 +502,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished">Załaduj mapę</translation> </message> @@ -505,6 +517,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -549,7 +565,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 dołączył</translation> + <translation type="obsolete">%1 *** %2 dołączył</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -743,6 +759,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -2001,6 +2028,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3130,119 +3161,4 @@ <translation>DPad</translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_pt_BR.ts --- a/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_pt_BR.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -254,6 +254,18 @@ <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -353,6 +365,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -473,10 +489,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished">Carregar mapa</translation> </message> @@ -492,6 +504,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -536,7 +552,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 entrou</translation> + <translation type="obsolete">%1 *** %2 entrou</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -730,6 +746,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1974,6 +2001,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3082,119 +3113,4 @@ <translation>DPad</translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_pt_PT.ts --- a/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation>Enviar Feedback</translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> + <source>Send us feedback!</source> <translation type="unfinished"></translation> </message> <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -261,6 +261,18 @@ <source>Failed to save StyleSheet to %1</source> <translation>Não foi possível gravar o StyleSheet em %1</translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -370,6 +382,10 @@ <translation>Tentás-te voltar ao servidor num espaço de tempo demasiado curto. Por favor, aguarda alguns segundos e tenta novamente.</translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -494,7 +510,7 @@ </message> <message> <source>Theme: </source> - <translation>Tema: </translation> + <translation type="obsolete">Tema: </translation> </message> <message> <source>Load drawn map</source> @@ -508,6 +524,10 @@ <source>All files</source> <translation>Todos os ficheiros</translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -552,7 +572,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 entrou</translation> + <translation type="obsolete">%1 *** %2 entrou</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -747,6 +767,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1955,6 +1986,10 @@ <source>This program is distributed under the %1</source> <translation>Este programa é distribuído sob a %1</translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3094,115 +3129,115 @@ <name>server</name> <message> <source>Not room master</source> - <translation type="unfinished">Não és o anfitrião da sala</translation> + <translation type="obsolete">Não és o anfitrião da sala</translation> </message> <message> <source>Corrupted hedgehogs info</source> - <translation type="unfinished">Informação dos ouriços corrompida</translation> + <translation type="obsolete">Informação dos ouriços corrompida</translation> </message> <message> <source>too many teams</source> - <translation type="unfinished">demasiadas equipas</translation> + <translation type="obsolete">demasiadas equipas</translation> </message> <message> <source>too many hedgehogs</source> - <translation type="unfinished">demasiados ouriços</translation> + <translation type="obsolete">demasiados ouriços</translation> </message> <message> <source>There's already a team with same name in the list</source> - <translation type="unfinished">Já existe uma equipa com o mesmo nome na lista</translation> + <translation type="obsolete">Já existe uma equipa com o mesmo nome na lista</translation> </message> <message> <source>round in progress</source> - <translation type="unfinished">partida em progresso</translation> + <translation type="obsolete">partida em progresso</translation> </message> <message> <source>restricted</source> - <translation type="unfinished">limitada</translation> + <translation type="obsolete">limitada</translation> </message> <message> <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished">REMOVE_TEAM: equipa inexistente</translation> + <translation type="obsolete">REMOVE_TEAM: equipa inexistente</translation> </message> <message> <source>Not team owner!</source> - <translation type="unfinished">A equipa não te pertence!</translation> + <translation type="obsolete">A equipa não te pertence!</translation> </message> <message> <source>Less than two clans!</source> - <translation type="unfinished">Menos de 2 clãs!</translation> + <translation type="obsolete">Menos de 2 clãs!</translation> </message> <message> <source>Room with such name already exists</source> - <translation type="unfinished">Já existe uma sala com esse nome</translation> + <translation type="obsolete">Já existe uma sala com esse nome</translation> </message> <message> <source>Nickname already chosen</source> - <translation type="unfinished">Utilizador já em uso</translation> + <translation type="obsolete">Utilizador já em uso</translation> </message> <message> <source>Illegal nickname</source> - <translation type="unfinished">Nome de utilizador ilegal</translation> + <translation type="obsolete">Nome de utilizador ilegal</translation> </message> <message> <source>Protocol already known</source> - <translation type="unfinished">Protocolo já conhecido</translation> + <translation type="obsolete">Protocolo já conhecido</translation> </message> <message> <source>Bad number</source> - <translation type="unfinished">Número inválido</translation> + <translation type="obsolete">Número inválido</translation> </message> <message> <source>Nickname is already in use</source> - <translation type="unfinished">Nome de utilizador já em uso</translation> + <translation type="obsolete">Nome de utilizador já em uso</translation> </message> <message> <source>No checker rights</source> - <translation type="unfinished">Não possui permissões para verificar</translation> + <translation type="obsolete">Não possui permissões para verificar</translation> </message> <message> <source>Authentication failed</source> - <translation type="unfinished">A autenticação falhou</translation> + <translation type="obsolete">A autenticação falhou</translation> </message> <message> <source>60 seconds cooldown after kick</source> - <translation type="unfinished">É necessário aguardar 60 segundos após uma expulsão</translation> + <translation type="obsolete">É necessário aguardar 60 segundos após uma expulsão</translation> </message> <message> <source>kicked</source> - <translation type="unfinished">expulso</translation> + <translation type="obsolete">expulso</translation> </message> <message> <source>Ping timeout</source> - <translation type="unfinished">Ping timeout</translation> + <translation type="obsolete">Ping timeout</translation> </message> <message> <source>bye</source> - <translation type="unfinished">tchau (bye)</translation> + <translation type="obsolete">tchau (bye)</translation> </message> <message> <source>Illegal room name</source> - <translation type="unfinished">Nome da sala ilegal</translation> + <translation type="obsolete">Nome da sala ilegal</translation> </message> <message> <source>No such room</source> - <translation type="unfinished">Sala inexistente</translation> + <translation type="obsolete">Sala inexistente</translation> </message> <message> <source>Joining restricted</source> - <translation type="unfinished">Entrada restrita</translation> + <translation type="obsolete">Entrada restrita</translation> </message> <message> <source>Registered users only</source> - <translation type="unfinished">Apenas utilizadores registados</translation> + <translation type="obsolete">Apenas utilizadores registados</translation> </message> <message> <source>You are banned in this room</source> - <translation type="unfinished">Estás banido desta sala</translation> + <translation type="obsolete">Estás banido desta sala</translation> </message> <message> <source>Empty config entry</source> - <translation type="unfinished">Campo vazio na configuração</translation> + <translation type="obsolete">Campo vazio na configuração</translation> </message> </context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_ro.ts --- a/share/hedgewars/Data/Locale/hedgewars_ro.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_ro.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -260,6 +260,18 @@ <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -359,6 +371,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -478,10 +494,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished"></translation> </message> @@ -497,6 +509,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -541,7 +557,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 has joined</translation> + <translation type="obsolete">%1 *** %2 has joined</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -735,6 +751,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1971,6 +1998,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3074,119 +3105,4 @@ <translation type="unfinished"></translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_ru.ts --- a/share/hedgewars/Data/Locale/hedgewars_ru.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_ru.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> + <source>Send us feedback!</source> <translation type="unfinished"></translation> </message> <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -264,6 +264,18 @@ <source>Failed to save StyleSheet to %1</source> <translation>Ошибка при сохранении стиля в %1</translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -364,6 +376,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -483,10 +499,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished">Загрузить рисованную карту</translation> </message> @@ -502,6 +514,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -546,7 +562,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 вошёл</translation> + <translation type="obsolete">%1 *** %2 вошёл</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -740,6 +756,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1998,6 +2025,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3101,119 +3132,4 @@ <translation type="unfinished"></translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_sk.ts --- a/share/hedgewars/Data/Locale/hedgewars_sk.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_sk.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> + <source>Send us feedback!</source> <translation type="unfinished"></translation> </message> <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -267,6 +267,18 @@ <source>Failed to save StyleSheet to %1</source> <translation>Nepodarilo sa uložiť súbor so štýlom do %1</translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -366,6 +378,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -485,10 +501,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished">Načítať nakreslenú mapu</translation> </message> @@ -504,6 +516,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -548,7 +564,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 sa pridal</translation> + <translation type="obsolete">%1 *** %2 sa pridal</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -742,6 +758,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1998,6 +2025,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3127,119 +3158,4 @@ <translation>Pravý joystick (Doľava)</translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_sv.ts --- a/share/hedgewars/Data/Locale/hedgewars_sv.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_sv.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> + <source>Send us feedback!</source> <translation type="unfinished"></translation> </message> <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -258,6 +258,18 @@ <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -357,6 +369,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -476,10 +492,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished">Läs in ritad karta</translation> </message> @@ -495,6 +507,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -539,7 +555,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 har gått med</translation> + <translation type="obsolete">%1 *** %2 har gått med</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -733,6 +749,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1977,6 +2004,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3079,119 +3110,4 @@ <translation>Styrkors</translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_tr_TR.ts --- a/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_tr_TR.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -248,6 +248,18 @@ <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -347,6 +359,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -466,10 +482,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished"></translation> </message> @@ -485,6 +497,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -528,10 +544,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>%1 *** %2 has joined</source> - <translation type="unfinished"></translation> - </message> - <message> <source>%1 *** %2 has left</source> <translation type="unfinished"></translation> </message> @@ -723,6 +735,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1939,6 +1962,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3039,119 +3066,4 @@ <translation type="unfinished"></translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_uk.ts --- a/share/hedgewars/Data/Locale/hedgewars_uk.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_uk.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -264,6 +264,18 @@ <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -363,6 +375,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -482,10 +498,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished">Завантажити намальовану мапу</translation> </message> @@ -501,6 +513,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -545,7 +561,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1 *** %2 приєднався</translation> + <translation type="obsolete">%1 *** %2 приєднався</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -739,6 +755,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1991,6 +2018,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3094,119 +3125,4 @@ <translation type="unfinished"></translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_zh_CN.ts --- a/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_zh_CN.ts Fri May 17 00:08:05 2013 +0400 @@ -97,7 +97,7 @@ <context> <name>DataManager</name> <message> - <location filename="../../../../QTfrontend/util/DataManager.cpp" line="149"/> + <location filename="../../../../QTfrontend/util/DataManager.cpp" line="151"/> <source>Use Default</source> <translation type="unfinished"></translation> </message> @@ -105,37 +105,37 @@ <context> <name>FeedbackDialog</name> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="87"/> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="88"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="91"/> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="89"/> - <source>If you found a bug, you can see if it's already known here (english): </source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="90"/> - <source>Your email address is optional, but we may want to contact you.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="121"/> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="92"/> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="93"/> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="124"/> <source>View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="147"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="150"/> <source>Cancel</source> <translation type="unfinished">取消</translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="175"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="178"/> <source>Send Feedback</source> <translation type="unfinished"></translation> </message> @@ -255,52 +255,67 @@ <context> <name>HWChatWidget</name> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="641"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="502"/> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="523"/> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="525"/> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="652"/> <source>%1 has been removed from your ignore list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="651"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="662"/> <source>%1 has been added to your ignore list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="681"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="692"/> <source>%1 has been removed from your friends list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="690"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="701"/> <source>%1 has been added to your friends list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="756"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="767"/> <source>Stylesheet imported from %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="757"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="768"/> <source>Enter %1 if you want to use the current StyleSheet in future, enter %2 to reset!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="765"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="776"/> <source>Couldn't read %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="773"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="784"/> <source>StyleSheet discarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="797"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="808"/> <source>StyleSheet saved to %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="800"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="811"/> <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> @@ -308,27 +323,27 @@ <context> <name>HWForm</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="478"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="480"/> <source>DefaultTeam</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="482"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="484"/> <source>%1's Team</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="632"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="638"/> <source>Game aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1056"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1077"/> <source>Hedgewars - Nick registered</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1057"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1078"/> <source>This nick is registered, and you haven't specified a password. If this nick isn't yours, please register your own nick at www.hedgewars.org @@ -337,93 +352,98 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1085"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1106"/> <source>Your nickname is not registered. To prevent someone else from using it, please register it at www.hedgewars.org</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1090"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1111"/> <source> Your password wasn't saved either.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1102"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1123"/> <source>Nickname</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1102"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1123"/> <source>Someone already uses your nickname %1 on the server. Please pick another nickname:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1107"/> - <location filename="../../../../QTfrontend/hwform.cpp" line="1400"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1128"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1437"/> <source>No nickname supplied.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1107"/> - <location filename="../../../../QTfrontend/hwform.cpp" line="1400"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1128"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1437"/> <source>Hedgewars - Empty nickname</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1133"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1154"/> <source>Hedgewars - Wrong password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1133"/> - <source>You entered a wrong password.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/hwform.cpp" line="1154"/> + <source>You entered a wrong password.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/hwform.cpp" line="1175"/> <source>Try Again</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1515"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1541"/> <source>Hedgewars - Connection error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1515"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1541"/> <source>You reconnected too fast. Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1923"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1947"/> <source>Hedgewars Demo File</source> <comment>File Types</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1924"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1948"/> <source>Hedgewars Save File</source> <comment>File Types</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1985"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="2009"/> <source>Demo name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1985"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="2009"/> <source>Demo name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1672"/> - <location filename="../../../../QTfrontend/hwform.cpp" line="1993"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="2077"/> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/hwform.cpp" line="1698"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="2017"/> <source>Cannot save record to file %1</source> <translation>无法录入文件 %1</translation> </message> @@ -431,13 +451,13 @@ <context> <name>HWGame</name> <message> - <location filename="../../../../QTfrontend/game.cpp" line="374"/> + <location filename="../../../../QTfrontend/game.cpp" line="386"/> <location filename="../../../../QTfrontend/net/recorder.cpp" line="112"/> <source>en.txt</source> <translation>zh_CN.txt</translation> </message> <message> - <location filename="../../../../QTfrontend/game.cpp" line="415"/> + <location filename="../../../../QTfrontend/game.cpp" line="427"/> <source>Cannot open demofile %1</source> <translation>DEMO %1 打不开</translation> </message> @@ -445,158 +465,158 @@ <context> <name>HWMapContainer</name> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="217"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="220"/> <source>Small tunnels</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="218"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="221"/> <source>Medium tunnels</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="124"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="126"/> <source>Seed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="93"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="94"/> <source>Map type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="96"/> - <source>Image map</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="97"/> - <source>Mission map</source> + <source>Image map</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="98"/> - <source>Hand-drawn</source> + <source>Mission map</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="99"/> - <source>Randomly generated</source> + <source>Hand-drawn</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="100"/> + <source>Randomly generated</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="101"/> <source>Random maze</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="110"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="111"/> <source>Random</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="133"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="135"/> <source>Map preview:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="185"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="188"/> <source>Load map drawing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="191"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="194"/> <source>Edit map drawing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="204"/> - <source>All</source> - <translation>全部</translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="205"/> - <source>Small</source> - <translation>小型</translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="206"/> - <source>Medium</source> - <translation>中型</translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="207"/> - <source>Large</source> - <translation>大型</translation> + <source>All</source> + <translation>全部</translation> </message> <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="208"/> - <source>Cavern</source> - <translation>洞穴</translation> + <source>Small</source> + <translation>小型</translation> </message> <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="209"/> + <source>Medium</source> + <translation>中型</translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="210"/> + <source>Large</source> + <translation>大型</translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="211"/> + <source>Cavern</source> + <translation>洞穴</translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="212"/> <source>Wacky</source> <translation>曲折</translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="219"/> - <source>Large tunnels</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="220"/> - <source>Small islands</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="221"/> - <source>Medium islands</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="222"/> + <source>Large tunnels</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="223"/> + <source>Small islands</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="224"/> + <source>Medium islands</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="225"/> <source>Large islands</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="705"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="710"/> <source>Map size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="712"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="717"/> <source>Maze style:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="725"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="730"/> <source>Mission:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="735"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="740"/> <source>Map:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="799"/> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="930"/> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="881"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="804"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="935"/> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="886"/> <source>Load drawn map</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="881"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="886"/> <source>Drawn Maps</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="881"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="886"/> <source>All files</source> <translation type="unfinished"></translation> </message> @@ -647,40 +667,33 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="495"/> - <source>%1 *** %2 has joined</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="544"/> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="788"/> + <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="797"/> <source>%1 *** %2 has left</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="546"/> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="790"/> + <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="799"/> <source>%1 *** %2 has left (%3)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="641"/> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="773"/> + <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="651"/> + <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="782"/> <source>%1 *** %2 has joined the room</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1535"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1561"/> <source>Quit reason: </source> <translation>退出原因:</translation> </message> <message> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="697"/> + <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="707"/> <source>Room destroyed</source> <translation>房间损坏</translation> </message> <message> - <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="470"/> + <location filename="../../../../QTfrontend/net/newnetclient.cpp" line="484"/> <source>You got kicked</source> <translation>被踢出</translation> </message> @@ -890,6 +903,19 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <location filename="../../../../QTfrontend/ui/page/pagedata.cpp" line="66"/> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pagedata.cpp" line="126"/> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <location filename="../../../../QTfrontend/ui/page/pagedrawmap.cpp" line="32"/> @@ -1010,47 +1036,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="174"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="182"/> <source>The best shot award was won by <b>%1</b> with <b>%2</b> pts.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="182"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="190"/> <source>The best killer is <b>%1</b> with <b>%2</b> kills in a turn.</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="189"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="197"/> <source>A total of <b>%1</b> hedgehog(s) were killed during this round.</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="253"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="261"/> <source>(%1 kill)</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="264"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="272"/> <source><b>%1</b> thought it's good to shoot his own hedgehogs with <b>%2</b> pts.</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="272"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="280"/> <source><b>%1</b> killed <b>%2</b> of his own hedgehogs.</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="280"/> + <location filename="../../../../QTfrontend/ui/page/pagegamestats.cpp" line="288"/> <source><b>%1</b> was scared and skipped turn <b>%2</b> times.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1149,12 +1175,12 @@ <context> <name>PageMultiplayer</name> <message> - <location filename="../../../../QTfrontend/ui/page/pagemultiplayer.cpp" line="52"/> + <location filename="../../../../QTfrontend/ui/page/pagemultiplayer.cpp" line="50"/> <source>Edit game preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pagemultiplayer.cpp" line="64"/> + <location filename="../../../../QTfrontend/ui/page/pagemultiplayer.cpp" line="62"/> <source>Start</source> <translation>开始</translation> </message> @@ -1318,97 +1344,97 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="369"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="371"/> <source>Frontend</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="386"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="388"/> <source>Custom colors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="416"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="418"/> <source>Reset to default colors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="429"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="431"/> <source>Game audio</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="467"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="469"/> <source>Frontend audio</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="490"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="492"/> <source>Account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="516"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="518"/> <source>Proxy settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="522"/> - <source>Proxy host</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="523"/> - <source>Proxy port</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="524"/> - <source>Proxy login</source> + <source>Proxy host</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="525"/> + <source>Proxy port</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="526"/> + <source>Proxy login</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="527"/> <source>Proxy password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="538"/> - <source>No proxy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="539"/> - <source>System proxy settings</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="540"/> - <source>Socks5 proxy</source> + <source>No proxy</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="541"/> + <source>System proxy settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="542"/> + <source>Socks5 proxy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="543"/> <source>HTTP proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="576"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="578"/> <source>Miscellaneous</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="616"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="623"/> <source>Updates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="629"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="636"/> <source>Check for updates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="643"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="650"/> <source>Video recording options</source> <translation type="unfinished"></translation> </message> @@ -1811,23 +1837,23 @@ </message> <message> <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="269"/> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="874"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="885"/> <source>Ignore</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="273"/> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="886"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="897"/> <source>Add friend</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="869"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="880"/> <source>Unignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="881"/> + <location filename="../../../../QTfrontend/ui/widget/chatwidget.cpp" line="892"/> <source>Remove friend</source> <translation type="unfinished"></translation> </message> @@ -1845,75 +1871,75 @@ <context> <name>QCheckBox</name> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="375"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="377"/> <source>Fullscreen</source> <translation>游戏全屏幕</translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="347"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="349"/> <source>Show FPS</source> <translation>显示帧率 (FPS)</translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="358"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="360"/> <source>Alternative damage show</source> <translation>另一种伤害显示方式</translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="381"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="383"/> <source>Visual effects</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="454"/> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="471"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="456"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="473"/> <source>Sound</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="455"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="457"/> <source>In-game sound effects</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="461"/> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="476"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="463"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="478"/> <source>Music</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="462"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="464"/> <source>In-game music</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="472"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="474"/> <source>Frontend sound effects</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="477"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="479"/> <source>Frontend music</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="622"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="629"/> <source>Check for updates at startup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="364"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="366"/> <source>Show ammo menu tooltips</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="602"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="609"/> <source>Append date and time to record file name</source> <translation>记录名称中包含具体时间日期</translation> </message> <message> <location filename="../../../../QTfrontend/ui/dialog/input_password.cpp" line="55"/> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="507"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="509"/> <source>Save password</source> <translation type="unfinished"></translation> </message> @@ -1928,12 +1954,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="683"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="690"/> <source>Record audio</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="732"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="739"/> <source>Use game resolution</source> <translation type="unfinished"></translation> </message> @@ -1956,82 +1982,82 @@ <translation>Lv 级别</translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="588"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="590"/> <source>(System default)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="311"/> - <source>Disabled</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="312"/> - <source>Red/Cyan</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="313"/> - <source>Cyan/Red</source> + <source>Disabled</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="314"/> - <source>Red/Blue</source> + <source>Red/Cyan</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="315"/> - <source>Blue/Red</source> + <source>Cyan/Red</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="316"/> - <source>Red/Green</source> + <source>Red/Blue</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="317"/> - <source>Green/Red</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="324"/> - <source>Side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="325"/> - <source>Top-Bottom</source> + <source>Blue/Red</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="318"/> - <source>Red/Cyan grayscale</source> + <source>Red/Green</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="319"/> - <source>Cyan/Red grayscale</source> + <source>Green/Red</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="326"/> + <source>Side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="327"/> + <source>Top-Bottom</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="320"/> - <source>Red/Blue grayscale</source> + <source>Red/Cyan grayscale</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="321"/> - <source>Blue/Red grayscale</source> + <source>Cyan/Red grayscale</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="322"/> - <source>Red/Green grayscale</source> + <source>Red/Blue grayscale</source> <translation type="unfinished"></translation> </message> <message> <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="323"/> + <source>Blue/Red grayscale</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="324"/> + <source>Red/Green grayscale</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="325"/> <source>Green/Red grayscale</source> <translation type="unfinished"></translation> </message> @@ -2060,7 +2086,7 @@ <translation>城堡模式</translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/teamselect.cpp" line="255"/> + <location filename="../../../../QTfrontend/ui/widget/teamselect.cpp" line="259"/> <source>Playing teams</source> <translation>玩家队伍</translation> </message> @@ -2093,22 +2119,27 @@ <context> <name>QLabel</name> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="582"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="584"/> <source>Locale</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="496"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="498"/> <source>Nickname</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="708"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="598"/> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="715"/> <source>Resolution</source> <translation>分辨率</translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="293"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="295"/> <source>Quality</source> <translation type="unfinished"></translation> </message> @@ -2128,12 +2159,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="307"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="309"/> <source>Stereo rendering</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="338"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="340"/> <source>FPS limit</source> <translation>FPS 上限</translation> </message> @@ -2177,7 +2208,7 @@ <translation type="obsolete">版本</translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="437"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="439"/> <source>Initial sound volume</source> <translation>初始音量</translation> </message> @@ -2324,27 +2355,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="100"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="103"/> <source>Your Email</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="108"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="111"/> <source>Summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="118"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="121"/> <source>Send system information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="133"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="136"/> <source>Description</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="161"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="164"/> <source>Type the security code:</source> <translation type="unfinished"></translation> </message> @@ -2359,27 +2390,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="652"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="659"/> <source>Format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="672"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="679"/> <source>Audio codec</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="697"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="704"/> <source>Video codec</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="738"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="745"/> <source>Framerate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="752"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="759"/> <source>Bitrate (Kbps)</source> <translation type="unfinished"></translation> </message> @@ -2397,7 +2428,7 @@ <context> <name>QLineEdit</name> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="933"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="954"/> <source>unnamed</source> <translation>无名</translation> </message> @@ -2408,7 +2439,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="501"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="503"/> <source>anonymous</source> <translation type="unfinished"></translation> </message> @@ -2449,82 +2480,82 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="962"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="983"/> <location filename="../../../../QTfrontend/ui/page/pagescheme.cpp" line="500"/> <source>Cannot delete default scheme '%1'!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="988"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1009"/> <source>Please select a record from the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1083"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1104"/> <source>Hedgewars - Nick not registered</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1474"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1500"/> <source>Unable to start server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1535"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1561"/> <source>Connection to server is lost</source> <translation>服务器连接丢失</translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="2021"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="2084"/> <source>Not all players are ready</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="2022"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="2085"/> <source>Are you sure you want to start this game? Not all players are ready.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="347"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="352"/> <location filename="../../../../QTfrontend/util/MessageDialog.cpp" line="24"/> <source>Hedgewars - Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="357"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="362"/> <source>System Information Preview</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="372"/> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="383"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="377"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="388"/> <source>Failed to generate captcha</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="400"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="405"/> <source>Failed to download captcha</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="464"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="469"/> <source>Please fill out all fields. Email is optional.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1963"/> - <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="434"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1987"/> + <location filename="../../../../QTfrontend/ui/widget/feedbackdialog.cpp" line="439"/> <source>Hedgewars - Success</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1964"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1988"/> <source>All file associations have been set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/hwform.cpp" line="1969"/> + <location filename="../../../../QTfrontend/hwform.cpp" line="1993"/> <source>File association failed.</source> <translation type="unfinished"></translation> </message> @@ -2654,7 +2685,7 @@ <message> <location filename="../../../../QTfrontend/ui/widget/drawmapwidget.cpp" line="101"/> <location filename="../../../../QTfrontend/ui/widget/drawmapwidget.cpp" line="121"/> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="891"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="896"/> <source>File error</source> <translation type="unfinished"></translation> </message> @@ -2665,7 +2696,7 @@ </message> <message> <location filename="../../../../QTfrontend/ui/widget/drawmapwidget.cpp" line="122"/> - <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="892"/> + <location filename="../../../../QTfrontend/ui/widget/mapContainer.cpp" line="897"/> <source>Cannot open '%1' for reading</source> <translation type="unfinished"></translation> </message> @@ -2809,17 +2840,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="608"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="615"/> <source>Associate file extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="765"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="772"/> <source>Set default options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="766"/> + <location filename="../../../../QTfrontend/ui/page/pageoptions.cpp" line="773"/> <source>Restore default coding parameters</source> <translation type="unfinished"></translation> </message> @@ -3017,7 +3048,7 @@ <context> <name>TeamSelWidget</name> <message> - <location filename="../../../../QTfrontend/ui/widget/teamselect.cpp" line="260"/> + <location filename="../../../../QTfrontend/ui/widget/teamselect.cpp" line="264"/> <source>At least two teams are required to play!</source> <translation type="unfinished"></translation> </message> @@ -3734,7 +3765,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../../../QTfrontend/util/DataManager.cpp" line="156"/> + <location filename="../../../../QTfrontend/util/DataManager.cpp" line="158"/> <source>Keyboard</source> <translation type="unfinished"></translation> </message> @@ -3776,147 +3807,4 @@ <translation type="unfinished"></translation> </message> </context> -<context> - <name>server</name> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="2"/> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="3"/> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="4"/> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="5"/> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="6"/> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="7"/> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="8"/> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="9"/> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="10"/> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="11"/> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="12"/> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="13"/> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="14"/> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="15"/> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="16"/> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="17"/> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="18"/> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="19"/> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="20"/> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="21"/> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="22"/> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="23"/> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="24"/> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="25"/> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="26"/> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="27"/> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="28"/> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../../../../QTfrontend/servermessages.h" line="29"/> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS> diff -r 15a6ed0bd074 -r e9d88f2522f4 share/hedgewars/Data/Locale/hedgewars_zh_TW.ts --- a/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Fri May 17 00:07:37 2013 +0400 +++ b/share/hedgewars/Data/Locale/hedgewars_zh_TW.ts Fri May 17 00:08:05 2013 +0400 @@ -99,19 +99,19 @@ <translation type="unfinished"></translation> </message> <message> - <source>Please give us feedback!</source> - <translation type="unfinished"></translation> - </message> - <message> <source>We are always happy about suggestions, ideas, or bug reports.</source> <translation type="unfinished"></translation> </message> <message> - <source>If you found a bug, you can see if it's already known here (english): </source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Your email address is optional, but we may want to contact you.</source> + <source>Send us feedback!</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>If you found a bug, you can see if it's already been reported here: </source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Your email address is optional, but necessary if you want us to get back at you.</source> <translation type="unfinished"></translation> </message> </context> @@ -248,6 +248,18 @@ <source>Failed to save StyleSheet to %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>%1 has joined</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>%1 has left (%2)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWForm</name> @@ -347,6 +359,10 @@ Please wait a few seconds and try again.</source> <translation type="unfinished"></translation> </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWGame</name> @@ -466,10 +482,6 @@ <translation type="unfinished"></translation> </message> <message> - <source>Theme: </source> - <translation type="unfinished"></translation> - </message> - <message> <source>Load drawn map</source> <translation type="unfinished"></translation> </message> @@ -485,6 +497,10 @@ <source>Large tunnels</source> <translation type="unfinished"></translation> </message> + <message> + <source>Theme: %1</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HWNetServersModel</name> @@ -529,7 +545,7 @@ </message> <message> <source>%1 *** %2 has joined</source> - <translation>%1***%2已經進入</translation> + <translation type="obsolete">%1***%2已經進入</translation> </message> <message> <source>%1 *** %2 has left (%3)</source> @@ -723,6 +739,17 @@ </message> </context> <context> + <name>PageDataDownload</name> + <message> + <source>Loading, please wait.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>This page requires an internet connection.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PageDrawMap</name> <message> <source>Undo</source> @@ -1947,6 +1974,10 @@ <source>This program is distributed under the %1</source> <translation type="unfinished"></translation> </message> + <message> + <source>This setting will be effective at next restart.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QLineEdit</name> @@ -3047,119 +3078,4 @@ <translation type="unfinished"></translation> </message> </context> -<context> - <name>server</name> - <message> - <source>No checker rights</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Authentication failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>60 seconds cooldown after kick</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>kicked</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Ping timeout</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>bye</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Empty config entry</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not room master</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Corrupted hedgehogs info</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many teams</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>too many hedgehogs</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>There's already a team with same name in the list</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>round in progress</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>REMOVE_TEAM: no such team</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Not team owner!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Less than two clans!</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Room with such name already exists</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal room name</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>No such room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Joining restricted</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Registered users only</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>You are banned in this room</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname already chosen</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Illegal nickname</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Protocol already known</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Bad number</source> - <translation type="unfinished"></translation> - </message> - <message> - <source>Nickname is already in use</source> - <translation type="unfinished"></translation> - </message> -</context> </TS>