Index: /trunk/Cocoa/Pester/Source/PSAlarm.m
===================================================================
--- /trunk/Cocoa/Pester/Source/PSAlarm.m	(revision 104)
+++ /trunk/Cocoa/Pester/Source/PSAlarm.m	(revision 105)
@@ -184,5 +184,5 @@
     dateTime = [NSCalendarDate dateWithDate: date atTime: time];
     if (dateTime == nil) {
-        [self _beInvalid: @"Please specify a reasonable date and time."];
+        [self _beInvalid: @"Please specify a reasonable date and time."]; return;
     }
     [self setForDateAtTime: dateTime];
@@ -418,6 +418,7 @@
 - (NSString *)description;
 {
-    return [NSString stringWithFormat: @"%@: type %@ date %@ interval %.1f%@",
+    return [NSString stringWithFormat: @"%@: type %@ date %@ interval %.1f%@%@",
         [super description], [self _alarmTypeString], alarmDate, alarmInterval,
+        (repeating ? @" repeating" : @""),
         (alarmType == PSAlarmInvalid ?
          [NSString stringWithFormat: @"\ninvalid message: %@", invalidMessage]
@@ -437,14 +438,15 @@
         case PSAlarmSet:
             [dict setObject: [NSNumber numberWithDouble: [alarmDate timeIntervalSinceReferenceDate]] forKey: PLAlarmDate];
-            break;
         case PSAlarmSnooze:
         case PSAlarmInterval:
         case PSAlarmExpired:
-            [dict setObject: [NSNumber numberWithDouble: alarmInterval] forKey: PLAlarmInterval];
-            [dict setObject: [NSNumber numberWithBool: repeating] forKey: PLAlarmRepeating];
             break;
         default:
             NSAssert1(NO, NSLocalizedString(@"Can't save alarm type %@", "Assertion for invalid PSAlarm type on string; %@ replaced with alarm type string"), [self _alarmTypeString]);
             break;
+    }
+    if ((alarmType != PSAlarmSet || repeating) && alarmType != PSAlarmDate) {
+        [dict setObject: [NSNumber numberWithBool: repeating] forKey: PLAlarmRepeating];
+        [dict setObject: [NSNumber numberWithDouble: alarmInterval] forKey: PLAlarmInterval];
     }
     if (snoozeInterval != 0)
@@ -474,6 +476,4 @@
             case PSAlarmInterval:
             case PSAlarmExpired:
-                alarmInterval = [[dict objectForRequiredKey: PLAlarmInterval] doubleValue];
-                repeating = [[dict objectForRequiredKey: PLAlarmRepeating] boolValue];
                 break;
             default:
@@ -481,4 +481,7 @@
                 break;
         }
+        repeating = [[dict objectForKey: PLAlarmRepeating] boolValue];
+        if ((alarmType != PSAlarmSet || repeating) && alarmType != PSAlarmDate)
+            alarmInterval = [[dict objectForRequiredKey: PLAlarmInterval] doubleValue];
         snoozeInterval = [[dict objectForKey: PLAlarmSnoozeInterval] doubleValue];
         [self setMessage: [dict objectForRequiredKey: PLAlarmMessage]];
@@ -488,5 +491,10 @@
         if (alarmType == PSAlarmSet) {
             alarmType = PSAlarmDate;
-            [self setTimer];
+            // don't want to put this logic in setTimer or isValid because it can cause invalid alarms to be set (consider when someone clicks the "repeat" checkbox, then switches to a [nonrepeating, by design] date alarm, and enters a date that has passed: we do -not- want the alarm to magically morph into a repeating interval alarm)
+            if (![self setTimer] && [self isRepeating]) {
+                alarmType = PSAlarmInterval;
+                [self setInterval: [[dict objectForRequiredKey: PLAlarmInterval] doubleValue]];
+                [self setTimer];
+            }
         }
         if (alarmType == PSAlarmExpired) {
Index: /trunk/Cocoa/Pester/Source/PSAlarmAlertController.m
===================================================================
--- /trunk/Cocoa/Pester/Source/PSAlarmAlertController.m	(revision 104)
+++ /trunk/Cocoa/Pester/Source/PSAlarmAlertController.m	(revision 105)
@@ -41,6 +41,6 @@
     unsigned count = [pendingAlerts count];
     [pendingAlerts removeObject: alert];
-    // NSLog(@"removed: %@; still pending: %@", alert, [pendingAlerts description]);
-    // NSLog(@"alarm: %@ retainCount %d", [notification object], [[notification object] retainCount]);
+    NSLog(@"removed: %@; still pending: %@", alert, [pendingAlerts description]);
+    NSLog(@"alarm: %@ retainCount %d", [notification object], [[notification object] retainCount]);
     NSAssert2([pendingAlerts count] == count - 1, @"alert not in set: %@\n%@", alert, notification);
     if ([pendingAlerts count] == 0) {
Index: /trunk/Cocoa/Pester/Source/PSAlarms.m
===================================================================
--- /trunk/Cocoa/Pester/Source/PSAlarms.m	(revision 104)
+++ /trunk/Cocoa/Pester/Source/PSAlarms.m	(revision 105)
@@ -215,4 +215,14 @@
 }
 
+#pragma mark printing
+
+- (NSString *)description;
+{
+    return [NSString stringWithFormat: @"%@ pending %@\n%@\n",
+        [super description], alarms,
+        [expiredAlarms count] > 0 ? [NSString stringWithFormat: @"expired %@\n", expiredAlarms]
+                                  : @""];
+}
+
 #pragma mark property list serialization (Pester 1.1)
 
@@ -243,5 +253,5 @@
     [plPendingAlarms release];
     [plExpiredAlarms release];
-    
+
     return plAllAlarms;
 }
Index: /trunk/Cocoa/Pester/Source/PSPowerManager.m
===================================================================
--- /trunk/Cocoa/Pester/Source/PSPowerManager.m	(revision 104)
+++ /trunk/Cocoa/Pester/Source/PSPowerManager.m	(revision 105)
@@ -180,4 +180,5 @@
     io_service_t pmuReference = openPMUComPort();
     NSAssert(pmuReference != NULL, NSLocalizedString(@"Couldn't find PMU in IORegistry. This computer may not support automatic wake from sleep.", "Assertion message: couldn't open ApplePMU"));
+    return pmuReference;
 }
 
Index: /trunk/Cocoa/Pester/Source/Pester.pbproj/nicholas.pbxuser
===================================================================
--- /trunk/Cocoa/Pester/Source/Pester.pbproj/nicholas.pbxuser	(revision 104)
+++ /trunk/Cocoa/Pester/Source/Pester.pbproj/nicholas.pbxuser	(revision 105)
@@ -22,5 +22,261 @@
 		);
 		perUserDictionary = {
-			PBXPerProjectTemplateStateSaveDate = 67918447;
+			PBXPerProjectTemplateStateSaveDate = 68247977;
+			"PBXTemplateGeometry-F5314676015831810DCA290F" = {
+				ContentSize = "{685, 434}";
+				LeftSlideOut = {
+					Collapsed = NO;
+					Frame = "{{0, 23}, {685, 411}}";
+					Split0 = {
+						ActiveTab = 2;
+						ActiveTabName = PBXBuildResultsModule;
+						Collapsed = NO;
+						Frame = "{{0, 0}, {685, 411}}";
+						Split0 = {
+							Frame = "{{0, 301}, {685, 110}}";
+						};
+						SplitCount = 1;
+						Tab0 = {
+							Frame = "{{0, 0}, {952, 321}}";
+						};
+						Tab1 = {
+							Debugger = {
+								Collapsed = NO;
+								Frame = "{{0, 0}, {781, 452}}";
+								Split0 = {
+									Frame = "{{0, 24}, {781, 428}}";
+									Split0 = {
+										Frame = "{{0, 0}, {383, 428}}";
+									};
+									Split1 = {
+										DebugVariablesTableConfiguration = (
+											Name,
+											123,
+											Value,
+											85,
+											Summary,
+											155.123,
+										);
+										Frame = "{{392, 0}, {389, 428}}";
+									};
+									SplitCount = 2;
+								};
+								SplitCount = 1;
+								Tab0 = {
+									Frame = "{{0, 0}, {100, 50}}";
+								};
+								Tab1 = {
+									Frame = "{{0, 0}, {100, 50}}";
+								};
+								TabCount = 2;
+								TabsVisible = YES;
+							};
+							Frame = "{{0, 0}, {781, 452}}";
+							LauncherConfigVersion = 7;
+						};
+						Tab2 = {
+							Frame = "{{0, 0}, {685, 215}}";
+							LauncherConfigVersion = 3;
+							Runner = {
+								Frame = "{{0, 0}, {685, 215}}";
+							};
+						};
+						Tab3 = {
+							BuildMessageFrame = "{{0, 0}, {687, 264}}";
+							BuildTranscriptFrame = "{{0, 273}, {687, 0}}";
+							BuildTranscriptFrameExpanded = YES;
+							Frame = "{{0, 0}, {685, 295}}";
+						};
+						Tab4 = {
+							Frame = "{{0, 0}, {612, 295}}";
+						};
+						TabCount = 5;
+						TabsVisible = NO;
+					};
+					SplitCount = 1;
+					Tab0 = {
+						Frame = "{{0, 0}, {300, 533}}";
+						GroupTreeTableConfiguration = (
+							TargetStatusColumn,
+							18,
+							MainColumn,
+							267,
+						);
+					};
+					Tab1 = {
+						ClassesFrame = "{{0, 0}, {280, 398}}";
+						ClassesTreeTableConfiguration = (
+							PBXBookColumnIdentifier,
+							20,
+							PBXClassColumnIdentifier,
+							237,
+						);
+						Frame = "{{0, 0}, {278, 659}}";
+						MembersFrame = "{{0, 407}, {280, 252}}";
+						MembersTreeTableConfiguration = (
+							PBXBookColumnIdentifier,
+							20,
+							PBXMethodColumnIdentifier,
+							236,
+						);
+					};
+					Tab2 = {
+						Frame = "{{0, 0}, {200, 100}}";
+					};
+					Tab3 = {
+						Frame = "{{0, 0}, {200, 100}}";
+						TargetTableConfiguration = (
+							ActiveObject,
+							16,
+							ObjectNames,
+							202.296,
+						);
+					};
+					Tab4 = {
+						BreakpointsTreeTableConfiguration = (
+							breakpointColumn,
+							197,
+							enabledColumn,
+							31,
+						);
+						Frame = "{{0, 0}, {250, 100}}";
+					};
+					TabCount = 5;
+					TabsVisible = NO;
+				};
+				NavBarShownByDefault = YES;
+				StatusViewVisible = YES;
+				Template = F5314676015831810DCA290F;
+				ToolbarVisible = YES;
+				WindowLocation = "{433, 70}";
+			};
+			"PBXTemplateGeometry-F5534CB2020F3F8A0DCA290F" = {
+				ContentSize = "{684, 312}";
+				LeftSlideOut = {
+					Collapsed = NO;
+					Frame = "{{0, 23}, {684, 289}}";
+					Split0 = {
+						ActiveTab = 1;
+						ActiveTabName = PBXRunSessionModule;
+						Collapsed = YES;
+						Frame = "{{0, 0}, {684, 289}}";
+						Split0 = {
+							Frame = "{{1e+06, 1e+06}, {684, 0}}";
+						};
+						SplitCount = 1;
+						Tab0 = {
+							Frame = "{{0, 0}, {804, 321}}";
+						};
+						Tab1 = {
+							Debugger = {
+								Collapsed = NO;
+								Frame = "{{0, 0}, {594, 274}}";
+								Split0 = {
+									Frame = "{{0, 24}, {594, 250}}";
+									Split0 = {
+										Frame = "{{0, 0}, {290, 250}}";
+									};
+									Split1 = {
+										DebugVariablesTableConfiguration = (
+											Name,
+											123,
+											Value,
+											85,
+											Summary,
+											62.123,
+										);
+										Frame = "{{299, 0}, {295, 250}}";
+									};
+									SplitCount = 2;
+								};
+								SplitCount = 1;
+								Tab0 = {
+									Frame = "{{0, 0}, {100, 50}}";
+								};
+								Tab1 = {
+									Frame = "{{0, 0}, {100, 50}}";
+								};
+								TabCount = 2;
+								TabsVisible = YES;
+							};
+							Frame = "{{0, 0}, {594, 274}}";
+							LauncherConfigVersion = 7;
+						};
+						Tab2 = {
+							Frame = "{{0, 0}, {684, 283}}";
+							LauncherConfigVersion = 3;
+							Runner = {
+								Frame = "{{0, 0}, {684, 283}}";
+							};
+						};
+						Tab3 = {
+							BuildMessageFrame = "{{0, 0}, {614, 262}}";
+							BuildTranscriptFrame = "{{0, 271}, {614, 2}}";
+							BuildTranscriptFrameExpanded = YES;
+							Frame = "{{0, 0}, {612, 295}}";
+						};
+						Tab4 = {
+							Frame = "{{0, 0}, {612, 295}}";
+						};
+						TabCount = 5;
+						TabsVisible = NO;
+					};
+					SplitCount = 1;
+					Tab0 = {
+						Frame = "{{0, 0}, {300, 533}}";
+						GroupTreeTableConfiguration = (
+							TargetStatusColumn,
+							18,
+							MainColumn,
+							267,
+						);
+					};
+					Tab1 = {
+						ClassesFrame = "{{0, 0}, {280, 398}}";
+						ClassesTreeTableConfiguration = (
+							PBXBookColumnIdentifier,
+							20,
+							PBXClassColumnIdentifier,
+							237,
+						);
+						Frame = "{{0, 0}, {278, 659}}";
+						MembersFrame = "{{0, 407}, {280, 252}}";
+						MembersTreeTableConfiguration = (
+							PBXBookColumnIdentifier,
+							20,
+							PBXMethodColumnIdentifier,
+							236,
+						);
+					};
+					Tab2 = {
+						Frame = "{{0, 0}, {200, 100}}";
+					};
+					Tab3 = {
+						Frame = "{{0, 0}, {200, 386}}";
+						TargetTableConfiguration = (
+							ActiveObject,
+							16,
+							ObjectNames,
+							202.296,
+						);
+					};
+					Tab4 = {
+						BreakpointsTreeTableConfiguration = (
+							breakpointColumn,
+							197,
+							enabledColumn,
+							31,
+						);
+						Frame = "{{0, 0}, {250, 386}}";
+					};
+					TabCount = 5;
+					TabsVisible = NO;
+				};
+				NavBarShownByDefault = YES;
+				StatusViewVisible = YES;
+				Template = F5534CB2020F3F8A0DCA290F;
+				ToolbarVisible = YES;
+				WindowLocation = "{13, 95}";
+			};
 			"PBXTemplateGeometry-F5CA7EC9015C08ED0DCA290F" = {
 				ContentSize = "{665, 594}";
@@ -151,4 +407,130 @@
 				WindowLocation = "{69, 216}";
 			};
+			"PBXTemplateGeometry-F5CA7ECB015C094F0DCA290F" = {
+				ContentSize = "{668, 621}";
+				LeftSlideOut = {
+					Collapsed = NO;
+					Frame = "{{0, 0}, {668, 621}}";
+					Split0 = {
+						Collapsed = NO;
+						Frame = "{{0, 0}, {668, 621}}";
+						Split0 = {
+							Frame = "{{0, 0}, {668, 621}}";
+						};
+						SplitCount = 1;
+						Tab0 = {
+							Frame = "{{0, 0}, {484, 208}}";
+						};
+						Tab1 = {
+							Debugger = {
+								Collapsed = NO;
+								Frame = "{{0, 0}, {664, 208}}";
+								Split0 = {
+									Frame = "{{0, 24}, {664, 184}}";
+									Split0 = {
+										Frame = "{{0, 0}, {325, 184}}";
+									};
+									Split1 = {
+										DebugVariablesTableConfiguration = (
+											Name,
+											123,
+											Value,
+											85,
+											Summary,
+											96.123,
+										);
+										Frame = "{{334, 0}, {330, 184}}";
+									};
+									SplitCount = 2;
+								};
+								SplitCount = 1;
+								Tab0 = {
+									Frame = "{{0, 0}, {100, 50}}";
+								};
+								Tab1 = {
+									Frame = "{{0, 0}, {100, 50}}";
+								};
+								TabCount = 2;
+								TabsVisible = YES;
+							};
+							Frame = "{{0, 0}, {664, 208}}";
+							LauncherConfigVersion = 7;
+						};
+						Tab2 = {
+							Frame = "{{0, 0}, {664, 50}}";
+							LauncherConfigVersion = 3;
+							Runner = {
+								Frame = "{{0, 0}, {664, 50}}";
+							};
+						};
+						Tab3 = {
+							BuildMessageFrame = "{{0, 0}, {614, 262}}";
+							BuildTranscriptFrame = "{{0, 271}, {614, 2}}";
+							BuildTranscriptFrameExpanded = YES;
+							Frame = "{{0, 0}, {612, 295}}";
+						};
+						Tab4 = {
+							Frame = "{{0, 0}, {612, 295}}";
+						};
+						TabCount = 5;
+						TabsVisible = NO;
+					};
+					SplitCount = 1;
+					Tab0 = {
+						Frame = "{{0, 0}, {313, 531}}";
+						GroupTreeTableConfiguration = (
+							TargetStatusColumn,
+							18,
+							MainColumn,
+							280,
+						);
+					};
+					Tab1 = {
+						ClassesFrame = "{{0, 0}, {280, 398}}";
+						ClassesTreeTableConfiguration = (
+							PBXBookColumnIdentifier,
+							20,
+							PBXClassColumnIdentifier,
+							237,
+						);
+						Frame = "{{0, 0}, {278, 659}}";
+						MembersFrame = "{{0, 407}, {280, 252}}";
+						MembersTreeTableConfiguration = (
+							PBXBookColumnIdentifier,
+							20,
+							PBXMethodColumnIdentifier,
+							236,
+						);
+					};
+					Tab2 = {
+						Frame = "{{0, 0}, {200, 100}}";
+					};
+					Tab3 = {
+						Frame = "{{0, 0}, {200, 557}}";
+						TargetTableConfiguration = (
+							ActiveObject,
+							16,
+							ObjectNames,
+							202.296,
+						);
+					};
+					Tab4 = {
+						BreakpointsTreeTableConfiguration = (
+							breakpointColumn,
+							197,
+							enabledColumn,
+							31,
+						);
+						Frame = "{{0, 0}, {250, 100}}";
+					};
+					TabCount = 5;
+					TabsVisible = NO;
+				};
+				NavBarShownByDefault = YES;
+				StatusViewVisible = NO;
+				Template = F5CA7ECB015C094F0DCA290F;
+				ToolbarVisible = NO;
+				WindowLocation = "{462, 79}";
+			};
 			PBXWorkspaceContents = (
 				{
@@ -157,5 +539,5 @@
 							Split0 = {
 								NavContent0 = {
-									bookmark = E1A60185040C8C6B00050002;
+									bookmark = E1669BD80412965E00050002;
 									history = (
 										E1D2937B03BD418200F9204E,
@@ -203,5 +585,4 @@
 										E17AED8803C0F5D300B89ACF,
 										E117A4AC03C3E9C600E10BA2,
-										E1BF6E9A03C95F4E00050002,
 										E1BF6E9D03C95F4E00050002,
 										E1BF6E9E03C95F4E00050002,
@@ -210,5 +591,4 @@
 										E1BF6EA203C95F4E00050002,
 										E1FCECFD03C972CF001509F3,
-										E1AFB0D103C9A59C001509F3,
 										E1AFB0D903C9A59C001509F3,
 										E1AFB0DA03C9A59C001509F3,
@@ -219,10 +599,7 @@
 										E143438703DB475300050002,
 										E143439503DB479900050002,
-										E14343C103DB52FA00050002,
 										E120347403EDEBC000000ABE,
-										E17F2F7003FE0DCC00050002,
 										E17F2F7403FE0DCC00050002,
 										E17F2F7803FE0DCC00050002,
-										E17F2F9F03FE193200050002,
 										E1DEF12A04003A5F00050002,
 										E1DEF12B04003A5F00050002,
@@ -251,7 +628,4 @@
 										E1DEF15304003A5F00050002,
 										E1DEF15404003A5F00050002,
-										E1DEF15504003A5F00050002,
-										E1DEF15704003A5F00050002,
-										E1DEF15A04003A5F00050002,
 										E1DEF15B04003A5F00050002,
 										E1DEF15D04003A5F00050002,
@@ -290,5 +664,4 @@
 										E1B46F6304053C4F00050002,
 										E1B46F6504053C4F00050002,
-										E1B46F6904053C4F00050002,
 										E1B46F6B04053C4F00050002,
 										E1B46F6C04053C4F00050002,
@@ -318,11 +691,20 @@
 										E1EF85620406E47300050002,
 										E1EF85630406E47300050002,
-										E1A60176040C8C6B00050002,
 										E1A60177040C8C6B00050002,
 										E1A60178040C8C6B00050002,
-										E1A60179040C8C6B00050002,
 										E1A6017A040C8C6B00050002,
 										E1A6017B040C8C6B00050002,
-										E1A6017C040C8C6B00050002,
+										E1669BB60412965E00050002,
+										E1669BB70412965E00050002,
+										E1669BB80412965E00050002,
+										E1669BB90412965E00050002,
+										E1669BBA0412965E00050002,
+										E1669BBB0412965E00050002,
+										E1669BBC0412965E00050002,
+										E1669BBD0412965E00050002,
+										E1669BBE0412965E00050002,
+										E1669BBF0412965E00050002,
+										E1669BC00412965E00050002,
+										E1669BC10412965E00050002,
 									);
 									prevStack = (
@@ -1377,4 +1759,26 @@
 										E1A60183040C8C6B00050002,
 										E1A60184040C8C6B00050002,
+										E1669BC20412965E00050002,
+										E1669BC30412965E00050002,
+										E1669BC40412965E00050002,
+										E1669BC50412965E00050002,
+										E1669BC60412965E00050002,
+										E1669BC70412965E00050002,
+										E1669BC80412965E00050002,
+										E1669BC90412965E00050002,
+										E1669BCA0412965E00050002,
+										E1669BCB0412965E00050002,
+										E1669BCC0412965E00050002,
+										E1669BCD0412965E00050002,
+										E1669BCE0412965E00050002,
+										E1669BCF0412965E00050002,
+										E1669BD00412965E00050002,
+										E1669BD10412965E00050002,
+										E1669BD20412965E00050002,
+										E1669BD30412965E00050002,
+										E1669BD40412965E00050002,
+										E1669BD50412965E00050002,
+										E1669BD60412965E00050002,
+										E1669BD70412965E00050002,
 									);
 								};
@@ -1417,46 +1821,4 @@
 								NavCount = 1;
 								NavGeometry0 = {
-									Frame = "{{0, 0}, {594, 150}}";
-									NavBarVisible = YES;
-								};
-								NavSplitVertical = NO;
-							};
-							SplitCount = 1;
-							Tab1 = {
-								Debugger = {
-									Split0 = {
-										SplitCount = 2;
-									};
-									SplitCount = 1;
-									TabCount = 2;
-								};
-								LauncherConfigVersion = 7;
-							};
-							Tab2 = {
-								LauncherConfigVersion = 3;
-								Runner = {
-								};
-							};
-							TabCount = 5;
-						};
-						SplitCount = 1;
-						Tab1 = {
-							OptionsSetName = "Hierarchy, all classes";
-						};
-						TabCount = 5;
-					};
-				},
-				{
-					LeftSlideOut = {
-						Split0 = {
-							Split0 = {
-								NavContent0 = {
-									bookmark = E1A60187040C8C6B00050002;
-									history = (
-										E1A60186040C8C6B00050002,
-									);
-								};
-								NavCount = 1;
-								NavGeometry0 = {
 									Frame = "{{0, 0}, {685, 150}}";
 									NavBarVisible = YES;
@@ -1495,47 +1857,5 @@
 								NavCount = 1;
 								NavGeometry0 = {
-									Frame = "{{0, 0}, {668, 621}}";
-									NavBarVisible = YES;
-								};
-								NavSplitVertical = NO;
-							};
-							SplitCount = 1;
-							Tab1 = {
-								Debugger = {
-									Split0 = {
-										SplitCount = 2;
-									};
-									SplitCount = 1;
-									TabCount = 2;
-								};
-								LauncherConfigVersion = 7;
-							};
-							Tab2 = {
-								LauncherConfigVersion = 3;
-								Runner = {
-								};
-							};
-							TabCount = 5;
-						};
-						SplitCount = 1;
-						Tab1 = {
-							OptionsSetName = "Hierarchy, all classes";
-						};
-						TabCount = 5;
-					};
-				},
-				{
-					LeftSlideOut = {
-						Split0 = {
-							Split0 = {
-								NavContent0 = {
-									bookmark = E1A60189040C8C6B00050002;
-									history = (
-										E1A60188040C8C6B00050002,
-									);
-								};
-								NavCount = 1;
-								NavGeometry0 = {
-									Frame = "{{0, 0}, {665, 293}}";
+									Frame = "{{0, 0}, {684, 150}}";
 									NavBarVisible = YES;
 								};
@@ -1695,133 +2015,5 @@
 					Template = 64ABBB4501FA494900185B06;
 					ToolbarVisible = YES;
-					WindowLocation = "{211, 120}";
-				},
-				{
-					ContentSize = "{684, 312}";
-					LeftSlideOut = {
-						Collapsed = NO;
-						Frame = "{{0, 23}, {684, 289}}";
-						Split0 = {
-							ActiveTab = 1;
-							ActiveTabName = PBXRunSessionModule;
-							Collapsed = YES;
-							Frame = "{{0, 0}, {684, 289}}";
-							Split0 = {
-								Frame = "{{1e+06, 1e+06}, {684, 0}}";
-							};
-							SplitCount = 1;
-							Tab0 = {
-								Frame = "{{0, 0}, {804, 321}}";
-							};
-							Tab1 = {
-								Debugger = {
-									Collapsed = NO;
-									Frame = "{{0, 0}, {594, 274}}";
-									Split0 = {
-										Frame = "{{0, 24}, {594, 250}}";
-										Split0 = {
-											Frame = "{{0, 0}, {290, 250}}";
-										};
-										Split1 = {
-											DebugVariablesTableConfiguration = (
-												Name,
-												123,
-												Value,
-												85,
-												Summary,
-												62.123,
-											);
-											Frame = "{{299, 0}, {295, 250}}";
-										};
-										SplitCount = 2;
-									};
-									SplitCount = 1;
-									Tab0 = {
-										Frame = "{{0, 0}, {100, 50}}";
-									};
-									Tab1 = {
-										Frame = "{{0, 0}, {100, 50}}";
-									};
-									TabCount = 2;
-									TabsVisible = YES;
-								};
-								Frame = "{{0, 0}, {594, 274}}";
-								LauncherConfigVersion = 7;
-							};
-							Tab2 = {
-								Frame = "{{0, 0}, {684, 283}}";
-								LauncherConfigVersion = 3;
-								Runner = {
-									Frame = "{{0, 0}, {684, 283}}";
-								};
-							};
-							Tab3 = {
-								BuildMessageFrame = "{{0, 0}, {614, 262}}";
-								BuildTranscriptFrame = "{{0, 271}, {614, 2}}";
-								BuildTranscriptFrameExpanded = YES;
-								Frame = "{{0, 0}, {612, 295}}";
-							};
-							Tab4 = {
-								Frame = "{{0, 0}, {612, 295}}";
-							};
-							TabCount = 5;
-							TabsVisible = NO;
-						};
-						SplitCount = 1;
-						Tab0 = {
-							Frame = "{{0, 0}, {300, 533}}";
-							GroupTreeTableConfiguration = (
-								TargetStatusColumn,
-								18,
-								MainColumn,
-								267,
-							);
-						};
-						Tab1 = {
-							ClassesFrame = "{{0, 0}, {280, 398}}";
-							ClassesTreeTableConfiguration = (
-								PBXBookColumnIdentifier,
-								20,
-								PBXClassColumnIdentifier,
-								237,
-							);
-							Frame = "{{0, 0}, {278, 659}}";
-							MembersFrame = "{{0, 407}, {280, 252}}";
-							MembersTreeTableConfiguration = (
-								PBXBookColumnIdentifier,
-								20,
-								PBXMethodColumnIdentifier,
-								236,
-							);
-						};
-						Tab2 = {
-							Frame = "{{0, 0}, {200, 100}}";
-						};
-						Tab3 = {
-							Frame = "{{0, 0}, {200, 386}}";
-							TargetTableConfiguration = (
-								ActiveObject,
-								16,
-								ObjectNames,
-								202.296,
-							);
-						};
-						Tab4 = {
-							BreakpointsTreeTableConfiguration = (
-								breakpointColumn,
-								197,
-								enabledColumn,
-								31,
-							);
-							Frame = "{{0, 0}, {250, 386}}";
-						};
-						TabCount = 5;
-						TabsVisible = NO;
-					};
-					NavBarShownByDefault = YES;
-					StatusViewVisible = YES;
-					Template = F5534CB2020F3F8A0DCA290F;
-					ToolbarVisible = YES;
-					WindowLocation = "{13, 95}";
+					WindowLocation = "{19, 177}";
 				},
 				{
@@ -1954,26 +2146,28 @@
 				},
 				{
-					ContentSize = "{668, 621}";
+					ContentSize = "{684, 312}";
 					LeftSlideOut = {
 						Collapsed = NO;
-						Frame = "{{0, 0}, {668, 621}}";
+						Frame = "{{0, 23}, {684, 289}}";
 						Split0 = {
-							Collapsed = NO;
-							Frame = "{{0, 0}, {668, 621}}";
+							ActiveTab = 1;
+							ActiveTabName = PBXRunSessionModule;
+							Collapsed = YES;
+							Frame = "{{0, 0}, {684, 289}}";
 							Split0 = {
-								Frame = "{{0, 0}, {668, 621}}";
+								Frame = "{{1e+06, 1e+06}, {684, 0}}";
 							};
 							SplitCount = 1;
 							Tab0 = {
-								Frame = "{{0, 0}, {484, 208}}";
+								Frame = "{{0, 0}, {804, 321}}";
 							};
 							Tab1 = {
 								Debugger = {
 									Collapsed = NO;
-									Frame = "{{0, 0}, {664, 208}}";
+									Frame = "{{0, 0}, {594, 274}}";
 									Split0 = {
-										Frame = "{{0, 24}, {664, 184}}";
+										Frame = "{{0, 24}, {594, 250}}";
 										Split0 = {
-											Frame = "{{0, 0}, {325, 184}}";
+											Frame = "{{0, 0}, {290, 250}}";
 										};
 										Split1 = {
@@ -1984,7 +2178,7 @@
 												85,
 												Summary,
-												96.123,
+												62.123,
 											);
-											Frame = "{{334, 0}, {330, 184}}";
+											Frame = "{{299, 0}, {295, 250}}";
 										};
 										SplitCount = 2;
@@ -2000,12 +2194,12 @@
 									TabsVisible = YES;
 								};
-								Frame = "{{0, 0}, {664, 208}}";
+								Frame = "{{0, 0}, {594, 274}}";
 								LauncherConfigVersion = 7;
 							};
 							Tab2 = {
-								Frame = "{{0, 0}, {664, 50}}";
+								Frame = "{{0, 0}, {684, 283}}";
 								LauncherConfigVersion = 3;
 								Runner = {
-									Frame = "{{0, 0}, {664, 50}}";
+									Frame = "{{0, 0}, {684, 283}}";
 								};
 							};
@@ -2024,10 +2218,10 @@
 						SplitCount = 1;
 						Tab0 = {
-							Frame = "{{0, 0}, {313, 531}}";
+							Frame = "{{0, 0}, {300, 533}}";
 							GroupTreeTableConfiguration = (
 								TargetStatusColumn,
 								18,
 								MainColumn,
-								280,
+								267,
 							);
 						};
@@ -2053,5 +2247,5 @@
 						};
 						Tab3 = {
-							Frame = "{{0, 0}, {200, 557}}";
+							Frame = "{{0, 0}, {200, 386}}";
 							TargetTableConfiguration = (
 								ActiveObject,
@@ -2068,5 +2262,5 @@
 								31,
 							);
-							Frame = "{{0, 0}, {250, 100}}";
+							Frame = "{{0, 0}, {250, 386}}";
 						};
 						TabCount = 5;
@@ -2074,139 +2268,11 @@
 					};
 					NavBarShownByDefault = YES;
-					StatusViewVisible = NO;
-					Template = F5CA7ECB015C094F0DCA290F;
-					ToolbarVisible = NO;
-					WindowLocation = "{462, 79}";
-				},
-				{
-					ContentSize = "{665, 594}";
-					LeftSlideOut = {
-						Collapsed = NO;
-						Frame = "{{0, 0}, {665, 594}}";
-						Split0 = {
-							ActiveTab = 3;
-							ActiveTabName = PBXProjectFindModule;
-							Collapsed = NO;
-							Frame = "{{0, 0}, {665, 594}}";
-							Split0 = {
-								Frame = "{{0, 301}, {665, 293}}";
-							};
-							SplitCount = 1;
-							Tab0 = {
-								Frame = "{{0, 0}, {484, 208}}";
-							};
-							Tab1 = {
-								Debugger = {
-									Collapsed = NO;
-									Frame = "{{0, 0}, {664, 208}}";
-									Split0 = {
-										Frame = "{{0, 24}, {664, 184}}";
-										Split0 = {
-											Frame = "{{0, 0}, {325, 184}}";
-										};
-										Split1 = {
-											DebugVariablesTableConfiguration = (
-												Name,
-												123,
-												Value,
-												85,
-												Summary,
-												96.123,
-											);
-											Frame = "{{334, 0}, {330, 184}}";
-										};
-										SplitCount = 2;
-									};
-									SplitCount = 1;
-									Tab0 = {
-										Frame = "{{0, 0}, {100, 50}}";
-									};
-									Tab1 = {
-										Frame = "{{0, 0}, {100, 50}}";
-									};
-									TabCount = 2;
-									TabsVisible = YES;
-								};
-								Frame = "{{0, 0}, {664, 208}}";
-								LauncherConfigVersion = 7;
-							};
-							Tab2 = {
-								Frame = "{{0, 0}, {664, 50}}";
-								LauncherConfigVersion = 3;
-								Runner = {
-									Frame = "{{0, 0}, {664, 50}}";
-								};
-							};
-							Tab3 = {
-								BuildMessageFrame = "{{0, 0}, {667, 265}}";
-								BuildTranscriptFrame = "{{0, 274}, {667, 2}}";
-								BuildTranscriptFrameExpanded = YES;
-								Frame = "{{0, 0}, {665, 298}}";
-							};
-							Tab4 = {
-								Frame = "{{0, 0}, {665, 295}}";
-							};
-							TabCount = 5;
-							TabsVisible = NO;
-						};
-						SplitCount = 1;
-						Tab0 = {
-							Frame = "{{0, 0}, {313, 531}}";
-							GroupTreeTableConfiguration = (
-								TargetStatusColumn,
-								18,
-								MainColumn,
-								280,
-							);
-						};
-						Tab1 = {
-							ClassesFrame = "{{0, 0}, {280, 398}}";
-							ClassesTreeTableConfiguration = (
-								PBXBookColumnIdentifier,
-								20,
-								PBXClassColumnIdentifier,
-								237,
-							);
-							Frame = "{{0, 0}, {278, 659}}";
-							MembersFrame = "{{0, 407}, {280, 252}}";
-							MembersTreeTableConfiguration = (
-								PBXBookColumnIdentifier,
-								20,
-								PBXMethodColumnIdentifier,
-								236,
-							);
-						};
-						Tab2 = {
-							Frame = "{{0, 0}, {200, 100}}";
-						};
-						Tab3 = {
-							Frame = "{{0, 0}, {200, 557}}";
-							TargetTableConfiguration = (
-								ActiveObject,
-								16,
-								ObjectNames,
-								202.296,
-							);
-						};
-						Tab4 = {
-							BreakpointsTreeTableConfiguration = (
-								breakpointColumn,
-								197,
-								enabledColumn,
-								31,
-							);
-							Frame = "{{0, 0}, {250, 100}}";
-						};
-						TabCount = 5;
-						TabsVisible = NO;
-					};
-					NavBarShownByDefault = YES;
-					StatusViewVisible = NO;
-					Template = F5CA7EC9015C08ED0DCA290F;
-					ToolbarVisible = NO;
-					WindowLocation = "{69, 216}";
+					StatusViewVisible = YES;
+					Template = F5534CB2020F3F8A0DCA290F;
+					ToolbarVisible = YES;
+					WindowLocation = "{13, 95}";
 				},
 			);
-			PBXWorkspaceStateSaveDate = 67918447;
+			PBXWorkspaceStateSaveDate = 68247977;
 		};
 		perUserProjectItems = {
@@ -2267,5 +2333,4 @@
 			E143439503DB479900050002 = E143439503DB479900050002;
 			E143439603DB479900050002 = E143439603DB479900050002;
-			E14343C103DB52FA00050002 = E14343C103DB52FA00050002;
 			E14343C203DB52FA00050002 = E14343C203DB52FA00050002;
 			E14343C303DB52FA00050002 = E14343C303DB52FA00050002;
@@ -2274,4 +2339,39 @@
 			E157230C04009B8300050002 = E157230C04009B8300050002;
 			E157230D04009B8300050002 = E157230D04009B8300050002;
+			E1669BB60412965E00050002 = E1669BB60412965E00050002;
+			E1669BB70412965E00050002 = E1669BB70412965E00050002;
+			E1669BB80412965E00050002 = E1669BB80412965E00050002;
+			E1669BB90412965E00050002 = E1669BB90412965E00050002;
+			E1669BBA0412965E00050002 = E1669BBA0412965E00050002;
+			E1669BBB0412965E00050002 = E1669BBB0412965E00050002;
+			E1669BBC0412965E00050002 = E1669BBC0412965E00050002;
+			E1669BBD0412965E00050002 = E1669BBD0412965E00050002;
+			E1669BBE0412965E00050002 = E1669BBE0412965E00050002;
+			E1669BBF0412965E00050002 = E1669BBF0412965E00050002;
+			E1669BC00412965E00050002 = E1669BC00412965E00050002;
+			E1669BC10412965E00050002 = E1669BC10412965E00050002;
+			E1669BC20412965E00050002 = E1669BC20412965E00050002;
+			E1669BC30412965E00050002 = E1669BC30412965E00050002;
+			E1669BC40412965E00050002 = E1669BC40412965E00050002;
+			E1669BC50412965E00050002 = E1669BC50412965E00050002;
+			E1669BC60412965E00050002 = E1669BC60412965E00050002;
+			E1669BC70412965E00050002 = E1669BC70412965E00050002;
+			E1669BC80412965E00050002 = E1669BC80412965E00050002;
+			E1669BC90412965E00050002 = E1669BC90412965E00050002;
+			E1669BCA0412965E00050002 = E1669BCA0412965E00050002;
+			E1669BCB0412965E00050002 = E1669BCB0412965E00050002;
+			E1669BCC0412965E00050002 = E1669BCC0412965E00050002;
+			E1669BCD0412965E00050002 = E1669BCD0412965E00050002;
+			E1669BCE0412965E00050002 = E1669BCE0412965E00050002;
+			E1669BCF0412965E00050002 = E1669BCF0412965E00050002;
+			E1669BD00412965E00050002 = E1669BD00412965E00050002;
+			E1669BD10412965E00050002 = E1669BD10412965E00050002;
+			E1669BD20412965E00050002 = E1669BD20412965E00050002;
+			E1669BD30412965E00050002 = E1669BD30412965E00050002;
+			E1669BD40412965E00050002 = E1669BD40412965E00050002;
+			E1669BD50412965E00050002 = E1669BD50412965E00050002;
+			E1669BD60412965E00050002 = E1669BD60412965E00050002;
+			E1669BD70412965E00050002 = E1669BD70412965E00050002;
+			E1669BD80412965E00050002 = E1669BD80412965E00050002;
 			E16A0E6104005B0E00050002 = E16A0E6104005B0E00050002;
 			E16A0E6204005B0E00050002 = E16A0E6204005B0E00050002;
@@ -2359,5 +2459,4 @@
 			E17AEDC603C0F5D300B89ACF = E17AEDC603C0F5D300B89ACF;
 			E17AEDC803C0F5D300B89ACF = E17AEDC803C0F5D300B89ACF;
-			E17F2F7003FE0DCC00050002 = E17F2F7003FE0DCC00050002;
 			E17F2F7403FE0DCC00050002 = E17F2F7403FE0DCC00050002;
 			E17F2F7803FE0DCC00050002 = E17F2F7803FE0DCC00050002;
@@ -2390,5 +2489,4 @@
 			E17F2F9703FE0DCC00050002 = E17F2F9703FE0DCC00050002;
 			E17F2F9803FE0DCC00050002 = E17F2F9803FE0DCC00050002;
-			E17F2F9F03FE193200050002 = E17F2F9F03FE193200050002;
 			E17F2FAA03FE193200050002 = E17F2FAA03FE193200050002;
 			E17F2FAB03FE193200050002 = E17F2FAB03FE193200050002;
@@ -2578,11 +2676,8 @@
 			E19FD3A903C9985C001509F3 = E19FD3A903C9985C001509F3;
 			E19FD3AA03C9985C001509F3 = E19FD3AA03C9985C001509F3;
-			E1A60176040C8C6B00050002 = E1A60176040C8C6B00050002;
 			E1A60177040C8C6B00050002 = E1A60177040C8C6B00050002;
 			E1A60178040C8C6B00050002 = E1A60178040C8C6B00050002;
-			E1A60179040C8C6B00050002 = E1A60179040C8C6B00050002;
 			E1A6017A040C8C6B00050002 = E1A6017A040C8C6B00050002;
 			E1A6017B040C8C6B00050002 = E1A6017B040C8C6B00050002;
-			E1A6017C040C8C6B00050002 = E1A6017C040C8C6B00050002;
 			E1A6017D040C8C6B00050002 = E1A6017D040C8C6B00050002;
 			E1A6017E040C8C6B00050002 = E1A6017E040C8C6B00050002;
@@ -2593,9 +2688,4 @@
 			E1A60183040C8C6B00050002 = E1A60183040C8C6B00050002;
 			E1A60184040C8C6B00050002 = E1A60184040C8C6B00050002;
-			E1A60185040C8C6B00050002 = E1A60185040C8C6B00050002;
-			E1A60186040C8C6B00050002 = E1A60186040C8C6B00050002;
-			E1A60187040C8C6B00050002 = E1A60187040C8C6B00050002;
-			E1A60188040C8C6B00050002 = E1A60188040C8C6B00050002;
-			E1A60189040C8C6B00050002 = E1A60189040C8C6B00050002;
 			E1A9DEEE03BF480F0089E8B2 = E1A9DEEE03BF480F0089E8B2;
 			E1A9DEF103BF480F0089E8B2 = E1A9DEF103BF480F0089E8B2;
@@ -2613,5 +2703,4 @@
 			E1A9DF0703BF480F0089E8B2 = E1A9DF0703BF480F0089E8B2;
 			E1A9DF0803BF480F0089E8B2 = E1A9DF0803BF480F0089E8B2;
-			E1AFB0D103C9A59C001509F3 = E1AFB0D103C9A59C001509F3;
 			E1AFB0D903C9A59C001509F3 = E1AFB0D903C9A59C001509F3;
 			E1AFB0DA03C9A59C001509F3 = E1AFB0DA03C9A59C001509F3;
@@ -2676,5 +2765,4 @@
 			E1B46F6304053C4F00050002 = E1B46F6304053C4F00050002;
 			E1B46F6504053C4F00050002 = E1B46F6504053C4F00050002;
-			E1B46F6904053C4F00050002 = E1B46F6904053C4F00050002;
 			E1B46F6B04053C4F00050002 = E1B46F6B04053C4F00050002;
 			E1B46F6C04053C4F00050002 = E1B46F6C04053C4F00050002;
@@ -2877,5 +2965,4 @@
 			E1B4707004069E0C00050002 = E1B4707004069E0C00050002;
 			E1B4707104069E0C00050002 = E1B4707104069E0C00050002;
-			E1BF6E9A03C95F4E00050002 = E1BF6E9A03C95F4E00050002;
 			E1BF6E9D03C95F4E00050002 = E1BF6E9D03C95F4E00050002;
 			E1BF6E9E03C95F4E00050002 = E1BF6E9E03C95F4E00050002;
@@ -3038,7 +3125,4 @@
 			E1DEF15304003A5F00050002 = E1DEF15304003A5F00050002;
 			E1DEF15404003A5F00050002 = E1DEF15404003A5F00050002;
-			E1DEF15504003A5F00050002 = E1DEF15504003A5F00050002;
-			E1DEF15704003A5F00050002 = E1DEF15704003A5F00050002;
-			E1DEF15A04003A5F00050002 = E1DEF15A04003A5F00050002;
 			E1DEF15B04003A5F00050002 = E1DEF15B04003A5F00050002;
 			E1DEF15D04003A5F00050002 = E1DEF15D04003A5F00050002;
@@ -3730,5 +3814,5 @@
 		fileReference = F59F6CB50354E7DA01AEEDB1;
 		isa = PBXFileBreakpoint;
-		lineNumber = 493;
+		lineNumber = 501;
 		state = 1;
 	};
@@ -3925,5 +4009,5 @@
 		name = "PSAlarmAlertController.m: 38";
 		rLen = 0;
-		rLoc = 1558;
+		rLoc = 1552;
 		rType = 0;
 		vrLen = 1672;
@@ -3945,5 +4029,5 @@
 		name = "PSAlarms.m: 244";
 		rLen = 0;
-		rLoc = 7715;
+		rLoc = 8004;
 		rType = 0;
 		vrLen = 1412;
@@ -4121,14 +4205,4 @@
 		vrLoc = 0;
 	};
-	E14343C103DB52FA00050002 = {
-		fRef = F59E47A8036AAA6D016B311C;
-		isa = PBXTextBookmark;
-		name = "PSAlert.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 823;
-		vrLoc = 0;
-	};
 	E14343C203DB52FA00050002 = {
 		fRef = 089C165DFE840E0CC02AAC07;
@@ -4190,4 +4264,354 @@
 		vrLen = 1180;
 		vrLoc = 0;
+	};
+	E1669BB60412965E00050002 = {
+		fRef = E10E71F4040C335800050002;
+		isa = PBXTextBookmark;
+		name = "English: 2";
+		rLen = 0;
+		rLoc = 145;
+		rType = 0;
+		vrLen = 1962;
+		vrLoc = 0;
+	};
+	E1669BB70412965E00050002 = {
+		fRef = E130B9AD03B7C59700000028;
+		isa = PBXTextBookmark;
+		name = "PSPowerManager.m: 13";
+		rLen = 0;
+		rLoc = 269;
+		rType = 0;
+		vrLen = 1364;
+		vrLoc = 0;
+	};
+	E1669BB80412965E00050002 = {
+		fRef = F517D6430356B8CC016D68B9;
+		isa = PBXTextBookmark;
+		name = "PSAlarms.h: 25";
+		rLen = 0;
+		rLoc = 539;
+		rType = 0;
+		vrLen = 887;
+		vrLoc = 18;
+	};
+	E1669BB90412965E00050002 = {
+		fRef = F59F6CB40354E7DA01AEEDB1;
+		isa = PBXTextBookmark;
+		name = "PSAlarm.h: PSAlarmTimerExpiredNotification";
+		rLen = 0;
+		rLoc = 638;
+		rType = 0;
+		vrLen = 1179;
+		vrLoc = 0;
+	};
+	E1669BBA0412965E00050002 = {
+		fRef = F59F6CB50354E7DA01AEEDB1;
+		isa = PBXTextBookmark;
+		name = "PSAlarm.m: 561";
+		rLen = 0;
+		rLoc = 19558;
+		rType = 0;
+		vrLen = 1183;
+		vrLoc = 18375;
+	};
+	E1669BBB0412965E00050002 = {
+		fRef = E1BF6E9103C928D200050002;
+		isa = PBXTextBookmark;
+		name = "PSTimer.m: 224";
+		rLen = 0;
+		rLoc = 6240;
+		rType = 0;
+		vrLen = 1157;
+		vrLoc = 5605;
+	};
+	E1669BBC0412965E00050002 = {
+		fRef = F589C9C6035AA12B0155F4B2;
+		isa = PBXTextBookmark;
+		name = "Read Me.rtfd: 112";
+		rLen = 0;
+		rLoc = 9566;
+		rType = 0;
+		vrLen = 2740;
+		vrLoc = 5849;
+	};
+	E1669BBD0412965E00050002 = {
+		fRef = F59E47A8036AAA6D016B311C;
+		isa = PBXTextBookmark;
+		name = "PSAlert.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 823;
+		vrLoc = 0;
+	};
+	E1669BBE0412965E00050002 = {
+		fRef = E1A18CAC03B4344C00000028;
+		isa = PBXTextBookmark;
+		name = "PSAlerts.m: 71";
+		rLen = 0;
+		rLoc = 1327;
+		rType = 0;
+		vrLen = 739;
+		vrLoc = 554;
+	};
+	E1669BBF0412965E00050002 = {
+		fRef = F59E47B5036AAD55016B311C;
+		isa = PBXTextBookmark;
+		name = "PSAlarmAlertController.h: 17";
+		rLen = 23;
+		rLoc = 380;
+		rType = 0;
+		vrLen = 586;
+		vrLoc = 0;
+	};
+	E1669BC00412965E00050002 = {
+		fRef = F59E47B4036AAD55016B311C;
+		isa = PBXTextBookmark;
+		name = "PSAlarmAlertController.m: 44";
+		rLen = 0;
+		rLoc = 1355;
+		rType = 0;
+		vrLen = 1492;
+		vrLoc = 1590;
+	};
+	E1669BC10412965E00050002 = {
+		fRef = F517D6420356B8CC016D68B9;
+		isa = PBXTextBookmark;
+		name = "PSAlarms.m: alarm";
+		rLen = 0;
+		rLoc = 7869;
+		rType = 0;
+		vrLen = 1338;
+		vrLoc = 7560;
+	};
+	E1669BC20412965E00050002 = {
+		fRef = E10E71F4040C335800050002;
+		isa = PBXTextBookmark;
+		name = "English: 2";
+		rLen = 0;
+		rLoc = 145;
+		rType = 0;
+		vrLen = 1962;
+		vrLoc = 0;
+	};
+	E1669BC30412965E00050002 = {
+		fRef = E130B9AD03B7C59700000028;
+		isa = PBXTextBookmark;
+		name = "PSPowerManager.m: 13";
+		rLen = 0;
+		rLoc = 269;
+		rType = 0;
+		vrLen = 1364;
+		vrLoc = 0;
+	};
+	E1669BC40412965E00050002 = {
+		fRef = F517D6420356B8CC016D68B9;
+		isa = PBXTextBookmark;
+		name = "PSAlarms.m: 269";
+		rLen = 0;
+		rLoc = 8522;
+		rType = 0;
+		vrLen = 1151;
+		vrLoc = 5218;
+	};
+	E1669BC50412965E00050002 = {
+		fRef = F517D6430356B8CC016D68B9;
+		isa = PBXTextBookmark;
+		name = "PSAlarms.h: 25";
+		rLen = 0;
+		rLoc = 539;
+		rType = 0;
+		vrLen = 900;
+		vrLoc = 0;
+	};
+	E1669BC60412965E00050002 = {
+		fRef = F517D6420356B8CC016D68B9;
+		isa = PBXTextBookmark;
+		name = "PSAlarms.m: plPendingAlarms";
+		rLen = 0;
+		rLoc = 6458;
+		rType = 0;
+		vrLen = 976;
+		vrLoc = 5348;
+	};
+	E1669BC70412965E00050002 = {
+		fRef = F517D6430356B8CC016D68B9;
+		isa = PBXTextBookmark;
+		name = "PSAlarms.h: 25";
+		rLen = 0;
+		rLoc = 539;
+		rType = 0;
+		vrLen = 887;
+		vrLoc = 18;
+	};
+	E1669BC80412965E00050002 = {
+		fRef = F517D6420356B8CC016D68B9;
+		isa = PBXTextBookmark;
+		name = "PSAlarms.m: plExpiredAlarms";
+		rLen = 0;
+		rLoc = 6458;
+		rType = 0;
+		vrLen = 1009;
+		vrLoc = 5348;
+	};
+	E1669BC90412965E00050002 = {
+		fRef = F517D6430356B8CC016D68B9;
+		isa = PBXTextBookmark;
+		name = "PSAlarms.h: 25";
+		rLen = 0;
+		rLoc = 539;
+		rType = 0;
+		vrLen = 887;
+		vrLoc = 18;
+	};
+	E1669BCA0412965E00050002 = {
+		fRef = F517D6420356B8CC016D68B9;
+		isa = PBXTextBookmark;
+		name = "PSAlarms.m: alarm";
+		rLen = 0;
+		rLoc = 7869;
+		rType = 0;
+		vrLen = 1338;
+		vrLoc = 7560;
+	};
+	E1669BCB0412965E00050002 = {
+		fRef = F59F6CB50354E7DA01AEEDB1;
+		isa = PBXTextBookmark;
+		name = "PSAlarm.m: 438";
+		rLen = 0;
+		rLoc = 14572;
+		rType = 0;
+		vrLen = 1557;
+		vrLoc = 13921;
+	};
+	E1669BCC0412965E00050002 = {
+		fRef = F59F6CB40354E7DA01AEEDB1;
+		isa = PBXTextBookmark;
+		name = "PSAlarm.h: cancelTimer";
+		rLen = 0;
+		rLoc = 2407;
+		rType = 0;
+		vrLen = 1283;
+		vrLoc = 571;
+	};
+	E1669BCD0412965E00050002 = {
+		fRef = F59F6CB50354E7DA01AEEDB1;
+		isa = PBXTextBookmark;
+		name = "PSAlarm.m: 440";
+		rLen = 0;
+		rLoc = 14573;
+		rType = 0;
+		vrLen = 1517;
+		vrLoc = 13921;
+	};
+	E1669BCE0412965E00050002 = {
+		fRef = F59F6CB40354E7DA01AEEDB1;
+		isa = PBXTextBookmark;
+		name = "PSAlarm.h: cancelTimer";
+		rLen = 0;
+		rLoc = 2407;
+		rType = 0;
+		vrLen = 1298;
+		vrLoc = 556;
+	};
+	E1669BCF0412965E00050002 = {
+		fRef = F59F6CB50354E7DA01AEEDB1;
+		isa = PBXTextBookmark;
+		name = "PSAlarm.m: __GNUC__";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1108;
+		vrLoc = 1504;
+	};
+	E1669BD00412965E00050002 = {
+		fRef = F59F6CB40354E7DA01AEEDB1;
+		isa = PBXTextBookmark;
+		name = "PSAlarm.h: cancelTimer";
+		rLen = 0;
+		rLoc = 2407;
+		rType = 0;
+		vrLen = 1179;
+		vrLoc = 0;
+	};
+	E1669BD10412965E00050002 = {
+		fRef = F59F6CB50354E7DA01AEEDB1;
+		isa = PBXTextBookmark;
+		name = "PSAlarm.m: 561";
+		rLen = 0;
+		rLoc = 19558;
+		rType = 0;
+		vrLen = 1183;
+		vrLoc = 18375;
+	};
+	E1669BD20412965E00050002 = {
+		fRef = E1BF6E9103C928D200050002;
+		isa = PBXTextBookmark;
+		name = "PSTimer.m: 224";
+		rLen = 0;
+		rLoc = 6240;
+		rType = 0;
+		vrLen = 1157;
+		vrLoc = 5605;
+	};
+	E1669BD30412965E00050002 = {
+		fRef = F589C9C6035AA12B0155F4B2;
+		isa = PBXTextBookmark;
+		name = "Read Me.rtfd: 112";
+		rLen = 0;
+		rLoc = 9566;
+		rType = 0;
+		vrLen = 2740;
+		vrLoc = 5849;
+	};
+	E1669BD40412965E00050002 = {
+		fRef = F59E47A8036AAA6D016B311C;
+		isa = PBXTextBookmark;
+		name = "PSAlert.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 823;
+		vrLoc = 0;
+	};
+	E1669BD50412965E00050002 = {
+		fRef = E1A18CAC03B4344C00000028;
+		isa = PBXTextBookmark;
+		name = "PSAlerts.m: 71";
+		rLen = 0;
+		rLoc = 1327;
+		rType = 0;
+		vrLen = 739;
+		vrLoc = 554;
+	};
+	E1669BD60412965E00050002 = {
+		fRef = F59E47B5036AAD55016B311C;
+		isa = PBXTextBookmark;
+		name = "PSAlarmAlertController.h: 17";
+		rLen = 23;
+		rLoc = 380;
+		rType = 0;
+		vrLen = 586;
+		vrLoc = 0;
+	};
+	E1669BD70412965E00050002 = {
+		fRef = F59E47B4036AAD55016B311C;
+		isa = PBXTextBookmark;
+		name = "PSAlarmAlertController.m: 44";
+		rLen = 0;
+		rLoc = 1355;
+		rType = 0;
+		vrLen = 1492;
+		vrLoc = 1590;
+	};
+	E1669BD80412965E00050002 = {
+		fRef = F517D6420356B8CC016D68B9;
+		isa = PBXTextBookmark;
+		name = "PSAlarms.m: 255";
+		rLen = 0;
+		rLoc = 7508;
+		rType = 0;
+		vrLen = 1344;
+		vrLoc = 6192;
 	};
 	E16A0E6104005B0E00050002 = {
@@ -4688,5 +5112,5 @@
 		name = "PSAlarmAlertController.m: 38";
 		rLen = 0;
-		rLoc = 1558;
+		rLoc = 1552;
 		rType = 0;
 		vrLen = 1406;
@@ -4878,5 +5302,5 @@
 		name = "PSAlarmAlertController.m: ";
 		rLen = 0;
-		rLoc = 2750;
+		rLoc = 2744;
 		rType = 0;
 		vrLen = 1857;
@@ -4898,5 +5322,5 @@
 		name = "PSAlarmAlertController.m: 60";
 		rLen = 0;
-		rLoc = 2432;
+		rLoc = 2426;
 		rType = 0;
 		vrLen = 1856;
@@ -4978,5 +5402,5 @@
 		name = "PSAlarmAlertController.m: 67";
 		rLen = 0;
-		rLoc = 2598;
+		rLoc = 2592;
 		rType = 0;
 		vrLen = 1800;
@@ -5018,5 +5442,5 @@
 		name = "PSAlarmAlertController.m: 78";
 		rLen = 0;
-		rLoc = 3032;
+		rLoc = 3026;
 		rType = 0;
 		vrLen = 1532;
@@ -5038,5 +5462,5 @@
 		name = "PSAlarmAlertController.m: 78";
 		rLen = 32;
-		rLoc = 3004;
+		rLoc = 2998;
 		rType = 0;
 		vrLen = 1636;
@@ -5058,5 +5482,5 @@
 		name = "PSAlarmAlertController.m: 62";
 		rLen = 14;
-		rLoc = 2155;
+		rLoc = 2149;
 		rType = 0;
 		vrLen = 1536;
@@ -5097,14 +5521,4 @@
 		refType = 0;
 	};
-	E17F2F7003FE0DCC00050002 = {
-		fRef = E130B9AD03B7C59700000028;
-		isa = PBXTextBookmark;
-		name = "PSPowerManager.m: 237";
-		rLen = 0;
-		rLoc = 8125;
-		rType = 0;
-		vrLen = 1226;
-		vrLoc = 1179;
-	};
 	E17F2F7403FE0DCC00050002 = {
 		fRef = F5F240B5036A862101FE7503;
@@ -5132,5 +5546,5 @@
 		name = "PSPowerManager.m: 237";
 		rLen = 0;
-		rLoc = 8125;
+		rLoc = 8150;
 		rType = 0;
 		vrLen = 1226;
@@ -5406,14 +5820,4 @@
 		vrLen = 528;
 		vrLoc = 0;
-	};
-	E17F2F9F03FE193200050002 = {
-		fRef = F59F6CB40354E7DA01AEEDB1;
-		isa = PBXTextBookmark;
-		name = "PSAlarm.h: cancelTimer";
-		rLen = 0;
-		rLoc = 2407;
-		rType = 0;
-		vrLen = 1231;
-		vrLoc = 1280;
 	};
 	E17F2FAA03FE193200050002 = {
@@ -5892,5 +6296,5 @@
 		name = "PSAlarmAlertController.m: stopAlerts:";
 		rLen = 0;
-		rLoc = 1681;
+		rLoc = 1675;
 		rType = 0;
 		vrLen = 945;
@@ -5962,5 +6366,5 @@
 		name = "PSAlarmAlertController.m: initWithAlarm:";
 		rLen = 0;
-		rLoc = 1699;
+		rLoc = 1693;
 		rType = 0;
 		vrLen = 945;
@@ -5972,5 +6376,5 @@
 		name = "PSAlarmAlertController.m: initWithAlarm:";
 		rLen = 0;
-		rLoc = 1948;
+		rLoc = 1942;
 		rType = 0;
 		vrLen = 945;
@@ -6032,5 +6436,5 @@
 		name = "PSAlarmAlertController.m: initWithAlarm:";
 		rLen = 0;
-		rLoc = 2959;
+		rLoc = 2953;
 		rType = 0;
 		vrLen = 954;
@@ -6052,5 +6456,5 @@
 		name = "PSAlarmAlertController.m: initWithAlarm:";
 		rLen = 0;
-		rLoc = 2352;
+		rLoc = 2346;
 		rType = 0;
 		vrLen = 1005;
@@ -6072,5 +6476,5 @@
 		name = "PSAlarmAlertController.m: initWithAlarm:";
 		rLen = 0;
-		rLoc = 2033;
+		rLoc = 2027;
 		rType = 0;
 		vrLen = 1025;
@@ -6092,5 +6496,5 @@
 		name = "PSAlarmAlertController.m: dealloc";
 		rLen = 0;
-		rLoc = 3033;
+		rLoc = 3027;
 		rType = 0;
 		vrLen = 1202;
@@ -6132,5 +6536,5 @@
 		name = "PSAlarmAlertController.m: initWithAlarm:";
 		rLen = 0;
-		rLoc = 2985;
+		rLoc = 2979;
 		rType = 0;
 		vrLen = 1202;
@@ -6239,5 +6643,5 @@
 		name = "PSAlarmAlertController.m: stopAlerts:";
 		rLen = 0;
-		rLoc = 1681;
+		rLoc = 1675;
 		rType = 0;
 		vrLen = 1238;
@@ -6299,5 +6703,5 @@
 		name = "PSAlarmAlertController.m: _alertCompleted:";
 		rLen = 0;
-		rLoc = 1611;
+		rLoc = 1605;
 		rType = 0;
 		vrLen = 1435;
@@ -6639,5 +7043,5 @@
 		name = "PSAlarmAlertController.m: initWithAlarm:";
 		rLen = 0;
-		rLoc = 2964;
+		rLoc = 2958;
 		rType = 0;
 		vrLen = 1561;
@@ -6699,5 +7103,5 @@
 		name = "PSAlarmAlertController.m: initWithAlarm:";
 		rLen = 0;
-		rLoc = 2342;
+		rLoc = 2336;
 		rType = 0;
 		vrLen = 1622;
@@ -6729,5 +7133,5 @@
 		name = "PSAlarmAlertController.m: _alertCompleted:";
 		rLen = 0;
-		rLoc = 1558;
+		rLoc = 1552;
 		rType = 0;
 		vrLen = 1440;
@@ -6819,5 +7223,5 @@
 		name = "PSAlarmAlertController.m: _alertCompleted:";
 		rLen = 0;
-		rLoc = 1558;
+		rLoc = 1552;
 		rType = 0;
 		vrLen = 1440;
@@ -7051,5 +7455,5 @@
 		name = "PSAlarmAlertController.m: _alertCompleted:";
 		rLen = 0;
-		rLoc = 1558;
+		rLoc = 1552;
 		rType = 0;
 		vrLen = 1267;
@@ -7422,14 +7826,4 @@
 		vrLoc = 622;
 	};
-	E1A60176040C8C6B00050002 = {
-		fRef = F589C9C6035AA12B0155F4B2;
-		isa = PBXTextBookmark;
-		name = "Read Me.rtfd: 85";
-		rLen = 0;
-		rLoc = 5706;
-		rType = 0;
-		vrLen = 2453;
-		vrLoc = 4870;
-	};
 	E1A60177040C8C6B00050002 = {
 		fRef = F5F240CC036A877301FE7503;
@@ -7452,14 +7846,4 @@
 		vrLoc = 11205;
 	};
-	E1A60179040C8C6B00050002 = {
-		fRef = F59F6CB50354E7DA01AEEDB1;
-		isa = PBXTextBookmark;
-		name = "PSAlarm.m: 199";
-		rLen = 0;
-		rLoc = 6886;
-		rType = 0;
-		vrLen = 794;
-		vrLoc = 6576;
-	};
 	E1A6017A040C8C6B00050002 = {
 		fRef = F59E47BC036AB228016B311C;
@@ -7481,14 +7865,4 @@
 		vrLen = 1614;
 		vrLoc = 2791;
-	};
-	E1A6017C040C8C6B00050002 = {
-		fRef = E10E71F4040C335800050002;
-		isa = PBXTextBookmark;
-		name = "English: 3";
-		rLen = 0;
-		rLoc = 169;
-		rType = 0;
-		vrLen = 1963;
-		vrLoc = 0;
 	};
 	E1A6017D040C8C6B00050002 = {
@@ -7537,5 +7911,5 @@
 		name = "PSAlarm.m: 209";
 		rLen = 0;
-		rLoc = 7013;
+		rLoc = 7021;
 		rType = 0;
 		vrLen = 855;
@@ -7571,48 +7945,4 @@
 		vrLen = 1614;
 		vrLoc = 2791;
-	};
-	E1A60185040C8C6B00050002 = {
-		fRef = E10E71F4040C335800050002;
-		isa = PBXTextBookmark;
-		name = "English: 26";
-		rLen = 0;
-		rLoc = 1395;
-		rType = 0;
-		vrLen = 1962;
-		vrLoc = 0;
-	};
-	E1A60186040C8C6B00050002 = {
-		fRef = F5F240CC036A877301FE7503;
-		isa = PBXTextBookmark;
-		rLen = 1;
-		rLoc = 109;
-		rType = 1;
-	};
-	E1A60187040C8C6B00050002 = {
-		fRef = F5F240CC036A877301FE7503;
-		isa = PBXTextBookmark;
-		name = "NJRQTMediaPopUpButton.m: 110";
-		rLen = 0;
-		rLoc = 4262;
-		rType = 0;
-		vrLen = 208;
-		vrLoc = 4055;
-	};
-	E1A60188040C8C6B00050002 = {
-		fRef = F59E4BE6036B2E5E016B311C;
-		isa = PBXTextBookmark;
-		rLen = 45;
-		rLoc = 963;
-		rType = 0;
-	};
-	E1A60189040C8C6B00050002 = {
-		fRef = F59E4BE6036B2E5E016B311C;
-		isa = PBXTextBookmark;
-		name = "PSScriptAlert.m: 41";
-		rLen = 0;
-		rLoc = 1089;
-		rType = 0;
-		vrLen = 941;
-		vrLoc = 678;
 	};
 	E1A9DEE703BF3C110089E8B2 = {
@@ -7656,5 +7986,5 @@
 		name = "Read Me.rtfd: 167";
 		rLen = 0;
-		rLoc = 12371;
+		rLoc = 12252;
 		rType = 0;
 		vrLen = 2647;
@@ -7696,5 +8026,5 @@
 		name = "PSAlarmAlertController.m: _alertCompleted:";
 		rLen = 0;
-		rLoc = 1558;
+		rLoc = 1552;
 		rType = 0;
 		vrLen = 1267;
@@ -7777,5 +8107,273 @@
 		refType = 0;
 	};
-	E1AFB0D103C9A59C001509F3 = {
+	E1AFB0D903C9A59C001509F3 = {
+		fRef = E1AFB11403C9A59C001509F3;
+		isa = PBXTextBookmark;
+		name = "NSInvocation.h: 76";
+		rLen = 25;
+		rLoc = 1700;
+		rType = 0;
+		vrLen = 966;
+		vrLoc = 1098;
+	};
+	E1AFB0DA03C9A59C001509F3 = {
+		fRef = E1AFB11503C9A59C001509F3;
+		isa = PBXTextBookmark;
+		name = "IOMessage.h: 52";
+		rLen = 25;
+		rLoc = 2250;
+		rType = 0;
+		vrLen = 1878;
+		vrLoc = 668;
+	};
+	E1AFB0DB03C9A59C001509F3 = {
+		fRef = E19FD39F03C98645001509F3;
+		isa = PBXTextBookmark;
+		name = "PSWakeAlert.m: 24";
+		rLen = 0;
+		rLoc = 444;
+		rType = 0;
+		vrLen = 815;
+		vrLoc = 0;
+	};
+	E1AFB0E003C9A59C001509F3 = {
+		isa = PBXTargetBookmark;
+		trg = 29B97326FDCFA39411CA2CEA;
+	};
+	E1AFB0E103C9A59C001509F3 = {
+		fRef = 089C165DFE840E0CC02AAC07;
+		isa = PBXTextBookmark;
+		name = "English: 7";
+		rLen = 0;
+		rLoc = 229;
+		rType = 0;
+		vrLen = 223;
+		vrLoc = 0;
+	};
+	E1AFB0E203C9A59C001509F3 = {
+		isa = PBXTargetBookmark;
+		trg = 29B97326FDCFA39411CA2CEA;
+	};
+	E1AFB0E303C9A59C001509F3 = {
+		fRef = F59F6CB50354E7DA01AEEDB1;
+		isa = PBXTextBookmark;
+		name = "PSAlarm.m: 205";
+		rLen = 0;
+		rLoc = 6964;
+		rType = 0;
+		vrLen = 895;
+		vrLoc = 6428;
+	};
+	E1AFB0E403C9A59C001509F3 = {
+		fRef = F59F6CB40354E7DA01AEEDB1;
+		isa = PBXTextBookmark;
+		name = "PSAlarm.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1400;
+		vrLoc = 0;
+	};
+	E1AFB0E503C9A59C001509F3 = {
+		fRef = F59F6CB50354E7DA01AEEDB1;
+		isa = PBXTextBookmark;
+		name = "PSAlarm.m: 205";
+		rLen = 0;
+		rLoc = 6964;
+		rType = 0;
+		vrLen = 907;
+		vrLoc = 6428;
+	};
+	E1AFB0E603C9A59C001509F3 = {
+		fRef = F59F6CB40354E7DA01AEEDB1;
+		isa = PBXTextBookmark;
+		name = "PSAlarm.h: 38";
+		rLen = 0;
+		rLoc = 1176;
+		rType = 0;
+		vrLen = 1419;
+		vrLoc = 0;
+	};
+	E1AFB0E703C9A59C001509F3 = {
+		fRef = F59F6CB50354E7DA01AEEDB1;
+		isa = PBXTextBookmark;
+		name = "PSAlarm.m: 205";
+		rLen = 0;
+		rLoc = 6984;
+		rType = 0;
+		vrLen = 944;
+		vrLoc = 6428;
+	};
+	E1AFB0E803C9A59C001509F3 = {
+		fRef = F59F6CB40354E7DA01AEEDB1;
+		isa = PBXTextBookmark;
+		name = "PSAlarm.h: 38";
+		rLen = 0;
+		rLoc = 1176;
+		rType = 0;
+		vrLen = 1368;
+		vrLoc = 840;
+	};
+	E1AFB0E903C9A59C001509F3 = {
+		fRef = F59F6CB50354E7DA01AEEDB1;
+		isa = PBXTextBookmark;
+		name = "PSAlarm.m: setWakeUp:";
+		rLen = 32;
+		rLoc = 6930;
+		rType = 0;
+		vrLen = 946;
+		vrLoc = 6428;
+	};
+	E1AFB0EA03C9A59C001509F3 = {
+		fRef = F59F6CB40354E7DA01AEEDB1;
+		isa = PBXTextBookmark;
+		name = "PSAlarm.h: setWakeUp:";
+		rLen = 0;
+		rLoc = 1545;
+		rType = 0;
+		vrLen = 1440;
+		vrLoc = 767;
+	};
+	E1AFB0EB03C9A59C001509F3 = {
+		fRef = E1BF6E9103C928D200050002;
+		isa = PBXTextBookmark;
+		name = "PSTimer.m: 181";
+		rLen = 18;
+		rLoc = 5402;
+		rType = 0;
+		vrLen = 708;
+		vrLoc = 4844;
+	};
+	E1AFB0EC03C9A59C001509F3 = {
+		fRef = E1BF6E9003C928D200050002;
+		isa = PBXTextBookmark;
+		name = "PSTimer.h: setWake:";
+		rLen = 0;
+		rLoc = 1211;
+		rType = 0;
+		vrLen = 1112;
+		vrLoc = 180;
+	};
+	E1AFB0ED03C9A59C001509F3 = {
+		fRef = E1BF6E9103C928D200050002;
+		isa = PBXTextBookmark;
+		name = "PSTimer.m: 186";
+		rLen = 32;
+		rLoc = 5446;
+		rType = 0;
+		vrLen = 682;
+		vrLoc = 4844;
+	};
+	E1AFB0EE03C9A59C001509F3 = {
+		fRef = E1BF6E9003C928D200050002;
+		isa = PBXTextBookmark;
+		name = "PSTimer.h: 46";
+		rLen = 0;
+		rLoc = 1243;
+		rType = 0;
+		vrLen = 1115;
+		vrLoc = 179;
+	};
+	E1AFB0EF03C9A59C001509F3 = {
+		fRef = E1BF6E9103C928D200050002;
+		isa = PBXTextBookmark;
+		name = "PSTimer.m: ";
+		rLen = 0;
+		rLoc = 5478;
+		rType = 0;
+		vrLen = 682;
+		vrLoc = 4844;
+	};
+	E1AFB0F003C9A59C001509F3 = {
+		fRef = E1BF6E9003C928D200050002;
+		isa = PBXTextBookmark;
+		name = "PSTimer.h: 15";
+		rLen = 19;
+		rLoc = 249;
+		rType = 0;
+		vrLen = 1175;
+		vrLoc = 17;
+	};
+	E1AFB0F103C9A59C001509F3 = {
+		fRef = E1BF6E9103C928D200050002;
+		isa = PBXTextBookmark;
+		name = "PSTimer.m: 47";
+		rLen = 0;
+		rLoc = 1313;
+		rType = 0;
+		vrLen = 1411;
+		vrLoc = 165;
+	};
+	E1AFB0F203C9A59C001509F3 = {
+		fRef = F59F6CB50354E7DA01AEEDB1;
+		isa = PBXTextBookmark;
+		name = "PSAlarm.m: setWakeUp:";
+		rLen = 32;
+		rLoc = 6930;
+		rType = 0;
+		vrLen = 946;
+		vrLoc = 6428;
+	};
+	E1AFB0F303C9A59C001509F3 = {
+		fRef = E1A18CAC03B4344C00000028;
+		isa = PBXTextBookmark;
+		name = "PSAlerts.m: 49";
+		rLen = 0;
+		rLoc = 973;
+		rType = 0;
+		vrLen = 834;
+		vrLoc = 350;
+	};
+	E1AFB0F403C9A59C001509F3 = {
+		fRef = E1A18CAB03B4344C00000028;
+		isa = PBXTextBookmark;
+		name = "PSAlerts.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 695;
+		vrLoc = 0;
+	};
+	E1AFB0F503C9A59C001509F3 = {
+		fRef = E1A18CAC03B4344C00000028;
+		isa = PBXTextBookmark;
+		name = "PSAlerts.m: triggerForAlarm:";
+		rLen = 0;
+		rLoc = 1429;
+		rType = 0;
+		vrLen = 1014;
+		vrLoc = 1056;
+	};
+	E1AFB0F603C9A59C001509F3 = {
+		fRef = F59E47A7036AAA6D016B311C;
+		isa = PBXTextBookmark;
+		name = "PSAlert.m: prepareForAlarm:";
+		rLen = 42;
+		rLoc = 561;
+		rType = 0;
+		vrLen = 986;
+		vrLoc = 3;
+	};
+	E1AFB0F703C9A59C001509F3 = {
+		fRef = E1A18CAC03B4344C00000028;
+		isa = PBXTextBookmark;
+		name = "PSAlerts.m: 79";
+		rLen = 0;
+		rLoc = 1497;
+		rType = 0;
+		vrLen = 1007;
+		vrLoc = 1056;
+	};
+	E1AFB0F803C9A59C001509F3 = {
+		fRef = E1A18CAB03B4344C00000028;
+		isa = PBXTextBookmark;
+		name = "PSAlerts.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 695;
+		vrLoc = 0;
+	};
+	E1AFB0F903C9A59C001509F3 = {
 		fRef = E1A18CAC03B4344C00000028;
 		isa = PBXTextBookmark;
@@ -7787,273 +8385,15 @@
 		vrLoc = 1056;
 	};
-	E1AFB0D903C9A59C001509F3 = {
-		fRef = E1AFB11403C9A59C001509F3;
-		isa = PBXTextBookmark;
-		name = "NSInvocation.h: 76";
-		rLen = 25;
-		rLoc = 1700;
-		rType = 0;
-		vrLen = 966;
-		vrLoc = 1098;
-	};
-	E1AFB0DA03C9A59C001509F3 = {
-		fRef = E1AFB11503C9A59C001509F3;
-		isa = PBXTextBookmark;
-		name = "IOMessage.h: 52";
-		rLen = 25;
-		rLoc = 2250;
-		rType = 0;
-		vrLen = 1878;
-		vrLoc = 668;
-	};
-	E1AFB0DB03C9A59C001509F3 = {
-		fRef = E19FD39F03C98645001509F3;
-		isa = PBXTextBookmark;
-		name = "PSWakeAlert.m: 24";
-		rLen = 0;
-		rLoc = 444;
-		rType = 0;
-		vrLen = 815;
-		vrLoc = 0;
-	};
-	E1AFB0E003C9A59C001509F3 = {
-		isa = PBXTargetBookmark;
-		trg = 29B97326FDCFA39411CA2CEA;
-	};
-	E1AFB0E103C9A59C001509F3 = {
-		fRef = 089C165DFE840E0CC02AAC07;
-		isa = PBXTextBookmark;
-		name = "English: 7";
-		rLen = 0;
-		rLoc = 229;
-		rType = 0;
-		vrLen = 223;
-		vrLoc = 0;
-	};
-	E1AFB0E203C9A59C001509F3 = {
-		isa = PBXTargetBookmark;
-		trg = 29B97326FDCFA39411CA2CEA;
-	};
-	E1AFB0E303C9A59C001509F3 = {
-		fRef = F59F6CB50354E7DA01AEEDB1;
-		isa = PBXTextBookmark;
-		name = "PSAlarm.m: 205";
-		rLen = 0;
-		rLoc = 6956;
-		rType = 0;
-		vrLen = 895;
-		vrLoc = 6428;
-	};
-	E1AFB0E403C9A59C001509F3 = {
-		fRef = F59F6CB40354E7DA01AEEDB1;
-		isa = PBXTextBookmark;
-		name = "PSAlarm.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 1400;
-		vrLoc = 0;
-	};
-	E1AFB0E503C9A59C001509F3 = {
-		fRef = F59F6CB50354E7DA01AEEDB1;
-		isa = PBXTextBookmark;
-		name = "PSAlarm.m: 205";
-		rLen = 0;
-		rLoc = 6956;
-		rType = 0;
-		vrLen = 907;
-		vrLoc = 6428;
-	};
-	E1AFB0E603C9A59C001509F3 = {
-		fRef = F59F6CB40354E7DA01AEEDB1;
-		isa = PBXTextBookmark;
-		name = "PSAlarm.h: 38";
-		rLen = 0;
-		rLoc = 1176;
-		rType = 0;
-		vrLen = 1419;
-		vrLoc = 0;
-	};
-	E1AFB0E703C9A59C001509F3 = {
-		fRef = F59F6CB50354E7DA01AEEDB1;
-		isa = PBXTextBookmark;
-		name = "PSAlarm.m: 205";
-		rLen = 0;
-		rLoc = 6976;
-		rType = 0;
-		vrLen = 944;
-		vrLoc = 6428;
-	};
-	E1AFB0E803C9A59C001509F3 = {
-		fRef = F59F6CB40354E7DA01AEEDB1;
-		isa = PBXTextBookmark;
-		name = "PSAlarm.h: 38";
-		rLen = 0;
-		rLoc = 1176;
-		rType = 0;
-		vrLen = 1368;
-		vrLoc = 840;
-	};
-	E1AFB0E903C9A59C001509F3 = {
-		fRef = F59F6CB50354E7DA01AEEDB1;
-		isa = PBXTextBookmark;
-		name = "PSAlarm.m: setWakeUp:";
-		rLen = 32;
-		rLoc = 6922;
-		rType = 0;
-		vrLen = 946;
-		vrLoc = 6428;
-	};
-	E1AFB0EA03C9A59C001509F3 = {
-		fRef = F59F6CB40354E7DA01AEEDB1;
-		isa = PBXTextBookmark;
-		name = "PSAlarm.h: setWakeUp:";
-		rLen = 0;
-		rLoc = 1545;
-		rType = 0;
-		vrLen = 1440;
-		vrLoc = 767;
-	};
-	E1AFB0EB03C9A59C001509F3 = {
-		fRef = E1BF6E9103C928D200050002;
-		isa = PBXTextBookmark;
-		name = "PSTimer.m: 181";
-		rLen = 18;
-		rLoc = 5402;
-		rType = 0;
-		vrLen = 708;
-		vrLoc = 4844;
-	};
-	E1AFB0EC03C9A59C001509F3 = {
-		fRef = E1BF6E9003C928D200050002;
-		isa = PBXTextBookmark;
-		name = "PSTimer.h: setWake:";
-		rLen = 0;
-		rLoc = 1211;
-		rType = 0;
-		vrLen = 1112;
-		vrLoc = 180;
-	};
-	E1AFB0ED03C9A59C001509F3 = {
-		fRef = E1BF6E9103C928D200050002;
-		isa = PBXTextBookmark;
-		name = "PSTimer.m: 186";
-		rLen = 32;
-		rLoc = 5446;
-		rType = 0;
-		vrLen = 682;
-		vrLoc = 4844;
-	};
-	E1AFB0EE03C9A59C001509F3 = {
-		fRef = E1BF6E9003C928D200050002;
-		isa = PBXTextBookmark;
-		name = "PSTimer.h: 46";
-		rLen = 0;
-		rLoc = 1243;
-		rType = 0;
-		vrLen = 1115;
-		vrLoc = 179;
-	};
-	E1AFB0EF03C9A59C001509F3 = {
-		fRef = E1BF6E9103C928D200050002;
-		isa = PBXTextBookmark;
-		name = "PSTimer.m: ";
-		rLen = 0;
-		rLoc = 5478;
-		rType = 0;
-		vrLen = 682;
-		vrLoc = 4844;
-	};
-	E1AFB0F003C9A59C001509F3 = {
-		fRef = E1BF6E9003C928D200050002;
-		isa = PBXTextBookmark;
-		name = "PSTimer.h: 15";
-		rLen = 19;
-		rLoc = 249;
-		rType = 0;
-		vrLen = 1175;
-		vrLoc = 17;
-	};
-	E1AFB0F103C9A59C001509F3 = {
-		fRef = E1BF6E9103C928D200050002;
-		isa = PBXTextBookmark;
-		name = "PSTimer.m: 47";
-		rLen = 0;
-		rLoc = 1313;
-		rType = 0;
-		vrLen = 1411;
-		vrLoc = 165;
-	};
-	E1AFB0F203C9A59C001509F3 = {
-		fRef = F59F6CB50354E7DA01AEEDB1;
-		isa = PBXTextBookmark;
-		name = "PSAlarm.m: setWakeUp:";
-		rLen = 32;
-		rLoc = 6922;
-		rType = 0;
-		vrLen = 946;
-		vrLoc = 6428;
-	};
-	E1AFB0F303C9A59C001509F3 = {
-		fRef = E1A18CAC03B4344C00000028;
-		isa = PBXTextBookmark;
-		name = "PSAlerts.m: 49";
-		rLen = 0;
-		rLoc = 973;
-		rType = 0;
-		vrLen = 834;
-		vrLoc = 350;
-	};
-	E1AFB0F403C9A59C001509F3 = {
+	E1AFB0FA03C9A59C001509F3 = {
 		fRef = E1A18CAB03B4344C00000028;
 		isa = PBXTextBookmark;
-		name = "PSAlerts.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 695;
-		vrLoc = 0;
-	};
-	E1AFB0F503C9A59C001509F3 = {
-		fRef = E1A18CAC03B4344C00000028;
-		isa = PBXTextBookmark;
-		name = "PSAlerts.m: triggerForAlarm:";
-		rLen = 0;
-		rLoc = 1429;
-		rType = 0;
-		vrLen = 1014;
-		vrLoc = 1056;
-	};
-	E1AFB0F603C9A59C001509F3 = {
-		fRef = F59E47A7036AAA6D016B311C;
-		isa = PBXTextBookmark;
-		name = "PSAlert.m: prepareForAlarm:";
-		rLen = 42;
-		rLoc = 561;
-		rType = 0;
-		vrLen = 986;
-		vrLoc = 3;
-	};
-	E1AFB0F703C9A59C001509F3 = {
-		fRef = E1A18CAC03B4344C00000028;
-		isa = PBXTextBookmark;
-		name = "PSAlerts.m: 79";
-		rLen = 0;
-		rLoc = 1497;
-		rType = 0;
-		vrLen = 1007;
-		vrLoc = 1056;
-	};
-	E1AFB0F803C9A59C001509F3 = {
-		fRef = E1A18CAB03B4344C00000028;
-		isa = PBXTextBookmark;
-		name = "PSAlerts.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 695;
-		vrLoc = 0;
-	};
-	E1AFB0F903C9A59C001509F3 = {
+		name = "PSAlerts.h: 31";
+		rLen = 0;
+		rLoc = 652;
+		rType = 0;
+		vrLen = 737;
+		vrLoc = 0;
+	};
+	E1AFB0FB03C9A59C001509F3 = {
 		fRef = E1A18CAC03B4344C00000028;
 		isa = PBXTextBookmark;
@@ -8065,24 +8405,4 @@
 		vrLoc = 1056;
 	};
-	E1AFB0FA03C9A59C001509F3 = {
-		fRef = E1A18CAB03B4344C00000028;
-		isa = PBXTextBookmark;
-		name = "PSAlerts.h: 31";
-		rLen = 0;
-		rLoc = 652;
-		rType = 0;
-		vrLen = 737;
-		vrLoc = 0;
-	};
-	E1AFB0FB03C9A59C001509F3 = {
-		fRef = E1A18CAC03B4344C00000028;
-		isa = PBXTextBookmark;
-		name = "PSAlerts.m: triggerForAlarm:";
-		rLen = 42;
-		rLoc = 1388;
-		rType = 0;
-		vrLen = 1007;
-		vrLoc = 1056;
-	};
 	E1AFB0FC03C9A59C001509F3 = {
 		fRef = F59E47A7036AAA6D016B311C;
@@ -8120,5 +8440,5 @@
 		name = "PSAlarm.m: 391";
 		rLen = 0;
-		rLoc = 12916;
+		rLoc = 12924;
 		rType = 0;
 		vrLen = 1574;
@@ -8140,5 +8460,5 @@
 		name = "PSAlarm.m: 389";
 		rLen = 0;
-		rLoc = 12857;
+		rLoc = 12865;
 		rType = 0;
 		vrLen = 1653;
@@ -8160,5 +8480,5 @@
 		name = "PSAlarm.m: setWakeUp:";
 		rLen = 32;
-		rLoc = 6922;
+		rLoc = 6930;
 		rType = 0;
 		vrLen = 1179;
@@ -8200,5 +8520,5 @@
 		name = "PSPowerManager.m: 222";
 		rLen = 0;
-		rLoc = 7405;
+		rLoc = 7430;
 		rType = 0;
 		vrLen = 1665;
@@ -8220,5 +8540,5 @@
 		name = "PSPowerManager.m: 245";
 		rLen = 0;
-		rLoc = 7698;
+		rLoc = 7723;
 		rType = 0;
 		vrLen = 1673;
@@ -8425,14 +8745,4 @@
 		rType = 0;
 		vrLen = 969;
-		vrLoc = 0;
-	};
-	E1B46F6904053C4F00050002 = {
-		fRef = F59E47B5036AAD55016B311C;
-		isa = PBXTextBookmark;
-		name = "PSAlarmAlertController.h: 17";
-		rLen = 23;
-		rLoc = 380;
-		rType = 0;
-		vrLen = 586;
 		vrLoc = 0;
 	};
@@ -10588,14 +10898,4 @@
 		isa = PBXBookmark;
 	};
-	E1BF6E9A03C95F4E00050002 = {
-		fRef = F517D6430356B8CC016D68B9;
-		isa = PBXTextBookmark;
-		name = "PSAlarms.h: setUp";
-		rLen = 15;
-		rLoc = 499;
-		rType = 0;
-		vrLen = 905;
-		vrLoc = 0;
-	};
 	E1BF6E9D03C95F4E00050002 = {
 		fRef = E1BF6F0403C95F4E00050002;
@@ -10671,5 +10971,5 @@
 		name = "PSPowerManager.m: 270";
 		rLen = 0;
-		rLoc = 9093;
+		rLoc = 9118;
 		rType = 0;
 		vrLen = 1300;
@@ -10721,5 +11021,5 @@
 		name = "PSPowerManager.m: notificationPort";
 		rLen = 0;
-		rLoc = 7698;
+		rLoc = 7723;
 		rType = 0;
 		vrLen = 1717;
@@ -10751,5 +11051,5 @@
 		name = "PSAlarmAlertController.m: ";
 		rLen = 0;
-		rLoc = 2948;
+		rLoc = 2942;
 		rType = 0;
 		vrLen = 1948;
@@ -10823,5 +11123,5 @@
 		rLoc = 9315;
 		rType = 0;
-		vrLen = 2212;
+		vrLen = 2071;
 		vrLoc = 10181;
 	};
@@ -10940,5 +11240,5 @@
 		name = "PSPowerManager.m: 195";
 		rLen = 36;
-		rLoc = 6724;
+		rLoc = 6749;
 		rType = 0;
 		vrLen = 1382;
@@ -10960,5 +11260,5 @@
 		name = "PSPowerManager.m: 229";
 		rLen = 0;
-		rLoc = 7659;
+		rLoc = 7684;
 		rType = 0;
 		vrLen = 1629;
@@ -11020,5 +11320,5 @@
 		name = "PSPowerManager.m: 223";
 		rLen = 27;
-		rLoc = 7521;
+		rLoc = 7546;
 		rType = 0;
 		vrLen = 1529;
@@ -11040,5 +11340,5 @@
 		name = "PSPowerManager.m: 225";
 		rLen = 0;
-		rLoc = 7627;
+		rLoc = 7652;
 		rType = 0;
 		vrLen = 1591;
@@ -11939,5 +12239,5 @@
 		name = "PSAlarmAlertController.m: stopAlerts:";
 		rLen = 0;
-		rLoc = 1681;
+		rLoc = 1675;
 		rType = 0;
 		vrLen = 945;
@@ -12287,34 +12587,4 @@
 		vrLoc = 0;
 	};
-	E1DEF15504003A5F00050002 = {
-		fRef = F59E47B4036AAD55016B311C;
-		isa = PBXTextBookmark;
-		name = "PSAlarmAlertController.m: 69";
-		rLen = 0;
-		rLoc = 2725;
-		rType = 0;
-		vrLen = 1113;
-		vrLoc = 0;
-	};
-	E1DEF15704003A5F00050002 = {
-		fRef = E1BF6E9103C928D200050002;
-		isa = PBXTextBookmark;
-		name = "PSTimer.m: 192";
-		rLen = 0;
-		rLoc = 5401;
-		rType = 0;
-		vrLen = 441;
-		vrLoc = 5115;
-	};
-	E1DEF15A04003A5F00050002 = {
-		fRef = F517D6420356B8CC016D68B9;
-		isa = PBXTextBookmark;
-		name = "PSAlarms.m: 80";
-		rLen = 0;
-		rLoc = 2427;
-		rType = 0;
-		vrLen = 1331;
-		vrLoc = 1304;
-	};
 	E1DEF15B04003A5F00050002 = {
 		fRef = E1BF6E9003C928D200050002;
@@ -14393,5 +14663,5 @@
 		name = "PSAlarmAlertController.m: 69";
 		rLen = 0;
-		rLoc = 2725;
+		rLoc = 2719;
 		rType = 0;
 		vrLen = 1113;
@@ -15716,5 +15986,5 @@
 		name = "PSAlarm.m: 198";
 		rLen = 0;
-		rLoc = 6720;
+		rLoc = 6728;
 		rType = 0;
 		vrLen = 1689;
@@ -15776,5 +16046,5 @@
 		name = "PSAlarmAlertController.m: 69";
 		rLen = 0;
-		rLoc = 2725;
+		rLoc = 2719;
 		rType = 0;
 		vrLen = 1113;
@@ -15796,5 +16066,5 @@
 		name = "PSAlarmAlertController.m: 69";
 		rLen = 0;
-		rLoc = 2725;
+		rLoc = 2719;
 		rType = 0;
 		vrLen = 1113;
@@ -15956,5 +16226,5 @@
 		name = "PSAlarm.m: 198";
 		rLen = 0;
-		rLoc = 6720;
+		rLoc = 6728;
 		rType = 0;
 		vrLen = 1687;
Index: /trunk/Cocoa/Pester/Source/Pester.pbproj/project.pbxproj
===================================================================
--- /trunk/Cocoa/Pester/Source/Pester.pbproj/project.pbxproj	(revision 104)
+++ /trunk/Cocoa/Pester/Source/Pester.pbproj/project.pbxproj	(revision 105)
@@ -238,5 +238,5 @@
 			);
 			buildSettings = {
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 12;
 				FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"";
 				HEADER_SEARCH_PATHS = "";
@@ -287,5 +287,5 @@
 	<string>Pstr</string>
 	<key>CFBundleVersion</key>
-	<string>11</string>
+	<string>12</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
