bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2026-01-19 17:03:21 +00:00
Code Issues Releases 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
parent 7ac3646fb0 e107b893ea
commit cd107b6161
11 changed files with 204 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);