nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 11:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
michael starke
2017-06-12 19:40:39 +02:00
parent 984fe768ad 749df8334e
commit 4ac7cf1a91
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MacPass/en.lproj/Credits.rtf
View File

@@ -99,4 +99,4 @@ Copyright \'a92008-2009 Jim Dovey, All rights reserved.\
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
{\field{\*\fldinst{HYPERLINK "https://github.com/mattt/TransformerKit"}}{\fldrslt \cf3 TransformerKit}}\
Copyright \'a92012 Mattt Thompson. All rights reseverd}
Copyright \'a92012 Mattt Thompson. All rights reserved}

4
MacPass/en.lproj/KPKLocalizable.strings
View File

@@ -13,7 +13,7 @@
/* Validation Errors */
"ERROR_WINDOW_TITLE_VALIDATION_FAILED" = "The Format of the Window Title is not valid!";
"ERROR_ATTRIBUTE_KEY_VALIDATION_FAILED" = "The Attribute Key is not unique!";
"ERROR_AUTOTYPE_SEQUENCE_VALIDATION_FAILED" = "Tht Autotype Sequence is not valid!";
"ERROR_AUTOTYPE_SEQUENCE_VALIDATION_FAILED" = "The Autotype Sequence is not valid!";
/* Errors */
"ERROR_CORRUPT_TREE" = "The internal file structure is corrupted!";
@@ -23,7 +23,7 @@
"ERROR_UNSUPPORTED_CHIPHER" = "Unsupported cipher algorithm";
"ERROR_UNKNOWN_FILE_FORMAT" = "Unknown file format";
"ERROR_HEADER_CORRUPTED" = "Header is corrupted";
"ERROR_UNSUPPORTED_KDBX_COMPRESSION_ALGORITHM" = "Unsported compression algorithm";
"ERROR_UNSUPPORTED_KDBX_COMPRESSION_ALGORITHM" = "Unsupported compression algorithm";
"ERROR_UNSUPPORTED_KDBX_RANDOM_STREAM" = "Unsupported random stream type";
"ERROR_INTEGRITY_CHECK_FAILED" = "The database integrity isn't ensured";
"ERROR_PASSWORD_OR_KEYFILE_WRONG" = "The password and/or the keyfile is wrong";

2
MacPass/en.lproj/PasswordEditWindow.strings
View File

@@ -2,7 +2,7 @@
/* Class = "NSWindow"; title = "Window"; ObjectID = "1"; */
"1.title" = "Window";
/* Class = "NSTextFieldCell"; title = "Missmatching Passwords"; ObjectID = "14"; */
/* Class = "NSTextFieldCell"; title = "Mismatching Passwords"; ObjectID = "14"; */
"14.title" = "Missmatching Passwords";
/* Class = "NSSecureTextFieldCell"; placeholderString = "Repeat Password"; ObjectID = "15"; */