[PM-26248] Add plurals

AuthenticatorShared/Core/Platform/Models/Enum/ClearClipboardValue.swift

@@ -44,11 +44,11 @@ enum ClearClipboardValue: Int, Menuable {
         case .never:
             Localizations.never
         case .tenSeconds:
-            Localizations.tenSeconds
+            Localizations.xSeconds(10)
         case .twentySeconds:
-            Localizations.twentySeconds
+            Localizations.xSeconds(20)
         case .thirtySeconds:
-            Localizations.thirtySeconds
+            Localizations.xSeconds(30)
         case .oneMinute:
             Localizations.xMinutes(1)
         case .twoMinutes:

AuthenticatorShared/Core/Platform/Models/Enum/ClearClipboardValueTests.swift

@@ -9,9 +9,9 @@ class ClearClipboardValueTests: BitwardenTestCase {
     /// `localizedName` returns the correct values.
     func test_localizedName() {
         XCTAssertEqual(ClearClipboardValue.never.localizedName, Localizations.never)
-        XCTAssertEqual(ClearClipboardValue.tenSeconds.localizedName, Localizations.tenSeconds)
-        XCTAssertEqual(ClearClipboardValue.twentySeconds.localizedName, Localizations.twentySeconds)
-        XCTAssertEqual(ClearClipboardValue.thirtySeconds.localizedName, Localizations.thirtySeconds)
+        XCTAssertEqual(ClearClipboardValue.tenSeconds.localizedName, Localizations.xSeconds(10))
+        XCTAssertEqual(ClearClipboardValue.twentySeconds.localizedName, Localizations.xSeconds(20))
+        XCTAssertEqual(ClearClipboardValue.thirtySeconds.localizedName, Localizations.xSeconds(30))
         XCTAssertEqual(ClearClipboardValue.oneMinute.localizedName, Localizations.xMinutes(1))
         XCTAssertEqual(ClearClipboardValue.twoMinutes.localizedName, Localizations.xMinutes(2))
         XCTAssertEqual(ClearClipboardValue.fiveMinutes.localizedName, Localizations.xMinutes(5))

AuthenticatorShared/Core/Platform/Models/Enum/SessionTimeoutValue.swift

@@ -34,9 +34,9 @@ extension SessionTimeoutValue: @retroactive CaseIterable, Menuable {
         case .thirtyMinutes:
             Localizations.xMinutes(30)
         case .oneHour:
-            Localizations.oneHour
+            Localizations.xHours(1)
         case .fourHours:
-            Localizations.fourHours
+            Localizations.xHours(4)
         case .onAppRestart:
             Localizations.onRestart
         case .never:

AuthenticatorShared/Core/Platform/Models/Enum/SessionTimeoutValueTests.swift

@@ -32,8 +32,8 @@ final class SessionTimeoutValueTests: BitwardenTestCase {
         XCTAssertEqual(SessionTimeoutValue.fiveMinutes.localizedName, Localizations.xMinutes(5))
         XCTAssertEqual(SessionTimeoutValue.fifteenMinutes.localizedName, Localizations.xMinutes(15))
         XCTAssertEqual(SessionTimeoutValue.thirtyMinutes.localizedName, Localizations.xMinutes(30))
-        XCTAssertEqual(SessionTimeoutValue.oneHour.localizedName, Localizations.oneHour)
-        XCTAssertEqual(SessionTimeoutValue.fourHours.localizedName, Localizations.fourHours)
+        XCTAssertEqual(SessionTimeoutValue.oneHour.localizedName, Localizations.xHours(1))
+        XCTAssertEqual(SessionTimeoutValue.fourHours.localizedName, Localizations.xHours(4))
         XCTAssertEqual(SessionTimeoutValue.onAppRestart.localizedName, Localizations.onRestart)
         XCTAssertEqual(SessionTimeoutValue.never.localizedName, Localizations.never)
         XCTAssertEqual(SessionTimeoutValue.custom(123).localizedName, Localizations.custom)

AuthenticatorShared/UI/Vault/AuthenticatorItem/AuthenticatorItemState.swift

@@ -161,11 +161,11 @@ enum TotpPeriodOptions: Int, Menuable, CaseIterable {
     var localizedName: String {
         switch self {
         case .thirty:
-            Localizations.thirtySeconds
+            Localizations.xSeconds(30)
         case .sixty:
-            Localizations.sixtySeconds
+            Localizations.xSeconds(60)
         case .ninety:
-            Localizations.ninetySeconds
+            Localizations.xSeconds(90)
         }
     }
 }

BitwardenResources/Localizations/en.lproj/Localizable.strings

@@ -131,8 +131,6 @@
 "LastSync" = "Last sync:";
 "Length" = "Length";
 "Lock" = "Lock";
-"OneHour" = "1 hour";
-"FourHours" = "4 hours";
 "Immediately" = "Immediately";
 "VaultTimeout" = "Vault timeout";
 "VaultTimeoutAction" = "Vault timeout action";
@@ -389,7 +387,6 @@
 "AllItems" = "All items";
 "CheckingPassword" = "Checking password…";
 "CheckPassword" = "Check if password has been exposed.";
-"PasswordExposed" = "This password has been exposed %1$@ time(s) in data breaches. You should change it.";
 "PasswordSafe" = "This password was not found in any known data breaches. It should be safe to use.";
 "IdentityName" = "Identity name";
 "Value" = "Value";
@@ -437,9 +434,6 @@
 "VaultLockedIdentity" = "Your vault is locked. Verify your identity to continue.";
 "Dark" = "Dark";
 "Light" = "Light";
-"TenSeconds" = "10 seconds";
-"ThirtySeconds" = "30 seconds";
-"TwentySeconds" = "20 seconds";
 "ClearClipboard" = "Clear clipboard";
 "ClearClipboardDescription" = "Automatically clear copied values from your clipboard.";
 "DefaultUriMatchDetection" = "Default URI match detection";
@@ -582,11 +576,6 @@
 "SendDeleted" = "Send deleted";
 "SendUpdated" = "Send saved";
 "NewSendCreated" = "Send created";
-"OneDay" = "1 day";
-"TwoDays" = "2 days";
-"ThreeDays" = "3 days";
-"SevenDays" = "7 days";
-"ThirtyDays" = "30 days";
 "Custom" = "Custom";
 "ShareOnSave" = "Share this Send upon save";
 "SendDisabledWarning" = "Due to an enterprise policy, you are only able to delete an existing Send.";
@@ -617,8 +606,6 @@
 "Fido2ReturnToApp" = "Return to app";
 "Fido2CheckBrowser" = "Please make sure your default browser supports WebAuthn and try again.";
 "ResetPasswordAutoEnrollInviteWarning" = "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password.";
-"VaultTimeoutPolicyInEffect" = "Your organization policies have set your maximum allowed vault timeout to %1$@ hour(s) and %2$@ minute(s).";
-"VaultTimeoutPolicyWithActionInEffect" = "Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is %1$@ hour(s) and %2$@ minute(s). Your vault timeout action is set to %3$@.";
 "VaultTimeoutActionPolicyInEffect" = "Your organization policies have set your vault timeout action to %1$@.";
 "VaultTimeoutToLarge" = "Your vault timeout exceeds the restrictions set by your organization.";
 "DisablePersonalVaultExportPolicyInEffect" = "One or more organization policies prevents your from exporting your individual vault.";
@@ -839,7 +826,6 @@
 "OneHourAndXMinute" = "One hour and %1$@ minutes";
 "XHoursAndOneMinute" = "%1$@ hours and one minute";
 "XHoursAndYMinutes" = "%1$@ hours and %2$@ minutes";
-"XHours" = "%1$@ hours";
 "PasskeyManagementExplanationLong" = "Use Bitwarden to save new passkeys and log in with passkeys stored in your vault.";
 "AutofillServicesExplanationLong" = "The Android Autofill Framework is used to assist in filling login information into other apps on your device.";
 "UseInlineAutofillExplanationLong" = "Use inline autofill if your selected keyboard supports it. Otherwise, use the default overlay.";
@@ -974,7 +960,6 @@
 "BitwardenCannotResetALostOrForgottenMasterPassword" = "Bitwarden cannot reset a lost or forgotten master password.";
 "LearnAboutWaysToPreventAccountLockout" = "Learn about ways to prevent account lockout";
 "WhatMakesAPasswordStrong" = "What makes a password strong?";
-"XCharacters" = "%1$@ Characters";
 "RemoveMasterPasswordMessage" = "%1$@ is using SSO with a self-hosted key server. A master password is no longer required to log in for members of this organization.";
 "RestartRegistration" = "Restart registration";
 "ExpiredLink" = "Expired link";
@@ -1089,7 +1074,6 @@
 "ImportingEllipsis" = "Importing…";
 "AreYouSureYouWantToCancelTheImportProcessQuestionMark" = "Are you sure you want to cancel the import process?";
 "ImportFailed" = "Import failed";
-"ItemsSuccessfullyImported" = "%1$@ items successfully imported";
 "ThereWasAnIssueImportingAllOfYourPasswordsNoDataWasDeleted" = "There was an issue importing all of your passwords.\n\nNo data was deleted.";
 "RetryImport" = "Retry import";
 "ShowVault" = "Show vault";
@@ -1111,7 +1095,6 @@
 "SendNameRequired" = "Send name (required)";
 "CheckPasswordForDataBreaches" = "Check password for data breaches";
 "PrivateNote" = "Private note";
-"XItems" = "%1$@ items";
 "CannotDeleteUserSoleOwnerDescriptionLong" = "Cannot delete this user because it is the sole owner of at least one organization. Please delete these organizations or upgrade another user.";
 "APasskeyAlreadyExistsForThisApplication" = "A passkey already exists for this application.";
 "APasskeyAlreadyExistsForThisApplicationButAnErrorOccurredWhileLoadingIt" = "A passkey already exists for this application but an error occurred while loading it.";
@@ -1145,7 +1128,6 @@
 "LoggingDuration" = "Logging duration";
 "LogsWillBeAutomaticallyDeletedAfter30DaysDescriptionLong" = "Logs will be automatically deleted after 30 days. Bitwarden is only able to access your log data when you share it.";
 "ForDetailsOnWhatIsAndIsntLoggedVisitTheBitwardenHelpCenter" = "For details on what is and isn’t logged, visit the **[Bitwarden help center](%1$@)**.";
-"OneWeek" = "1 week";
 "ShowMore" = "Show more";
 "ShowLess" = "Show less";
 "ItemNameX" = "Item name, %1$@";
@@ -1169,7 +1151,6 @@
 "GeneratePassphrase" = "Generate passphrase";
 "AllowUniversalClipboard" = "Allow Universal Clipboard";
 "UseUniversalClipboardToCopyDescriptionLong" = "Use Universal Clipboard to copy here and paste on other devices signed in with the same Apple ID.";
-"YourPINMustBeAtLeastXCharactersDescriptionLong" = "Your PIN must be at least %1$@ characters. Your PIN settings will be reset if you ever fully log out of the application.";
 "RemoveMasterPasswordMessage" = "%1$@ is using SSO with a self-hosted key server. A master password is no longer required to log in for members of this organization.";
 "RemoveMasterPasswordConfirmDomain" = "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator.";
 "ConfirmKeyConnectorDomain" = "Confirm Key Connector domain";
@@ -1204,8 +1185,6 @@
 "PasswordLastUpdated" = "Password last updated: %1$@";
 "DecryptionError" = "Decryption error";
 "BitwardenCouldNotDecryptThisVaultItemDescriptionLong" = "Bitwarden could not decrypt this vault item. Copy and share this error report with customer success to avoid additional data loss.";
-"BitwardenCouldNotDecryptOneVaultItemDescriptionLong" = "Bitwarden could not decrypt 1 vault item. Copy and share this error report with customer success to avoid additional data loss.";
-"BitwardenCouldNotDecryptXVaultItemsDescriptionLong" = "Bitwarden could not decrypt %1$@ vault items. Copy and share this error report with customer success to avoid additional data loss.";
 "CopyErrorReport" = "Copy error report";
 "ErrorCannotDecrypt" = "[error: cannot decrypt]";
 "AccountName" = "Account name";
@@ -1240,7 +1219,6 @@
 "LearnMoreLink" = "[Learn more](%1$@)";
 "LocalCodes" = "Local codes";
 "NeedHelpVisitOurHelpCenterForGuidance" = "Need help? Visit our Help Center for guidance.";
-"NinetySeconds" = "90 seconds";
 "NoAskMe" = "No, ask me";
 "NoCodes" = "You don’t have any codes to display";
 "None" = "None";
@@ -1258,7 +1236,6 @@
 "SetSaveLocallyAsYourDefaultSaveOption" = "Set “Save locally” as your default save option?";
 "SetSaveToBitwardenAsYourDefaultSaveOption" = "Set “Save to Bitwarden” as your default save option?";
 "SignInUsingUniqueCodes" = "Sign in using unique codes";
-"SixtySeconds" = "60 seconds";
 "Skip" = "Skip";
 "Steam" = "Steam";
 "StoreAllOfYourLoginsAndSyncVerificationCodesDirectlyWithTheAuthenticatorApp" = "Store all of your logins and sync verification codes directly with the Authenticator app.";