Merge branch 'statisticssweden:master' into master

runejo · Jan 30, 2024 · 27fb455 · 27fb455
2 parents ae9bfe3 + 06e9b9e
commit 27fb455
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/deploy_to_azure.yml b/.github/workflows/deploy_to_azure.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup MSBuild path
-        uses: microsoft/[email protected].1
+        uses: microsoft/[email protected].2
 
       - name: Setup NuGet
         uses: NuGet/[email protected]

diff --git a/.github/workflows/master_px-web_org.yaml b/.github/workflows/master_px-web_org.yaml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup MSBuild path
-        uses: microsoft/[email protected].1
+        uses: microsoft/[email protected].2
 
       - name: Setup NuGet
         uses: NuGet/[email protected]

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
@@ -15,7 +15,7 @@ jobs:
 
     - uses: actions/checkout@v4
 
-    - uses: microsoft/[email protected].1
+    - uses: microsoft/[email protected].2
 
     - uses: NuGet/[email protected]
 

diff --git a/PXWeb/Resources/Languages/pxlang.da.xml b/PXWeb/Resources/Languages/pxlang.da.xml
@@ -611,7 +611,7 @@
   <sentence name="PxWebReturnToStartpage" value="Gå tilbage til startsiden" />
   <sentence name="PxWebAdminLogout" value="Log ud" />
   <sentence name="PxWebAdminHeading" value="PxWeb Administration" />
-  <sentence name="PxWebAdminVersion" value="PxWeb 2023 Beta1" />
+  <sentence name="PxWebAdminVersion" value="PxWeb 2023 v1" />
   <sentence name="PxWebAdminHomePage" value="PxWeb Homepage" />
   <sentence name="PxWebAdminSaveButton" value="Save" />
   <sentence name="PxWebAdminGenerateButton" value="Generate" />

diff --git a/PXWeb/Resources/Languages/pxlang.fi.xml b/PXWeb/Resources/Languages/pxlang.fi.xml
@@ -637,7 +637,7 @@
   <sentence name="PxWebMetadataNoValueMeta" value="Näille määrittelyille ei ole arvoja" />
   <sentence name="PxWebAdminLogout" value="Kirjaudu ulos" />
   <sentence name="PxWebAdminHeading" value="PxWeb-ylläpito" />
-  <sentence name="PxWebAdminVersion" value="PxWeb 2023 Beta1" />
+  <sentence name="PxWebAdminVersion" value="PxWeb 2023 v1" />
   <sentence name="PxWebAdminHomePage" value="PxWeb-kotisivu" />
   <sentence name="PxWebAdminSaveButton" value="Tallenna" />
   <sentence name="PxWebAdminGenerateButton" value="Luo" />

diff --git a/PXWeb/Resources/Languages/pxlang.kl.xml b/PXWeb/Resources/Languages/pxlang.kl.xml
@@ -611,7 +611,7 @@
   <sentence name="PxWebReturnToStartpage" value="Quppernermut siullermut uterit" />
   <sentence name="PxWebAdminLogout" value="Log-ud" />
   <sentence name="PxWebAdminHeading" value="PxWeb Administration" />
-  <sentence name="PxWebAdminVersion" value="PxWeb 2023 Beta1" />
+  <sentence name="PxWebAdminVersion" value="PxWeb 2023 v1" />
   <sentence name="PxWebAdminHomePage" value="PxWeb Homepage" />
   <sentence name="PxWebAdminSaveButton" value="Save" />
   <sentence name="PxWebAdminGenerateButton" value="Generate" />

diff --git a/PXWeb/Resources/Languages/pxlang.sv.xml b/PXWeb/Resources/Languages/pxlang.sv.xml
@@ -537,8 +537,8 @@
   <sentence name="PageViewDataSortColumnIsSortedAscSR" value="Tabellen är sorterad i fallande ordning på {0}. Klicka för att sortera i stigande ordning." />
   <sentence name="PageViewDataSortColumnIsSortedDescSR" value="Tabellen är sorterad i stigande ordning på {0}. klicka för att sortera i fallande ordning." />
   <sentence name="CancelButton" value="Avbryt" />
-  <sentence name="PxWebApplicationTitle" value="PxWeb 2023 Beta1" />
-  <sentence name="PxWebApplicationName" value="PxWeb 2023 Beta1" />
+  <sentence name="PxWebApplicationTitle" value="PxWeb 2023 v1" />
+  <sentence name="PxWebApplicationName" value="PxWeb 2023 v1" />
   <sentence name="PxWebLogoAlt" value="PxWeb logotyp" />
   <sentence name="PxWebExternalSearchText" value="Sök"/>
   <sentence name="PxWebExternalSearchURL" value="https://www.google.se"/>
@@ -659,7 +659,7 @@
   <sentence name="PxWebSkipToSelectionLinkScreenReader" value="Nu har du hamnat på en sida där du ska välja variabler och värden för dessa." />
   <sentence name="PxWebAdminLogout" value="Logga ut" />
   <sentence name="PxWebAdminHeading" value="PxWeb Administration" />
-  <sentence name="PxWebAdminVersion" value="PxWeb 2023 Beta1" />
+  <sentence name="PxWebAdminVersion" value="PxWeb 2023 v1" />
   <sentence name="PxWebAdminHomePage" value="PxWeb hemsida" />
   <sentence name="PxWebAdminSaveButton" value="Spara" />
   <sentence name="PxWebAdminGenerateButton" value="Generera" />

diff --git a/PXWeb/Resources/Languages/pxlang.xml b/PXWeb/Resources/Languages/pxlang.xml
@@ -692,8 +692,8 @@
 	 <sentence name="CancelButton" value="Cancel"/>
 
 	 <!-- PxWeb -->
-	 <sentence name="PxWebApplicationTitle" value="PxWeb 2023 Beta1"/>
-	 <sentence name="PxWebApplicationName" value="PxWeb 2023 Beta1"/>
+	 <sentence name="PxWebApplicationTitle" value="PxWeb 2023 v1"/>
+	 <sentence name="PxWebApplicationName" value="PxWeb 2023 v1"/>
    <sentence name="PxWebLogoAlt" value="PxWeb Logotype"/>
    <sentence name="PxWebExternalSearchText" value="Search"/>
    <sentence name="PxWebExternalSearchURL" value="https://www.google.com"/>
@@ -834,7 +834,7 @@
 
 	 <sentence name="PxWebAdminLogout" value="Log out"/>
 	 <sentence name="PxWebAdminHeading" value="PxWeb Administration"/>
-	 <sentence name="PxWebAdminVersion" value="PxWeb 2023 Beta1"/>
+	 <sentence name="PxWebAdminVersion" value="PxWeb 2023 v1"/>
 	 <sentence name="PxWebAdminHomePage" value="PxWeb Homepage"/>
 	 <sentence name="PxWebAdminSaveButton" value="Save"/>
 	 <sentence name="PxWebAdminGenerateButton" value="Generate"/>