1 files changed, 12 insertions, 21 deletions
diff --git a/nsis/langmacros.nsh b/nsis/langmacros.nsh
index 44edb51..4b692d6 100755
--- a/nsis/langmacros.nsh
+++ b/nsis/langmacros.nsh
@@ -2,15 +2,6 @@
 ;; Windows Gcompris NSIS installer language macros
 ;;
 
-!macro GCOMPRIS_MACRO_DEFAULT_STRING LABEL VALUE
-  !ifndef "${LABEL}"
-    !define "${LABEL}" "${VALUE}"
-    !ifdef INSERT_DEFAULT
-      !warning "${LANG} lang file mising ${LABEL}, using default.."
-    !endif
-  !endif
-!macroend
-
 !macro GCOMPRIS_MACRO_LANGSTRING_INSERT LABEL LANG
   LangString "${LABEL}" "${LANG_${LANG}}" "${${LABEL}}"
   !undef "${LABEL}"
@@ -29,28 +20,28 @@
   ; String labels should match those from the default language file.
 
   ; Startup checks
-  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT INSTALLER_IS_RUNNING			${CUR_LANG}
-  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GCOMPRIS_IS_RUNNING				${CUR_LANG}
+  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT InstallerIsRunning		${CUR_LANG}
+  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GcomprisIsRunning		${CUR_LANG}
 
   ; License Page
-  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GCOMPRIS_LICENSE_BUTTON			${CUR_LANG}
-  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GCOMPRIS_LICENSE_BOTTOM_TEXT		${CUR_LANG}
+  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GcomprisLicenseButton		${CUR_LANG}
+  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GcomprisLicenseBottomText	${CUR_LANG}
 
   ; Components Page
-  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GCOMPRIS_SECTION_TITLE			${CUR_LANG}
-  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GCOMPRIS_SECTION_DESCRIPTION		${CUR_LANG}
+  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GcomprisSectionTitle		${CUR_LANG}
+  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GcomprisSectionDescription	${CUR_LANG}
 
   ; Installer Finish Page
-  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GCOMPRIS_FINISH_VISIT_WEB_SITE		${CUR_LANG}
+  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GcomprisFinishVisitWebSite	${CUR_LANG}
 
   ; Gcompris Section Prompts and Texts
-  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GCOMPRIS_UNINSTALL_DESC			${CUR_LANG}
-  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GCOMPRIS_PROMPT_WIPEOUT			${CUR_LANG}
-  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GCOMPRIS_PROMPT_DIR_EXISTS		${CUR_LANG}
+  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GcomprisUninstallDesc	${CUR_LANG}
+  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GcomprisPromptWipeout	${CUR_LANG}
+  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT GcomprisPromptDirExists	${CUR_LANG}
 
   ; Uninstall Section Prompts
-  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT un.GCOMPRIS_UNINSTALL_ERROR_1		${CUR_LANG}
-  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT un.GCOMPRIS_UNINSTALL_ERROR_2		${CUR_LANG}
+  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT unGcomprisUninstallError1	${CUR_LANG}
+  !insertmacro GCOMPRIS_MACRO_LANGSTRING_INSERT unGcomprisUninstallError2	${CUR_LANG}
 
   !undef CUR_LANG
 !macroend