mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-26 19:08:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into feature/maui-migration

Browse source 
# Conflicts:
#	src/App/Platforms/Android/AndroidManifest.xml
#	src/iOS.Core/Renderers/CollectionView/ExtendedGroupableItemsViewController.cs
This commit is contained in:
Federico Maccaroni 2024-01-11 14:17:34 -03:00
commit cd107b6161
No known key found for this signature in database
GPG key ID: 5D233F8F2B034536
11 changed files with 204 additions and 204 deletions
Show stats 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.0" 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.1.1" 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" />

374
src/Core/Resources/Localization/AppResources.hi.resx
View file

File diff suppressed because it is too large Load diff

2
src/Core/Resources/Localization/AppResources.pt-PT.resx
View file

@ -885,7 +885,7 @@
<comment>Totp code label</comment>
</data>
<data name="AuthenticatorKeyAdded" xml:space="preserve">
<value>Chave de autenticador adicionada.</value>
<value>Chave de autenticação adicionada.</value>
</data>
<data name="AuthenticatorKeyReadError" xml:space="preserve">
<value>Não é possível ler a chave de autenticação.</value>

6
src/Core/Resources/Localization/AppResources.ru.resx
View file

@ -885,10 +885,10 @@
<comment>Totp code label</comment>
</data>
<data name="AuthenticatorKeyAdded" xml:space="preserve">
<value>Ключ проверки подлинности добавлен.</value>
<value>Ключ аутентификатора добавлен.</value>
</data>
<data name="AuthenticatorKeyReadError" xml:space="preserve">
<value>Не удается прочитать ключ проверки подлинности.</value>
<value>Не удается прочитать ключ аутентификатора.</value>
</data>
<data name="PointYourCameraAtTheQRCode" xml:space="preserve">
<value>Наведите камеру на QR-код.
@ -2272,7 +2272,7 @@
<value>Требуется подписка Премиум</value>
</data>
<data name="CannotAddAuthenticatorKey" xml:space="preserve">
<value>Не удается добавить ключ проверки подлинности? </value>
<value>Не удается добавить ключ аутентификатора? </value>
</data>
<data name="ScanQRCode" xml:space="preserve">
<value>Сканировать QR-код</value>

10
src/Core/Resources/Localization/AppResources.zh-Hans.resx
View file

@ -885,17 +885,17 @@
<comment>Totp code label</comment>
</data>
<data name="AuthenticatorKeyAdded" xml:space="preserve">
<value>验证器密钥已添加。</value>
<value>已添加验证器密钥。</value>
</data>
<data name="AuthenticatorKeyReadError" xml:space="preserve">
<value>无法读取验证器密钥。</value>
</data>
<data name="PointYourCameraAtTheQRCode" xml:space="preserve">
<value>将您的摄像头对准 QR 码。
<value>将您的摄像头对准二维码。
扫描将自动完成。</value>
</data>
<data name="ScanQrTitle" xml:space="preserve">
<value>扫描 QR 码</value>
<value>扫描二维码</value>
</data>
<data name="Camera" xml:space="preserve">
<value>相机</value>
@ -2275,10 +2275,10 @@
<value>无法添加验证器密钥？</value>
</data>
<data name="ScanQRCode" xml:space="preserve">
<value>扫描 QR 码</value>
<value>扫描二维码</value>
</data>
<data name="CannotScanQRCode" xml:space="preserve">
<value>无法扫描 QR 码吗？ </value>
<value>无法扫描二维码吗？ </value>
</data>
<data name="AuthenticatorKeyScanner" xml:space="preserve">
<value>验证器密钥</value>

2
src/Core/Services/ApiService.cs
View file

@ -631,7 +631,7 @@ namespace Bit.Core.Services
public async Task<SsoPrevalidateResponse> PreValidateSsoAsync(string identifier)
{
var path = "/account/prevalidate?domainHint=" + WebUtility.UrlEncode(identifier);
var path = "/sso/prevalidate?domainHint=" + WebUtility.UrlEncode(identifier);
using (var requestMessage = new HttpRequestMessage())
{
requestMessage.Version = new Version(1, 0);

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.0</string>
<string>2024.1.1</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.0</string>
<string>2024.1.1</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.0</string>
<string>2024.1.1</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>MinimumOSVersion</key>

2
src/iOS/Info.plist
View file

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

4
src/watchOS/bitwarden/bitwarden WatchKit Extension/Localization/hi.lproj/Localizable.strings
View file

@ -5,6 +5,6 @@
"SyncingItemsContainingVerificationCodes" = "वेरीफिकेशन कोड वाले चीज़ें सिंक कर रहे";
"UnlockBitwardenOnYourIPhoneToViewVerificationCodes" = "वेरीफिकेशन कोड देखने के लिए अपने आईफोन पे बिटवार्डन खोलें";
"SetUpBitwardenToViewItemsContainingVerificationCodes" = "वेरीफिकेशन कोड वाले चीज़ें देखने के लिए बिटवार्डन सेट करें";
"Search" = "खोजें";
"NoItemsFound" = "कोई चीज़ नहीं मिला";
"Search" = "सर्च करें";
"NoItemsFound" = "कोई आइटम नहीं मिला";
"SetUpAppleWatchPasscodeInOrderToUseBitwarden" = "बिटवार्डन इस्तेमाल करने के लिए एप्पल वॉच पासकोड सेट करें";