Skip to content
GitLab
Commit 93e31aea authored by Max-Wilhelm Bruker's avatar Max-Wilhelm Bruker
Browse files

translation update; windows installer code

parent 6829e2ed
Hide whitespace changes
Inline Side-by-side
cockatrice/translations/cockatrice_de.ts
View file @ 93e31aea
...@@ -564,32 +564,54 @@ ...@@ -564,32 +564,54 @@
<context> <context>
<name>DlgSettings</name> <name>DlgSettings</name>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="459"/> <location filename="../src/dlg_settings.cpp" line="460"/>
<location filename="../src/dlg_settings.cpp" line="463"/>
<location filename="../src/dlg_settings.cpp" line="466"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
<location filename="../src/dlg_settings.cpp" line="460"/>
<source>Your card database is invalid. Please check if the path is set correctly.</source>
<translation>Ihre Kartendatenbank ist ungültig. Bitte überprüfen Sie, ob der Pfad korrekt gesetzt ist.</translation>
</message>
<message>
<location filename="../src/dlg_settings.cpp" line="463"/>
<source>The path to your deck directory is invalid.</source>
<translation>Der Pfad zum Deckverzeichnis ist ungültig.</translation>
</message>
<message>
<location filename="../src/dlg_settings.cpp" line="466"/>
<source>The path to your card pictures directory is invalid.</source>
<translation>Der Pfad zum Kartenbilderverzeichnis ist ungültig.</translation>
</message>
<message>
<location filename="../src/dlg_settings.cpp" line="474"/>
<source>Settings</source> <source>Settings</source>
<translation>Einstellungen</translation> <translation>Einstellungen</translation>
</message> </message>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="461"/> <location filename="../src/dlg_settings.cpp" line="476"/>
<source>General</source> <source>General</source>
<translation>Allgemeines</translation> <translation>Allgemeines</translation>
</message> </message>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="462"/> <location filename="../src/dlg_settings.cpp" line="477"/>
<source>Appearance</source> <source>Appearance</source>
<translation>Erscheinungsbild</translation> <translation>Erscheinungsbild</translation>
</message> </message>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="463"/> <location filename="../src/dlg_settings.cpp" line="478"/>
<source>User interface</source> <source>User interface</source>
<translation>Bedienung</translation> <translation>Bedienung</translation>
</message> </message>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="464"/> <location filename="../src/dlg_settings.cpp" line="479"/>
<source>Messages</source> <source>Messages</source>
<translation>Nachrichten</translation> <translation>Nachrichten</translation>
</message> </message>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="466"/> <location filename="../src/dlg_settings.cpp" line="481"/>
<source>&amp;Close</source> <source>&amp;Close</source>
<translation>S&amp;chließen</translation> <translation>S&amp;chließen</translation>
</message> </message>
...@@ -2237,17 +2259,17 @@ ...@@ -2237,17 +2259,17 @@
<translation>Deck</translation> <translation>Deck</translation>
</message> </message>
<message> <message>
<location filename="../src/playerlistwidget.cpp" line="51"/> <location filename="../src/playerlistwidget.cpp" line="52"/>
<source>no deck</source> <source>no deck</source>
<translation>kein Deck</translation> <translation>kein Deck</translation>
</message> </message>
<message> <message>
<location filename="../src/playerlistwidget.cpp" line="52"/> <location filename="../src/playerlistwidget.cpp" line="53"/>
<source>local deck</source> <source>local deck</source>
<translation>lokales Deck</translation> <translation>lokales Deck</translation>
</message> </message>
<message> <message>
<location filename="../src/playerlistwidget.cpp" line="53"/> <location filename="../src/playerlistwidget.cpp" line="54"/>
<source>ID #%1</source> <source>ID #%1</source>
<translation>ID #%1</translation> <translation>ID #%1</translation>
</message> </message>
...@@ -2770,17 +2792,17 @@ Willst du die Änderungen speichern?</translation> ...@@ -2770,17 +2792,17 @@ Willst du die Änderungen speichern?</translation>
<translation type="obsolete">alphabetisch sortieren</translation> <translation type="obsolete">alphabetisch sortieren</translation>
</message> </message>
<message> <message>
<location filename="../src/zoneviewwidget.cpp" line="70"/> <location filename="../src/zoneviewwidget.cpp" line="71"/>
<source>sort by name</source> <source>sort by name</source>
<translation>nach Namen sortieren</translation> <translation>nach Namen sortieren</translation>
</message> </message>
<message> <message>
<location filename="../src/zoneviewwidget.cpp" line="72"/> <location filename="../src/zoneviewwidget.cpp" line="73"/>
<source>sort by type</source> <source>sort by type</source>
<translation>nach Kartentypen sortieren</translation> <translation>nach Kartentypen sortieren</translation>
</message> </message>
<message> <message>
<location filename="../src/zoneviewwidget.cpp" line="74"/> <location filename="../src/zoneviewwidget.cpp" line="75"/>
<source>shuffle when closing</source> <source>shuffle when closing</source>
<translation>beim Schließen mischen</translation> <translation>beim Schließen mischen</translation>
</message> </message>
......
cockatrice/translations/cockatrice_en.ts
View file @ 93e31aea
...@@ -453,32 +453,54 @@ ...@@ -453,32 +453,54 @@
<context> <context>
<name>DlgSettings</name> <name>DlgSettings</name>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="459"/> <location filename="../src/dlg_settings.cpp" line="460"/>
<location filename="../src/dlg_settings.cpp" line="463"/>
<location filename="../src/dlg_settings.cpp" line="466"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/dlg_settings.cpp" line="460"/>
<source>Your card database is invalid. Please check if the path is set correctly.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/dlg_settings.cpp" line="463"/>
<source>The path to your deck directory is invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/dlg_settings.cpp" line="466"/>
<source>The path to your card pictures directory is invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/dlg_settings.cpp" line="474"/>
<source>Settings</source> <source>Settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="461"/> <location filename="../src/dlg_settings.cpp" line="476"/>
<source>General</source> <source>General</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="462"/> <location filename="../src/dlg_settings.cpp" line="477"/>
<source>Appearance</source> <source>Appearance</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="463"/> <location filename="../src/dlg_settings.cpp" line="478"/>
<source>User interface</source> <source>User interface</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="464"/> <location filename="../src/dlg_settings.cpp" line="479"/>
<source>Messages</source> <source>Messages</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/dlg_settings.cpp" line="466"/> <location filename="../src/dlg_settings.cpp" line="481"/>
<source>&amp;Close</source> <source>&amp;Close</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
...@@ -1516,17 +1538,17 @@ ...@@ -1516,17 +1538,17 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/playerlistwidget.cpp" line="51"/> <location filename="../src/playerlistwidget.cpp" line="52"/>
<source>no deck</source> <source>no deck</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/playerlistwidget.cpp" line="52"/> <location filename="../src/playerlistwidget.cpp" line="53"/>
<source>local deck</source> <source>local deck</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/playerlistwidget.cpp" line="53"/> <location filename="../src/playerlistwidget.cpp" line="54"/>
<source>ID #%1</source> <source>ID #%1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
...@@ -1992,17 +2014,17 @@ Do you want to save the changes?</source> ...@@ -1992,17 +2014,17 @@ Do you want to save the changes?</source>
<context> <context>
<name>ZoneViewWidget</name> <name>ZoneViewWidget</name>
<message> <message>
<location filename="../src/zoneviewwidget.cpp" line="70"/> <location filename="../src/zoneviewwidget.cpp" line="71"/>
<source>sort by name</source> <source>sort by name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/zoneviewwidget.cpp" line="72"/> <location filename="../src/zoneviewwidget.cpp" line="73"/>
<source>sort by type</source> <source>sort by type</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../src/zoneviewwidget.cpp" line="74"/> <location filename="../src/zoneviewwidget.cpp" line="75"/>
<source>shuffle when closing</source> <source>shuffle when closing</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
......
nsis/cockatrice.nsi 0 → 100644
View file @ 93e31aea
!include "MUI2.nsh"
Name "Cockatrice"
OutFile "cockatrice_win32.exe"
SetCompressor lzma
InstallDir "$PROGRAMFILES\Cockatrice"
!define MUI_ABORTWARNING
!define MUI_WELCOMEFINISHPAGE_BITMAP "leftimage.bmp"
!define MUI_HEADERIMAGE
!define MUI_HEADERIMAGE_BITMAP "headerimage.bmp"
!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of Cockatrice.$\r$\n$\r$\nClick Next to continue."
!define MUI_FINISHPAGE_RUN "$INSTDIR/oracle.exe"
!define MUI_FINISHPAGE_RUN_TEXT "Run card database downloader now"
!define MUI_FINISHPAGE_RUN_PARAMETERS "-dlsets"
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
!insertmacro MUI_PAGE_FINISH
!insertmacro MUI_LANGUAGE "English"
Section "Application" SecApplication
SetOutPath "$INSTDIR"
File ..\cockatrice\release\cockatrice.exe
File ..\oracle\release\oracle.exe
File data\libgcc_s_dw2-1.dll
File data\mingwm10.dll
File data\QtCore4.dll
File data\QtGui4.dll
File data\QtNetwork4.dll
File data\QtSvg4.dll
File data\QtXml4.dll
SetOutPath "$INSTDIR\zonebg"
File /r ..\zonebg\*.*
SetOutPath "$INSTDIR\plugins"
File /r data\plugins\*.*
SetOutPath "$INSTDIR\pics"
SetOutPath "$INSTDIR\decks"
SectionEnd
Section "Update configuration" SecUpdateConfig
WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "carddatabase" "$INSTDIR\cards.xml"
WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "decks" "$INSTDIR\decks"
WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "pics" "$INSTDIR\pics"
SectionEnd
Section "Start menu item" SecStartMenu
createDirectory "$SMPROGRAMS\Cockatrice"
createShortCut "$SMPROGRAMS\Cockatrice\Cockatrice.lnk" "$INSTDIR\cockatrice.exe"
createShortCut "$SMPROGRAMS\Cockatrice\Oracle.lnk" "$INSTDIR\oracle.exe"
SectionEnd
LangString DESC_SecApplication ${LANG_ENGLISH} "Cockatrice program files"
LangString DESC_SecUpdateConfig ${LANG_ENGLISH} "Update the paths in the application settings according to the installation paths."
LangString DESC_SecStartMenu ${LANG_ENGLISH} "Create start menu items for Cockatrice and Oracle."
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SecApplication} $(DESC_SecApplication)
!insertmacro MUI_DESCRIPTION_TEXT ${SecUpdateConfig} $(DESC_SecUpdateConfig)
!insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenu} $(DESC_SecStartMenu)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment