[vlc-commits] nsis: make new strings translatable

[Ludovic Fauvet]

vlc/vlc-2.1 | branch: master | Ludovic Fauvet <etix at videolan.org> | Wed Nov 20 15:30:26 2013 +0100| [45b4a74730e4512945d2cce90a07e3e59f31a402] | committer: Ludovic Fauvet

nsis: make new strings translatable

Signed-off-by: Ludovic Fauvet <etix at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=45b4a74730e4512945d2cce90a07e3e59f31a402
---

 .../package/win32/NSIS/languages/declaration.nsh   |   12 ++++++++++
 extras/package/win32/NSIS/languages/english.nsh    |   12 ++++++++++
 extras/package/win32/NSIS/vlc.win32.nsi.in         |   24 ++++++++++----------
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/extras/package/win32/NSIS/languages/declaration.nsh b/extras/package/win32/NSIS/languages/declaration.nsh
index be1fbc7..4abebf9 100644
--- a/extras/package/win32/NSIS/languages/declaration.nsh
+++ b/extras/package/win32/NSIS/languages/declaration.nsh
@@ -48,3 +48,15 @@ Var Action_OnArrivalMusicFiles
 Var Action_OnArrivalDVDAudio
 
 Var License_NextText
+
+Var Reinstall_Headline
+Var Reinstall_HeadlineInstall
+Var Reinstall_HeadlineMaintenance
+Var Reinstall_MessageOlder
+Var Reinstall_MessageNewer
+Var Reinstall_MessageSame
+Var Reinstall_OptionUpgrade
+Var Reinstall_OptionDowngrade
+Var Reinstall_OptionComponents
+Var Reinstall_OptionAdvanced
+Var Reinstall_OptionUninstall
diff --git a/extras/package/win32/NSIS/languages/english.nsh b/extras/package/win32/NSIS/languages/english.nsh
index 2f1b896..fbfac6e 100644
--- a/extras/package/win32/NSIS/languages/english.nsh
+++ b/extras/package/win32/NSIS/languages/english.nsh
@@ -62,3 +62,15 @@ StrCpy $Action_OnArrivalMusicFiles "Play audio files"
 StrCpy $Action_OnArrivalDVDAudio "Play audio DVD"
 
 StrCpy $License_NextText "You are now aware of your rights. Click Next to continue."
+
+StrCpy $Reinstall_Headline "Already Installed"
+StrCpy $Reinstall_HeadlineInstall "Choose how you want to install VLC."
+StrCpy $Reinstall_HeadlineMaintenance "Choose the maintenance option to perform."
+StrCpy $Reinstall_MessageOlder "An older version of VLC is installed on your system. Select the operation you want to perform and click Next to continue."
+StrCpy $Reinstall_MessageNewer "A newer version of VLC is already installed! It is not recommended that you downgrade to an older version. Select the operation you want to perform and click Next to continue."
+StrCpy $Reinstall_MessageSame "VLC ${VERSION} is already installed. Select the operation you want to perform and click Next to continue."
+StrCpy $Reinstall_OptionUpgrade "Upgrade VLC using previous settings (recommended)"
+StrCpy $Reinstall_OptionDowngrade "Downgrade VLC using previous settings (recommended)"
+StrCpy $Reinstall_OptionComponents "Add/Remove/Reinstall components"
+StrCpy $Reinstall_OptionAdvanced "Change settings (advanced)"
+StrCpy $Reinstall_OptionUninstall "Uninstall VLC"
diff --git a/extras/package/win32/NSIS/vlc.win32.nsi.in b/extras/package/win32/NSIS/vlc.win32.nsi.in
index bb4013d..50bc75e 100644
--- a/extras/package/win32/NSIS/vlc.win32.nsi.in
+++ b/extras/package/win32/NSIS/vlc.win32.nsi.in
@@ -631,12 +631,12 @@ Function PageReinstall
 
   ${If} $PreviousVersionState == "newer"
 
-    !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install VLC."
-    nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 40 "An older version of VLC is installed on your system. Select the operation you want to perform and click Next to continue."
+    !insertmacro MUI_HEADER_TEXT $Reinstall_Headline $Reinstall_HeadlineInstall
+    nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 40 $Reinstall_MessageOlder
     Pop $R0
-    nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP} 0 10 55 100% 30 "Upgrade VLC using previous settings (recommended)"
+    nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP} 0 10 55 100% 30 $Reinstall_OptionUpgrade
     Pop $ReinstallUninstallBtn
-    nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 "Change settings (advanced)"
+    nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 $Reinstall_OptionAdvanced
     Pop $R0
 
     ${If} $ReinstallType == ""
@@ -645,12 +645,12 @@ Function PageReinstall
 
   ${ElseIf} $PreviousVersionState == "older"
 
-    !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install VLC."
-    nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 40 "A newer version of VLC is already installed! It is not recommended that you downgrade to an older version. Select the operation you want to perform and click Next to continue."
+    !insertmacro MUI_HEADER_TEXT $Reinstall_Headline $Reinstall_HeadlineInstall
+    nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 40 $Reinstall_MessageNewer
     Pop $R0
-    nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP} 0 10 55 100% 30 "Downgrade VLC using previous settings (recommended)"
+    nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP} 0 10 55 100% 30 $Reinstall_OptionDowngrade
     Pop $ReinstallUninstallBtn
-    nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 "Change settings (advanced)"
+    nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 $Reinstall_OptionAdvanced
     Pop $R0
 
     ${If} $ReinstallType == ""
@@ -659,12 +659,12 @@ Function PageReinstall
 
   ${ElseIf} $PreviousVersionState == "same"
 
-    !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose the maintenance option to perform."
-    nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 40 "VLC ${VERSION} is already installed. Select the operation you want to perform and click Next to continue."
+    !insertmacro MUI_HEADER_TEXT $Reinstall_Headline $Reinstall_HeadlineMaintenance
+    nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 40 $Reinstall_MessageSame
     Pop $R0
-    nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP} 0 10 55 100% 30 "Add/Remove/Reinstall components"
+    nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP} 0 10 55 100% 30 $Reinstall_OptionComponents
     Pop $R0
-    nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 "Uninstall VLC"
+    nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 $Reinstall_OptionUninstall
     Pop $ReinstallUninstallBtn
 
     ${If} $ReinstallType == ""