From e6d6d9e553bf95a04435acf6e0333c6402c1164d Mon Sep 17 00:00:00 2001 From: michael starke Date: Fri, 22 Aug 2014 12:32:39 +0200 Subject: [PATCH] Fixed typo in KPKLocalizable file name --- KeePassKit | 2 +- MacPass.xcodeproj/project.pbxproj | 20 +++++++++--------- MacPass/MPDatePickingViewController.m | 7 +++--- ...izeable.strings => KPKLocalizable.strings} | 2 +- MacPass/de.lproj/Localizable.strings | Bin 10086 -> 10206 bytes ...izeable.strings => KPKLocalizable.strings} | 2 +- MacPass/en.lproj/Localizable.strings | Bin 9462 -> 9574 bytes ...izeable.strings => KPKLocalizable.strings} | 2 +- MacPass/fr.lproj/Localizable.strings | Bin 10176 -> 10288 bytes ...izeable.strings => KPKLocalizable.strings} | 2 +- MacPass/nl.lproj/Localizable.strings | Bin 10098 -> 10210 bytes ...izeable.strings => KPKLocalizable.strings} | 2 +- MacPass/zh-Hans.lproj/Localizable.strings | Bin 7768 -> 7880 bytes 13 files changed, 20 insertions(+), 19 deletions(-) rename MacPass/de.lproj/{KPKLocalizeable.strings => KPKLocalizable.strings} (98%) rename MacPass/en.lproj/{KPKLocalizeable.strings => KPKLocalizable.strings} (98%) rename MacPass/fr.lproj/{KPKLocalizeable.strings => KPKLocalizable.strings} (98%) rename MacPass/nl.lproj/{KPKLocalizeable.strings => KPKLocalizable.strings} (98%) rename MacPass/zh-Hans.lproj/{KPKLocalizeable.strings => KPKLocalizable.strings} (98%) diff --git a/KeePassKit b/KeePassKit index 8b66768d..1372ed20 160000 --- a/KeePassKit +++ b/KeePassKit @@ -1 +1 @@ -Subproject commit 8b66768ddbfca8f9fcd1213e76fbf89a9a659e7b +Subproject commit 1372ed20238f576aa2d7372f7d337595ef52a8d7 diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index 8572cda6..c97c8244 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -126,7 +126,7 @@ 4C52A88F1788628B00868229 /* 13_KeysTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C52A88C1788628B00868229 /* 13_KeysTemplate.pdf */; }; 4C52A8901788628B00868229 /* 18_DisplayTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C52A88D1788628B00868229 /* 18_DisplayTemplate.pdf */; }; 4C52A892178863B000868229 /* 68_PhoneTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C52A891178863B000868229 /* 68_PhoneTemplate.pdf */; }; - 4C53A7A51864C39D000DFF0D /* KPKLocalizeable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C53A7A71864C39D000DFF0D /* KPKLocalizeable.strings */; }; + 4C53A7A51864C39D000DFF0D /* KPKLocalizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C53A7A71864C39D000DFF0D /* KPKLocalizable.strings */; }; 4C5426F317BEEA8700A4424C /* Autotype_test.kdbx in Resources */ = {isa = PBXBuildFile; fileRef = 4C5426F217BEEA8700A4424C /* Autotype_test.kdbx */; }; 4C569D9E17652B0600595B62 /* MPConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C569D9D17652B0600595B62 /* MPConstants.m */; }; 4C569DA117652BFE00595B62 /* MPEntryTableDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C569DA017652BFE00595B62 /* MPEntryTableDataSource.m */; }; @@ -586,9 +586,9 @@ 4C52A88C1788628B00868229 /* 13_KeysTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 13_KeysTemplate.pdf; sourceTree = ""; }; 4C52A88D1788628B00868229 /* 18_DisplayTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 18_DisplayTemplate.pdf; sourceTree = ""; }; 4C52A891178863B000868229 /* 68_PhoneTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 68_PhoneTemplate.pdf; sourceTree = ""; }; - 4C53A7A81864C3A1000DFF0D /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/KPKLocalizeable.strings; sourceTree = ""; }; - 4C53A7A91864C3A2000DFF0D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/KPKLocalizeable.strings; sourceTree = ""; }; - 4C53A7AA1864C3A2000DFF0D /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/KPKLocalizeable.strings; sourceTree = ""; }; + 4C53A7A81864C3A1000DFF0D /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/KPKLocalizable.strings; sourceTree = ""; }; + 4C53A7A91864C3A2000DFF0D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/KPKLocalizable.strings; sourceTree = ""; }; + 4C53A7AA1864C3A2000DFF0D /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/KPKLocalizable.strings; sourceTree = ""; }; 4C5426F217BEEA8700A4424C /* Autotype_test.kdbx */ = {isa = PBXFileReference; lastKnownFileType = file; name = Autotype_test.kdbx; path = Databases/Autotype_test.kdbx; sourceTree = ""; }; 4C569D9C17652AC800595B62 /* MPConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPConstants.h; sourceTree = ""; }; 4C569D9D17652B0600595B62 /* MPConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPConstants.m; sourceTree = ""; }; @@ -919,7 +919,7 @@ 601F811818E016340028F3DE /* zh-Hans */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = ""; }; 601F811918E016340028F3DE /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = "zh-Hans"; path = "zh-Hans.lproj/Credits.rtf"; sourceTree = ""; }; 601F811A18E016340028F3DE /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = ""; }; - 601F811B18E016340028F3DE /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/KPKLocalizeable.strings"; sourceTree = ""; }; + 601F811B18E016340028F3DE /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/KPKLocalizable.strings"; sourceTree = ""; }; 601F811C18E016340028F3DE /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = ""; }; 6021FE3C18E1341900C3BC51 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/EntryInspectorView.xib; sourceTree = ""; }; 6021FE4418E1342500C3BC51 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/EntryInspectorView.strings"; sourceTree = ""; }; @@ -983,7 +983,7 @@ BD6C366319484CF40089EB37 /* nl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = ""; }; BD6C366419484CF40089EB37 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = nl; path = nl.lproj/Credits.rtf; sourceTree = ""; }; BD6C366519484CF40089EB37 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = ""; }; - BD6C366619484CF40089EB37 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/KPKLocalizeable.strings; sourceTree = ""; }; + BD6C366619484CF40089EB37 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/KPKLocalizable.strings; sourceTree = ""; }; BD6C366719484CF40089EB37 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = ""; }; /* End PBXFileReference section */ @@ -1590,7 +1590,7 @@ 4C77E36F15B84A240093A587 /* InfoPlist.strings */, 4C77E37215B84A240093A587 /* main.m */, 4C77E37415B84A240093A587 /* MacPass-Prefix.pch */, - 4C53A7A71864C39D000DFF0D /* KPKLocalizeable.strings */, + 4C53A7A71864C39D000DFF0D /* KPKLocalizable.strings */, ); name = "Supporting Files"; sourceTree = ""; @@ -2220,7 +2220,7 @@ 4C0DD6C618B2A44700FCB193 /* AutotypeCandidateSelectionWindow.xib in Resources */, 4C7ABA4C17BAEC6700FF5799 /* 20_MiscTemplate.pdf in Resources */, 4C7ABA4E17BAEC7000FF5799 /* addEntryTemplate.pdf in Resources */, - 4C53A7A51864C39D000DFF0D /* KPKLocalizeable.strings in Resources */, + 4C53A7A51864C39D000DFF0D /* KPKLocalizable.strings in Resources */, 4C68456F17BC2A0700FCDBFC /* WelcomeWindow.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -2491,7 +2491,7 @@ name = InfoPlist.strings; sourceTree = ""; }; - 4C53A7A71864C39D000DFF0D /* KPKLocalizeable.strings */ = { + 4C53A7A71864C39D000DFF0D /* KPKLocalizable.strings */ = { isa = PBXVariantGroup; children = ( 4C53A7A81864C3A1000DFF0D /* de */, @@ -2500,7 +2500,7 @@ 601F811B18E016340028F3DE /* zh-Hans */, BD6C366619484CF40089EB37 /* nl */, ); - name = KPKLocalizeable.strings; + name = KPKLocalizable.strings; sourceTree = ""; }; 4C76155E1764C04C0015A1A6 /* GeneralSettings.xib */ = { diff --git a/MacPass/MPDatePickingViewController.m b/MacPass/MPDatePickingViewController.m index 2f0beabe..dfe1fbd4 100644 --- a/MacPass/MPDatePickingViewController.m +++ b/MacPass/MPDatePickingViewController.m @@ -13,6 +13,7 @@ #import "KPKTimeInfo.h" typedef NS_ENUM(NSUInteger, MPDatePreset) { + MPDatePresetNone, MPDatePresetTomorrow, MPDatePresetOneWeek, MPDatePresetOneMonth, @@ -38,7 +39,7 @@ typedef NS_ENUM(NSUInteger, MPDatePreset) { NSArray *dateItems = @[ NSLocalizedString(@"TOMORROW", ""), NSLocalizedString(@"ONE_WEEK", ""), NSLocalizedString(@"ONE_MONTH", ""), NSLocalizedString(@"90_DAYS", ""), NSLocalizedString(@"ONE_YEAR", "") ]; NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"SELECT_DATE_PRESET", "") action:NULL keyEquivalent:@""]; - [item setTag:-1]; + [item setTag:MPDatePresetNone]; [presetMenu addItem:item]; [presetMenu addItem:[NSMenuItem separatorItem]]; @@ -88,9 +89,9 @@ typedef NS_ENUM(NSUInteger, MPDatePreset) { case MPDatePresetOneYear: [offsetComponents setYear:1]; break; + case MPDatePresetNone: default: - return; // No valid selection, just return - break; + return; // Nothing to do; } NSDate *newDate = [gregorian dateByAddingComponents:offsetComponents toDate:[NSDate date] options:0]; [self.datePicker setDateValue:newDate]; diff --git a/MacPass/de.lproj/KPKLocalizeable.strings b/MacPass/de.lproj/KPKLocalizable.strings similarity index 98% rename from MacPass/de.lproj/KPKLocalizeable.strings rename to MacPass/de.lproj/KPKLocalizable.strings index 971b24b5..80f3c248 100644 --- a/MacPass/de.lproj/KPKLocalizeable.strings +++ b/MacPass/de.lproj/KPKLocalizable.strings @@ -1,5 +1,5 @@ /* - KPKLocalizeable.strings + KPKlocalizable.strings MacPass Created by Michael Starke on 20/12/13. diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings index 6441b28874d57f981a7b6b1d919128ba0ad1315b..36b49ed2c9fe9cd8a7dc961e454f070827c920a3 100644 GIT binary patch delta 112 zcmaFnch7%A0duqqLn1>7Ln?y;LjXf2Lo!1)kX;1iX))+Ca4{$`1T(lY_yDmpLkL4W zgA0Qrkah*K0vLjTG)OiCs7iss7KoJ?!Wi;_x^sYLrZc2Yu9cCWT)=!_vk{AlG63qE B7196z delta 16 YcmccT|IBYg0rTWn%m+5FU@=n$07w%DeE7Ln?y;LjXf2Lo!1)kX_gu#^|9w-w8q=SJt mgh2_Y(iVu77(y9}!TJgqihwkTUBaNIFxiRu%w_?WX9@rSAQU(N delta 16 YcmaFn_04lb0Q2NS%=7Ln?y;LjXf2Lo!1)kX_gu#^|9w-w8q=SJt mgh2_Y(iVu77(y9}!TJgqihwkTUBaNIFgb$C|7Y0X$5C&I2xf3)@Bw0Hh7g8$ z1{VfLAngid1uz5wX^?CPP?Z9MEf6a)gfbL^%_;zzkqTy)FsLa^p2oChvkS9`GypvL B70Uns delta 16 YcmX?Md&6eK5~j&w%=0#HViuDI06v-qQvd(}