From db244705ba2a5b215b0db14c17582e891983df24 Mon Sep 17 00:00:00 2001 From: Charlie Stigler Date: Sat, 11 Oct 2014 14:56:50 -0700 Subject: [PATCH] Add first-time tutorial + import common sites --- AppController.h | 2 + AppController.m | 23 +- BlockManager.m | 5 +- DomainListWindowController.h | 3 + DomainListWindowController.m | 71 +---- FirstTime.xib | 393 ++++++++++++++++++++++++++ HelperCommon.m | 3 +- HostImporter.h | 3 + HostImporter.m | 33 +++ SelfControl.xcodeproj/project.pbxproj | 4 + ThunderbirdPreferenceParser.m | 6 +- de.lproj/DomainList.xib | 91 +++++- de.lproj/MainMenu.xib | 56 +++- en.lproj/DomainList.xib | 79 +++++- en.lproj/MainMenu.xib | 57 +++- es.lproj/DomainList.xib | 78 ++++- es.lproj/MainMenu.xib | 56 +++- it.lproj/DomainList.xib | 78 ++++- it.lproj/MainMenu.xib | 56 +++- ja.lproj/DomainList.xib | 78 ++++- ja.lproj/MainMenu.xib | 56 +++- ko.lproj/DomainList.xib | 16 +- ko.lproj/MainMenu.xib | 6 + pt_BR.lproj/DomainList.xib | 78 ++++- pt_BR.lproj/MainMenu.xib | 56 +++- sv.lproj/DomainList.xib | 78 ++++- sv.lproj/MainMenu.xib | 56 +++- tr.lproj/DomainList.xib | 16 +- tr.lproj/MainMenu.xib | 6 + zh-Hans.lproj/DomainList.xib | 91 +++++- zh-Hans.lproj/MainMenu.xib | 56 +++- 31 files changed, 1578 insertions(+), 112 deletions(-) create mode 100644 FirstTime.xib diff --git a/AppController.h b/AppController.h index fa9f2e10..886015a0 100755 --- a/AppController.h +++ b/AppController.h @@ -125,6 +125,8 @@ // open preferences panel - (IBAction)openPreferences:(id)sender; +- (IBAction)showGetStartedWindow:(id)sender; + // Opens a save panel and saves the blocklist. - (IBAction)save:(id)sender; diff --git a/AppController.m b/AppController.m index 215f5ba0..234f39d4 100755 --- a/AppController.m +++ b/AppController.m @@ -27,7 +27,9 @@ NSString* const kSelfControlErrorDomain = @"SelfControlErrorDomain"; -@implementation AppController +@implementation AppController { + NSWindowController* getStartedWindowController; +} @synthesize addingBlock; @@ -52,7 +54,8 @@ - (AppController*) init { @"AllowLocalNetworks": @YES, @"MaxBlockLength": @1440, @"BlockLengthInterval": @15, - @"WhitelistAlertSuppress": @NO}; + @"WhitelistAlertSuppress": @NO, + @"GetStartedShown": @NO}; [defaults_ registerDefaults:appDefaults]; @@ -228,6 +231,12 @@ - (void)refreshUserInterface { [editBlacklistButton_ setEnabled: NO]; [submitButton_ setTitle: NSLocalizedString(@"Loading", @"Loading button")]; } + + // if block's off, and we haven't shown it yet, show the first-time modal + if (![defaults_ boolForKey: @"GetStartedShown"]) { + [self showGetStartedWindow: self]; + [defaults_ setBool: YES forKey: @"GetStartedShown"]; + } } [refreshUILock_ unlock]; } @@ -257,6 +266,15 @@ - (IBAction)openPreferences:(id)sender { [preferencesWindowController_ showWindow: nil]; } +- (IBAction)showGetStartedWindow:(id)sender { + if (!getStartedWindowController) { + getStartedWindowController = [[NSWindowController alloc] initWithWindowNibName: @"FirstTime"]; + } + [getStartedWindowController.window center]; + [getStartedWindowController.window makeKeyAndOrderFront: nil]; + [getStartedWindowController showWindow: nil]; +} + - (void)applicationDidFinishLaunching:(NSNotification *)aNotification { [NSApp setDelegate: self]; @@ -453,7 +471,6 @@ - (void)dealloc { object: nil]; } -// @synthesize initialWindow = initialWindow_; - (id)initialWindow { return initialWindow_; } diff --git a/BlockManager.m b/BlockManager.m index 1f920a45..1f882585 100644 --- a/BlockManager.m +++ b/BlockManager.m @@ -259,7 +259,7 @@ - (NSArray*)commonSubdomainsForHostName:(NSString*)hostName { // If the domain ends in facebook.com... Special case for Facebook because // users will often forget to block some of its many mirror subdomains that resolve // to different IPs, i.e. hs.facebook.com. Thanks to Danielle for raising this issue. - if([hostName rangeOfString: @"facebook.com"].location == ([hostName length] - 12)) { + if([hostName hasSuffix: @"facebook.com"]) { // pulled list of facebook IP ranges from https://developers.facebook.com/docs/ApplicationSecurity/#facebook_scraper // TODO: pull these automatically by running: // whois -h whois.radb.net -- '-i origin AS32934' | grep ^route @@ -275,6 +275,9 @@ - (NSArray*)commonSubdomainsForHostName:(NSString*)hostName { [newHosts addObjectsFromArray: facebookIPs]; } + if ([hostName hasSuffix: @"twitter.com"]) { + [newHosts addObject: @"api.twitter.com"]; + } // Block the domain with no subdomains, if www.domain is blocked if([hostName rangeOfString: @"www."].location == 0) { diff --git a/DomainListWindowController.h b/DomainListWindowController.h index 5b4e462c..a796e730 100755 --- a/DomainListWindowController.h +++ b/DomainListWindowController.h @@ -72,6 +72,9 @@ forTableColumn:(NSTableColumn *)tableColumn row:(int)row; +- (IBAction)importCommonDistractingWebsites:(id)sender; +- (IBAction)importNewsAndPublications:(id)sender; + // Called when the button-menu item is clicked to import all incoming mail // servers from Thunderbird. Adds to the domain list array all incoming mail // servers from the Thunderbird default profile that haven't already been added, diff --git a/DomainListWindowController.m b/DomainListWindowController.m index 36d9e579..1d74ac0a 100755 --- a/DomainListWindowController.m +++ b/DomainListWindowController.m @@ -293,8 +293,7 @@ - (void)tableView:(NSTableView *)tableView } } -- (IBAction)importIncomingMailServersFromThunderbird:(id)sender { - NSArray* arr = [HostImporter incomingMailHostnamesFromThunderbird]; +- (void)addHostArray:(NSArray*)arr { for(int i = 0; i < [arr count]; i++) { // Check for dupes if(![domainList_ containsObject: arr[i]]) @@ -306,69 +305,29 @@ - (IBAction)importIncomingMailServersFromThunderbird:(id)sender { object: self]; } +- (IBAction)importCommonDistractingWebsites:(id)sender { + [self addHostArray: [HostImporter commonDistractingWebsites]]; +} +- (IBAction)importNewsAndPublications:(id)sender { + [self addHostArray: [HostImporter newsAndPublications]]; +} +- (IBAction)importIncomingMailServersFromThunderbird:(id)sender { + [self addHostArray: [HostImporter incomingMailHostnamesFromThunderbird]]; +} - (IBAction)importOutgoingMailServersFromThunderbird:(id)sender { - NSArray* arr = [HostImporter outgoingMailHostnamesFromThunderbird]; - for(int i = 0; i < [arr count]; i++) { - // Check for dupes - if(![domainList_ containsObject: arr[i]]) - [domainList_ addObject: arr[i]]; - } - [defaults_ setObject: domainList_ forKey: @"HostBlacklist"]; - [domainListTableView_ reloadData]; - [[NSNotificationCenter defaultCenter] postNotificationName: @"SCConfigurationChangedNotification" - object: self]; + [self addHostArray: [HostImporter outgoingMailHostnamesFromThunderbird]]; } - - (IBAction)importIncomingMailServersFromMail:(id)sender { - NSArray* arr = [HostImporter incomingMailHostnamesFromMail]; - for(int i = 0; i < [arr count]; i++) { - // Check for dupes - if(![domainList_ containsObject: arr[i]]) - [domainList_ addObject: arr[i]]; - } - [defaults_ setObject: domainList_ forKey: @"HostBlacklist"]; - [domainListTableView_ reloadData]; - [[NSNotificationCenter defaultCenter] postNotificationName: @"SCConfigurationChangedNotification" - object: self]; + [self addHostArray: [HostImporter incomingMailHostnamesFromMail]]; } - - (IBAction)importOutgoingMailServersFromMail:(id)sender { - NSArray* arr = [HostImporter outgoingMailHostnamesFromMail]; - for(int i = 0; i < [arr count]; i++) { - // Check for dupes - if(![domainList_ containsObject: arr[i]]) - [domainList_ addObject: arr[i]]; - } - [defaults_ setObject: domainList_ forKey: @"HostBlacklist"]; - [domainListTableView_ reloadData]; - [[NSNotificationCenter defaultCenter] postNotificationName: @"SCConfigurationChangedNotification" - object: self]; + [self addHostArray: [HostImporter outgoingMailHostnamesFromMail]]; } - - (IBAction)importIncomingMailServersFromMailMate:(id)sender { - NSArray* arr = [HostImporter incomingMailHostnamesFromMailMate]; - for(int i = 0; i < [arr count]; i++) { - // Check for dupes - if(![domainList_ containsObject: arr[i]]) - [domainList_ addObject: arr[i]]; - } - [defaults_ setObject: domainList_ forKey: @"HostBlacklist"]; - [domainListTableView_ reloadData]; - [[NSNotificationCenter defaultCenter] postNotificationName: @"SCConfigurationChangedNotification" - object: self]; + [self addHostArray: [HostImporter incomingMailHostnamesFromMailMate]]; } - - (IBAction)importOutgoingMailServersFromMailMate:(id)sender { - NSArray* arr = [HostImporter outgoingMailHostnamesFromMailMate]; - for(int i = 0; i < [arr count]; i++) { - // Check for dupes - if(![domainList_ containsObject: arr[i]]) - [domainList_ addObject: arr[i]]; - } - [defaults_ setObject: domainList_ forKey: @"HostBlacklist"]; - [domainListTableView_ reloadData]; - [[NSNotificationCenter defaultCenter] postNotificationName: @"SCConfigurationChangedNotification" - object: self]; + [self addHostArray: [HostImporter outgoingMailHostnamesFromMailMate]]; } @end \ No newline at end of file diff --git a/FirstTime.xib b/FirstTime.xib new file mode 100644 index 00000000..32d5688e --- /dev/null +++ b/FirstTime.xib @@ -0,0 +1,393 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Cg + + + + + + + + + + + + + + + + + + + + + + + +Cg + + + + + + + + + + + + + + + + + + + + + + + 1. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + and add the domain names of your most distracting websites -- for example, "facebook.com". Or use the Import function to add a pre-made list of websites. + 2. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + to decide how long you want to block these websites for. You can change it from 15 minutes all the way up to a whole day. + 3. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + , type your password to start the block, and get studying! + + + + + + + + + + + + + + + + + + + + + + + + +CgoKCg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HelperCommon.m b/HelperCommon.m index 5b02cd6b..3482a6e3 100644 --- a/HelperCommon.m +++ b/HelperCommon.m @@ -32,7 +32,8 @@ void registerDefaults(uid_t controllingUID) { @"AllowLocalNetworks": @YES, @"MaxBlockLength": @1440, @"BlockLengthInterval": @15, - @"WhitelistAlertSuppress": @NO}; + @"WhitelistAlertSuppress": @NO, + @"GetStartedShown": @NO}; [defaults registerDefaults:appDefaults]; [defaults synchronize]; seteuid(0); diff --git a/HostImporter.h b/HostImporter.h index 9c0a657f..fb06c44f 100755 --- a/HostImporter.h +++ b/HostImporter.h @@ -29,6 +29,9 @@ @interface HostImporter : NSObject { } ++ (NSArray*)commonDistractingWebsites; ++ (NSArray*)newsAndPublications; + // Returns an autoreleased instance of NSArray containing all incoming hostnames // imported from the user's instance of Mail.app + (NSArray*)incomingMailHostnamesFromMail; diff --git a/HostImporter.m b/HostImporter.m index 45572174..5ae64a63 100755 --- a/HostImporter.m +++ b/HostImporter.m @@ -25,6 +25,39 @@ @implementation HostImporter ++ (NSArray*)commonDistractingWebsites { + return @[ + @"facebook.com", + @"twitter.com", + @"reddit.com", + @"tumblr.com", + @"youtube.com", + @"9gag.com", + @"netflix.com", + @"hulu.com", + @"buzzfeed.com" + ]; +} ++ (NSArray*)newsAndPublications { + return @[ + @"cnn.com", + @"huffingtonpost.com", + @"foxnews.com", + @"nytimes.com", + @"bbc.com", + @"bbc.co.uk", + @"telegraph.co.uk", + @"news.google.com", + @"buzzfeed.com", + @"vice.com", + @"gawker.com", + @"tumblr.com", + @"forbes.com", + @"gothamist.com", + @"jezebel.com" + ]; +} + + (NSArray*)incomingMailHostnamesFromMail { NSMutableArray* hostnames = [NSMutableArray arrayWithCapacity: 10]; NSString* sandboxedPreferences = [@"~/Library/Containers/com.apple.mail/Data/Library/Preferences/com.apple.mail" stringByExpandingTildeInPath]; diff --git a/SelfControl.xcodeproj/project.pbxproj b/SelfControl.xcodeproj/project.pbxproj index 8ebb6618..af57fa55 100755 --- a/SelfControl.xcodeproj/project.pbxproj +++ b/SelfControl.xcodeproj/project.pbxproj @@ -24,6 +24,7 @@ /* Begin PBXBuildFile section */ 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; + CB02347219E9B6D0008E2473 /* FirstTime.xib in Resources */ = {isa = PBXBuildFile; fileRef = CB02347119E9B6D0008E2473 /* FirstTime.xib */; }; CB0385E119D77051004614B6 /* PreferencesAdvancedViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = CB0385DD19D77051004614B6 /* PreferencesAdvancedViewController.xib */; }; CB0385E219D77051004614B6 /* PreferencesGeneralViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = CB0385DF19D77051004614B6 /* PreferencesGeneralViewController.xib */; }; CB1E7A6E0F9AEA9B00D158BC /* ERRORS in Resources */ = {isa = PBXBuildFile; fileRef = CB1E7A6D0F9AEA9B00D158BC /* ERRORS */; }; @@ -206,6 +207,7 @@ 949F9F8A15B33267007B8B42 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hans"; path = "zh-Hans.lproj/MainMenu.xib"; sourceTree = ""; }; 949F9F8B15B33339007B8B42 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hans"; path = "zh-Hans.lproj/TimerWindow.xib"; sourceTree = ""; }; 949F9F8D15B333A1007B8B42 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = ""; }; + CB02347119E9B6D0008E2473 /* FirstTime.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FirstTime.xib; sourceTree = ""; }; CB03860D19D777B0004614B6 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/PreferencesGeneralViewController.xib; sourceTree = ""; }; CB03860E19D777B2004614B6 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = de.lproj/PreferencesGeneralViewController.xib; sourceTree = ""; }; CB03860F19D777B4004614B6 /* es */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = es; path = es.lproj/PreferencesGeneralViewController.xib; sourceTree = ""; }; @@ -524,6 +526,7 @@ CB4294F10F53D95D008E10CA /* Interfaces */ = { isa = PBXGroup; children = ( + CB02347119E9B6D0008E2473 /* FirstTime.xib */, CBBF4E7D1582F7A200E364D9 /* MainMenu.xib */, CBBF4E7B1582F7A200E364D9 /* DomainList.xib */, CBBF4EE715830D7300E364D9 /* TimerWindow.xib */, @@ -744,6 +747,7 @@ CB9365620F8581B000EF284E /* dsa_pub.pem in Resources */, CB9366E80F85BEF100EF284E /* NSRemoveTemplate.jpg in Resources */, CB9366E90F85BEF100EF284E /* NSAddTemplate.jpg in Resources */, + CB02347219E9B6D0008E2473 /* FirstTime.xib in Resources */, CBBF4EE515830D7300E364D9 /* TimerWindow.xib in Resources */, CB0385E219D77051004614B6 /* PreferencesGeneralViewController.xib in Resources */, CB1E7A6E0F9AEA9B00D158BC /* ERRORS in Resources */, diff --git a/ThunderbirdPreferenceParser.m b/ThunderbirdPreferenceParser.m index eb28d30d..27f79496 100755 --- a/ThunderbirdPreferenceParser.m +++ b/ThunderbirdPreferenceParser.m @@ -142,11 +142,7 @@ + (NSArray*)incomingHostnames { if(![[NSFileManager defaultManager] isReadableFileAtPath: pathToPrefsJsFile]) return @[]; - // NSArray* prefsJsLines = [[NSString stringWithContentsOfFile: pathToPrefsJsFile] componentsSeparatedByCharactersInSet: [NSCharacterSet newlineCharacterSet]]; - // The old implementation of this was better. The new one misses alternative - // line breaks like \r. 10.4 doesn't have a componentSeparatedByCharactersInSet - // method though, so this'll have to do. - NSArray* prefsJsLines = [[NSString stringWithContentsOfFile: pathToPrefsJsFile encoding: NSUTF8StringEncoding error: NULL] componentsSeparatedByString: @"\n"]; + NSArray* prefsJsLines = [[NSString stringWithContentsOfFile: pathToPrefsJsFile encoding: NSUTF8StringEncoding error: NULL] componentsSeparatedByCharactersInSet: [NSCharacterSet newlineCharacterSet]]; NSMutableArray* hostnames = [NSMutableArray arrayWithCapacity: 10]; for(int i = 0; i < [prefsJsLines count]; i++) { diff --git a/de.lproj/DomainList.xib b/de.lproj/DomainList.xib index b7cfa91b..7ae5bf75 100644 --- a/de.lproj/DomainList.xib +++ b/de.lproj/DomainList.xib @@ -60,6 +60,22 @@ NSMenuMixedState + + + Common Distracting Sites + + 2147483647 + + + + + + News & Publications + + 2147483647 + + + Von Mail @@ -166,7 +182,7 @@ {400, 315} - + 274 @@ -182,6 +198,7 @@ 274 {400, 264} + YES NO @@ -279,6 +296,7 @@ {{1, 1}, {400, 264}} + @@ -289,6 +307,7 @@ -2147483392 {{344, 1}, {15, 249}} + NO @@ -301,6 +320,7 @@ -2147483392 {{1, 250}, {343, 15}} + NO 1 @@ -311,6 +331,7 @@ {{-1, 50}, {402, 266}} + 133682 @@ -326,6 +347,7 @@ 256 {{20, 19}, {24, 24}} + YES @@ -352,6 +374,7 @@ 256 {{52, 19}, {24, 24}} + YES @@ -378,6 +401,7 @@ 256 {{143, 19}, {113, 24}} + YES @@ -420,6 +444,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 290 {{296, 8}, {104, 38}} + YES NO 2 @@ -493,6 +518,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {400, 315} + + {{0, 0}, {1440, 878}} @@ -621,6 +648,22 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 136 + + + importCommonDistractingWebsites: + + + + 140 + + + + importNewsAndPublications: + + + + 141 + popUpMenu_ @@ -786,6 +829,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + + @@ -905,6 +950,16 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + + 137 + + + + + 138 + + + @@ -925,6 +980,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -970,7 +1027,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - 136 + 141 @@ -984,6 +1041,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA id id id + id id @@ -1011,6 +1069,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1074,6 +1136,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA id id id + id id @@ -1101,6 +1164,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1135,9 +1202,11 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NSWindowController id + id id id id + id id id id @@ -1148,6 +1217,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA addDomain: id + + importCommonDistractingWebsites: + id + importIncomingMailServersFromMail: id @@ -1160,6 +1233,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA importIncomingMailServersFromThunderbird: id + + importNewsAndPublications: + id + importOutgoingMailServersFromMail: id @@ -1197,9 +1274,11 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA DomainListWindowController id + id id id id + id id id id @@ -1210,6 +1289,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA addDomain: id + + importCommonDistractingWebsites: + id + importIncomingMailServersFromMail: id @@ -1222,6 +1305,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA importIncomingMailServersFromThunderbird: id + + importNewsAndPublications: + id + importOutgoingMailServersFromMail: id diff --git a/de.lproj/MainMenu.xib b/de.lproj/MainMenu.xib index a254363c..0039ddef 100644 --- a/de.lproj/MainMenu.xib +++ b/de.lproj/MainMenu.xib @@ -493,6 +493,14 @@ Help + + + Get Started + + 2147483647 + + + SelfControl FAQ @@ -932,6 +940,14 @@ 904 + + + showGetStartedWindow: + + + + 906 + checkForUpdates: @@ -1406,6 +1422,7 @@ + @@ -1414,6 +1431,11 @@ + + 905 + + + @@ -1488,13 +1510,14 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - 904 + 906 @@ -1508,7 +1531,7 @@ id id id - id + id id @@ -1536,8 +1559,8 @@ showDomainList: id - - soundSelectionChanged: + + showGetStartedWindow: id @@ -1603,6 +1626,7 @@ id id id + id id @@ -1630,6 +1654,10 @@ showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1646,8 +1674,10 @@ id id + id id id + id id id @@ -1660,6 +1690,10 @@ importIncomingMailServersFromMail: id + + importIncomingMailServersFromMailMate: + id + importIncomingMailServersFromThunderbird: id @@ -1668,6 +1702,10 @@ importOutgoingMailServersFromMail: id + + importOutgoingMailServersFromMailMate: + id + importOutgoingMailServersFromThunderbird: id @@ -1698,8 +1736,10 @@ id id + id id id + id id id @@ -1712,6 +1752,10 @@ importIncomingMailServersFromMail: id + + importIncomingMailServersFromMailMate: + id + importIncomingMailServersFromThunderbird: id @@ -1720,6 +1764,10 @@ importOutgoingMailServersFromMail: id + + importOutgoingMailServersFromMailMate: + id + importOutgoingMailServersFromThunderbird: id diff --git a/en.lproj/DomainList.xib b/en.lproj/DomainList.xib index f1e1f2c1..79cd547b 100755 --- a/en.lproj/DomainList.xib +++ b/en.lproj/DomainList.xib @@ -60,6 +60,22 @@ NSMenuMixedState + + + Common Distracting Sites + + 2147483647 + + + + + + News & Publications + + 2147483647 + + + From Mail @@ -430,6 +446,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {{300, 5}, {93, 40}} + YES NO 2 @@ -808,6 +825,22 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 140 + + + importCommonDistractingWebsites: + + + + 142 + + + + importNewsAndPublications: + + + + 145 + popUpMenu_ @@ -973,6 +1006,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 + + @@ -1092,6 +1127,16 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 + + 141 + + + + + 143 + + + @@ -1113,6 +1158,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1157,7 +1204,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - 140 + 145 @@ -1171,6 +1218,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 id id id + id id @@ -1198,6 +1246,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1261,6 +1313,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 id id id + id id @@ -1288,6 +1341,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1322,9 +1379,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NSWindowController id + id id id id + id id id id @@ -1335,6 +1394,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 addDomain: id + + importCommonDistractingWebsites: + id + importIncomingMailServersFromMail: id @@ -1347,6 +1410,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 importIncomingMailServersFromThunderbird: id + + importNewsAndPublications: + id + importOutgoingMailServersFromMail: id @@ -1384,9 +1451,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 DomainListWindowController id + id id id id + id id id id @@ -1397,6 +1466,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 addDomain: id + + importCommonDistractingWebsites: + id + importIncomingMailServersFromMail: id @@ -1409,6 +1482,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 importIncomingMailServersFromThunderbird: id + + importNewsAndPublications: + id + importOutgoingMailServersFromMail: id diff --git a/en.lproj/MainMenu.xib b/en.lproj/MainMenu.xib index c34f168e..9f52d14d 100755 --- a/en.lproj/MainMenu.xib +++ b/en.lproj/MainMenu.xib @@ -493,6 +493,14 @@ Help + + + Get Started + + 2147483647 + + + SelfControl FAQ @@ -621,6 +629,7 @@ {{482, 9}, {118, 25}} + YES 67108864 @@ -916,6 +925,14 @@ 907 + + + showGetStartedWindow: + + + + 910 + checkForUpdates: @@ -1351,6 +1368,7 @@ + @@ -1398,6 +1416,11 @@ + + 908 + + + @@ -1472,13 +1495,14 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - 907 + 910 @@ -1492,7 +1516,7 @@ id id id - id + id id @@ -1520,8 +1544,8 @@ showDomainList: id - - soundSelectionChanged: + + showGetStartedWindow: id @@ -1587,6 +1611,7 @@ id id id + id id @@ -1614,6 +1639,10 @@ showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1630,8 +1659,10 @@ id id + id id id + id id id @@ -1644,6 +1675,10 @@ importIncomingMailServersFromMail: id + + importIncomingMailServersFromMailMate: + id + importIncomingMailServersFromThunderbird: id @@ -1652,6 +1687,10 @@ importOutgoingMailServersFromMail: id + + importOutgoingMailServersFromMailMate: + id + importOutgoingMailServersFromThunderbird: id @@ -1682,8 +1721,10 @@ id id + id id id + id id id @@ -1696,6 +1737,10 @@ importIncomingMailServersFromMail: id + + importIncomingMailServersFromMailMate: + id + importIncomingMailServersFromThunderbird: id @@ -1704,6 +1749,10 @@ importOutgoingMailServersFromMail: id + + importOutgoingMailServersFromMailMate: + id + importOutgoingMailServersFromThunderbird: id diff --git a/es.lproj/DomainList.xib b/es.lproj/DomainList.xib index 1c95ce17..8a33b66d 100644 --- a/es.lproj/DomainList.xib +++ b/es.lproj/DomainList.xib @@ -60,6 +60,22 @@ NSMenuMixedState + + + Common Distracting Sites + + 2147483647 + + + + + + News & Publications + + 2147483647 + + + De correo @@ -632,6 +648,22 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 132 + + + importCommonDistractingWebsites: + + + + 135 + + + + importNewsAndPublications: + + + + 136 + popUpMenu_ @@ -797,6 +829,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + + @@ -916,6 +950,16 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + + 133 + + + + + 134 + + + @@ -936,6 +980,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -981,7 +1027,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - 132 + 136 @@ -995,6 +1041,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA id id id + id id @@ -1022,6 +1069,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1085,6 +1136,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA id id id + id id @@ -1112,6 +1164,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1146,9 +1202,11 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NSWindowController id + id id id id + id id id id @@ -1159,6 +1217,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA addDomain: id + + importCommonDistractingWebsites: + id + importIncomingMailServersFromMail: id @@ -1171,6 +1233,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA importIncomingMailServersFromThunderbird: id + + importNewsAndPublications: + id + importOutgoingMailServersFromMail: id @@ -1208,9 +1274,11 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA DomainListWindowController id + id id id id + id id id id @@ -1221,6 +1289,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA addDomain: id + + importCommonDistractingWebsites: + id + importIncomingMailServersFromMail: id @@ -1233,6 +1305,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA importIncomingMailServersFromThunderbird: id + + importNewsAndPublications: + id + importOutgoingMailServersFromMail: id diff --git a/es.lproj/MainMenu.xib b/es.lproj/MainMenu.xib index fd440730..267d3d8e 100644 --- a/es.lproj/MainMenu.xib +++ b/es.lproj/MainMenu.xib @@ -493,6 +493,14 @@ Help + + + Get Started + + 2147483647 + + + SelfControl FAQ @@ -926,6 +934,14 @@ 906 + + + showGetStartedWindow: + + + + 908 + checkForUpdates: @@ -1400,6 +1416,7 @@ + @@ -1408,6 +1425,11 @@ + + 907 + + + @@ -1482,13 +1504,14 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - 906 + 908 @@ -1502,7 +1525,7 @@ id id id - id + id id @@ -1530,8 +1553,8 @@ showDomainList: id - - soundSelectionChanged: + + showGetStartedWindow: id @@ -1597,6 +1620,7 @@ id id id + id id @@ -1624,6 +1648,10 @@ showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1640,8 +1668,10 @@ id id + id id id + id id id @@ -1654,6 +1684,10 @@ importIncomingMailServersFromMail: id + + importIncomingMailServersFromMailMate: + id + importIncomingMailServersFromThunderbird: id @@ -1662,6 +1696,10 @@ importOutgoingMailServersFromMail: id + + importOutgoingMailServersFromMailMate: + id + importOutgoingMailServersFromThunderbird: id @@ -1692,8 +1730,10 @@ id id + id id id + id id id @@ -1706,6 +1746,10 @@ importIncomingMailServersFromMail: id + + importIncomingMailServersFromMailMate: + id + importIncomingMailServersFromThunderbird: id @@ -1714,6 +1758,10 @@ importOutgoingMailServersFromMail: id + + importOutgoingMailServersFromMailMate: + id + importOutgoingMailServersFromThunderbird: id diff --git a/it.lproj/DomainList.xib b/it.lproj/DomainList.xib index 85ba2985..e1052634 100755 --- a/it.lproj/DomainList.xib +++ b/it.lproj/DomainList.xib @@ -60,6 +60,22 @@ NSMenuMixedState + + + Common Distracting Sites + + 2147483647 + + + + + + News & Publications + + 2147483647 + + + Da Mail @@ -807,6 +823,22 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 132 + + + importCommonDistractingWebsites: + + + + 135 + + + + importNewsAndPublications: + + + + 136 + popUpMenu_ @@ -972,6 +1004,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 + + @@ -1091,6 +1125,16 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 + + 133 + + + + + 134 + + + @@ -1111,6 +1155,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1156,7 +1202,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - 132 + 136 @@ -1170,6 +1216,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 id id id + id id @@ -1197,6 +1244,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1260,6 +1311,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 id id id + id id @@ -1287,6 +1339,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1321,9 +1377,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NSWindowController id + id id id id + id id id id @@ -1334,6 +1392,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 addDomain: id + + importCommonDistractingWebsites: + id + importIncomingMailServersFromMail: id @@ -1346,6 +1408,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 importIncomingMailServersFromThunderbird: id + + importNewsAndPublications: + id + importOutgoingMailServersFromMail: id @@ -1383,9 +1449,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 DomainListWindowController id + id id id id + id id id id @@ -1396,6 +1464,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 addDomain: id + + importCommonDistractingWebsites: + id + importIncomingMailServersFromMail: id @@ -1408,6 +1480,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 importIncomingMailServersFromThunderbird: id + + importNewsAndPublications: + id + importOutgoingMailServersFromMail: id diff --git a/it.lproj/MainMenu.xib b/it.lproj/MainMenu.xib index 5e684b58..9892df85 100755 --- a/it.lproj/MainMenu.xib +++ b/it.lproj/MainMenu.xib @@ -493,6 +493,14 @@ Aiuto + + + Get Started + + 2147483647 + + + FAQ su SelfControl @@ -926,6 +934,14 @@ 904 + + + showGetStartedWindow: + + + + 906 + checkForUpdates: @@ -1361,6 +1377,7 @@ + @@ -1408,6 +1425,11 @@ + + 905 + + + @@ -1482,13 +1504,14 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - 904 + 906 @@ -1502,7 +1525,7 @@ id id id - id + id id @@ -1530,8 +1553,8 @@ showDomainList: id - - soundSelectionChanged: + + showGetStartedWindow: id @@ -1597,6 +1620,7 @@ id id id + id id @@ -1624,6 +1648,10 @@ showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1640,8 +1668,10 @@ id id + id id id + id id id @@ -1654,6 +1684,10 @@ importIncomingMailServersFromMail: id + + importIncomingMailServersFromMailMate: + id + importIncomingMailServersFromThunderbird: id @@ -1662,6 +1696,10 @@ importOutgoingMailServersFromMail: id + + importOutgoingMailServersFromMailMate: + id + importOutgoingMailServersFromThunderbird: id @@ -1692,8 +1730,10 @@ id id + id id id + id id id @@ -1706,6 +1746,10 @@ importIncomingMailServersFromMail: id + + importIncomingMailServersFromMailMate: + id + importIncomingMailServersFromThunderbird: id @@ -1714,6 +1758,10 @@ importOutgoingMailServersFromMail: id + + importOutgoingMailServersFromMailMate: + id + importOutgoingMailServersFromThunderbird: id diff --git a/ja.lproj/DomainList.xib b/ja.lproj/DomainList.xib index 5394755f..2fcdc22c 100644 --- a/ja.lproj/DomainList.xib +++ b/ja.lproj/DomainList.xib @@ -60,6 +60,22 @@ NSMenuMixedState + + + Common Distracting Sites + + 2147483647 + + + + + + News & Publications + + 2147483647 + + + Mail から @@ -632,6 +648,22 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 132 + + + importCommonDistractingWebsites: + + + + 135 + + + + importNewsAndPublications: + + + + 136 + popUpMenu_ @@ -797,6 +829,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + + @@ -916,6 +950,16 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + + 133 + + + + + 134 + + + @@ -936,6 +980,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -981,7 +1027,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - 132 + 136 @@ -995,6 +1041,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA id id id + id id @@ -1022,6 +1069,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1085,6 +1136,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA id id id + id id @@ -1112,6 +1164,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1146,9 +1202,11 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NSWindowController id + id id id id + id id id id @@ -1159,6 +1217,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA addDomain: id + + importCommonDistractingWebsites: + id + importIncomingMailServersFromMail: id @@ -1171,6 +1233,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA importIncomingMailServersFromThunderbird: id + + importNewsAndPublications: + id + importOutgoingMailServersFromMail: id @@ -1208,9 +1274,11 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA DomainListWindowController id + id id id id + id id id id @@ -1221,6 +1289,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA addDomain: id + + importCommonDistractingWebsites: + id + importIncomingMailServersFromMail: id @@ -1233,6 +1305,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA importIncomingMailServersFromThunderbird: id + + importNewsAndPublications: + id + importOutgoingMailServersFromMail: id diff --git a/ja.lproj/MainMenu.xib b/ja.lproj/MainMenu.xib index e14ec43b..e206b01e 100644 --- a/ja.lproj/MainMenu.xib +++ b/ja.lproj/MainMenu.xib @@ -493,6 +493,14 @@ Help + + + Get Started + + 2147483647 + + + SelfControl FAQ @@ -922,6 +930,14 @@ 904 + + + showGetStartedWindow: + + + + 906 + checkForUpdates: @@ -1396,6 +1412,7 @@ + @@ -1404,6 +1421,11 @@ + + 905 + + + @@ -1478,13 +1500,14 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - 904 + 906 @@ -1498,7 +1521,7 @@ id id id - id + id id @@ -1526,8 +1549,8 @@ showDomainList: id - - soundSelectionChanged: + + showGetStartedWindow: id @@ -1593,6 +1616,7 @@ id id id + id id @@ -1620,6 +1644,10 @@ showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1636,8 +1664,10 @@ id id + id id id + id id id @@ -1650,6 +1680,10 @@ importIncomingMailServersFromMail: id + + importIncomingMailServersFromMailMate: + id + importIncomingMailServersFromThunderbird: id @@ -1658,6 +1692,10 @@ importOutgoingMailServersFromMail: id + + importOutgoingMailServersFromMailMate: + id + importOutgoingMailServersFromThunderbird: id @@ -1688,8 +1726,10 @@ id id + id id id + id id id @@ -1702,6 +1742,10 @@ importIncomingMailServersFromMail: id + + importIncomingMailServersFromMailMate: + id + importIncomingMailServersFromThunderbird: id @@ -1710,6 +1754,10 @@ importOutgoingMailServersFromMail: id + + importOutgoingMailServersFromMailMate: + id + importOutgoingMailServersFromThunderbird: id diff --git a/ko.lproj/DomainList.xib b/ko.lproj/DomainList.xib index 711553b2..1ca53f62 100755 --- a/ko.lproj/DomainList.xib +++ b/ko.lproj/DomainList.xib @@ -17,6 +17,18 @@ + + + + + + + + + + + + @@ -165,7 +177,7 @@ CA + + + Common Distracting Sites + + 2147483647 + + + + + + News & Publications + + 2147483647 + + + Do Email @@ -807,6 +823,22 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 132 + + + importCommonDistractingWebsites: + + + + 135 + + + + importNewsAndPublications: + + + + 136 + popUpMenu_ @@ -972,6 +1004,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 + + @@ -1091,6 +1125,16 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 + + 133 + + + + + 134 + + + @@ -1111,6 +1155,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1156,7 +1202,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - 132 + 136 @@ -1170,6 +1216,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 id id id + id id @@ -1197,6 +1244,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1260,6 +1311,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 id id id + id id @@ -1287,6 +1339,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1321,9 +1377,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NSWindowController id + id id id id + id id id id @@ -1334,6 +1392,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 addDomain: id + + importCommonDistractingWebsites: + id + importIncomingMailServersFromMail: id @@ -1346,6 +1408,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 importIncomingMailServersFromThunderbird: id + + importNewsAndPublications: + id + importOutgoingMailServersFromMail: id @@ -1383,9 +1449,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 DomainListWindowController id + id id id id + id id id id @@ -1396,6 +1464,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 addDomain: id + + importCommonDistractingWebsites: + id + importIncomingMailServersFromMail: id @@ -1408,6 +1480,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 importIncomingMailServersFromThunderbird: id + + importNewsAndPublications: + id + importOutgoingMailServersFromMail: id diff --git a/pt_BR.lproj/MainMenu.xib b/pt_BR.lproj/MainMenu.xib index 3c430f60..1e77c6d0 100755 --- a/pt_BR.lproj/MainMenu.xib +++ b/pt_BR.lproj/MainMenu.xib @@ -493,6 +493,14 @@ Help + + + Get Started + + 2147483647 + + + SelfControl FAQ @@ -932,6 +940,14 @@ 904 + + + showGetStartedWindow: + + + + 906 + checkForUpdates: @@ -1367,6 +1383,7 @@ + @@ -1414,6 +1431,11 @@ + + 905 + + + @@ -1488,13 +1510,14 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - 904 + 906 @@ -1508,7 +1531,7 @@ id id id - id + id id @@ -1536,8 +1559,8 @@ showDomainList: id - - soundSelectionChanged: + + showGetStartedWindow: id @@ -1603,6 +1626,7 @@ id id id + id id @@ -1630,6 +1654,10 @@ showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1646,8 +1674,10 @@ id id + id id id + id id id @@ -1660,6 +1690,10 @@ importIncomingMailServersFromMail: id + + importIncomingMailServersFromMailMate: + id + importIncomingMailServersFromThunderbird: id @@ -1668,6 +1702,10 @@ importOutgoingMailServersFromMail: id + + importOutgoingMailServersFromMailMate: + id + importOutgoingMailServersFromThunderbird: id @@ -1698,8 +1736,10 @@ id id + id id id + id id id @@ -1712,6 +1752,10 @@ importIncomingMailServersFromMail: id + + importIncomingMailServersFromMailMate: + id + importIncomingMailServersFromThunderbird: id @@ -1720,6 +1764,10 @@ importOutgoingMailServersFromMail: id + + importOutgoingMailServersFromMailMate: + id + importOutgoingMailServersFromThunderbird: id diff --git a/sv.lproj/DomainList.xib b/sv.lproj/DomainList.xib index 9718faa0..3377820e 100644 --- a/sv.lproj/DomainList.xib +++ b/sv.lproj/DomainList.xib @@ -60,6 +60,22 @@ NSMenuMixedState + + + Common Distracting Sites + + 2147483647 + + + + + + News & Publications + + 2147483647 + + + Från e-post @@ -632,6 +648,22 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 132 + + + importCommonDistractingWebsites: + + + + 137 + + + + importNewsAndPublications: + + + + 138 + popUpMenu_ @@ -797,6 +829,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + + @@ -916,6 +950,16 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + + 135 + + + + + 136 + + + @@ -936,6 +980,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -981,7 +1027,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - 132 + 138 @@ -995,6 +1041,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA id id id + id id @@ -1022,6 +1069,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1085,6 +1136,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA id id id + id id @@ -1112,6 +1164,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1146,9 +1202,11 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NSWindowController id + id id id id + id id id id @@ -1159,6 +1217,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA addDomain: id + + importCommonDistractingWebsites: + id + importIncomingMailServersFromMail: id @@ -1171,6 +1233,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA importIncomingMailServersFromThunderbird: id + + importNewsAndPublications: + id + importOutgoingMailServersFromMail: id @@ -1208,9 +1274,11 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA DomainListWindowController id + id id id id + id id id id @@ -1221,6 +1289,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA addDomain: id + + importCommonDistractingWebsites: + id + importIncomingMailServersFromMail: id @@ -1233,6 +1305,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA importIncomingMailServersFromThunderbird: id + + importNewsAndPublications: + id + importOutgoingMailServersFromMail: id diff --git a/sv.lproj/MainMenu.xib b/sv.lproj/MainMenu.xib index 9232867c..e5db4443 100644 --- a/sv.lproj/MainMenu.xib +++ b/sv.lproj/MainMenu.xib @@ -493,6 +493,14 @@ Help + + + Get Started + + 2147483647 + + + SelfControl FAQ @@ -926,6 +934,14 @@ 906 + + + showGetStartedWindow: + + + + 908 + checkForUpdates: @@ -1400,6 +1416,7 @@ + @@ -1408,6 +1425,11 @@ + + 907 + + + @@ -1482,13 +1504,14 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - 906 + 908 @@ -1502,7 +1525,7 @@ id id id - id + id id @@ -1530,8 +1553,8 @@ showDomainList: id - - soundSelectionChanged: + + showGetStartedWindow: id @@ -1597,6 +1620,7 @@ id id id + id id @@ -1624,6 +1648,10 @@ showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1640,8 +1668,10 @@ id id + id id id + id id id @@ -1654,6 +1684,10 @@ importIncomingMailServersFromMail: id + + importIncomingMailServersFromMailMate: + id + importIncomingMailServersFromThunderbird: id @@ -1662,6 +1696,10 @@ importOutgoingMailServersFromMail: id + + importOutgoingMailServersFromMailMate: + id + importOutgoingMailServersFromThunderbird: id @@ -1692,8 +1730,10 @@ id id + id id id + id id id @@ -1706,6 +1746,10 @@ importIncomingMailServersFromMail: id + + importIncomingMailServersFromMailMate: + id + importIncomingMailServersFromThunderbird: id @@ -1714,6 +1758,10 @@ importOutgoingMailServersFromMail: id + + importOutgoingMailServersFromMailMate: + id + importOutgoingMailServersFromThunderbird: id diff --git a/tr.lproj/DomainList.xib b/tr.lproj/DomainList.xib index 85f78f8e..f0a06a19 100755 --- a/tr.lproj/DomainList.xib +++ b/tr.lproj/DomainList.xib @@ -17,6 +17,18 @@ + + + + + + + + + + + + @@ -165,7 +177,7 @@ CA + + + Common Distracting Sites + + 2147483647 + + + + + + News & Publications + + 2147483647 + + + 来自 Mail @@ -166,7 +182,7 @@ {400, 315} - + 274 @@ -182,6 +198,7 @@ 274 {400, 264} + YES NO @@ -279,6 +296,7 @@ {{1, 1}, {400, 264}} + @@ -289,6 +307,7 @@ -2147483392 {{344, 1}, {15, 249}} + NO @@ -301,6 +320,7 @@ -2147483392 {{1, 250}, {343, 15}} + NO 1 @@ -311,6 +331,7 @@ {{-1, 50}, {402, 266}} + 133682 @@ -326,6 +347,7 @@ 256 {{20, 19}, {24, 24}} + YES @@ -352,6 +374,7 @@ 256 {{52, 19}, {24, 24}} + YES @@ -378,6 +401,7 @@ 256 {{143, 19}, {113, 24}} + YES @@ -420,6 +444,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 290 {{300, 6}, {87, 42}} + YES NO 2 @@ -493,6 +518,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {400, 315} + + {{0, 0}, {1440, 878}} @@ -621,6 +648,22 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 132 + + + importCommonDistractingWebsites: + + + + 135 + + + + importNewsAndPublications: + + + + 136 + popUpMenu_ @@ -786,6 +829,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + + @@ -905,6 +950,16 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + + 133 + + + + + 134 + + + @@ -925,6 +980,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -969,7 +1026,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - 132 + 136 @@ -983,6 +1040,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA id id id + id id @@ -1010,6 +1068,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1073,6 +1135,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA id id id + id id @@ -1100,6 +1163,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1134,9 +1201,11 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NSWindowController id + id id id id + id id id id @@ -1147,6 +1216,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA addDomain: id + + importCommonDistractingWebsites: + id + importIncomingMailServersFromMail: id @@ -1159,6 +1232,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA importIncomingMailServersFromThunderbird: id + + importNewsAndPublications: + id + importOutgoingMailServersFromMail: id @@ -1196,9 +1273,11 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA DomainListWindowController id + id id id id + id id id id @@ -1209,6 +1288,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA addDomain: id + + importCommonDistractingWebsites: + id + importIncomingMailServersFromMail: id @@ -1221,6 +1304,10 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA importIncomingMailServersFromThunderbird: id + + importNewsAndPublications: + id + importOutgoingMailServersFromMail: id diff --git a/zh-Hans.lproj/MainMenu.xib b/zh-Hans.lproj/MainMenu.xib index 6708e511..1a7b955f 100755 --- a/zh-Hans.lproj/MainMenu.xib +++ b/zh-Hans.lproj/MainMenu.xib @@ -493,6 +493,14 @@ 帮助 + + + Get Started + + 2147483647 + + + SelfControl FAQ @@ -930,6 +938,14 @@ 904 + + + showGetStartedWindow: + + + + 906 + checkForUpdates: @@ -1404,6 +1420,7 @@ + @@ -1412,6 +1429,11 @@ + + 905 + + + @@ -1486,13 +1508,14 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - 904 + 906 @@ -1506,7 +1529,7 @@ id id id - id + id id @@ -1534,8 +1557,8 @@ showDomainList: id - - soundSelectionChanged: + + showGetStartedWindow: id @@ -1601,6 +1624,7 @@ id id id + id id @@ -1628,6 +1652,10 @@ showDomainList: id + + showGetStartedWindow: + id + updateTimeSliderDisplay: id @@ -1644,8 +1672,10 @@ id id + id id id + id id id @@ -1658,6 +1688,10 @@ importIncomingMailServersFromMail: id + + importIncomingMailServersFromMailMate: + id + importIncomingMailServersFromThunderbird: id @@ -1666,6 +1700,10 @@ importOutgoingMailServersFromMail: id + + importOutgoingMailServersFromMailMate: + id + importOutgoingMailServersFromThunderbird: id @@ -1696,8 +1734,10 @@ id id + id id id + id id id @@ -1710,6 +1750,10 @@ importIncomingMailServersFromMail: id + + importIncomingMailServersFromMailMate: + id + importIncomingMailServersFromThunderbird: id @@ -1718,6 +1762,10 @@ importOutgoingMailServersFromMail: id + + importOutgoingMailServersFromMailMate: + id + importOutgoingMailServersFromThunderbird: id