Merge branch 'develop' into release/1.2.0

infeo · infeo · commit aff6c7397ee7 · 2023-02-21T12:52:01.000+01:00
diff --git a/README.md b/README.md
@@ -6,6 +6,6 @@ macOS-specific implementations of [integrations-api](https://github.com/cryptoma
 
 Since this project involves JNI, you'll Java as well as Xcode build tools:
 
-* JDK 11
+* JDK 17
 * Maven
 * XCode Command Line Tools (run `xcode-select --install`)
diff --git a/src/main/resources/MacIntegrationsBundle_pt.properties b/src/main/resources/MacIntegrationsBundle_pt.properties
@@ -1 +1 @@
-org.cryptomator.macos.keychain.displayName=macOS Keychain
+org.cryptomator.macos.keychain.displayName=Porta-chaves macOS

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-org.cryptomator.macos.keychain.displayName=macOS Keychain`
	`1`	`+org.cryptomator.macos.keychain.displayName=Porta-chaves macOS`