diff --git a/programs/uninstaller/Bg.rc b/programs/uninstaller/Bg.rc index 45705148187..517f3e2b7a1 100644 --- a/programs/uninstaller/Bg.rc +++ b/programs/uninstaller/Bg.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { diff --git a/programs/uninstaller/Cs.rc b/programs/uninstaller/Cs.rc index 69446360eda..ed73cd33bf7 100644 --- a/programs/uninstaller/Cs.rc +++ b/programs/uninstaller/Cs.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL /* Czech strings in CP1250 */ diff --git a/programs/uninstaller/Da.rc b/programs/uninstaller/Da.rc index 1c928d72240..696413c4110 100644 --- a/programs/uninstaller/Da.rc +++ b/programs/uninstaller/Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { diff --git a/programs/uninstaller/De.rc b/programs/uninstaller/De.rc index a01bd7a8d65..fb196216dcd 100644 --- a/programs/uninstaller/De.rc +++ b/programs/uninstaller/De.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { diff --git a/programs/uninstaller/En.rc b/programs/uninstaller/En.rc index f6ce7b2aa0b..728254318b5 100644 --- a/programs/uninstaller/En.rc +++ b/programs/uninstaller/En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { diff --git a/programs/uninstaller/Eo.rc b/programs/uninstaller/Eo.rc index 52153620c1f..199356b302a 100644 --- a/programs/uninstaller/Eo.rc +++ b/programs/uninstaller/Eo.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ESPERANTO, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { diff --git a/programs/uninstaller/Es.rc b/programs/uninstaller/Es.rc index 0fe7d14763d..7862cea676c 100644 --- a/programs/uninstaller/Es.rc +++ b/programs/uninstaller/Es.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { diff --git a/programs/uninstaller/Fi.rc b/programs/uninstaller/Fi.rc index 0114990bdb0..13bc170cf07 100644 --- a/programs/uninstaller/Fi.rc +++ b/programs/uninstaller/Fi.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { diff --git a/programs/uninstaller/Fr.rc b/programs/uninstaller/Fr.rc index d9ec2a86cc5..d1a44854683 100644 --- a/programs/uninstaller/Fr.rc +++ b/programs/uninstaller/Fr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { diff --git a/programs/uninstaller/Hu.rc b/programs/uninstaller/Hu.rc index bfd689ca577..d58e54dff16 100644 --- a/programs/uninstaller/Hu.rc +++ b/programs/uninstaller/Hu.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { diff --git a/programs/uninstaller/It.rc b/programs/uninstaller/It.rc index af21f6cbc49..3eaad1f684d 100644 --- a/programs/uninstaller/It.rc +++ b/programs/uninstaller/It.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { diff --git a/programs/uninstaller/Ko.rc b/programs/uninstaller/Ko.rc index 7300c114b27..a14ac3d9664 100644 --- a/programs/uninstaller/Ko.rc +++ b/programs/uninstaller/Ko.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { diff --git a/programs/uninstaller/Lt.rc b/programs/uninstaller/Lt.rc index 1a3156a6573..7cf0dc26486 100644 --- a/programs/uninstaller/Lt.rc +++ b/programs/uninstaller/Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -27,5 +29,3 @@ STRINGTABLE DISCARDABLE { IDS_APPNAME, "Wine programų šalinimo programa" IDS_UNINSTALLFAILED, "Nepavyko įvykdyti programos pašalinimo komandos '%s', greičiausiai dėl trūkstamo vykdomojo failo.\r\nAr norite pašalinti programos šalinimo įrašą iš registro?" } - -#pragma code_page(default) diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in index 0f7e0e462e5..0c9851c0b65 100644 --- a/programs/uninstaller/Makefile.in +++ b/programs/uninstaller/Makefile.in @@ -11,7 +11,30 @@ DELAYIMPORTS = shlwapi shell32 user32 gdi32 C_SRCS = \ main.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Bg.rc \ + Cs.rc \ + Da.rc \ + De.rc \ + En.rc \ + Eo.rc \ + Es.rc \ + Fi.rc \ + Fr.rc \ + Hu.rc \ + It.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ro.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc @MAKE_PROG_RULES@ diff --git a/programs/uninstaller/Nl.rc b/programs/uninstaller/Nl.rc index 8c645b707eb..97d218417ef 100644 --- a/programs/uninstaller/Nl.rc +++ b/programs/uninstaller/Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { diff --git a/programs/uninstaller/No.rc b/programs/uninstaller/No.rc index 2aaa1ecd2f3..470f8d9bb3f 100644 --- a/programs/uninstaller/No.rc +++ b/programs/uninstaller/No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE { diff --git a/programs/uninstaller/Pl.rc b/programs/uninstaller/Pl.rc index 7451e63da0f..174759aad3a 100644 --- a/programs/uninstaller/Pl.rc +++ b/programs/uninstaller/Pl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { diff --git a/programs/uninstaller/Pt.rc b/programs/uninstaller/Pt.rc index 14c7867133b..01c26f875c5 100644 --- a/programs/uninstaller/Pt.rc +++ b/programs/uninstaller/Pt.rc @@ -18,6 +18,8 @@ * */ +#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE DISCARDABLE { diff --git a/programs/uninstaller/Ro.rc b/programs/uninstaller/Ro.rc index 5f0248879f3..770b4a69c7c 100644 --- a/programs/uninstaller/Ro.rc +++ b/programs/uninstaller/Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -25,5 +27,3 @@ STRINGTABLE DISCARDABLE { IDS_APPNAME, "Programul de dezinstalare de aplicații Wine" IDS_UNINSTALLFAILED, "Execuția comenzi de dezinstalare '%s' a eșuat, probabil din lipsa fișierului executabil.\r\nDoriți să ștergeți înregistrarea de dezinstalare din registru?" } - -#pragma code_page(default) diff --git a/programs/uninstaller/Ru.rc b/programs/uninstaller/Ru.rc index bada09cafa1..512b8f6a2c7 100644 --- a/programs/uninstaller/Ru.rc +++ b/programs/uninstaller/Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { diff --git a/programs/uninstaller/Si.rc b/programs/uninstaller/Si.rc index a971ae35b3a..598df642b72 100644 --- a/programs/uninstaller/Si.rc +++ b/programs/uninstaller/Si.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -26,5 +28,3 @@ STRINGTABLE DISCARDABLE { IDS_APPNAME, "Wine Odstranjevalec programov" IDS_UNINSTALLFAILED, "Izvedba odstranitvenega ukaza '%s' ni uspela, morda zaradi manjkajoče izvršljive datoteke.\r\nAli želite odstraniti odstranitveni ključ iz registra?" } - -#pragma code_page(default) diff --git a/programs/uninstaller/Sv.rc b/programs/uninstaller/Sv.rc index 00d08103dee..3365e2e4bf4 100644 --- a/programs/uninstaller/Sv.rc +++ b/programs/uninstaller/Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { diff --git a/programs/uninstaller/Tr.rc b/programs/uninstaller/Tr.rc index 5a46812552a..ce31e15ef6e 100644 --- a/programs/uninstaller/Tr.rc +++ b/programs/uninstaller/Tr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { diff --git a/programs/uninstaller/Zh.rc b/programs/uninstaller/Zh.rc index 6e0e2beb992..368814c9582 100644 --- a/programs/uninstaller/Zh.rc +++ b/programs/uninstaller/Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -34,5 +36,3 @@ STRINGTABLE DISCARDABLE { IDS_APPNAME, "Wine 應有程式卸載管理器" IDS_UNINSTALLFAILED, "卸載指令執行失敗 '%s', 可能是找不到可執行程式.\r\n你想把這項卸載指令從註冊表中刪除嗎?" } - -#pragma code_page(default) diff --git a/programs/uninstaller/resource.h b/programs/uninstaller/resource.h index b30be4ecba3..67e1f4b424f 100644 --- a/programs/uninstaller/resource.h +++ b/programs/uninstaller/resource.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include + #define IDS_APPNAME 1000 #define IDS_UNINSTALLFAILED 1001 #define MAX_STRING_LEN 255 diff --git a/programs/uninstaller/rsrc.rc b/programs/uninstaller/rsrc.rc deleted file mode 100644 index 799e3f6a290..00000000000 --- a/programs/uninstaller/rsrc.rc +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Uninstaller (rsrc.rc) - * - * Copyright 2000 Andreas Mohr - * Copyright 2003 Vincent Bron - * Copyright 2003 Ivan Leo Puoti - * Copyright 2004 David Kredba - * Copyright 2005 Jonathan Ernst - * - * 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. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include -#include - -#include "resource.h" -#include "Bg.rc" -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Eo.rc" -#include "Es.rc" -#include "Fi.rc" -#include "Fr.rc" -#include "It.rc" -#include "Hu.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ro.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc"