lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Show merge conflict file names in the error message (#681)

Browse source
This commit is contained in:
Mingshen Sun 2025-02-16 13:01:42 -08:00 • committed by GitHub
parent 1d6785511a
commit fddd0c2563
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pass/en.lproj/Localizable.strings
View file

@ -34,6 +34,7 @@
"UnresolvedError" = "Unresolved error %@";
"MigrationError" = "Migration error: %@";
"UnderlyingError" = "Underlying Error: %@";
"MergeConflictError" = "Conflict files: %@";
"ErrorSaving" = "Error saving: %@";
"CannotCopyPassword" = "Cannot copy password";
"CannotAddPassword" = "Cannot add password";