bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2026-01-08 03:23:23 +00:00
Code Issues Releases Wiki Activity

Merge branch 'main' into feature/maui-migration

Browse Source 
# Conflicts:
#	src/App/Platforms/Android/AndroidManifest.xml
This commit is contained in:
Federico Maccaroni
2024-01-29 13:58:30 -03:00
parent f35bef0d7b a5878d3341
commit ec1ade7761
12 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App/Platforms/Android/AndroidManifest.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2024.1.1" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="2024.2.0" android:installLocation="internalOnly" package="com.x8bit.bitwarden">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.NFC" />

2
src/App/Platforms/iOS/Info.plist
View File

@@ -11,7 +11,7 @@
<key>CFBundleIdentifier</key>
<string>com.8bit.bitwarden</string>
<key>CFBundleShortVersionString</key>
<string>2024.1.1</string>
<string>2024.2.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>CFBundleIconName</key>

2
src/Core/Constants.cs
View File

@@ -70,7 +70,7 @@ namespace Bit.Core
public const int Argon2Parallelism = 4;
public const int MasterPasswordMinimumChars = 12;
public const int CipherKeyRandomBytesLength = 64;
public const string CipherKeyEncryptionMinServerVersion = "2023.12.0";
public const string CipherKeyEncryptionMinServerVersion = "2024.1.3";
public const string DefaultFido2CredentialType = "public-key";
public const string DefaultFido2CredentialAlgorithm = "ECDSA";
public const string DefaultFido2CredentialCurve = "P-256";

2
src/Core/Resources/Localization/AppResources.fr.resx
View File

@@ -2844,7 +2844,7 @@ Voulez-vous basculer vers ce compte ?</value>
<value>Vous ne trouvez pas ce que vous cherchez ? Contactez le support de Bitwarden sur bitwarden.com.</value>
</data>
<data name="PrivacyPolicyDescriptionLong" xml:space="preserve">
<value>Check out our privacy policy on bitwarden.com.</value>
<value>Consultez notre politique de confidentialité sur bitwarden.com.</value>
</data>
<data name="ExploreMoreFeaturesOfYourBitwardenAccountOnTheWebApp" xml:space="preserve">
<value>Explorez plus de fonctionnalités de votre compte Bitwarden sur l'application Web.</value>

2
src/Core/Resources/Localization/AppResources.nl.resx
View File

@@ -2212,7 +2212,7 @@ Het scannen gebeurt automatisch.</value>
<value>Er is een fout opgetreden tijdens het verzenden van een verificatiecode naar je e-mail. Probeer het opnieuw</value>
</data>
<data name="EnterTheVerificationCodeThatWasSentToYourEmail" xml:space="preserve">
<value>Voer de verificatiecode in die we naar je e-mail is gestuurd</value>
<value>Voer de verificatiecode in die naar je e-mail is gestuurd</value>
</data>
<data name="SubmitCrashLogs" xml:space="preserve">
<value>Crashes rapporteren</value>

4
src/Core/Resources/Localization/AppResources.nn.resx
View File

@@ -2822,7 +2822,7 @@ Do you want to switch to this account?</value>
<value>Continue to contact support?</value>
</data>
<data name="ContinueToPrivacyPolicy" xml:space="preserve">
<value>Continue to privacy policy?</value>
<value>Fortset til personvernerklæringa?</value>
</data>
<data name="ContinueToAppStore" xml:space="preserve">
<value>Continue to app store?</value>
@@ -2844,7 +2844,7 @@ Do you want to switch to this account?</value>
<value>Can’t find what you are looking for? Reach out to Bitwarden support on bitwarden.com.</value>
</data>
<data name="PrivacyPolicyDescriptionLong" xml:space="preserve">
<value>Check out our privacy policy on bitwarden.com.</value>
<value>Sjekk ut personvernerklæringa vår på bitwarden.com.</value>
</data>
<data name="ExploreMoreFeaturesOfYourBitwardenAccountOnTheWebApp" xml:space="preserve">
<value>Explore more features of your Bitwarden account on the web app.</value>

4
src/Core/Resources/Localization/AppResources.vi.resx
View File

@@ -2822,7 +2822,7 @@ Bạn có muốn chuyển sang tài khoản này không?</value>
<value>Vẫn liên hệ hỗ trợ?</value>
</data>
<data name="ContinueToPrivacyPolicy" xml:space="preserve">
<value>Continue to privacy policy?</value>
<value>Đồng ý với chính sách bảo mật?</value>
</data>
<data name="ContinueToAppStore" xml:space="preserve">
<value>Vẫn tiếp tục đến cửa hàng ứng dụng?</value>
@@ -2844,7 +2844,7 @@ Bạn có muốn chuyển sang tài khoản này không?</value>
<value>Không tìm thấy? Hãy liên hệ với bộ phận hỗ trợ của Bitwarden trên bitwarden.com.</value>
</data>
<data name="PrivacyPolicyDescriptionLong" xml:space="preserve">
<value>Check out our privacy policy on bitwarden.com.</value>
<value>Đọc chính sách bảo mật trên bitwarden.com.</value>
</data>
<data name="ExploreMoreFeaturesOfYourBitwardenAccountOnTheWebApp" xml:space="preserve">
<value>Khám phá thêm các tính năng của tài khoản Bitwarden của bạn trên bản web.</value>

2
src/iOS.Autofill/Info.plist
View File

@@ -11,7 +11,7 @@
<key>CFBundleIdentifier</key>
<string>com.8bit.bitwarden.autofill</string>
<key>CFBundleShortVersionString</key>
<string>2024.1.1</string>
<string>2024.2.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>CFBundleLocalizations</key>

2
src/iOS.Extension/Info.plist
View File

@@ -11,7 +11,7 @@
<key>CFBundleIdentifier</key>
<string>com.8bit.bitwarden.find-login-action-extension</string>
<key>CFBundleShortVersionString</key>
<string>2024.1.1</string>
<string>2024.2.0</string>
<key>CFBundleLocalizations</key>
<array>
<string>en</string>

2
src/iOS.ShareExtension/Info.plist
View File

@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>2024.1.1</string>
<string>2024.2.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>MinimumOSVersion</key>