diff --git a/lang/american.txt b/lang/american.txt index 32e72ffd34..b08f5bcf23 100644 --- a/lang/american.txt +++ b/lang/american.txt @@ -186,7 +186,7 @@ STR_00B4_CAN_T_DO_THIS :{WHITE}Can't do this.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Can't clear this area.... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved STR_00B7_VERSION :{BLACK}OpenTTD version {REV} -STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2004 The OpenTTD team +STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2005 The OpenTTD team STR_00C5 :{BLACK}{CROSS} STR_00C6 :{SILVER}{CROSS} diff --git a/lang/catalan.txt b/lang/catalan.txt index 9813f4532e..05c628202f 100644 --- a/lang/catalan.txt +++ b/lang/catalan.txt @@ -186,7 +186,7 @@ STR_00B4_CAN_T_DO_THIS :{WHITE}No es pot fer aix STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}No es pot netejar l'ŕrea.... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Copyright Original {COPYRIGHT} 1995 Chris Sawyer, Tots els Drets reservats STR_00B7_VERSION :{BLACK}OpenTTD versió {REV} -STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2004 The OpenTTD team +STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2005 The OpenTTD team STR_00C5 :{BLACK}{CROSS} STR_00C6 :{SILVER}{CROSS} diff --git a/lang/czech.txt b/lang/czech.txt index af317e9a53..08aec67500 100644 --- a/lang/czech.txt +++ b/lang/czech.txt @@ -186,7 +186,7 @@ STR_00B4_CAN_T_DO_THIS :{WHITE}Tohle neumuzes udelat... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Nemuzes vycistit tuto oblast... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Puvodni copyright: {COPYRIGHT} 1995 Chris Sawyer, vsechna práva vyhrazena STR_00B7_VERSION :{BLACK}OpenTTD verze {REV} -STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2004 Tým OpenTTD +STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2005 Tým OpenTTD STR_00C5 :{BLACK}{CROSS} STR_00C6 :{SILVER}{CROSS} diff --git a/lang/danish.txt b/lang/danish.txt index 4ced211cf5..e603b10639 100644 --- a/lang/danish.txt +++ b/lang/danish.txt @@ -157,7 +157,7 @@ STR_00B4_CAN_T_DO_THIS :{WHITE}Det kan jeg ikke.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Kan ikke rydde omrĺdet.... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, Alle retigheder reserveret STR_00B7_VERSION :{BLACK}OpenTTD version {REV} -STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2004 The OpenTTD team +STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2005 The OpenTTD team STR_00C5 :{BLACK}{CROSS} STR_00C6 :{SILVER}{CROSS} diff --git a/lang/dutch.txt b/lang/dutch.txt index 44376eafa7..93c0a12d79 100644 --- a/lang/dutch.txt +++ b/lang/dutch.txt @@ -186,7 +186,7 @@ STR_00B4_CAN_T_DO_THIS :{WHITE}Kan dit niet uitvoeren.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Kan gebied niet ontruimen.... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Origineel copyright {COPYRIGHT} 1995 Chris Sawyer, Alle rechten voorbehouden STR_00B7_VERSION :{BLACK}OpenTTD versie {REV} -STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2004 Het OpenTTD team +STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2005 Het OpenTTD team STR_00C5 :{BLACK}{CROSS} STR_00C6 :{SILVER}{CROSS} diff --git a/lang/finnish.txt b/lang/finnish.txt index b6867b10e3..3ac79365f3 100644 --- a/lang/finnish.txt +++ b/lang/finnish.txt @@ -186,7 +186,7 @@ STR_00B4_CAN_T_DO_THIS :{WHITE}N STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Aluetta ei voi puhdistaa.... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Alkuperäinen {COPYRIGHT} 1995 Chris Sawyer, kaikki oikeudet pidätetään STR_00B7_VERSION :{BLACK}OpenTTD versio {REV} -STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2004 OpenTTD-ryhmä +STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2005 OpenTTD-ryhmä STR_00C5 :{BLACK}{CROSS} STR_00C6 :{SILVER}{CROSS} diff --git a/lang/french.txt b/lang/french.txt index 077be500a7..e350d99c6a 100644 --- a/lang/french.txt +++ b/lang/french.txt @@ -186,7 +186,7 @@ STR_00B4_CAN_T_DO_THIS :{WHITE}Impossible d'ex STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Impossible de balayer.... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Copyright originel {COPYRIGHT} 1995 Chris Sawyer, Tous droits réservés STR_00B7_VERSION :{BLACK}OpenTTD version {REV} -STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2004 The OpenTTD team +STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2005 The OpenTTD team STR_00C5 :{BLACK}{CROSS} STR_00C6 :{SILVER}{CROSS} diff --git a/lang/galician.txt b/lang/galician.txt index 97feafc62c..e58e075408 100644 --- a/lang/galician.txt +++ b/lang/galician.txt @@ -186,7 +186,7 @@ STR_00B4_CAN_T_DO_THIS :{WHITE}Non podes facer eso.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Non podes limpar esta área.... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Copyright Orixinal {COPYRIGHT} 1995 Chris Sawyer, Tódolos dereitos reservados STR_00B7_VERSION :{BLACK}OpenTTD versión {REV} -STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2004 The OpenTTD team +STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2005 The OpenTTD team STR_00C5 :{BLACK}{CROSS} STR_00C6 :{SILVER}{CROSS} diff --git a/lang/german.txt b/lang/german.txt index 26b5039715..736e5b56f6 100644 --- a/lang/german.txt +++ b/lang/german.txt @@ -186,7 +186,7 @@ STR_00B4_CAN_T_DO_THIS :{WHITE}Kann dies nicht tun.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Kann das Gebiet nicht räumen.... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, Alle Rechte vorbehalten STR_00B7_VERSION :{BLACK}OpenTTD Version {REV} -STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2004 OpenTTD-Team +STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2005 OpenTTD-Team STR_00C5 :{BLACK}{CROSS} STR_00C6 :{SILVER}{CROSS} diff --git a/lang/hungarian.txt b/lang/hungarian.txt index cdd6a4b3ab..48cce9b1e0 100644 --- a/lang/hungarian.txt +++ b/lang/hungarian.txt @@ -186,7 +186,7 @@ STR_00B4_CAN_T_DO_THIS :{WHITE}Nem teheted ezt... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Nem tisztíthatod meg a területet... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Copyright {COPYRIGHT} 1995 Chris Sawyer, Minden jog fenntartva STR_00B7_VERSION :{BLACK}OpenTTD version {REV} -STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2004 The OpenTTD team +STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2005 The OpenTTD team STR_00C5 :{BLACK}{CROSS} STR_00C6 :{SILVER}{CROSS} diff --git a/lang/icelandic.txt b/lang/icelandic.txt index 60946efc8f..ccea071eb1 100644 --- a/lang/icelandic.txt +++ b/lang/icelandic.txt @@ -186,7 +186,7 @@ STR_00B4_CAN_T_DO_THIS :{WHITE}Get ekki gert STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Get ekki hreinsađ ţetta svćđi.... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Upphaflegur höfundarréttur {COPYRIGHT} 1995 Chris Sawyer, Öll réttindi áskilin STR_00B7_VERSION :{BLACK}OpenTTD útgáfa {REV} -STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2004 OpenTTD hópurinn +STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2005 OpenTTD hópurinn STR_00C5 :{BLACK}{CROSS} STR_00C6 :{SILVER}{CROSS} diff --git a/lang/italian.txt b/lang/italian.txt index b819a97c2d..d18f227edf 100644 --- a/lang/italian.txt +++ b/lang/italian.txt @@ -186,7 +186,7 @@ STR_00B4_CAN_T_DO_THIS :{WHITE}Non puoi fare questo.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Non puoi ripulire l'area.... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Copyright Originale{COPYRIGHT} 1995 Chris Sawyer, Tutti i diritti riservati STR_00B7_VERSION :{BLACK}OpenTTD versione {REV} -STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2004 The OpenTTD team +STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2005 The OpenTTD team STR_00C5 :{BLACK}{CROSS} STR_00C6 :{SILVER}{CROSS} diff --git a/lang/norwegian.txt b/lang/norwegian.txt index cf6ff18206..cf20ed79ad 100644 --- a/lang/norwegian.txt +++ b/lang/norwegian.txt @@ -186,7 +186,7 @@ STR_00B4_CAN_T_DO_THIS :{WHITE}Kan ikke gj STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Kan ikke rydde feltet.... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Opprinnelig copyright {COPYRIGHT} 1995 Chris Sawyer, Alle rettigheter reservert STR_00B7_VERSION :{BLACK}OpenTTD versjon {REV} -STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2004 OpenTTD-teamet +STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2005 OpenTTD-teamet STR_00C5 :{BLACK}{CROSS} STR_00C6 :{SILVER}{CROSS} diff --git a/lang/polish.txt b/lang/polish.txt index 3663269942..87f7b1a723 100644 --- a/lang/polish.txt +++ b/lang/polish.txt @@ -186,7 +186,7 @@ STR_00B4_CAN_T_DO_THIS :{WHITE}Niemozna tego zrobic.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Nie mozna wyczyscic terenu.... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved STR_00B7_VERSION :{BLACK}Wersja OpenTTD {REV}: Language Pack by Tom and PolPot and Spooqy -STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2004 The OpenTTD team +STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2005 The OpenTTD team STR_00C5 :{BLACK}{CROSS} STR_00C6 :{SILVER}{CROSS} diff --git a/lang/portuguese.txt b/lang/portuguese.txt index 844ba42848..af98cfcb02 100644 --- a/lang/portuguese.txt +++ b/lang/portuguese.txt @@ -186,7 +186,7 @@ STR_00B4_CAN_T_DO_THIS :{WHITE}N STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Năo é possível limpar esta área.... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, Todos os direitos reservados STR_00B7_VERSION :{BLACK}OpenTTD versăo {REV} -STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2004 A equipa do OpenTTD +STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2005 A equipa do OpenTTD STR_00C5 :{BLACK}{CROSS} STR_00C6 :{SILVER}{CROSS} diff --git a/lang/romanian.txt b/lang/romanian.txt index 06ea265381..4e5203edd7 100644 --- a/lang/romanian.txt +++ b/lang/romanian.txt @@ -186,7 +186,7 @@ STR_00B4_CAN_T_DO_THIS :{WHITE}Nu pot face asta.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Nu pot curăta terenul.... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, toate drepturile rezervate STR_00B7_VERSION :{BLACK}OpenTTD versiunea {REV} -STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2004 Echipa OpenTTD +STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2005 Echipa OpenTTD STR_00C5 :{BLACK}{CROSS} STR_00C6 :{SILVER}{CROSS} diff --git a/lang/slovak.txt b/lang/slovak.txt index 4be016edff..124cc42b10 100644 --- a/lang/slovak.txt +++ b/lang/slovak.txt @@ -186,7 +186,7 @@ STR_00B4_CAN_T_DO_THIS :{WHITE}Takto sa to neda... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Oblast sa neda vycistit... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved STR_00B7_VERSION :{BLACK}OpenTTD version {REV} -STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2004 The OpenTTD team +STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2005 The OpenTTD team STR_00C5 :{BLACK}{CROSS} STR_00C6 :{SILVER}{CROSS} diff --git a/lang/spanish.txt b/lang/spanish.txt index 868fc6845e..a22f92a10e 100644 --- a/lang/spanish.txt +++ b/lang/spanish.txt @@ -186,7 +186,7 @@ STR_00B4_CAN_T_DO_THIS :{WHITE}No se puede hacer eso.... STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}No se puede desbrozar esta zona.... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Copyright Original {COPYRIGHT} 1995 Chris Sawyer, Todos los derechos reservados STR_00B7_VERSION :{BLACK}OpenTTD versión {REV} -STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2004 El equipo OpenTTD +STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2005 El equipo OpenTTD STR_00C5 :{BLACK}{CROSS} STR_00C6 :{SILVER}{CROSS} diff --git a/lang/swedish.txt b/lang/swedish.txt index 21dd5d25bb..0af19b3a41 100644 --- a/lang/swedish.txt +++ b/lang/swedish.txt @@ -186,7 +186,7 @@ STR_00B4_CAN_T_DO_THIS :{WHITE}Kan inte utf STR_00B5_CAN_T_CLEAR_THIS_AREA :{WHITE}Kan inte röja omrĺdet... STR_00B6_ORIGINAL_COPYRIGHT :{BLACK}Ursprunglig äganderätt {COPYRIGHT} 1995 Chris Sawyer, Alla rättigheter reserverade STR_00B7_VERSION :{BLACK}OpenTTD version {REV} -STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2004 OpenTTD-teamet +STR_00BA_COPYRIGHT_OPENTTD :{BLACK}OpenTTD {COPYRIGHT}2002-2005 OpenTTD-teamet STR_00C5 :{BLACK}{CROSS} STR_00C6 :{SILVER}{CROSS} diff --git a/misc_gui.c b/misc_gui.c index 0a61762f16..995762a4ae 100644 --- a/misc_gui.c +++ b/misc_gui.c @@ -256,7 +256,7 @@ static const Widget _about_widgets[] = { { WWT_CLOSEBOX, 14, 0, 10, 0, 13, STR_00C5, STR_NULL}, { WWT_CAPTION, 14, 11, 399, 0, 13, STR_015B_OPENTTD, STR_NULL}, { WWT_PANEL, 14, 0, 399, 14, 271, 0x0, STR_NULL}, -{ WWT_FRAME, 14, 5, 394, 40, 245, STR_EMPTY, STR_NULL}, +{ WWT_FRAME, 14, 5, 394, 40, 245, STR_NULL, STR_NULL}, { WIDGETS_END}, }; diff --git a/widget.c b/widget.c index 708c33ebb5..ad8733b4d1 100644 --- a/widget.c +++ b/widget.c @@ -361,7 +361,7 @@ void DrawWindowWidgets(Window *w) case WWT_FRAME: { int c1,c2; - int x2 = 0; + int x2 = r.left; // by default the left side is the left side of the widget if (wi->unkA != 0) { x2 = DrawString(r.left+6, r.top, wi->unkA, 0);