From ca0c51491be43acb51b698e91e9ecda865151323 Mon Sep 17 00:00:00 2001 From: anders_k Date: Tue, 22 Nov 2016 21:21:58 +0000 Subject: [PATCH] Norwegian MultiUser fixes (patch #279) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6799 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Language files/Norwegian.nsh | 8 ++++++++ Contrib/Language files/NorwegianNynorsk.nsh | 8 ++++++++ Docs/src/history.but | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Contrib/Language files/Norwegian.nsh b/Contrib/Language files/Norwegian.nsh index 5fda41fa..a8cb1811 100644 --- a/Contrib/Language files/Norwegian.nsh +++ b/Contrib/Language files/Norwegian.nsh @@ -119,3 +119,11 @@ !ifdef MUI_UNABORTWARNING ${LangFileString} MUI_UNTEXT_ABORTWARNING "Er du sikker på at du vil avbryte avinstallasjonen av $(^Name)?" !endif + +!ifdef MULTIUSER_INSTALLMODEPAGE + ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Velg brukere" + ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Velg hvilke brukere du vil installere $(^NameDA) for." + ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Velg om du vil installere $(^NameDA) bare for deg selv, eller for alle som bruker denne maskinen. $(^ClickNext)" + ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Installer for alle som bruker denne maskinen" + ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Installer bare for meg" +!endif diff --git a/Contrib/Language files/NorwegianNynorsk.nsh b/Contrib/Language files/NorwegianNynorsk.nsh index 85c59ba7..8a9398f9 100644 --- a/Contrib/Language files/NorwegianNynorsk.nsh +++ b/Contrib/Language files/NorwegianNynorsk.nsh @@ -119,3 +119,11 @@ !ifdef MUI_UNABORTWARNING ${LangFileString} MUI_UNTEXT_ABORTWARNING "Er du viss på at du vil avbryta avinstalleringa av $(^Name)?" !endif + +!ifdef MULTIUSER_INSTALLMODEPAGE + ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Vel brukarar" + ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Vel kva brukarar du vil installere $(^NameDA) for." + ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Vel om du vil installere $(^NameDA) berre for deg, eller for alle som nyttar denne maskina. $(^ClickNext)" + ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Installer for alle som nyttar maskina" + ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Installer berre for me" +!endif diff --git a/Docs/src/history.but b/Docs/src/history.but index 087ddc31..c40ecac3 100644 --- a/Docs/src/history.but +++ b/Docs/src/history.but @@ -22,7 +22,7 @@ Released on December ?th, 2016 \b PortugueseBR fixes (\W{http://sf.net/p/nsis/patches/276}{patch #276}) -\b Arabic, Portuguese, Ukrainian and Swedish MultiUser fixes (\W{http://sf.net/p/nsis/patches/278}{patch #278}, \W{http://sf.net/p/nsis/patches/274}{patch #274}, \W{http://sf.net/p/nsis/patches/275}{patch #275} & \W{http://sf.net/p/nsis/patches/277}{patch #277}) +\b Arabic, Norwegian, Portuguese, Ukrainian and Swedish MultiUser fixes (\W{http://sf.net/p/nsis/patches/278}{patch #278}, \W{http://sf.net/p/nsis/patches/279}{patch #279}, \W{http://sf.net/p/nsis/patches/274}{patch #274}, \W{http://sf.net/p/nsis/patches/275}{patch #275} & \W{http://sf.net/p/nsis/patches/277}{patch #277}) \H{v3.0} 3.0