Author: Zero3
Date: 2009-04-08 21:24:03 +0000 (Wed, 08 Apr 2009)
New Revision: 26664
Modified:
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller.ahk
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Uninstaller.ahk
trunk/apps/wininstaller/src_translationhelper/Include_Lang_da.inc
trunk/apps/wininstaller/src_translationhelper/Include_Lang_fr.inc
Log:
Misc. fixes for translation support
Modified: trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller.ahk
===================================================================
--- trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller.ahk
2009-04-08 20:07:30 UTC (rev 26663)
+++ trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller.ahk
2009-04-08 21:24:03 UTC (rev 26664)
@@ -230,8 +230,8 @@
_GBHeight := CalculateGroupBoxHeight(0,0,3,0)
Gui, Add, GroupBox, xs w%_GuiWidth2% h%_GBHeight% Section, % Trans("Additional
settings")
-Gui, Add, Checkbox, xs+%_GBHorMargin% ys+%_GBTopMargin% W%_GuiWidth3%
v_cInstallStartMenuShortcuts Checked%_cInstallStartMenuShortcuts%, %
Trans("Install &start menu shortcuts (All users: Browse Freenet, Start Freenet,
Stop Freenet)")
-Gui, Add, Checkbox, v_cInstallDesktopShortcuts
Checked%_cInstallDesktopShortcuts%, % Trans("Install &desktop shortcut (All
users: Browse Freenet)")
+Gui, Add, Checkbox, xs+%_GBHorMargin% ys+%_GBTopMargin% W%_GuiWidth3%
v_cInstallStartMenuShortcuts Checked%_cInstallStartMenuShortcuts%, %
Trans("Install &start menu shortcuts (All users: Freenet, Start Freenet, Stop
Freenet)")
+Gui, Add, Checkbox, v_cInstallDesktopShortcuts
Checked%_cInstallDesktopShortcuts%, % Trans("Install &desktop shortcut (All
users: Freenet)")
Gui, Add, Checkbox, v_cBrowseAfterInstall Checked%_cBrowseAfterInstall%, %
Trans("Browse Freenet &after the installation")
;
@@ -323,7 +323,8 @@
FileAppend, fproxy.port=%_FProxyPort%`n,
%_InstallDir%\freenet.ini
FileAppend, fcp.port=%_FCPPort%`n,
%_InstallDir%\freenet.ini
FileAppend,
pluginmanager.loadplugin=JSTUN;KeyExplorer;ThawIndexBrowser;UPnP;XMLLibrarian`n,
%_InstallDir%\freenet.ini
-FileAppend, node.updater.autoupdate=true`n,
%_InstallDir%\freenet.ini
+FileAppend, node.updater.autoupdate=true`n,
%_InstallDir%\freenet.ini
+FileAppend, % "node.l10n=" UTF82Ansi(_LanguageNames%_LangNum%) "`n",
%_InstallDir%\freenet.ini
FileAppend, End`n,
%_InstallDir%\freenet.ini
FileAppend, `n,
%_InstallDir%\wrapper.conf
@@ -331,7 +332,7 @@
FileAppend, wrapper.ntservice.name=freenet%_InstallSuffix%`n,
%_InstallDir%\wrapper.conf
FileAppend, `n,
%_InstallDir%\wrapper.conf
FileAppend, # Display name of the service`n,
%_InstallDir%\wrapper.conf
-FileAppend, % "wrapper.ntservice.displayname=" Trans("Freenet background
service") _InstallSuffix "`n", %_InstallDir%\wrapper.conf
+FileAppend, wrapper.ntservice.displayname=Freenet background
service%_InstallSuffix%`n,
%_InstallDir%\wrapper.conf
FileAppend, `n,
%_InstallDir%\wrapper.conf
FileAppend, # User account to run the serve runder`n,
%_InstallDir%\wrapper.conf
FileAppend, wrapper.ntservice.account=.\Freenet%_InstallSuffix%`n,
%_InstallDir%\wrapper.conf
@@ -383,14 +384,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%\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%\Freenet%_InstallSuffix%.lnk, , , % Trans("Opens the Freenet
proxy homepage in a web browser"), %_InstallDir%\Freenet.ico
}
GuiControl, , _cProgressBar, +1
Modified:
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Uninstaller.ahk
===================================================================
---
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Uninstaller.ahk
2009-04-08 20:07:30 UTC (rev 26663)
+++
trunk/apps/wininstaller/src_freenetinstaller/FreenetInstaller_Uninstaller.ahk
2009-04-08 21:24:03 UTC (rev 26664)
@@ -200,7 +200,7 @@
; 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 "\" Trans("Browse") " Freenet" _InstallSuffix
".lnk"
+FileDelete, %A_DesktopCommon%\Freenet%_InstallSuffix%.lnk
Progress, 4
Modified: trunk/apps/wininstaller/src_translationhelper/Include_Lang_da.inc
===================================================================
--- trunk/apps/wininstaller/src_translationhelper/Include_Lang_da.inc
2009-04-08 20:07:30 UTC (rev 26663)
+++ trunk/apps/wininstaller/src_translationhelper/Include_Lang_da.inc
2009-04-08 21:24:03 UTC (rev 26664)
@@ -62,8 +62,8 @@
; 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("Install &start menu shortcuts (All users: Freenet, Start
Freenet, Stop Freenet)", "Installer start&menugenveje (Alle brugere: Freenet,
Start Freenet, Stop Freenet)")
+ Trans_Add("Install &desktop shortcut (All users: Freenet)", "Installer
s&krivebordsgenvej (Alle brugere: Freenet)")
Trans_Add("Browse Freenet &after the installation", "Åbn Freenet &efter
installationen")
; Installer - Main GUI - Footer
@@ -72,8 +72,6 @@
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")
Modified: trunk/apps/wininstaller/src_translationhelper/Include_Lang_fr.inc
===================================================================
--- trunk/apps/wininstaller/src_translationhelper/Include_Lang_fr.inc
2009-04-08 20:07:30 UTC (rev 26663)
+++ trunk/apps/wininstaller/src_translationhelper/Include_Lang_fr.inc
2009-04-08 21:24:03 UTC (rev 26664)
@@ -62,8 +62,8 @@
; 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, Démarrer, Arrêter Freenet)")
- Trans_Add("Install &desktop shortcut (All users: Browse Freenet)",
"Installer un raccourci sur le &bureau (Parcourir Freenet)")
+ Trans_Add("Install &start menu shortcuts (All users: Freenet, Start
Freenet, Stop Freenet)", "Installer des raccourcis dans le menu &démarrer
(Freenet, Démarrer, Arrêter Freenet)")
+ Trans_Add("Install &desktop shortcut (All users: Freenet)", "Installer
un raccourci sur le &bureau (Freenet)")
Trans_Add("Browse Freenet &after the installation", "Commencer à
parcourir Freenet &après l'installation")
; Installer - Main GUI - Footer
@@ -72,8 +72,6 @@
Trans_Add("&Install", "&Installeur")
; Installer - Actual installation
- Trans_Add("Freenet Background Service", "Service Freenet (arrière
plan)")
- Trans_Add("Browse", "Parcourir") ; Part of 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.")
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
