Skip to content
Snippets Groups Projects
Commit 4006306d authored by Yann Leboulanger's avatar Yann Leboulanger
Browse files

typo in windows installer script + french translation

parent 7bc8f160
No related branches found
No related tags found
No related merge requests found
...@@ -4,6 +4,8 @@ Name "Gajim" ...@@ -4,6 +4,8 @@ Name "Gajim"
OutFile "Gajim.exe" OutFile "Gajim.exe"
SetCompressor /final /solid lzma SetCompressor /final /solid lzma
!define myAppName "Gajim"
InstallDir "$PROGRAMFILES\Gajim" InstallDir "$PROGRAMFILES\Gajim"
InstallDirRegKey HKCU "Software\Gajim" "" InstallDirRegKey HKCU "Software\Gajim" ""
RequestExecutionLevel admin RequestExecutionLevel admin
...@@ -77,8 +79,8 @@ LangString DESC_SecAutostart ${LANG_FRENCH} "Si activ ...@@ -77,8 +79,8 @@ LangString DESC_SecAutostart ${LANG_FRENCH} "Si activ
LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement dja install." LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement dja install."
LangString STR_Uninstall ${LANG_FRENCH} "Lancer la Dsinstallation" LangString STR_Uninstall ${LANG_FRENCH} "Lancer la Dsinstallation"
LangString STR_Cancel ${LANG_FRENCH} "Annuler" LangString STR_Cancel ${LANG_FRENCH} "Annuler"
LangString STR_Running ${LANG_FRENCH} "It appears that Gajim is currently running.$\n\ LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lanc.$\n\
Close it and restart uninstaller." Fermez-le et redmarrez le dsinstallateur."
; German ; German
LangString NAME_Emoticons ${LANG_GERMAN} "Emoticons" LangString NAME_Emoticons ${LANG_GERMAN} "Emoticons"
...@@ -782,7 +784,7 @@ Function un.onInit ...@@ -782,7 +784,7 @@ Function un.onInit
; Check that Gajim is not running before uninstalling ; Check that Gajim is not running before uninstalling
FindWindow $0 "gdkWindowToplevel" "Gajim" FindWindow $0 "gdkWindowToplevel" "Gajim"
StrCmp $0 0 Remove StrCmp $0 0 Remove
MessageBox MB_ICONSTOP|MB_OK STR_Running MessageBox MB_ICONSTOP|MB_OK $(STR_Running)
Quit Quit
Remove: Remove:
FunctionEnd FunctionEnd
...@@ -796,17 +798,11 @@ Function .onInit ...@@ -796,17 +798,11 @@ Function .onInit
StrCmp $0 0 launch StrCmp $0 0 launch
StrLen $0 "$(^Name)" StrLen $0 "$(^Name)"
IntOp $0 $0 + 1 IntOp $0 $0 + 1
;; loop: FindWindow $1 '#32770' '' 0 $1
FindWindow $1 '#32770' '' 0 $1 IntCmp $1 0 +3
;; IntCmp $1 0 +5 System::Call "user32::ShowWindow(i r1,i 9) i." ; If minimized then maximize
IntCmp $1 0 +4 System::Call "user32::SetForegroundWindow(i r1) i." ; Bring to front
System::Call "user32::GetWindowText(i r1, t .r2, i r0) i." Abort
;; Don't compare name, it's not "Gajim", it depends on window currently shown
;; Bad because we could open another nsin installer, but that's rare to have several installler running
;; StrCmp $2 "$(^Name)" 0 loop
System::Call "user32::ShowWindow(i r1,i 9) i." ; If minimized then maximize
System::Call "user32::SetForegroundWindow(i r1) i." ; Bring to front
Abort
launch: launch:
; Check to see if old install (inno setup) is already installed ; Check to see if old install (inno setup) is already installed
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment