diff --git a/build-all-mingw32make.bat b/build-all-mingw32make.bat index d7105ec05..7e2c9673c 100644 --- a/build-all-mingw32make.bat +++ b/build-all-mingw32make.bat @@ -1,4 +1,4 @@ -set QTDIR=h:\qt\2010.01 +set QTDIR=d:\qt\2010.01 set MINGW=%QTDIR%\mingw set PATH=%QTDIR%\qt\bin;%QTDIR%\bin;%MINGW%\bin;%PATH% @@ -71,19 +71,11 @@ qmake libretroshare.pro mingw32-make %%a -cd ..\..\plugins +cd ..\..\retroshare-nogui\src if not %clean%x==x mingw32-make clean -qmake plugins.pro - -mingw32-make %%a - -rem cd ..\..\retroshare-nogui\src - -rem if not %clean%x==x mingw32-make clean - -rem qmake retroshare-nogui.pro +qmake retroshare-nogui.pro mingw32-make %%a diff --git a/retroshare-gui/src/retroshare.in b/retroshare-gui/src/retroshare.in index 844b619d1..0df556324 100644 --- a/retroshare-gui/src/retroshare.in +++ b/retroshare-gui/src/retroshare.in @@ -1,11 +1,11 @@ -; Script generated with the Venis Install Wizard & modified by defnax +; Script generated with the Venis Install Wizard & modified by defnax ; Define your application name !define APPNAME "RetroShare" -!define VERSION "0.5.3c" +!define VERSION "0.5.4" !define REVISION "$WCREV$" !define APPNAMEANDVERSION "${APPNAME} ${VERSION} ${REVISION}" -!define QTBASE "H:\qt\2010.01" +!define QTBASE "d:\qt\2010.01" ; Main Install settings Name "${APPNAMEANDVERSION}" @@ -153,30 +153,30 @@ ReserveFile "${NSISDIR}\Plugins\AdvSplash.dll" LangString DESC_sec_link ${LANG_GERMAN} "RetroShare mit .rsc Dateiendung verknüpfen" LangString LANGUAGEID ${LANG_GERMAN} "1031" - LangString sec_main ${LANG_TURKISH} "Program Dosyalar�" + LangString sec_main ${LANG_TURKISH} "Program Dosyalar?" LangString sec_data ${LANG_TURKISH} "Program Skinleri" LangString sec_shortcuts ${LANG_TURKISH} "Shortcut'lar" LangString sec_plugins ${LANG_TURKISH} "Eklentiler" LangString sec_link ${LANG_TURKISH} ".rsc Dosya Kaydet" LangString sec_autostart ${LANG_TURKISH} "Otomatik calistir ve baglan" - LangString DESC_sec_main ${LANG_TURKISH} "Program dosyalar�n� kurar." + LangString DESC_sec_main ${LANG_TURKISH} "Program dosyalar?n? kurar." LangString DESC_sec_data ${LANG_TURKISH} "RetroShare Skin'leri kurar" LangString DESC_sec_plugins ${LANG_TURKISH} "Installs the RetroShare plugins." LangString DESC_sec_shortcuts ${TURKISH} "Shortcut yap Start menu , Desktop veya Quicklaunchbar icin." - LangString DESC_sec_link ${LANG_TURKISH} "RetroShare .rsc almas� i�in kaydettirir" + LangString DESC_sec_link ${LANG_TURKISH} "RetroShare .rsc almas? i?in kaydettirir" LangString LANGUAGEID ${LANG_TURKISH} "1055" - LangString sec_main ${LANG_SIMPCHINESE} "程序文件" - LangString sec_data ${LANG_SIMPCHINESE} "程序皮肤" + LangString sec_main ${LANG_SIMPCHINESE} "????" + LangString sec_data ${LANG_SIMPCHINESE} "????" LangString sec_plugins ${LANG_SIMPCHINESE} "Plugins" - LangString sec_shortcuts ${LANG_SIMPCHINESE} "快捷方式" - LangString sec_link ${LANG_SIMPCHINESE} "RetroShare文件关联" - LangString sec_autostart ${LANG_SIMPCHINESE} "自动启动" - LangString DESC_sec_main ${LANG_SIMPCHINESE} "安装RetroShare程序" - LangString DESC_sec_data ${LANG_SIMPCHINESE} "安装RetroShare皮肤" + LangString sec_shortcuts ${LANG_SIMPCHINESE} "????" + LangString sec_link ${LANG_SIMPCHINESE} "RetroShare????" + LangString sec_autostart ${LANG_SIMPCHINESE} "????" + LangString DESC_sec_main ${LANG_SIMPCHINESE} "??RetroShare??" + LangString DESC_sec_data ${LANG_SIMPCHINESE} "??RetroShare??" LangString DESC_sec_plugins ${LANG_SIMPCHINESE} "Installs the RetroShare plugins." - LangString DESC_sec_shortcuts ${LANG_SIMPCHINESE} "建RetroShare快捷方式" - LangString DESC_sec_link ${LANG_SIMPCHINESE} "关联.rsc扩展名" + LangString DESC_sec_shortcuts ${LANG_SIMPCHINESE} "?RetroShare????" + LangString DESC_sec_link ${LANG_SIMPCHINESE} "??.rsc???" LangString LANGUAGEID ${LANG_SIMPCHINESE} "2052" LangString sec_main ${LANG_POLISH} "Pliki programu" @@ -550,8 +550,8 @@ LangString FINISHPAGELINK ${LANG_ENGLISH} "Visit the RetroShare forums for t LangString FINISHPAGELINK ${LANG_GERMAN} "Das RetroShare Support-Forum besuchen, um Neuigkeiten und Unterstützung zu erfahren" LangString FINISHPAGELINK ${LANG_TURKISH} "Destek için Retroshare foruma ziyaret et" LangString FINISHPAGELINK ${LANG_FRENCH} "Consultez le forum RetroShare pour vous tenir au courant des dernieres modifications, et obtenir de l'aide." -LangString FINISHPAGELINK ${LANG_SIMPCHINESE} "帮助论坛" -LangString FINISHPAGELINK ${LANG_POLISH} "Odwiedź forum RetroShare do najświeższych informacji i wsparcia" +LangString FINISHPAGELINK ${LANG_SIMPCHINESE} "????" +LangString FINISHPAGELINK ${LANG_POLISH} "Odwiedz forum RetroShare do najswiezszych informacji i wsparcia" LangString FINISHPAGELINK ${LANG_DANISH} "Besøg RetroShare fora for de seneste nyheder og støtte" LangString FINISHPAGELINK ${LANG_JAPANESE} "Visit the RetroShare forums for the latest news and support" LangString FINISHPAGELINK ${LANG_KOREAN} "Visit the RetroShare forums for the latest news and support" @@ -564,9 +564,9 @@ LangString FINISHPAGELINK ${LANG_PORTUGUESEBR} "Visit the RetroShare forums for LangString ^UninstallLink ${LANG_ENGLISH} "Uninstall" LangString ^UninstallLink ${LANG_GERMAN} "Deinstallieren" -LangString ^UninstallLink ${LANG_TURKISH} "Kald�r" +LangString ^UninstallLink ${LANG_TURKISH} "Kald?r" LangString ^UninstallLink ${LANG_FRENCH} "Désinstaller" -LangString ^UninstallLink ${LANG_SIMPCHINESE} "卸载" +LangString ^UninstallLink ${LANG_SIMPCHINESE} "??" LangString ^UninstallLink ${LANG_POLISH} "Odinstaluj" LangString ^UninstallLink ${LANG_DANISH} "Afinstaller" LangString ^UninstallLink ${LANG_JAPANESE} "Uninstall" @@ -575,7 +575,7 @@ LangString ^UninstallLink ${LANG_RUSSIAN} "Uninstall" LangString ^UninstallLink ${LANG_SWEDISH} "Avinstallera" LangString ^UninstallLink ${LANG_SPANISH} "Desinstalar" LangString ^UninstallLink ${LANG_ITALIAN} "Disinstallare" -LangString ^UninstallLink ${LANG_GREEK} "Απεγκατάσταση" +LangString ^UninstallLink ${LANG_GREEK} "?pe??at?stas?" LangString ^UninstallLink ${LANG_PORTUGUESEBR} "Desinstalar" ; eof diff --git a/retroshare-gui/src/retroshare.nsi b/retroshare-gui/src/retroshare.nsi index 54b76d2ea..900c0a437 100644 --- a/retroshare-gui/src/retroshare.nsi +++ b/retroshare-gui/src/retroshare.nsi @@ -1,11 +1,11 @@ -; Script generated with the Venis Install Wizard & modified by defnax +; Script generated with the Venis Install Wizard & modified by defnax ; Define your application name !define APPNAME "RetroShare" -!define VERSION "0.5.3c" -!define REVISION "5547" +!define VERSION "0.5.4" +!define REVISION "5564" !define APPNAMEANDVERSION "${APPNAME} ${VERSION} ${REVISION}" -!define QTBASE "H:\qt\2010.01" +!define QTBASE "d:\qt\2010.01" ; Main Install settings Name "${APPNAMEANDVERSION}" @@ -153,30 +153,30 @@ ReserveFile "${NSISDIR}\Plugins\AdvSplash.dll" LangString DESC_sec_link ${LANG_GERMAN} "RetroShare mit .rsc Dateiendung verknüpfen" LangString LANGUAGEID ${LANG_GERMAN} "1031" - LangString sec_main ${LANG_TURKISH} "Program Dosyalar�" + LangString sec_main ${LANG_TURKISH} "Program Dosyalar?" LangString sec_data ${LANG_TURKISH} "Program Skinleri" LangString sec_shortcuts ${LANG_TURKISH} "Shortcut'lar" LangString sec_plugins ${LANG_TURKISH} "Eklentiler" LangString sec_link ${LANG_TURKISH} ".rsc Dosya Kaydet" LangString sec_autostart ${LANG_TURKISH} "Otomatik calistir ve baglan" - LangString DESC_sec_main ${LANG_TURKISH} "Program dosyalar�n� kurar." + LangString DESC_sec_main ${LANG_TURKISH} "Program dosyalar?n? kurar." LangString DESC_sec_data ${LANG_TURKISH} "RetroShare Skin'leri kurar" LangString DESC_sec_plugins ${LANG_TURKISH} "Installs the RetroShare plugins." LangString DESC_sec_shortcuts ${TURKISH} "Shortcut yap Start menu , Desktop veya Quicklaunchbar icin." - LangString DESC_sec_link ${LANG_TURKISH} "RetroShare .rsc almas� i�in kaydettirir" + LangString DESC_sec_link ${LANG_TURKISH} "RetroShare .rsc almas? i?in kaydettirir" LangString LANGUAGEID ${LANG_TURKISH} "1055" - LangString sec_main ${LANG_SIMPCHINESE} "程序文件" - LangString sec_data ${LANG_SIMPCHINESE} "程序皮肤" + LangString sec_main ${LANG_SIMPCHINESE} "????" + LangString sec_data ${LANG_SIMPCHINESE} "????" LangString sec_plugins ${LANG_SIMPCHINESE} "Plugins" - LangString sec_shortcuts ${LANG_SIMPCHINESE} "快捷方式" - LangString sec_link ${LANG_SIMPCHINESE} "RetroShare文件关联" - LangString sec_autostart ${LANG_SIMPCHINESE} "自动启动" - LangString DESC_sec_main ${LANG_SIMPCHINESE} "安装RetroShare程序" - LangString DESC_sec_data ${LANG_SIMPCHINESE} "安装RetroShare皮肤" + LangString sec_shortcuts ${LANG_SIMPCHINESE} "????" + LangString sec_link ${LANG_SIMPCHINESE} "RetroShare????" + LangString sec_autostart ${LANG_SIMPCHINESE} "????" + LangString DESC_sec_main ${LANG_SIMPCHINESE} "??RetroShare??" + LangString DESC_sec_data ${LANG_SIMPCHINESE} "??RetroShare??" LangString DESC_sec_plugins ${LANG_SIMPCHINESE} "Installs the RetroShare plugins." - LangString DESC_sec_shortcuts ${LANG_SIMPCHINESE} "建RetroShare快捷方式" - LangString DESC_sec_link ${LANG_SIMPCHINESE} "关联.rsc扩展名" + LangString DESC_sec_shortcuts ${LANG_SIMPCHINESE} "?RetroShare????" + LangString DESC_sec_link ${LANG_SIMPCHINESE} "??.rsc???" LangString LANGUAGEID ${LANG_SIMPCHINESE} "2052" LangString sec_main ${LANG_POLISH} "Pliki programu" @@ -550,8 +550,8 @@ LangString FINISHPAGELINK ${LANG_ENGLISH} "Visit the RetroShare forums for t LangString FINISHPAGELINK ${LANG_GERMAN} "Das RetroShare Support-Forum besuchen, um Neuigkeiten und Unterstützung zu erfahren" LangString FINISHPAGELINK ${LANG_TURKISH} "Destek için Retroshare foruma ziyaret et" LangString FINISHPAGELINK ${LANG_FRENCH} "Consultez le forum RetroShare pour vous tenir au courant des dernieres modifications, et obtenir de l'aide." -LangString FINISHPAGELINK ${LANG_SIMPCHINESE} "帮助论坛" -LangString FINISHPAGELINK ${LANG_POLISH} "Odwiedź forum RetroShare do najświeższych informacji i wsparcia" +LangString FINISHPAGELINK ${LANG_SIMPCHINESE} "????" +LangString FINISHPAGELINK ${LANG_POLISH} "Odwiedz forum RetroShare do najswiezszych informacji i wsparcia" LangString FINISHPAGELINK ${LANG_DANISH} "Besøg RetroShare fora for de seneste nyheder og støtte" LangString FINISHPAGELINK ${LANG_JAPANESE} "Visit the RetroShare forums for the latest news and support" LangString FINISHPAGELINK ${LANG_KOREAN} "Visit the RetroShare forums for the latest news and support" @@ -564,9 +564,9 @@ LangString FINISHPAGELINK ${LANG_PORTUGUESEBR} "Visit the RetroShare forums for LangString ^UninstallLink ${LANG_ENGLISH} "Uninstall" LangString ^UninstallLink ${LANG_GERMAN} "Deinstallieren" -LangString ^UninstallLink ${LANG_TURKISH} "Kald�r" +LangString ^UninstallLink ${LANG_TURKISH} "Kald?r" LangString ^UninstallLink ${LANG_FRENCH} "Désinstaller" -LangString ^UninstallLink ${LANG_SIMPCHINESE} "卸载" +LangString ^UninstallLink ${LANG_SIMPCHINESE} "??" LangString ^UninstallLink ${LANG_POLISH} "Odinstaluj" LangString ^UninstallLink ${LANG_DANISH} "Afinstaller" LangString ^UninstallLink ${LANG_JAPANESE} "Uninstall" @@ -575,7 +575,7 @@ LangString ^UninstallLink ${LANG_RUSSIAN} "Uninstall" LangString ^UninstallLink ${LANG_SWEDISH} "Avinstallera" LangString ^UninstallLink ${LANG_SPANISH} "Desinstalar" LangString ^UninstallLink ${LANG_ITALIAN} "Disinstallare" -LangString ^UninstallLink ${LANG_GREEK} "Απεγκατάσταση" +LangString ^UninstallLink ${LANG_GREEK} "?pe??at?stas?" LangString ^UninstallLink ${LANG_PORTUGUESEBR} "Desinstalar" ; eof