Merge branch 'develop' into release/1.2.0

infeo · infeo · commit 84c4ff90d142 · 2023-01-18T13:58:22.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,11 +26,9 @@ jobs:
           name: artifacts
           path: target/*.jar
       - name: Create Release
-        uses: actions/create-release@v1 # NOTE: action is unmaintained and repo archived
+        uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
-        env:
-          GITHUB_TOKEN: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }} # release as "cryptobot"
         with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
           prerelease: true
+          token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
+          generate_release_notes: true
diff --git a/src/main/resources/MacIntegrationsBundle_be.properties b/src/main/resources/MacIntegrationsBundle_be.properties
diff --git a/src/main/resources/MacIntegrationsBundle_da.properties b/src/main/resources/MacIntegrationsBundle_da.properties
@@ -0,0 +1 @@
+org.cryptomator.macos.keychain.displayName=macOS nøglering
diff --git a/src/main/resources/MacIntegrationsBundle_si.properties b/src/main/resources/MacIntegrationsBundle_si.properties
diff --git a/src/main/resources/MacIntegrationsBundle_sl.properties b/src/main/resources/MacIntegrationsBundle_sl.properties
diff --git a/src/main/resources/MacIntegrationsBundle_sw.properties b/src/main/resources/MacIntegrationsBundle_sw.properties
@@ -0,0 +1 @@
+org.cryptomator.macos.keychain.displayName=keychain ya macOS
diff --git a/src/main/resources/MacIntegrationsBundle_vi.properties b/src/main/resources/MacIntegrationsBundle_vi.properties
@@ -0,0 +1 @@
+org.cryptomator.macos.keychain.displayName=Chuỗi khóa macOS
diff --git a/src/main/resources/MacIntegrationsBundle_zh_HK.properties b/src/main/resources/MacIntegrationsBundle_zh_HK.properties
@@ -0,0 +1 @@
+org.cryptomator.macos.keychain.displayName=macOS 鑰匙圈存取
diff --git a/src/main/resources/MacIntegrationsBundle_zh_TW.properties b/src/main/resources/MacIntegrationsBundle_zh_TW.properties
@@ -1 +1 @@
-org.cryptomator.macos.keychain.displayName=Mac OS钥匙串
+org.cryptomator.macos.keychain.displayName=macOS 鑰匙圈存取

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+org.cryptomator.macos.keychain.displayName=macOS nøglering`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-org.cryptomator.macos.keychain.displayName=Mac OS钥匙串`
	`1`	`+org.cryptomator.macos.keychain.displayName=macOS 鑰匙圈存取`