I suppose now is not the right time to be complaining about translations in
code? I guess we can change the build process later on so that they start as
something like a SimpleFieldSet and get converted during the build process?
(No idea how to do that in Windows, but it probably isn't a reason not to
deploy the wininstaller...)
On Wednesday 08 April 2009 20:05:13 Zero3 at freenetproject.org wrote:
> Author: Zero3
> Date: 2009-04-08 19:05:12 +0000 (Wed, 08 Apr 2009)
> New Revision: 26659
>
> Added:
> trunk/apps/wininstaller/src_translationhelper/
> trunk/apps/wininstaller/src_translationhelper/Include_Lang_da.inc
> trunk/apps/wininstaller/src_translationhelper/Include_Lang_fr.inc
>
trunk/apps/wininstaller/src_translationhelper/Include_TranslationHelper.ahk
> Removed:
>
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Include_Lang_da.inc
> Modified:
> trunk/apps/wininstaller/src_freenethelpers/FreenetLauncher.ahk
> trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller.ahk
>
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Include_Helpers.inc
>
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Uninstaller.ahk
> Log:
> Separated translation helper from main installer. Added localization to
uninstaller and launcher. In-dev Italian translation from Artefact2_.
>
> Modified: trunk/apps/wininstaller/src_freenethelpers/FreenetLauncher.ahk
> ===================================================================
> --- trunk/apps/wininstaller/src_freenethelpers/FreenetLauncher.ahk
2009-04-08 18:36:05 UTC (rev 26658)
> +++ trunk/apps/wininstaller/src_freenethelpers/FreenetLauncher.ahk
2009-04-08 19:05:12 UTC (rev 26659)
> @@ -11,18 +11,25 @@
> #NoEnv ;
> Recommended for performance and compatibility with future
AutoHotkey releases
> #NoTrayIcon ; We won't need
> this...
> #SingleInstance ignore ; Only
> allow one instance at any given time
> +
> +#Include ..\src_translationhelper\Include_TranslationHelper.ahk ;
> Include
translation helper
>
> SendMode, Input ;
> Recommended for new scripts due to its superior
speed and reliability
> StringCaseSense, Off ; Treat A-Z as
> equal to a-z when comparing
strings. Useful when dealing with folders, as Windows treat them as equals.
>
> SetWorkingDir, %A_ScriptDir% ; Look for
> other files relative to our own
location
> +
> +;
> +; General init stuff
> +;
> +InitTranslations()
>
> ;
> ; Figure out what our service is called
> ;
> IfNotExist, installid.dat
> {
> - PopupErrorMessage("Freenet Launcher was unable to find the
> installid.dat
ID file.`n`nMake sure that you are running Freenet Launcher from a Freenet
installation directory.`nIf you are already doing so, please report this
error message to the developers.")
> + PopupErrorMessage(Trans("Freenet Launcher was unable to find the
installid.dat ID file.`n`nMake sure that you are running Freenet Launcher
from a Freenet installation directory.`nIf you are already doing so, please
report this error message to the developers."))
> ExitApp, 1
> }
> Else
> @@ -38,7 +45,7 @@
> {
> IfNotExist, bin\start.exe
> {
> - PopupErrorMessage("Freenet Launcher was unable to find the
> bin\start.exe
launcher.`n`nPlease reinstall Freenet.`n`nIf the problem keeps occurring,
please report this error message to the developers.")
> + PopupErrorMessage(Trans("Freenet Launcher was unable to find
> the
bin\start.exe launcher.`n`nPlease reinstall Freenet.`n`nIf the problem keeps
occurring, please report this error message to the developers."))
> ExitApp, 1
> }
> Else
> @@ -52,7 +59,7 @@
> ;
> IfNotExist, freenet.ini
> {
> - PopupErrorMessage("Freenet Launcher was unable to find the freenet.ini
configuration file.`n`nMake sure that you are running Freenet Launcher from a
Freenet installation directory.`nIf you are already doing so, please report
this error message to the developers.")
> + PopupErrorMessage(Trans("Freenet Launcher was unable to find the
freenet.ini configuration file.`n`nMake sure that you are running Freenet
Launcher from a Freenet installation directory.`nIf you are already doing so,
please report this error message to the developers."))
> ExitApp, 1
> }
> Else
> @@ -60,7 +67,7 @@
> FileRead, _INI, freenet.ini
> If (RegExMatch(_INI, "i)fproxy.port=([0-9]{1,5})", _Port) == 0 ||
> !_Port1)
> {
> - PopupErrorMessage("Freenet Launcher was unable to read the
> 'fproxy.port'
value from the freenet.ini configuration file.`n`nPlease reinstall
Freenet.`n`nIf the problem keeps occurring, please report this error message
to the developers.")
> + PopupErrorMessage(Trans("Freenet Launcher was unable to read
the 'fproxy.port' value from the freenet.ini configuration file.`n`nPlease
reinstall Freenet.`n`nIf the problem keeps occurring, please report this
error message to the developers."))
> ExitApp, 1
> }
>
> @@ -68,7 +75,7 @@
> }
>
> ;
> -; Try browser: Mozilla FireFox (Tetsted versions: 3.0)
> +; Try browser: Mozilla FireFox (Tested versions: 3.0)
> ;
> RegRead, _FFVersion, HKEY_LOCAL_MACHINE, Software\Mozilla\Mozilla Firefox,
CurrentVersion
>
> @@ -100,7 +107,7 @@
> }
>
> ;
> -; Try browser: Google Chrome (Tested versions: 1.0.154) (no direct registry
key to where it is installed, so we will have to do with what we get)
> +; Try browser: Google Chrome (Tested versions: 1.0.154)
> ;
> RegRead, _ChromeInstallDir, HKEY_CURRENT_USER,
Software\Microsoft\Windows\CurrentVersion\Uninstall\Google Chrome,
InstallLocation
>
> @@ -127,7 +134,7 @@
> ;
> ; No usable browser found
> ;
> -PopupErrorMessage("Freenet Launcher was unable to find a supported
browser.`n`nPlease install one of the supported browsers, or
manually`nnavigate to the URL inside freenet.url.dat.`n`nFreenet Launcher
supports the following browsers:`n- Mozilla FireFox`n- Opera`n- Google
Chrome`n- Internet Explorer (not recommended)")
> +PopupErrorMessage(Trans("Freenet Launcher was unable to find a supported
browser.`n`nPlease install one of the supported browsers, or
manually`nnavigate to: ") _URL "`n`n" Trans("Freenet Launcher supports the
following browsers:") "`n- Mozilla FireFox`n- Opera`n- Google Chrome`n-
Internet Explorer (" Trans("not recommended") ")")
> ExitApp, 1
>
> ;
> @@ -135,7 +142,7 @@
> ;
> PopupErrorMessage(_ErrorMessage)
> {
> - MsgBox, 16, Freenet Launcher error, %_ErrorMessage% ; 16 = Icon
> Hand
(stop/error)
> + MsgBox, 16, % Trans("Freenet Launcher error"), %_ErrorMessage% ; 16 =
> Icon
Hand (stop/error)
> }
>
> Service_State(ServiceName)
>
> Modified: trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller.ahk
> ===================================================================
> --- trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller.ahk
2009-04-08 18:36:05 UTC (rev 26658)
> +++ trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller.ahk
2009-04-08 19:05:12 UTC (rev 26659)
> @@ -7,51 +7,42 @@
> ;
> ; Don't-touch-unless-you-know-what-you-are-doing settings
> ;
> -#NoEnv ;
> Recommended for performance and compatibility with future
AutoHotkey releases
> -#NoTrayIcon ; We won't need
> this...
> -#SingleInstance ignore ; Only
> allow one instance of at any given time
(theoretically, if we allowed multiple, we could run into some temp files
problems)
> +#NoEnv
> ; Recommended for performance and compatibility with future
AutoHotkey releases
> +#NoTrayIcon ; We
> won't need this...
> +#SingleInstance ignore
> ; Only allow one instance of at any given time
(theoretically, if we allowed multiple, we could run into some temp files
problems)
> +
> +#Include FreenetInstaller_Include_Info.inc ;
> Include version and build
info (which should be updated by the compiler bot before compiling this
installer) as well as localizations
> +#Include ..\src_translationhelper\Include_TranslationHelper.ahk
> ; Include
translation helper
>
> -#Include FreenetInstaller_Include_Info.inc ; Include
> version and build
info (which should be updated by the compiler bot before compiling this
installer) as well as localizations
> -#Include FreenetInstaller_Include_Lang_da.inc ;
> Include Danish (da)
translation
> +SendMode, Input
> ; Recommended for new scripts due to its superior
speed and reliability
> +SetFormat, FLOAT, 0.0
> ; Remove trailing zeroes on floats. We won't
need the precision and it looks stupid with numbers printed with 27 trailing
zeroes
> +StringCaseSense, Off ; Treat
> A-Z as equal to a-z when comparing
strings. Useful when dealing with folders, as Windows treat them as equals.
> +_FontSize := 9
> ; Our font size. Changing this *might* mess up some
of the margin calculations! See comment for _TextHeight calculation below as
well.
> +Gui, +OwnDialogs ; Make
> messageboxes "stick" to the main GUI
>
> -SendMode, Input ;
> Recommended for new scripts due to its superior
speed and reliability
> -SetFormat, FLOAT, 0.0 ;
> Remove trailing zeroes on floats. We won't
need the precision and it looks stupid with numbers printed with 27 trailing
zeroes
> -StringCaseSense, Off ; Treat A-Z as
> equal to a-z when comparing
strings. Useful when dealing with folders, as Windows treat them as equals.
> -_FontSize := 9 ; Our
> font size. Changing this *might* mess up some of
the margin calculations! See comment for _TextHeight calculation below as
well.
> -Gui, +OwnDialogs ; Make
> messageboxes "stick" to the main GUI
> -
> ;
> ; Customizable settings
> ;
> -_GuiWidth := 450+10+10 ; Main
> GUI width. Should be the same size as
the header image + default element margins (used for the GUI window itself)
> -_StandardMargin := 12 ; Our
> standard margin. Must be at least 8 px.
> -_ButtonWidth := 100 ; Width of our
> buttons
> -_LanguageListWidth := 100 ; Width of
> language drop-down list
> +_GuiWidth := 450+10+10
> ; Main GUI width. Should be the same size as
the header image + default element margins (used for the GUI window itself)
> +_StandardMargin := 12
> ; Our standard margin. Must be at least 8 px.
> +_ButtonWidth := 100 ; Width
> of our buttons
> +_LanguageListWidth := 100 ; Width
> of language drop-down list
>
> -_RequiredJRE := 1.5 ; Java version
> required by Freenet. If not found,
user will be asked to upgrade/install via the bundled online installer
> -_UsedFreeSpace := _Inc_InstallSize+256 ; What
> we actually need.
Installation size + default datastore size
> -_RequiredFreeSpace := _UsedFreeSpace+512 ; In MB, how
> much free space do
we require to install? What we actually use + enough free space for Windows
to continue operating (in case install dir is on system drive... and to not
block the drive in general)
> -_InternalPathLength := 75 ; Length of
> longest path within the Freenet
installation. Installation will refuse to continue if install path + this
number exceeds 255 (FAT32 and NTFS limit)
> +_RequiredJRE := 1.5 ; Java
> version required by Freenet. If not found,
user will be asked to upgrade/install via the bundled online installer
> +_UsedFreeSpace := _Inc_InstallSize+256
> ; What we actually need.
Installation size + default datastore size
> +_RequiredFreeSpace := _UsedFreeSpace+512 ; In
> MB, how much free space do
we require to install? What we actually use + enough free space for Windows
to continue operating (in case install dir is on system drive... and to not
block the drive in general)
> +_InternalPathLength := 75 ;
> Length of longest path within the Freenet
installation. Installation will refuse to continue if install path + this
number exceeds 255 (FAT32 and NTFS limit)
>
> -_DefaultInstallDir = %A_ProgramFiles%\Freenet ;
> Default installation
directory
> -_cInstallStartMenuShortcuts := 1 ; Install start
> menu shortcut(s) by
default?
> -_cInstallDesktopShortcuts := 1 ;
> Install desktop shorctu(s) by default?
> -_cBrowseAfterInstall := 1 ; Browse
> Freenet after installation by
default?
> +_DefaultInstallDir = %A_ProgramFiles%\Freenet
> ; Default installation
directory
> +_cInstallStartMenuShortcuts := 1 ;
> Install start menu shortcut(s) by
default?
> +_cInstallDesktopShortcuts := 1
> ; Install desktop shorctu(s) by
default?
> +_cBrowseAfterInstall := 1 ;
> Browse Freenet after installation by
default?
>
> -;
> -; Setup localization
> -;
> -_LangArray := 1
> ; Set initial position for languages array
> -
> -; AddLanguage() arguments: <localized language name> <language load
function name from language file> <windows language code (see
http://www.autohotkey.com/docs/misc/Languages.htm)>
> -AddLanguage("English","","")
> ; Load English (en) translation
(dummy)
> -AddLanguage("Dansk","LoadLanguage_da","0406")
> ; Load Danish (da)
translation
> -
> -LoadLanguage(LanguageCodeToID(A_Language))
> ; Load language matching
OS language (will fall back to English if no match)
> -
> ;
> ; General init stuff
> ;
> +InitTranslations()
> +
> FileRemoveDir, %A_Temp%\FreenetInstaller, 1
> ; Remove any old temp
dir
> FileCreateDir, %A_Temp%\FreenetInstaller
> ; Create a new temp dir
> If (ErrorLevel)
> @@ -260,7 +251,21 @@
> SetInstallDir("")
> SetTimer, UpdateInstallDirStatusTimer, 5000
> Gui, Show, W%_GuiWidth%, % Trans("Freenet Installer (Beta)")
> -return
> +return
> +
> +;
> +; Messing around with the language dropdown list triggers this
> +;
> +_ListSelectLanguage:
> + Gui, Submit, NoHide
> ; Read values of controls into their
variables
> +
> + If (_cLanguageSelector <> _LangNum)
> + {
> + Gui, Destroy
> + LoadLanguage(_cLanguageSelector)
> + SetTimer, GuiStart, -100
> + }
> +return
>
> ;
> ; Actual installation thread starts here (when user presses "Install")
> @@ -377,14 +382,14 @@
> If (_cInstallStartMenuShortcuts)
> {
> FileCreateDir, %A_ProgramsCommon%\Freenet%_InstallSuffix%
> - FileCreateShortcut, %_InstallDir%\freenetlauncher.exe, %
A_ProgramsCommon "\Freenet" _InstallSuffix "\" Trans("Browse
Freenet") ".lnk", , , % Trans("Opens the Freenet proxy homepage in a web
browser"), %_InstallDir%\Freenet.ico
> + FileCreateShortcut, %_InstallDir%\freenetlauncher.exe, %
A_ProgramsCommon "\Freenet" _InstallSuffix "\" Trans("Browse") "
Freenet.lnk", , , % Trans("Opens the Freenet proxy homepage in a web
browser"), %_InstallDir%\Freenet.ico
> FileCreateShortcut, %_InstallDir%\bin\start.exe, %
A_ProgramsCommon "\Freenet" _InstallSuffix "\" Trans("Start
Freenet") ".lnk", , , % Trans("Starts the background service needed to use
Freenet"), %_InstallDir%\Freenet.ico
> FileCreateShortcut, %_InstallDir%\bin\stop.exe, %
A_ProgramsCommon "\Freenet" _InstallSuffix "\" Trans("Stop
Freenet") ".lnk", , , % Trans("Stops the background service needed to use
Freenet"), %_InstallDir%\Freenet.ico
> }
> If (_cInstallDesktopShortcuts)
> {
> FileCreateDir, %A_DesktopCommon%
> - FileCreateShortcut, %_InstallDir%\freenetlauncher.exe, %
A_DesktopCommon "\" Trans("Browse Freenet") _InstallSuffix ".lnk", , , %
Trans("Opens the Freenet proxy homepage in a web
browser"), %_InstallDir%\Freenet.ico
> + FileCreateShortcut, %_InstallDir%\freenetlauncher.exe, %
A_DesktopCommon "\" Trans("Browse") " Freenet" _InstallSuffix ".lnk", , , %
Trans("Opens the Freenet proxy homepage in a web
browser"), %_InstallDir%\Freenet.ico
> }
> GuiControl, , _cProgressBar, +1
>
> @@ -416,4 +421,5 @@
> ;
> ; Include helpers
> ;
> -#Include FreenetInstaller_Include_Helpers.inc
> ; Include our helper
functions. Should be placed at the very end because of the labels in it.
> +#Include FreenetInstaller_Include_Helpers.inc
> ; Include our helper
functions. Should be placed at the very end because of labels
> +
>
> Modified:
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Include_Helpers.inc
> ===================================================================
> ---
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Include_Helpers.inc
2009-04-08 18:36:05 UTC (rev 26658)
> +++
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Include_Helpers.inc
2009-04-08 19:05:12 UTC (rev 26659)
> @@ -1,7 +1,7 @@
> ;
> ; Windows Freenet Installer - Include file - Helpers
> ;
> -; This file contains helpers that are used throughout the installer. Placed
here to not clutter the
> +; This file contains helpers used throughout the installer. Placed here to
not clutter the
> ; main script file. Will be included directly into the installer (at the
bottom) at compile time.
> ;
>
> @@ -257,138 +257,6 @@
> UpdateInstallDirStatus()
> return
>
> -;
> -; Localization helpers
> -;
> -AddLanguage(_Name, _LoadFunction, _LanguageCode)
> -{
> - global
> -
> - _LanguageNames%_LangArray% := _Name
> - _LanguageLoadFunctions%_LangArray% := _LoadFunction
> - _LanguageCodes%_LangArray% := _LanguageCode
> -
> - _LangArray++
> -}
> -
> -LoadLanguage(_LoadNum)
> -{
> - global
> -
> - _LangNum := _LoadNum
> - _TransArray := 1
> - _LoadFunction := _LanguageLoadFunctions%_LoadNum%
> -
> - If (_LoadFunction <> "")
> - {
> - %_LoadFunction%()
> - }
> -}
> -
> -LanguageCodeToID(_LanguageCode)
> -{
> - global
> -
> - Loop % _LangArray-1
> - {
> - If (_LanguageCode = _LanguageCodes%A_Index%)
> - {
> - return A_Index
> - }
> - }
> -
> - return 1
> ; Language 1 should always be the default
> language, so
use that if no match above
> -}
> -
> -Trans_Add(_OriginalText, _TranslatedText)
> -{
> - global
> -
> - _OriginalTextArray%_TransArray% := _OriginalText
> - _TranslatedTextArray%_TransArray% := _TranslatedText
> -
> - _TransArray++
> -}
> -
> -Trans(_OriginalText)
> -{
> - global
> -
> - Loop % _TransArray-1
> - {
> - If (_OriginalText = _OriginalTextArray%A_Index%)
> - {
> - return UTF82Ansi(_TranslatedTextArray%A_Index%)
> - }
> - }
> -
> - return _OriginalText
> -}
> -
> -_ListSelectLanguage:
> - Gui, Submit, NoHide
> ; Read values of controls into their
variables
> -
> - If (_cLanguageSelector <> _LangNum)
> - {
> - Gui, Destroy
> - LoadLanguage(_cLanguageSelector)
> - SetTimer, GuiStart, -100
> - }
> -return
> -
> -UTF82Ansi(zString)
> -{
> - Ansi2Unicode(zString, wString, 65001)
> - Unicode2Ansi(wString, sString, 0)
> - Return sString
> -}
> -
> -Ansi2Unicode(ByRef sString, ByRef wString, CP = 0)
> -{
> - nSize := DllCall("MultiByteToWideChar"
> - , "Uint", CP
> - , "Uint", 0
> - , "Uint", &sString
> - , "int", -1
> - , "Uint", 0
> - , "int", 0)
> -
> - VarSetCapacity(wString, nSize * 2)
> -
> - DllCall("MultiByteToWideChar"
> - , "Uint", CP
> - , "Uint", 0
> - , "Uint", &sString
> - , "int", -1
> - , "Uint", &wString
> - , "int", nSize)
> -}
> -
> -Unicode2Ansi(ByRef wString, ByRef sString, CP = 0)
> -{
> - nSize := DllCall("WideCharToMultiByte"
> - , "Uint", CP
> - , "Uint", 0
> - , "Uint", &wString
> - , "int", -1
> - , "Uint", 0
> - , "int", 0
> - , "Uint", 0
> - , "Uint", 0)
> -
> - VarSetCapacity(sString, nSize)
> -
> - DllCall("WideCharToMultiByte"
> - , "Uint", CP
> - , "Uint", 0
> - , "Uint", &wString
> - , "int", -1
> - , "str", sString
> - , "int", nSize
> - , "Uint", 0
> - , "Uint", 0)
> -}
> -
> ;
> ; Actual installation helpers
> ;
>
> Deleted:
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Include_Lang_da.inc
> ===================================================================
> ---
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Include_Lang_da.inc
2009-04-08 18:36:05 UTC (rev 26658)
> +++
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Include_Lang_da.inc
2009-04-08 19:05:12 UTC (rev 26659)
> @@ -1,84 +0,0 @@
> -;
> -; Windows Freenet Installer - Include file - Localization - Danish (da)
> -;
> -
> -LoadLanguage_da()
> -{
> - ; Common
> - Trans_Add("Freenet Installer", "Freenet Installer")
> - Trans_Add("Freenet Installer (Beta)", "Freenet Installer (Beta)")
> - Trans_Add("Welcome to the Freenet Installer!", "Velkommen til Freenet
Installer!")
> - Trans_Add("Installation Problem", "Installationsproblem")
> - Trans_Add("Freenet Installer fatal error", "Freenet Installer fatal
> fejl")
> - Trans_Add("Freenet Installer error", "Freenet Installer fejl")
> - Trans_Add("Error: ", "Fejl: ")
> - Trans_Add("E&xit", "&Afslut")
> -
> - ; Error messageboxes
> - Trans_Add("Freenet Installer was not able to unpack necessary
> installation
files to:", "Freenet Installer kunne ikke udpakke n?dvendige
installationsfiler til:")
> - Trans_Add("Please make sure that Freenet Installer has full access to
> the
system's temporary files folder.", "Kontroll?r at Freenet Installer har
ubegr?nset adgang til systemets mappe til midlertidige filer.")
> - Trans_Add("Freenet Installer requires administrator privileges to
> install
Freenet.`nPlease make sure that your user account has administrative access
to the system,`nand Freenet Installer is executed with access to use these
privileges.", "Freenet Installer kr?ver administratorrettigheder for at
installere Freenet.`nKontroll?r at din brugerkonto har administrativ adgang
til systemet,`nog at Freenet Installer k?res med adgang til at udnytte disse
rettigheder.")
> - Trans_Add("Freenet Installer was not able to write to the selected
installation directory.`nPlease select one to which you have write
access.", "Freenet Installer kunne ikke skrive til den valgte
installationsmappe.`nV?lg venligst en mappe du har skriveadgang til.")
> - Trans_Add("Freenet Installer was not able to find a free port on your
system in the range ", "Freenet Installer kunne ikke finde en fri port p? dit
system i intervallet ")
> - Trans_Add("Please free a system port in this range to install
Freenet.", "For at installere Freenet er du n?dt til at frig?re en port i
dette interval.")
> - Trans_Add("Freenet Installer was not able to create a Winsock 2.0
socket`nfor port availability testing.", "Freenet Installer kunne ikke
oprette en Winsock 2.0-sokkel`ntil porttestning.")
> -
> - ; Unsupported Windows version
> - Trans_Add("Freenet only supports the following versions of the Windows
operating system:", "Freenet underst?tter kun f?lgende versioner af
Windows-operativsystemet:")
> - Trans_Add("Please install one of these versions if you want to use
> Freenet
on Windows.", "Hvis du vil bruge Freenet er du n?dt til at installere en af
disse versioner.")
> -
> - ; Java missing
> - Trans_Add("Freenet requires the Java Runtime Environment, but your
> system
does not appear to have an up-to-date version installed. You can install Java
by using the included online installer, which will download and install the
necessary files from the Java website automatically:", "Freenet kr?ver Java
Runtime Environment, men dit system har tilsyneladende ikke en opdateret
version installeret. Du kan installere Java ved hj?lp af den inkluderede
online-installer som automatisk vil downloade og installere filerne fra Javas
hjemmeside:")
> - Trans_Add("&Install Java", "&Installer Java")
> - Trans_Add("The installation will continue once Java
version ", "Installationen vil forts?tte n?r Java version ")
> - Trans_Add(" or later has been installed.", " eller nyere er blevet
installeret.")
> -
> - ; Old installation detected
> - Trans_Add("Freenet Installer has detected that you already have Freenet
installed. Your current installation was installed using an older,
unsupported installer. To continue, you must first uninstall your current
version of Freenet using the previously created uninstaller:", "Freenet
Installer har opdaget at Freenet allerede er installeret, men af et ?ldre,
ikke l?ngere underst?ttet, installationsprogram. For at forts?tte skal du
f?rst afinstallere din nuv?rende version ved hj?lp af det tidligere oprettede
afinstallationsprogram:")
> - Trans_Add("&Uninstall", "A&finstaller")
> - Trans_Add("The installation will continue once the old installation has
been removed.", "Installationen vil forts?tte n?r den tidligere installation
er blevet fjernet.")
> -
> - ; Main GUI - Header
> - Trans_Add("Please check the following default settings before
> continuing
with the installation of Freenet.", "Kontroll?r nedenst?ende
standardindstillinger f?r du forts?tter med installationen af Freenet.")
> -
> - ; Main GUI - Install folder
> - Trans_Add("Installation directory", "Installationsmappe")
> - Trans_Add("Freenet requires at least ", "Freenet kr?ver mindst ")
> - Trans_Add(" MB free disk space, but will not install with less than ",
> "
MB fri diskplads, men vil ikke installere med mindre end ")
> - Trans_Add(" MB free. The amount of space reserved can be changed after
installation.", " MB fri. M?ngden af reserveret diskplads kan justeres efter
installationen.")
> - Trans_Add("&Browse", "&Gennemse")
> - Trans_Add("If you do not choose a folder containing 'Freenet' in the
> path,
a folder will be created for you automatically.", "Hvis du ikke v?lger en
mappe der indeholder 'Freenet' i stien vil en mappe automatisk blive oprettet
for dig.")
> - Trans_Add("De&fault", "&Standard")
> - Trans_Add("Status:", "Status:")
> - Trans_Add("Invalid install path!", "Ugyldig installationssti!")
> - Trans_Add("Invalid install path! (Too long for file system to
handle)", "Ugyldig installationssti! (For lang til filsystemet)")
> - Trans_Add("Not enough free space on installation drive!", "Ikke nok fri
plads p? installationsdrevet!")
> - Trans_Add("Freenet already installed! Please uninstall first or choose
another directory!", "Freenet allerede installeret! Afinstaller f?rst eller
v?lg en anden mappe!")
> - Trans_Add("Installation directory OK!", "Installationsmappe OK!")
> -
> - ; Main GUI - System service
> - Trans_Add("System service", "Systemtjeneste")
> - Trans_Add("Freenet will automatically start in the background as a
> system
service. This is required to be a part of the Freenet network, and will use a
small amount of system resources. The amount of resources used can be
adjusted after installation.", "Freenet vil automatisk starte i baggrunden
som en systemtjeneste. Denne er n?dvendigt for at v?re en del af
Freenet-netv?rket, og vil bruge en lille andel systemresurser. M?ngden af
resurser kan justeres efter installationen.")
> -
> - ; Main GUI - Additional settings
> - Trans_Add("Additional settings", "Yderligere indstillinger")
> - Trans_Add("Install &start menu shortcuts (All users: Browse Freenet,
> Start
Freenet, Stop Freenet)", "Installer start&menugenveje (Alle brugere: ?bn
Freenet, Start Freenet, Stop Freenet)")
> - Trans_Add("Install &desktop shortcut (All users: Browse
Freenet)", "Installer s&krivebordsgenvej (Alle brugere: ?bn Freenet)")
> - Trans_Add("Browse Freenet &after the installation", "?bn Freenet &efter
installationen")
> -
> - ; Main GUI - Footer
> - Trans_Add("Version ", "Version ")
> - Trans_Add(" - Build ", " - Build ")
> - Trans_Add("&Install", "&Installer")
> -
> - ; Installation itself
> - Trans_Add("Freenet Background Service", "Freenet baggrundstjeneste")
> - Trans_Add("Browse Freenet", "?bn Freenet") ; Shortcut name
> - Trans_Add("Opens the Freenet proxy homepage in a web browser", "?bner
Freenet-proxyen i en webbrowser")
> - Trans_Add("Start Freenet", "Start Freenet") ; Shortcut name
> - Trans_Add("Starts the background service needed to use Freenet",
> "Starter
baggrundstjenesten kr?vet for at bruge Freenet")
> - Trans_Add("Stop Freenet", "Stop Freenet") ; Shortcut name
> - Trans_Add("Stops the background service needed to use Freenet",
> "Stopper
baggrundstjenesten kr?vet for at bruge Freenet")
> - Trans_Add("Installation finished successfully!", "Installationen
gennemf?rt med succes!")
> -}
> -
>
> Modified:
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Uninstaller.ahk
> ===================================================================
> ---
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Uninstaller.ahk
2009-04-08 18:36:05 UTC (rev 26658)
> +++
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Uninstaller.ahk
2009-04-08 19:05:12 UTC (rev 26659)
> @@ -15,6 +15,8 @@
> #NoEnv ;
> Recommended for performance and compatibility with future
AutoHotkey releases
> #NoTrayIcon ; We won't need
> this...
> #SingleInstance ignore ; Only
> allow one instance of at any given time
(theoretically, if we allowed multiple, we could run into some temp files
problems)
> +
> +#Include ..\src_translationhelper\Include_TranslationHelper.ahk ;
> Include
translation helper
>
> SendMode, Input ;
> Recommended for new scripts due to its superior
speed and reliability
> StringCaseSense, Off ; Treat A-Z as
> equal to a-z when comparing
strings. Useful when dealing with folders, as Windows treat them as equals.
> @@ -24,16 +26,21 @@
> ;
> _ServiceTimeout := 60 ;
> Maximum number of seconds we wait
before "timing out" and throwing an error when managing the system service
> _ProgressFormat = A T W300 FS10 ; How
> our progress bar should look.
The 'R' (range) parameter is added later in the script.
> -
> +
> +;
> +; General init stuff
> +;
> +InitTranslations()
> +
> ;
> ; Check for administrator privileges.
> ;
> If not (A_IsAdmin)
> {
> - PopupErrorMessage("The uninstaller requires administrator privileges to
uninstall Freenet. Please make sure that your user account has administrative
access to the system, and the uninstaller is executed with access to use
these privileges.")
> + PopupErrorMessage(Trans("The uninstaller requires administrator
> privileges
to uninstall Freenet. Please make sure that your user account has
administrative access to the system, and the uninstaller is executed with
access to use these privileges."))
> ExitApp
> }
> -
> +
> ;
> ; Setup various stuff and make sure that we are running from the temp
folder (we need to, because we can't delete the install folder if we are
running the uninstaller from it at the same time)
> ;
> @@ -50,7 +57,7 @@
> FileCreateDir, %A_Temp%\FreenetUninstaller
> ; Create a new temp dir
> If (ErrorLevel)
> {
> - PopupErrorMessage("The uninstaller was not able to unpack
> necessary files
to:`n`n" . A_Temp . "\FreenetUninstaller`n`nPlease make sure that the
uninstaller has full access to the system's temporary files folder.")
> + PopupErrorMessage(Trans("The uninstaller was not able to unpack
> necessary
files to:") "`n`n" A_Temp "\FreenetUninstaller`n`n" Trans("Please make sure
that the uninstaller has full access to the system's temporary files
folder."))
> ExitApp
> }
>
> @@ -65,7 +72,7 @@
>
> If
(!FileExist(_InstallDir . "\freenet.jar") || !FileExist(_InstallDir .
"\installid.dat"))
> {
> - PopupErrorMessage("The uninstaller was unable to recognize your
> Freenet
installation at:`n`n" . _InstallDir . "`n`nPlease run this uninstaller from
the 'bin' folder of a Freenet installation.")
> + PopupErrorMessage(Trans("The uninstaller was unable to
> recognize your
Freenet installation at:") "`n`n" _InstallDir "`n`n" Trans("Please run this
uninstaller from the 'bin' folder of a Freenet installation."))
> Exit()
> }
>
> @@ -77,13 +84,13 @@
> ;
> ; Ask for confirmation and about the uninstallation survey
> ;
> -MsgBox, 33, Freenet uninstaller, Do you really want to uninstall
Freenet%_InstallSuffix%? ; 1 = OK/Cancel, 32 = Icon Question
> +MsgBox, 33, % Trans("Freenet uninstaller"), % Trans("Do you really want to
uninstall") " Freenet" _InstallSuffix "?" ; 1 = OK/Cancel, 32 =
Icon
Question
> IfMsgBox, Cancel
> {
> Exit()
> }
>
> -MsgBox, 36, Freenet uninstaller, The development team would appreciate it
very much if you can`nspare a moment and fill out a short, anonymous
online`nsurvey about the reason for your uninstallation.`n`nThe survey,
located on the Freenet website, will be opened`nin your browser after the
uninstallation.`n`nTake the uninstallation survey? ; 4 = Yes/No, 32 = Icon
Question
> +MsgBox, 36, % Trans("Freenet uninstaller"), % Trans("The development team
would appreciate it very much if you can`nspare a moment and fill out a
short, anonymous online`nsurvey about the reason for your
uninstallation.`n`nThe survey, located on the Freenet website, will be
opened`nin your browser after the uninstallation.`n`nTake the uninstallation
survey?") ; 4 = Yes/No, 32 = Icon Question
> IfMsgBox, Yes
> {
> _DoSurvey := 1
> @@ -96,12 +103,12 @@
> ;
> ; Allright. No way back!
> ;
> -Progress, %_ProgressFormat% R0-6, ..., , Freenet uninstaller
> ; "R0-6"
defines number of "ticks" in the progress bar. Should match the numbers
below.
> +Progress, %_ProgressFormat% R0-6, ..., , % Trans("Freenet
uninstaller") ; "R0-6" defines number of
"ticks" in the progress bar.
Should match the numbers below.
>
> ;
> ; Shut down node
> ;
> -Progress, , Stopping system service...
> +Progress, , % Trans("Stopping system service...")
>
> _ServiceHasBeenStopped := 0
> ; Used to make sure that we only stop
the service once (to avoid UAC spam on Vista, among other things)
>
> @@ -111,12 +118,12 @@
>
> If (A_Index > _ServiceTimeout)
> {
> - PopupErrorMessage("The uninstaller was unable to control the
> Freenet
system service as it appears to be stuck.`n`nPlease try again.`n`nIf the
problem keeps occurring, please report this error message to the
developers.")
> + PopupErrorMessage(Trans("The uninstaller was unable to control
> the
Freenet system service as it appears to be stuck.`n`nPlease try again.`n`nIf
the problem keeps occurring, please report this error message to the
developers."))
> Exit()
> }
> Else If (_ServiceState == -1 || _ServiceState == -4)
> {
> - PopupErrorMessage("The uninstaller was unable to find and
> control the
Freenet system service.`n`nPlease try again.`n`nIf the problem keeps
occurring, please report this error message to the developers.")
> + PopupErrorMessage(Trans("The uninstaller was unable to find and
> control
the Freenet system service.`n`nPlease try again.`n`nIf the problem keeps
occurring, please report this error message to the developers."))
> Exit()
> }
> Else If (_ServiceState == 2 || _ServiceState == 3 || _ServiceState == 5
> ||
_ServiceState == 6)
> @@ -124,8 +131,6 @@
> Sleep, 1000
> Continue
> }
> -
> -
> Else If (_ServiceState == 1)
> {
> Break ; Service is
> not running. Continue!
> @@ -140,7 +145,7 @@
> }
> Else
> {
> - PopupErrorMessage("The uninstaller was unable to stop
> the Freenet system
service.`n`nPlease try again.`n`nIf the problem keeps occurring, please
report this error message to the developers.")
> + PopupErrorMessage(Trans("The uninstaller was unable to
> stop the Freenet
system service.`n`nPlease try again.`n`nIf the problem keeps occurring,
please report this error message to the developers."))
> ExitApp, 1
> }
> }
> @@ -151,7 +156,7 @@
> ;
> ; Remove service
> ;
> -Progress, , Removing system service...
> +Progress, , % Trans("Removing system service...")
>
> RunWait, %_InstallDir%\bin\wrapper-windows-x86-32.exe -r ../wrapper.conf, ,
Hide UseErrorLevel
>
> @@ -160,7 +165,7 @@
> ;
> ; Remove special account rights for our custom user
> ;
> -Progress, , Removing custom user account rights...
> +Progress, , % Trans("Removing custom user account rights...")
>
> FileInstall, files_bundle\Ntrights.exe, %A_WorkingDir%\Ntrights.exe
> ;
Extract 3rd party "Ntrights" tool. Taken from old installer. (Apparently
belongs to the resource kit and is OK to redistribute)
> RunWait, %A_WorkingDir%\Ntrights.exe -u Freenet%_InstallSuffix% -r
SeServiceLogonRight, , Hide UseErrorLevel
> @@ -174,17 +179,17 @@
> ;
> ; Remove files
> ;
> -Progress, , Removing files...
> +Progress, , % Trans("Removing files...")
> RemoveFiles:
>
> FileRemoveDir, %_InstallDir%, 1
> If (ErrorLevel)
> {
> - MsgBox, 18, Freenet uninstaller error, The uninstaller was unable to
delete the Freenet files located at:`n`n%_InstallDir%`n`nPlease close all
applications with open files inside this directory. ; 2 =
Abort/Retry/Ignore,
16 = Icon Hand (stop/error)
> + MsgBox, 18, % Trans("Freenet uninstaller error"), % Trans("The
> uninstaller
was unable to delete the Freenet files located at:") "`n`n"
_InstallDir "`n`n" Trans("Please close all applications with open files
inside this directory.") ; 2 = Abort/Retry/Ignore, 16 = Icon Hand
(stop/error)
>
> IfMsgBox, Abort
> {
> - PopupErrorMessage("The uninstallation was aborted.`n`nPlease
> manually
remove the rest of your Freenet installation.")
> + PopupErrorMessage(Trans("The uninstallation was
> aborted.`n`nPlease
manually remove the rest of your Freenet installation."))
> Exit()
> }
> IfMsgBox, Retry
> @@ -195,14 +200,14 @@
>
> ; We don't really care if deletion of shortcuts fail, as the user probably
just deleted / renamed / moved them around.
> FileRemoveDir, %A_ProgramsCommon%\Freenet%_InstallSuffix%, 1
> -FileDelete, %A_DesktopCommon%\Browse Freenet%_InstallSuffix%.lnk
> +FileDelete, % A_DesktopCommon "\" Trans("Browse") " Freenet"
_InstallSuffix ".lnk"
>
> Progress, 4
>
> ;
> ; Remove registry edits
> ;
> -Progress, , Removing registry modifications...
> +Progress, , % Trans("Removing registry modifications...")
>
> RegDelete, HKEY_LOCAL_MACHINE, SOFTWARE\Microsoft\Windows
NT\CurrentVersion\Winlogon\SpecialAccounts\UserList, Freenet%_InstallSuffix%
> RegDelete, HKEY_LOCAL_MACHINE,
SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Freenet%_InstallSuffix%
> @@ -212,7 +217,7 @@
> ;
> ; Remove our custom user
> ;
> -Progress, , Removing custom user...
> +Progress, , % Trans("Removing custom user...")
>
> FileInstall, files_bundle\RemProf.exe, %A_WorkingDir%\RemProf.exe
> ;
Extract 3rd party "RemProf" tool from
http://www.ctrl-alt-del.com.au/CAD_TSUtils.htm. Freeware, but not
open-source :(. Removes the profile folder and its registry entry of
specified user
> RunWait, %A_WorkingDir%\RemProf.exe Freenet%_InstallSuffix%, , Hide
UseErrorLevel
> @@ -226,7 +231,7 @@
> ; Done!
> ;
> Progress, Off
> -MsgBox, 64, Freenet uninstaller, Freenet has been uninstalled! ; 64 =
> Icon
Asterisk (info)
> +MsgBox, 64, % Trans("Freenet uninstaller"), % Trans("Freenet has been
uninstalled!") ; 64 = Icon Asterisk (info)
>
> If (_DoSurvey)
> {
> @@ -240,7 +245,7 @@
> ;
> PopupErrorMessage(_ErrorMessage)
> {
> - MsgBox, 16, Freenet uninstaller error, %_ErrorMessage% ; 16 = Icon
> Hand
(stop/error)
> + MsgBox, 16, % Trans("Freenet uninstaller error"), %_ErrorMessage%
> ; 16 =
Icon Hand (stop/error)
> }
>
> Service_State(ServiceName)
> @@ -318,4 +323,5 @@
> }
>
> ExitApp
> ; Bye Bye
> -}
> +}
> +
>
> Added: trunk/apps/wininstaller/src_translationhelper/Include_Lang_da.inc
> ===================================================================
> --- trunk/apps/wininstaller/src_translationhelper/Include_Lang_da.inc
>
(rev 0)
> +++ trunk/apps/wininstaller/src_translationhelper/Include_Lang_da.inc
2009-04-08 19:05:12 UTC (rev 26659)
> @@ -0,0 +1,128 @@
> +;
> +; Translation file - Danish (da)
> +;
> +
> +LoadLanguage_da()
> +{
> + ; Installer - Common
> + Trans_Add("Freenet Installer", "Freenet Installer")
> + Trans_Add("Freenet Installer (Beta)", "Freenet Installer (Beta)")
> + Trans_Add("Welcome to the Freenet Installer!", "Velkommen til Freenet
Installer!")
> + Trans_Add("Installation Problem", "Installationsproblem")
> + Trans_Add("Freenet Installer fatal error", "Freenet Installer fatal
> fejl")
> + Trans_Add("Freenet Installer error", "Freenet Installer fejl")
> + Trans_Add("Error: ", "Fejl: ")
> + Trans_Add("E&xit", "&Afslut")
> +
> + ; Installer - Error messageboxes
> + Trans_Add("Freenet Installer was not able to unpack necessary
> installation
files to:", "Freenet Installer kunne ikke udpakke n?dvendige
installationsfiler til:")
> + Trans_Add("Please make sure that Freenet Installer has full access to
> the
system's temporary files folder.", "Kontroll?r at Freenet Installer har
ubegr?nset adgang til systemets mappe til midlertidige filer.")
> + Trans_Add("Freenet Installer requires administrator privileges to
> install
Freenet.`nPlease make sure that your user account has administrative access
to the system,`nand Freenet Installer is executed with access to use these
privileges.", "Freenet Installer kr?ver administratorrettigheder for at
installere Freenet.`nKontroll?r at din brugerkonto har administrativ adgang
til systemet,`nog at Freenet Installer k?res med adgang til at udnytte disse
rettigheder.")
> + Trans_Add("Freenet Installer was not able to write to the selected
installation directory.`nPlease select one to which you have write
access.", "Freenet Installer kunne ikke skrive til den valgte
installationsmappe.`nV?lg venligst en mappe du har skriveadgang til.")
> + Trans_Add("Freenet Installer was not able to find a free port on your
system in the range ", "Freenet Installer kunne ikke finde en fri port p? dit
system i intervallet ")
> + Trans_Add("Please free a system port in this range to install
Freenet.", "For at installere Freenet er du n?dt til at frig?re en port i
dette interval.")
> + Trans_Add("Freenet Installer was not able to create a Winsock 2.0
socket`nfor port availability testing.", "Freenet Installer kunne ikke
oprette en Winsock 2.0-sokkel`ntil porttestning.")
> +
> + ; Installer - Unsupported Windows version
> + Trans_Add("Freenet only supports the following versions of the Windows
operating system:", "Freenet underst?tter kun f?lgende versioner af
Windows-operativsystemet:")
> + Trans_Add("Please install one of these versions if you want to use
> Freenet
on Windows.", "Hvis du vil bruge Freenet er du n?dt til at installere en af
disse versioner.")
> +
> + ; Installer - Java missing
> + Trans_Add("Freenet requires the Java Runtime Environment, but your
> system
does not appear to have an up-to-date version installed. You can install Java
by using the included online installer, which will download and install the
necessary files from the Java website automatically:", "Freenet kr?ver Java
Runtime Environment, men dit system har tilsyneladende ikke en opdateret
version installeret. Du kan installere Java ved hj?lp af den inkluderede
online-installer som automatisk vil downloade og installere filerne fra Javas
hjemmeside:")
> + Trans_Add("&Install Java", "&Installer Java")
> + Trans_Add("The installation will continue once Java
version ", "Installationen vil forts?tte n?r Java version ")
> + Trans_Add(" or later has been installed.", " eller nyere er blevet
installeret.")
> +
> + ; Installer - Old installation detected
> + Trans_Add("Freenet Installer has detected that you already have Freenet
installed. Your current installation was installed using an older,
unsupported installer. To continue, you must first uninstall your current
version of Freenet using the previously created uninstaller:", "Freenet
Installer har opdaget at Freenet allerede er installeret, men af et ?ldre,
ikke l?ngere underst?ttet, installationsprogram. For at forts?tte skal du
f?rst afinstallere din nuv?rende version ved hj?lp af det tidligere oprettede
afinstallationsprogram:")
> + Trans_Add("&Uninstall", "A&finstaller")
> + Trans_Add("The installation will continue once the old installation has
been removed.", "Installationen vil forts?tte n?r den tidligere installation
er blevet fjernet.")
> +
> + ; Installer - Main GUI - Header
> + Trans_Add("Please check the following default settings before
> continuing
with the installation of Freenet.", "Kontroll?r nedenst?ende
standardindstillinger f?r du forts?tter med installationen af Freenet.")
> +
> + ; Installer - Main GUI - Install folder
> + Trans_Add("Installation directory", "Installationsmappe")
> + Trans_Add("Freenet requires at least ", "Freenet kr?ver mindst ")
> + Trans_Add(" MB free disk space, but will not install with less than ",
> "
MB fri diskplads, men vil ikke installere med mindre end ")
> + Trans_Add(" MB free. The amount of space reserved can be changed after
installation.", " MB fri. M?ngden af reserveret diskplads kan justeres efter
installationen.")
> + Trans_Add("&Browse", "&Gennemse")
> + Trans_Add("If you do not choose a folder containing 'Freenet' in the
> path,
a folder will be created for you automatically.", "Hvis du ikke v?lger en
mappe der indeholder 'Freenet' i stien vil en mappe automatisk blive oprettet
for dig.")
> + Trans_Add("De&fault", "&Standard")
> + Trans_Add("Status:", "Status:")
> + Trans_Add("Invalid install path!", "Ugyldig installationssti!")
> + Trans_Add("Invalid install path! (Too long for file system to
handle)", "Ugyldig installationssti! (For lang til filsystemet)")
> + Trans_Add("Not enough free space on installation drive!", "Ikke nok fri
plads p? installationsdrevet!")
> + Trans_Add("Freenet already installed! Please uninstall first or choose
another directory!", "Freenet allerede installeret! Afinstaller f?rst eller
v?lg en anden mappe!")
> + Trans_Add("Installation directory OK!", "Installationsmappe OK!")
> +
> + ; Installer - Main GUI - System service
> + Trans_Add("System service", "Systemtjeneste")
> + Trans_Add("Freenet will automatically start in the background as a
> system
service. This is required to be a part of the Freenet network, and will use a
small amount of system resources. The amount of resources used can be
adjusted after installation.", "Freenet vil automatisk starte i baggrunden
som en systemtjeneste. Denne er n?dvendigt for at v?re en del af
Freenet-netv?rket, og vil bruge en lille andel systemresurser. M?ngden af
resurser kan justeres efter installationen.")
> +
> + ; Installer - Main GUI - Additional settings
> + Trans_Add("Additional settings", "Yderligere indstillinger")
> + Trans_Add("Install &start menu shortcuts (All users: Browse Freenet,
> Start
Freenet, Stop Freenet)", "Installer start&menugenveje (Alle brugere: ?bn
Freenet, Start Freenet, Stop Freenet)")
> + Trans_Add("Install &desktop shortcut (All users: Browse
Freenet)", "Installer s&krivebordsgenvej (Alle brugere: ?bn Freenet)")
> + Trans_Add("Browse Freenet &after the installation", "?bn Freenet &efter
installationen")
> +
> + ; Installer - Main GUI - Footer
> + Trans_Add("Version ", "Version ")
> + Trans_Add(" - Build ", " - Build ")
> + Trans_Add("&Install", "&Installer")
> +
> + ; Installer - Actual installation
> + Trans_Add("Freenet Background Service", "Freenet baggrundstjeneste")
> + Trans_Add("Browse", "?bn") ; Part of shortcut name
> + Trans_Add("Opens the Freenet proxy homepage in a web browser", "?bner
Freenet-proxyen i en webbrowser")
> + Trans_Add("Start Freenet", "Start Freenet") ; Shortcut name
> + Trans_Add("Starts the background service needed to use Freenet",
> "Starter
baggrundstjenesten kr?vet for at bruge Freenet")
> + Trans_Add("Stop Freenet", "Stop Freenet") ; Shortcut name
> + Trans_Add("Stops the background service needed to use Freenet",
> "Stopper
baggrundstjenesten kr?vet for at bruge Freenet")
> + Trans_Add("Installation finished successfully!", "Installationen
gennemf?rt med succes!")
> +
> + ; Uninstaller - Common
> + Trans_Add("Freenet uninstaller", "Freenet afinstallationsprogram")
> + Trans_Add("Freenet uninstaller error", "Freenet afinstallationsprogram
fejl")
> +
> + ; Uninstaller - General
> + Trans_Add("Freenet has been uninstalled!", "Freenet er blevet
afinstalleret!")
> + Trans_Add("Do you really want to uninstall", "Vil du virkelig
afinstallere")
> + Trans_Add("The development team would appreciate it very much if you
can`nspare a moment and fill out a short, anonymous online`nsurvey about the
reason for your uninstallation.`n`nThe survey, located on the Freenet
website, will be opened`nin your browser after the uninstallation.`n`nTake
the uninstallation survey?", "Udviklingsholdet vil s?tte stor pris p? hvis du
kan undv?re et`npar minutter, og udfylde et kort, anonymt, online
sp?rgsskema`nomkring grunden til at du afinstallerer
Freenet.`n`nSp?rgeskemaet, placeret p? Freenets hjemmeside, vil blive`n?bnet
i din browser efter afinstallationen.`n`nUdfyld sp?rgeskemaet?")
> +
> + ; Uninstaller - Error messageboxes
> + Trans_Add("The uninstaller requires administrator privileges to
> uninstall
Freenet. Please make sure that your user account has administrative access to
the system, and the uninstaller is executed with access to use these
privileges.", "Afinstallationsprogrammet kr?ver administratorrettigheder for
at afinstallere Freenet. Kontroll?r at din brugerkonto har administrativ
adgang til systemet, og at afinstallationsprogrammet k?res med adgang til at
udnytte disse rettigheder.")
> + Trans_Add("The uninstaller was not able to unpack necessary files
to:", "Afinstallationsprogrammet kunne ikke udpakke n?dvendige filer til:")
> + Trans_Add("Please make sure that the uninstaller has full access to the
system's temporary files folder.", "Kontroll?r at afinstallationsprogrammet
har ubegr?nset adgang til systemets mappe til midlertidige filer.")
> + Trans_Add("The uninstaller was unable to recognize your Freenet
installation at:", "Afinstallationsprogrammet kunne ikke genkende din
Freenet-installation i:")
> + Trans_Add("Please run this uninstaller from the 'bin' folder of a
> Freenet
installation.", "K?r venligst dette afinstallationsprogram fra 'bin'-mappen
af en Freenet-installation.")
> +
> + ; Uninstaller - Service problems
> + Trans_Add("The uninstaller was unable to control the Freenet system
service as it appears to be stuck.`n`nPlease try again.`n`nIf the problem
keeps occurring, please report this error message to the
developers.", "Afinstallationsprogrammet kunne ikke styre
Freenet-systemtjenesten da den tilsyneladende har sat sig fast.`n`nPr?v
igen.`n`nHvis problemet forts?tter s? indrapporter venligst denne fejlbesked
til udviklerne.")
> + Trans_Add("The uninstaller was unable to find and control the Freenet
system service.`n`nPlease try again.`n`nIf the problem keeps occurring,
please report this error message to the
developers.", "Afinstallationsprogrammet kunne ikke finde og styre
Freenet-systemtjenesten.`n`nPr?v igen.`n`nHvis problemet forts?tter s?
indrapporter venligst denne fejlbesked til udviklerne.")
> + Trans_Add("The uninstaller was unable to stop the Freenet system
service.`n`nPlease try again.`n`nIf the problem keeps occurring, please
report this error message to the developers.", "Afinstallationsprogrammet
kunne ikke stoppe Freenet-systemtjenesten.`n`nPr?v igen.`n`nHvis problemet
forts?tter s? indrapporter venligst denne fejlbesked til udviklerne.")
> +
> + ; Uninstaller - Files undeletable
> + Trans_Add("The uninstaller was unable to delete the Freenet files
> located
at:", "Afinstallationsprogrammet kunne ikke slette Freenet-filerne placeret
i:")
> + Trans_Add("Please close all applications with open files inside this
directory.", "Luk venligst alle programmer med ?bne filer inden i denne
mappe.")
> + Trans_Add("The uninstallation was aborted.`n`nPlease manually remove
> the
rest of your Freenet installation.", "Afinstallationen blev afbrudt.`n`nDu
bliver n?dt til manuelt at fjerne resten af din Freenet-installation.")
> +
> + ; Uninstaller - Progress statuses
> + Trans_Add("Stopping system service...", "Stopper systemtjeneste...")
> + Trans_Add("Removing system service...", "Fjerner systemtjeneste...")
> + Trans_Add("Removing custom user account rights...", "Fjerner specielle
kontorettigheder...")
> + Trans_Add("Removing files...", "Fjerner filer...")
> + Trans_Add("Removing registry modifications...", "Fjerner
registreringsdatabase?ndringer...")
> + Trans_Add("Removing custom user...", "Fjerner speciel bruger...")
> +
> + ; Launcher
> + Trans_Add("Freenet Launcher error", "Freenet Starter fejl")
> + Trans_Add("Freenet Launcher was unable to find the installid.dat ID
file.`n`nMake sure that you are running Freenet Launcher from a Freenet
installation directory.`nIf you are already doing so, please report this
error message to the developers.", "Freenet Starter kunne ikke finde
installid.dat ID-filen.`n`nKontroll?r at du k?rer Freenet Starter fra en
Freenet-installationsmappe.`nHvis du allerede g?r dette, s? indrapporter
venligst denne fejlbesked til udviklerne.")
> + Trans_Add("Freenet Launcher was unable to find the bin\start.exe
launcher.`n`nPlease reinstall Freenet.`n`nIf the problem keeps occurring,
please report this error message to the developers.", "Freenet Starter kunne
ikke finde bin\start.exe startfilen.`n`nPr?v at geninstallere
Freenet.`n`nHvis problemet forts?tter, s? indrapporter venligst denne
fejlbesked til udviklerne.")
> + Trans_Add("Freenet Launcher was unable to find the freenet.ini
configuration file.`n`nMake sure that you are running Freenet Launcher from a
Freenet installation directory.`nIf you are already doing so, please report
this error message to the developers.", "Freenet Starter kunne ikke finde
freenet.ini konfigurationsfilen.`n`nKontroll?r at du k?rer Freenet Starter
fra en Freenet-installationsmappe.`nHvis du allerede g?r dette, s?
indrapporter venligst denne fejlbesked til udviklerne.")
> + Trans_Add("Freenet Launcher was unable to read the 'fproxy.port' value
from the freenet.ini configuration file.`n`nPlease reinstall Freenet.`n`nIf
the problem keeps occurring, please report this error message to the
developers.", "Freenet Starter kunne ikke l?se 'fproxy.port' v?rdien fra
freenet.ini konfigurationsfilen.`n`nPr?v at geninstallere Freenet.`n`nHvis
problemet forts?tter, s? indrapporter venligst denne fejlbesked til
udviklerne.")
> + Trans_Add("Freenet Launcher was unable to find a supported
browser.`n`nPlease install one of the supported browsers, or
manually`nnavigate to: ", "Freenet Starter kunne ikke finde en underst?ttet
browser.`n`nInstaller en af de underst?ttede browsere, eller naviger`nmanuelt
til: ")
> + Trans_Add("Freenet Launcher supports the following browsers:", "Freenet
Starter underst?tter f?lgende browsere:")
> + Trans_Add("not recommended", "ikke anbefalet")
> +}
> +
>
> Added: trunk/apps/wininstaller/src_translationhelper/Include_Lang_fr.inc
> ===================================================================
> --- trunk/apps/wininstaller/src_translationhelper/Include_Lang_fr.inc
>
(rev 0)
> +++ trunk/apps/wininstaller/src_translationhelper/Include_Lang_fr.inc
2009-04-08 19:05:12 UTC (rev 26659)
> @@ -0,0 +1,84 @@
> +;
> +; Translation file - French (fr)
> +;
> +
> +LoadLanguage_fr()
> +{
> + ; Installer - Common
> + Trans_Add("Freenet Installer", "Installeur Freenet")
> + Trans_Add("Freenet Installer (Beta)", "Installeur Freenet (B?ta)")
> + Trans_Add("Welcome to the Freenet Installer!", "L'Installeur Freenet
> vous
souhaite la bienvenue !")
> + Trans_Add("Installation Problem", "Probl?me lors de l'installation")
> + Trans_Add("Freenet Installer fatal error", "Erreur fatale de
> l'Installeur
Freenet")
> + Trans_Add("Freenet Installer error", "Erreur de l'Installeur Freenet")
> + Trans_Add("Error: ", "Erreur : ")
> + Trans_Add("E&xit", "&Quitter")
> +
> + ; Installer - Error messageboxes
> + Trans_Add("Freenet Installer was not able to unpack necessary
> installation
files to:", "L'Installeur Freenet n'a pas pu d?compresser les fichiers
n?cessaires ? l'installation dans :")
> + Trans_Add("Please make sure that Freenet Installer has full access to
> the
system's temporary files folder.", "Assurez-vous que l'Installeur Freenet a
les droits d'?criture dans le dossier des fichiers temporaires du syst?me.")
> + Trans_Add("Freenet Installer requires administrator privileges to
> install
Freenet.`nPlease make sure that your user account has administrative access
to the system,`nand Freenet Installer is executed with access to use these
privileges.", "L'Installeur Freenet a besoin des privil?ges d'Administrateur
pour installer Freenet.`nAssurez-vous que votre compte utilisateur a les
droits d'administration,`net que l'Installeur Freenet est ex?cut? avec les
droits d'administration.")
> + Trans_Add("Freenet Installer was not able to write to the selected
installation directory.`nPlease select one to which you have write
access.", "L'Installeur Freenet n'a pas pu ?crire dans le dossier
d'installation choisi.`nChoisissez un r?pertoire o? vous disposez des droits
d'?criture.")
> + Trans_Add("Freenet Installer was not able to find a free port on your
system in the range ", "L'Installeur Freenet n'a pas pu trouver un port libre
dans la plage de ports ")
> + Trans_Add("Please free a system port in this range to install
Freenet.", "Vous devez lib?rer un port dans cette plage pour pouvoir
installer Freenet.")
> + Trans_Add("Freenet Installer was not able to create a Winsock 2.0
socket`nfor port availability testing.", "L'Installeur Freenet n'a pas pu
cr?er un socket Winsock 2.0`npour tester la disponibilit? d'un port.")
> +
> + ; Installer - Unsupported Windows version
> + Trans_Add("Freenet only supports the following versions of the Windows
operating system:", "Freenet ne supporte que les versions suivantes du
syst?me d'exploitation Windows :")
> + Trans_Add("Please install one of these versions if you want to use
> Freenet
on Windows.", "Vous devez installer une de ces versions si vous voulez
utiliser Freenet sur Windows.")
> +
> + ; Installer - Java missing
> + Trans_Add("Freenet requires the Java Runtime Environment, but your
> system
does not appear to have an up-to-date version installed. You can install Java
by using the included online installer, which will download and install the
necessary files from the Java website automatically:", "Freenet a besoin
d'une machine virtuelle Java, mais votre syst?me n'a pas l'air d'en poss?der
une. Vous pouvez installer Java en utilisant l'installeur fourni, qui
t?l?chargera et installera les fichiers n?cessaires automatiquement :")
> + Trans_Add("&Install Java", "&Installer Java")
> + Trans_Add("The installation will continue once Java
version ", "L'installation continuera une fois que Java version ")
> + Trans_Add(" or later has been installed.", " ou ult?rieur aura ?t?
install?.")
> +
> + ; Installer - Old installation detected
> + Trans_Add("Freenet Installer has detected that you already have Freenet
installed. Your current installation was installed using an older,
unsupported installer. To continue, you must first uninstall your current
version of Freenet using the previously created uninstaller:", "L'Installeur
Freenet a d?t?ct? une pr?c?dente installation de Freenet sur votre syst?me.
Votre installation actuelle de Freenet a ?t? install?e en utilisant une
version plus ancienne et non support?e de l'installeur Freenet. Pour
continuer, vous devez tout d'abord d?sinstaller votre version actuelle de
Freenet en utilisant le programme de d?sinstallation cr?? pr?c?demment :")
> + Trans_Add("&Uninstall", "&D?sinstaller")
> + Trans_Add("The installation will continue once the old installation has
been removed.", "L'installation continuera une fois que l'ancienne
installation aura ?t? supprim?e.")
> +
> + ; Installer - Main GUI - Header
> + Trans_Add("Please check the following default settings before
> continuing
with the installation of Freenet.", "V?rifiez les param?tres par d?faut
suivants avant de continuer l'installation de Freenet.")
> +
> + ; Installer - Main GUI - Install folder
> + Trans_Add("Installation directory", "R?pertoire d'installation")
> + Trans_Add("Freenet requires at least ", "Freenet a besoin au minimum de
> ")
> + Trans_Add(" MB free disk space, but will not install with less than ",
> "
MB d'espace disque, mais l'installation ne se fera pas sans au moins ")
> + Trans_Add(" MB free. The amount of space reserved can be changed after
installation.", " MB d'espace disque. La quantit? d'espace r?serv?e pourra
?tre chang?e apr?s l'installation.")
> + Trans_Add("&Browse", "&Parcourir")
> + Trans_Add("If you do not choose a folder containing 'Freenet' in the
> path,
a folder will be created for you automatically.", "Si vous ne choisissez pas
de dossier contenant 'Freenet' dans son nom, un dossier sera cr??
automatiquement pour vous.")
> + Trans_Add("De&fault", "&D?faut")
> + Trans_Add("Status:", "Statut :")
> + Trans_Add("Invalid install path!", "R?pertoire d'installation invalide
> !")
> + Trans_Add("Invalid install path! (Too long for file system to
handle)", "R?pertoire d'installation invalide ! (Nom trop long)")
> + Trans_Add("Not enough free space on installation drive!", "Pas assez
d'espace disque disponible sur le disque dur choisi !")
> + Trans_Add("Freenet already installed! Please uninstall first or choose
another directory!", "Freenet est d?j? install? ! Vous devez d'abord
d?sinstaller Freenet, ou choisir un autre dossier.")
> + Trans_Add("Installation directory OK!", "R?pertoire d'installation OK.")
> +
> + ; Installer - Main GUI - System service
> + Trans_Add("System service", "Service syst?me")
> + Trans_Add("Freenet will automatically start in the background as a
> system
service. This is required to be a part of the Freenet network, and will use a
small amount of system resources. The amount of resources used can be
adjusted after installation.", "Freenet sera automatiquement lanc? en arri?re
plan en tant que service syst?me. Cela est n?cessaire pour faire partie du
r?seau Freenet, et cela utilisera un petit peu de ressources syst?me. La
quantit? de ressources qui sera utilis?e pourra ?tre ajust?e apr?s
l'installation.")
> +
> + ; Installer - Main GUI - Additional settings
> + Trans_Add("Additional settings", "Param?tres suppl?mentaires")
> + Trans_Add("Install &start menu shortcuts (All users: Browse Freenet,
> Start
Freenet, Stop Freenet)", "Installer des raccourcis dans le menu &d?marrer
(Parcourir Freenet, D?marrer Freenet, Arr?ter Freenet)")
> + Trans_Add("Install &desktop shortcut (All users: Browse
Freenet)", "Installer un raccourci sur le &bureau (Parcourir Freenet)")
> + Trans_Add("Browse Freenet &after the installation", "Commencer ?
> parcourir
Freenet &apr?s l'installation")
> +
> + ; Installer - Main GUI - Footer
> + Trans_Add("Version ", "Version ")
> + Trans_Add(" - Build ", " - Build ")
> + Trans_Add("&Install", "&Installeur")
> +
> + ; Installer - Actual installation
> + Trans_Add("Freenet Background Service", "Service Freenet (arri?re
> plan)")
> + Trans_Add("Browse Freenet", "Parcourir Freenet") ; Shortcut name
> + Trans_Add("Opens the Freenet proxy homepage in a web browser", "Ouvre
> la
page d'accueil du proxy Freenet dans un navigateur internet")
> + Trans_Add("Start Freenet", "D?marrer Freenet") ; Shortcut name
> + Trans_Add("Starts the background service needed to use Freenet",
> "D?marre
le service d'arri?re plan n?cessaire pour utiliser Freenet.")
> + Trans_Add("Stop Freenet", "Arr?ter Freenet") ; Shortcut name
> + Trans_Add("Stops the background service needed to use Freenet", "Arr?te
> le
service d'arri?re plan n?cessaire pour utiliser Freenet.")
> + Trans_Add("Installation finished successfully!", "L'installation s'est
termin?e avec succ?s !")
> +}
> +
>
> Added:
trunk/apps/wininstaller/src_translationhelper/Include_TranslationHelper.ahk
> ===================================================================
> ---
trunk/apps/wininstaller/src_translationhelper/Include_TranslationHelper.ahk
(rev 0)
> +++
trunk/apps/wininstaller/src_translationhelper/Include_TranslationHelper.ahk
2009-04-08 19:05:12 UTC (rev 26659)
> @@ -0,0 +1,149 @@
> +;
> +; Translation helper
> +;
> +; This file contains functions used to translate the GUI.
> +;
> +; Special notes about translation:
> +; - Because of the compact GUI design, most of the text are subject to
min/max limitations. A too short translation will leave holes in the GUI and
> +; a too long will mess up the layout. So try to keep the translations at
the approx. same length as the original English text, with the same placement
> +; of eventual newline markers. The easiest way to test the translation is
to compile the installer and look for any broken layout.
> +;
> +
> +;
> +; Include translations
> +;
> +#Include ..\src_translationhelper\Include_Lang_da.inc
> ; Include
Danish (da) translation
> +#Include ..\src_translationhelper\Include_Lang_fr.inc
> ; Include
French (fr) translation
> +
> +InitTranslations()
> +{
> + global
> +
> + _LangArray := 1
> ; Set initial position for languages array
> +
> + ; AddLanguage() arguments: <localized language name> <language load
function name from language file> <windows language code (see
http://www.autohotkey.com/docs/misc/Languages.htm)>
> + AddLanguage("English","","")
> ; Load English (en) translation
(dummy)
> + AddLanguage("Dansk","LoadLanguage_da","0406")
> +
AddLanguage("Fran?ais","LoadLanguage_fr","040c+080c+0c0c+100c+140c+180c")
;
Make default for all variations of French
> +
> + LoadLanguage(LanguageCodeToID(A_Language))
> ; Load language matching
OS language (will fall back to English if no match)
> +}
> +
> +AddLanguage(_Name, _LoadFunction, _LanguageCode)
> +{
> + global
> +
> + _LanguageNames%_LangArray% := _Name
> + _LanguageLoadFunctions%_LangArray% := _LoadFunction
> + _LanguageCodes%_LangArray% := _LanguageCode
> +
> + _LangArray++
> +}
> +
> +LoadLanguage(_LoadNum)
> +{
> + global
> +
> + _LangNum := _LoadNum
> + _TransArray := 1
> + _LoadFunction := _LanguageLoadFunctions%_LoadNum%
> +
> + If (_LoadFunction <> "")
> + {
> + %_LoadFunction%()
> + }
> +}
> +
> +LanguageCodeToID(_LanguageCode)
> +{
> + global
> +
> + Loop % _LangArray-1
> + {
> + IfInString, _LanguageCodes%A_Index%, %_LanguageCode%
> + {
> + return A_Index
> + }
> + }
> +
> + return 1
> ; Language 1 should always be the default
> language, so
use that if no match above
> +}
> +
> +Trans_Add(_OriginalText, _TranslatedText)
> +{
> + global
> +
> + _OriginalTextArray%_TransArray% := _OriginalText
> + _TranslatedTextArray%_TransArray% := _TranslatedText
> +
> + _TransArray++
> +}
> +
> +Trans(_OriginalText)
> +{
> + global
> +
> + Loop % _TransArray-1
> + {
> + If (_OriginalText = _OriginalTextArray%A_Index%)
> + {
> + return UTF82Ansi(_TranslatedTextArray%A_Index%)
> + }
> + }
> +
> + return _OriginalText
> +}
> +
> +UTF82Ansi(zString)
> +{
> + Ansi2Unicode(zString, wString, 65001)
> + Unicode2Ansi(wString, sString, 0)
> + Return sString
> +}
> +
> +Ansi2Unicode(ByRef sString, ByRef wString, CP = 0)
> +{
> + nSize := DllCall("MultiByteToWideChar"
> + , "Uint", CP
> + , "Uint", 0
> + , "Uint", &sString
> + , "int", -1
> + , "Uint", 0
> + , "int", 0)
> +
> + VarSetCapacity(wString, nSize * 2)
> +
> + DllCall("MultiByteToWideChar"
> + , "Uint", CP
> + , "Uint", 0
> + , "Uint", &sString
> + , "int", -1
> + , "Uint", &wString
> + , "int", nSize)
> +}
> +
> +Unicode2Ansi(ByRef wString, ByRef sString, CP = 0)
> +{
> + nSize := DllCall("WideCharToMultiByte"
> + , "Uint", CP
> + , "Uint", 0
> + , "Uint", &wString
> + , "int", -1
> + , "Uint", 0
> + , "int", 0
> + , "Uint", 0
> + , "Uint", 0)
> +
> + VarSetCapacity(sString, nSize)
> +
> + DllCall("WideCharToMultiByte"
> + , "Uint", CP
> + , "Uint", 0
> + , "Uint", &wString
> + , "int", -1
> + , "str", sString
> + , "int", nSize
> + , "Uint", 0
> + , "Uint", 0)
> +}
> +
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 835 bytes
Desc: This is a digitally signed message part.
URL:
<https://emu.freenetproject.org/pipermail/devl/attachments/20090410/2f4b3414/attachment.pgp>
