From d2e5469bbfb7c30424410b56775df8b60ef6e677 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 13 Oct 2005 14:24:52 +0000 Subject: [PATCH] Report the correct version in the About dialog. --- programs/winecfg/Bg.rc | 7 +++---- programs/winecfg/De.rc | 5 ++--- programs/winecfg/En.rc | 5 ++--- programs/winecfg/Fi.rc | 5 ++--- programs/winecfg/Fr.rc | 5 ++--- programs/winecfg/Ja.rc | 5 ++--- programs/winecfg/Nl.rc | 7 +++---- programs/winecfg/No.rc | 5 ++--- programs/winecfg/Ru.rc | 7 +++---- programs/winecfg/resource.h | 1 - programs/winecfg/winecfg.rc | 1 + 11 files changed, 22 insertions(+), 31 deletions(-) diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index 0695888d68a..a261f4e502f 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -26,14 +26,13 @@ IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270 STYLE WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Версия на Wine:",IDC_STATIC,119,17,55,8 - LTEXT "CVS",IDC_WINEVER,179,17,56,8 + LTEXT PACKAGE_STRING,IDC_STATIC,119,17,120,8 CONTROL IDB_WINE,IDC_STATIC,"Static",SS_BITMAP ,15,17,157,111 LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 /* - CTEXT "Тази библиотека е свободен софтуер. Можете да я разпространявате и/или променяте при условията на GNU Lesser General Public License, публикуван от Free Software Foundation - версия 2.1 на лиценза или (по ваш избор), която и да е следваща версия.", + LTEXT "Тази библиотека е свободен софтуер. Можете да я разпространявате и/или променяте при условията на GNU Lesser General Public License, публикуван от Free Software Foundation - версия 2.1 на лиценза или (по ваш избор), която и да е следваща версия.", */ - CTEXT "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", + LTEXT "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", IDC_STATIC,119,44,124,72 END diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index d0eddfee429..eb0c9da7165 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -26,11 +26,10 @@ IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270 STYLE WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Wine Version:",IDC_STATIC,119,17,55,8 - LTEXT "CVS",IDC_WINEVER,179,17,56,8 + LTEXT PACKAGE_STRING,IDC_STATIC,119,17,120,8 CONTROL IDB_WINE,IDC_STATIC,"Static",SS_BITMAP ,15,17,157,111 LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 - CTEXT "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", + LTEXT "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", IDC_STATIC,119,44,124,72 END diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 0176b7d8d07..dfcb0e4c242 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -28,11 +28,10 @@ IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270 STYLE WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Wine Version:",IDC_STATIC,119,17,55,8 - LTEXT "CVS",IDC_WINEVER,179,17,56,8 + LTEXT PACKAGE_STRING,IDC_STATIC,119,17,120,8 CONTROL IDB_WINE,IDC_STATIC,"Static",SS_BITMAP ,15,17,157,111 LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 - CTEXT "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", + LTEXT "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", IDC_STATIC,119,44,124,72 END diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc index 959dcccdad1..04f16143c65 100644 --- a/programs/winecfg/Fi.rc +++ b/programs/winecfg/Fi.rc @@ -26,11 +26,10 @@ IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270 STYLE WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Wine Version:",IDC_STATIC,119,17,55,8 - LTEXT "CVS",IDC_WINEVER,179,17,56,8 + LTEXT PACKAGE_STRING,IDC_STATIC,119,17,120,8 CONTROL IDB_WINE,IDC_STATIC,"Static",SS_BITMAP ,15,17,157,111 LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 - CTEXT "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", + LTEXT "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", IDC_STATIC,119,44,124,72 END diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 8877a9771a6..5060deffdeb 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -26,11 +26,10 @@ IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270 STYLE WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Version de Wine:",IDC_STATIC,119,17,55,8 - LTEXT "CVS",IDC_WINEVER,179,17,56,8 + LTEXT PACKAGE_STRING,IDC_STATIC,119,17,120,8 CONTROL IDB_WINE,IDC_STATIC,"Static",SS_BITMAP ,15,17,157,111 LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 - CTEXT "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", + LTEXT "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", IDC_STATIC,119,44,124,72 END diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index 24a92483507..d3808787bc3 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -28,11 +28,10 @@ IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270 STYLE WS_CHILD FONT 9, "MS UI Gothic" BEGIN - LTEXT "Wine ѓoЃ[ѓWѓ‡ѓ“:",IDC_STATIC,119,17,55,8 - LTEXT "CVS",IDC_WINEVER,179,17,56,8 + LTEXT PACKAGE_STRING,IDC_STATIC,119,17,120,8 CONTROL IDB_WINE,IDC_STATIC,"Static",SS_BITMAP ,15,17,157,111 LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 - CTEXT "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", + LTEXT "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", IDC_STATIC,119,44,124,72 END diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index e085cbe404b..576c0f127ef 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -27,11 +27,10 @@ IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270 STYLE WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - RTEXT "Wine Versie:",IDC_STATIC,119,17,70,8 - LTEXT "CVS",IDC_WINEVER,191,17,54,8 + LTEXT PACKAGE_STRING,IDC_STATIC,119,17,120,8 CONTROL IDB_WINE,IDC_STATIC,"Static",SS_BITMAP ,15,17,157,111 - CTEXT "http://www.winehq.org/",IDC_STATIC,119,31,124,8 - CTEXT "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", + LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,124,8 + LTEXT "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", IDC_STATIC,119,44,124,72 END diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index d063fb3c84b..3b0d5c33171 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -26,11 +26,10 @@ IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270 STYLE WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Wine-versjon:",IDC_STATIC,119,17,55,8 - LTEXT "CVS",IDC_WINEVER,179,17,56,8 + LTEXT PACKAGE_STRING,IDC_STATIC,119,17,120,8 CONTROL IDB_WINE,IDC_STATIC,"Static",SS_BITMAP ,15,17,157,111 LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 - CTEXT "Dette biblioteket er fri programvarer; det kan redistribueres i henhold til vilkеrene i GNU Lesser General Public License utgitt av «the Free Software Foundation», enten versjon 2.1 av denne Lisensen, eller (hvis du шnsker det) en nyere versjon.", + LTEXT "Dette biblioteket er fri programvarer; det kan redistribueres i henhold til vilkеrene i GNU Lesser General Public License utgitt av «the Free Software Foundation», enten versjon 2.1 av denne Lisensen, eller (hvis du шnsker det) en nyere versjon.", IDC_STATIC,119,44,124,72 END diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index d1796bca14f..d375ef6a7d5 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -26,14 +26,13 @@ IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270 STYLE WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Версия Wine:",IDC_STATIC,119,17,55,8 - LTEXT "CVS",IDC_WINEVER,179,17,56,8 + LTEXT PACKAGE_STRING,IDC_STATIC,119,17,120,8 CONTROL IDB_WINE,IDC_STATIC,"Static",SS_BITMAP ,15,17,157,111 LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 /* - CTEXT "Эта библиотека является свободным программным обеспечением; вы можете распространять её и/или модифицировать согласно условиям лицензии GNU Lesser General Public License, опубликованной Free Software Foundation; версии 2.1 лицензии или (на ваше усмотрение) любой более поздней.", + LTEXT "Эта библиотека является свободным программным обеспечением; вы можете распространять её и/или модифицировать согласно условиям лицензии GNU Lesser General Public License, опубликованной Free Software Foundation; версии 2.1 лицензии или (на ваше усмотрение) любой более поздней.", */ - CTEXT "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", + LTEXT "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", IDC_STATIC,119,44,124,72 END diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 789f0e68a42..1edab366787 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -52,7 +52,6 @@ #define IDB_WINE_LOGO 200 #define IDC_TABABOUT 1001 #define IDC_APPLYBTN 1002 -#define IDC_WINEVER 1011 #define IDC_WINVER 1012 #define IDC_SYSCOLORS 1017 #define IDC_PRIVATEMAP 1018 diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index f7bdb1420b5..018ad0570d3 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" #include "windef.h" #include "winbase.h" #include "wingdi.h"