# HG changeset patch # User koda # Date 1269648205 0 # Node ID 9d05c8000ed47d22b65efbc8694d8dc1be965e9f # Parent 51629e69da510e674aec715f4a41e8776eebb1d5 some code polish for the ifrontend inu patch for translation diff -r 51629e69da51 -r 9d05c8000ed4 cocoaTouch/overlayViewController.m --- a/cocoaTouch/overlayViewController.m Fri Mar 26 23:47:12 2010 +0000 +++ b/cocoaTouch/overlayViewController.m Sat Mar 27 00:03:25 2010 +0000 @@ -149,39 +149,16 @@ } -(IBAction) showPopover{ - //UIViewController *content = [[UIViewController alloc] initWithNibName: nil bundle:nil]; - //CGRect rectArea = CGRectMake(0, 0, 320, 480); - //content.view.frame = rectArea; - //settings.view.frame = rectArea; - //popupMenuViewController *popupMenu = [[UIViewController alloc] initWithNibName:@"popupMenuViewController" bundle:nil]; - popupMenuViewController *popupMenu = [[popupMenuViewController alloc] initWithNibName:@"popupMenuViewController" bundle:nil]; - - /*UIButton *buttonPause = [UIButton buttonWithType:UIButtonTypeRoundedRect]; - buttonPause.tag = 7; - buttonPause.frame = CGRectMake(100, 170, 170, 30); - [buttonPause setTitle:@"Pause Game" forState:UIControlStateNormal]; - [buttonPause addTarget:self action:@selector(buttonPressed:) forControlEvents:UIControlEventTouchUpInside]; - [popupMenu.view addSubview:buttonPause]; - - UIButton *buttonChat = [UIButton buttonWithType:UIButtonTypeRoundedRect]; - buttonChat.tag = 8; - buttonChat.frame = CGRectMake(100, 220, 170, 30); - [buttonChat setTitle:@"Chat" forState:UIControlStateNormal]; - [buttonChat addTarget:self action:@selector(buttonPressed:) forControlEvents:UIControlEventTouchUpInside]; - [popupMenu.view addSubview:buttonChat]; - - UIButton *buttonEnd = [UIButton buttonWithType:UIButtonTypeRoundedRect]; - buttonEnd.tag = 9; - buttonEnd.frame = CGRectMake(100, 270, 170, 30); - [buttonEnd setTitle:@"End Game" forState:UIControlStateNormal]; - [buttonEnd addTarget:self action:@selector(buttonPressed:) forControlEvents:UIControlEventTouchUpInside]; - [popupMenu.view addSubview:buttonEnd]; -*/ UIPopoverController* aPopover = [[UIPopoverController alloc] initWithContentViewController:popupMenu]; [aPopover setPopoverContentSize:CGSizeMake(220, 170) animated:YES]; - [aPopover presentPopoverFromRect:CGRectMake(1024, 0, 320, 480) inView:self.view permittedArrowDirections:UIPopoverArrowDirectionDown animated:YES]; + /*UIButton *button = [UIButton buttonWithType:UIButtonTypeRoundedRect]; + button.frame= CGRectMake(960, 0, 64, 64); + button.titleLabel.text=@"UUUUUUUF"; + [self.view addSubview:button];*/ + + [aPopover presentPopoverFromRect:CGRectMake(960, 0, 220, 32) inView:self.view permittedArrowDirections:UIPopoverArrowDirectionUp animated:YES]; //UIBarButtonItem *sender = [[useless items] objectAtIndex:1]; //[self.popoverController presentPopoverFromBarButtonItem:sender permittedArrowDirections:UIPopoverArrowDirectionDown animated:YES]; } diff -r 51629e69da51 -r 9d05c8000ed4 cocoaTouch/popupMenuViewController.h --- a/cocoaTouch/popupMenuViewController.h Fri Mar 26 23:47:12 2010 +0000 +++ b/cocoaTouch/popupMenuViewController.h Sat Mar 27 00:03:25 2010 +0000 @@ -11,8 +11,10 @@ @interface popupMenuViewController : UIViewController { UITableView *menuTable; + NSArray *menuList; BOOL isPaused; } -@property (nonatomic, retain) IBOutlet UITableView * menuTable; +@property (nonatomic,retain) IBOutlet UITableView * menuTable; +@property (nonatomic,retain) NSArray *menuList; @end diff -r 51629e69da51 -r 9d05c8000ed4 cocoaTouch/popupMenuViewController.m --- a/cocoaTouch/popupMenuViewController.m Fri Mar 26 23:47:12 2010 +0000 +++ b/cocoaTouch/popupMenuViewController.m Sat Mar 27 00:03:25 2010 +0000 @@ -10,7 +10,7 @@ #import "PascalImports.h" @implementation popupMenuViewController -@synthesize menuTable; +@synthesize menuTable, menuList; /* // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. @@ -30,13 +30,13 @@ */ -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { // Overriden to allow any orientation. return YES; } -- (void)didReceiveMemoryWarning { +-(void) didReceiveMemoryWarning { // Releases the view if it doesn't have a superview. [super didReceiveMemoryWarning]; @@ -47,11 +47,13 @@ -(void) viewDidLoad { isPaused = NO; menuTable.allowsSelection = YES; + menuList = [[NSArray alloc] initWithObjects:NSLocalizedString(@"Pause Game", @""), NSLocalizedString(@"Chat", @""), NSLocalizedString(@"End Game", @""),nil]; [super viewDidLoad]; } -- (void)dealloc { +-(void) dealloc { + [menuList release]; [menuTable release]; [super dealloc]; } @@ -73,29 +75,13 @@ if (nil == cell) { cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellIdentifier] autorelease]; + cell.textLabel.text = [menuList objectAtIndex:[indexPath row]]; } - switch ([indexPath row]) { - case 0: - cell.textLabel.text = NSLocalizedString(@"Pause Game", @""); - //cell.accessoryView = username; - break; - case 1: - cell.textLabel.text = NSLocalizedString(@"Chat", @""); - //cell.accessoryView = password; - break; - case 2: - cell.textLabel.text = NSLocalizedString(@"End Game", @""); - break; - default: - NSLog(@"Warning: unset case value in kNetworkFields section!"); - break; - } - return cell; } -- (void)tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { +-(void) tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { UIActionSheet *actionSheet; switch ([indexPath row]) { @@ -124,7 +110,7 @@ } } -- (void)tableView:(UITableView *)aTableView didDeselectRowAtIndexPath:(NSIndexPath *)indexPath { +-(void) tableView:(UITableView *)aTableView didDeselectRowAtIndexPath:(NSIndexPath *)indexPath { [aTableView deselectRowAtIndexPath: indexPath animated:YES]; } diff -r 51629e69da51 -r 9d05c8000ed4 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Fri Mar 26 23:47:12 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Sat Mar 27 00:03:25 2010 +0000 @@ -202,47 +202,6 @@ Content PBXProjectModuleGUID - 61FA7482115D731F00DA6ED0 - PBXProjectModuleLabel - popupMenuViewController.m - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 61FA7483115D731F00DA6ED0 - PBXProjectModuleLabel - popupMenuViewController.m - _historyCapacity - 0 - bookmark - 61FA7537115D7DFD00DA6ED0 - history - - 61FA7528115D7D8500DA6ED0 - 61FA7529115D7D8500DA6ED0 - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {927, 748}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 966 356 927 789 0 0 1920 1178 - - - - Content - - PBXProjectModuleGUID 61FA743B115D6C1900DA6ED0 PBXProjectModuleLabel overlayViewController.m @@ -257,11 +216,11 @@ _historyCapacity 0 bookmark - 61FA7538115D7DFD00DA6ED0 + 61FA75BA115D8A9400DA6ED0 history 61FA74B7115D74BE00DA6ED0 - 61FA74B8115D74BE00DA6ED0 + 61FA756E115D887200DA6ED0 SplitCount @@ -277,48 +236,7 @@ PBXModuleWindowStatusBarHidden2 RubberWindowFrame - 828 401 927 662 0 0 1920 1178 - - - - Content - - PBXProjectModuleGUID - 61FA7490115D739000DA6ED0 - PBXProjectModuleLabel - SettingsViewController.m - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 61FA7491115D739000DA6ED0 - PBXProjectModuleLabel - SettingsViewController.m - _historyCapacity - 0 - bookmark - 61FA7539115D7DFD00DA6ED0 - history - - 61FA7492115D739000DA6ED0 - 61FA7493115D739000DA6ED0 - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {927, 748}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 38 363 927 789 0 0 1920 1178 + 456 125 927 662 0 0 1920 1178 @@ -399,7 +317,7 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 9 + 8 2 0 @@ -440,7 +358,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - popupMenuViewController.h + popupMenuViewController.m PBXSplitModuleInNavigatorKey Split0 @@ -448,11 +366,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - popupMenuViewController.h + popupMenuViewController.m _historyCapacity 0 bookmark - 61FA7536115D7DFD00DA6ED0 + 61FA75B9115D8A9400DA6ED0 history 6179889C114AA5BD00BA94A9 @@ -509,13 +427,13 @@ 618AFC06115BE92A003D411B 618AFC07115BE92A003D411B 618AFC14115BEA91003D411B - 61FA7438115D6C1900DA6ED0 - 61FA747D115D731F00DA6ED0 - 61FA747E115D731F00DA6ED0 61FA748B115D739000DA6ED0 61FA74C4115D76A000DA6ED0 61FA74C5115D76A000DA6ED0 - 6107A1C0115C232E00BAD238 + 61FA755F115D87C200DA6ED0 + 61FA7561115D87C200DA6ED0 + 61FA756B115D887200DA6ED0 + 61FA756C115D887200DA6ED0 SplitCount @@ -713,16 +631,14 @@ 5 WindowOrderList - 61FA753A115D7DFD00DA6ED0 + 61FA75BB115D8A9400DA6ED0 61FA7450115D6C3A00DA6ED0 61FA7446115D6C1900DA6ED0 1CD10A99069EF8BA00B06720 61798848114AA42600BA94A9 - 61FA7490115D739000DA6ED0 + 1C78EAAD065D492600B07095 /Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj - 1C78EAAD065D492600B07095 61FA743B115D6C1900DA6ED0 - 61FA7482115D731F00DA6ED0 WindowString 760 364 801 617 0 0 1920 1178 diff -r 51629e69da51 -r 9d05c8000ed4 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Fri Mar 26 23:47:12 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Sat Mar 27 00:03:25 2010 +0000 @@ -299,6 +299,55 @@ 61FA7537115D7DFD00DA6ED0 /* PBXTextBookmark */ = 61FA7537115D7DFD00DA6ED0 /* PBXTextBookmark */; 61FA7538115D7DFD00DA6ED0 /* PBXTextBookmark */ = 61FA7538115D7DFD00DA6ED0 /* PBXTextBookmark */; 61FA7539115D7DFD00DA6ED0 /* PBXTextBookmark */ = 61FA7539115D7DFD00DA6ED0 /* PBXTextBookmark */; + 61FA7548115D839700DA6ED0 /* PBXTextBookmark */ = 61FA7548115D839700DA6ED0 /* PBXTextBookmark */; + 61FA7549115D839700DA6ED0 /* PBXTextBookmark */ = 61FA7549115D839700DA6ED0 /* PBXTextBookmark */; + 61FA754A115D839700DA6ED0 /* PBXTextBookmark */ = 61FA754A115D839700DA6ED0 /* PBXTextBookmark */; + 61FA754B115D839700DA6ED0 /* PBXTextBookmark */ = 61FA754B115D839700DA6ED0 /* PBXTextBookmark */; + 61FA754C115D839700DA6ED0 /* PBXTextBookmark */ = 61FA754C115D839700DA6ED0 /* PBXTextBookmark */; + 61FA755C115D859C00DA6ED0 /* PBXTextBookmark */ = 61FA755C115D859C00DA6ED0 /* PBXTextBookmark */; + 61FA755D115D859C00DA6ED0 /* PBXTextBookmark */ = 61FA755D115D859C00DA6ED0 /* PBXTextBookmark */; + 61FA755E115D859C00DA6ED0 /* PBXTextBookmark */ = 61FA755E115D859C00DA6ED0 /* PBXTextBookmark */; + 61FA755F115D87C200DA6ED0 /* PBXTextBookmark */ = 61FA755F115D87C200DA6ED0 /* PBXTextBookmark */; + 61FA7560115D87C200DA6ED0 /* PBXTextBookmark */ = 61FA7560115D87C200DA6ED0 /* PBXTextBookmark */; + 61FA7561115D87C200DA6ED0 /* PBXTextBookmark */ = 61FA7561115D87C200DA6ED0 /* PBXTextBookmark */; + 61FA7562115D87C200DA6ED0 /* PBXTextBookmark */ = 61FA7562115D87C200DA6ED0 /* PBXTextBookmark */; + 61FA7563115D87C200DA6ED0 /* PBXTextBookmark */ = 61FA7563115D87C200DA6ED0 /* PBXTextBookmark */; + 61FA7564115D87C200DA6ED0 /* PBXTextBookmark */ = 61FA7564115D87C200DA6ED0 /* PBXTextBookmark */; + 61FA756B115D887200DA6ED0 /* PBXTextBookmark */ = 61FA756B115D887200DA6ED0 /* PBXTextBookmark */; + 61FA756C115D887200DA6ED0 /* PBXTextBookmark */ = 61FA756C115D887200DA6ED0 /* PBXTextBookmark */; + 61FA756D115D887200DA6ED0 /* PBXTextBookmark */ = 61FA756D115D887200DA6ED0 /* PBXTextBookmark */; + 61FA756E115D887200DA6ED0 /* PBXTextBookmark */ = 61FA756E115D887200DA6ED0 /* PBXTextBookmark */; + 61FA756F115D887200DA6ED0 /* PBXTextBookmark */ = 61FA756F115D887200DA6ED0 /* PBXTextBookmark */; + 61FA7572115D88A600DA6ED0 /* PBXTextBookmark */ = 61FA7572115D88A600DA6ED0 /* PBXTextBookmark */; + 61FA7573115D88A600DA6ED0 /* PBXTextBookmark */ = 61FA7573115D88A600DA6ED0 /* PBXTextBookmark */; + 61FA7578115D891A00DA6ED0 /* PBXTextBookmark */ = 61FA7578115D891A00DA6ED0 /* PBXTextBookmark */; + 61FA7579115D891A00DA6ED0 /* PBXTextBookmark */ = 61FA7579115D891A00DA6ED0 /* PBXTextBookmark */; + 61FA757D115D893D00DA6ED0 /* PBXTextBookmark */ = 61FA757D115D893D00DA6ED0 /* PBXTextBookmark */; + 61FA757E115D893D00DA6ED0 /* PBXTextBookmark */ = 61FA757E115D893D00DA6ED0 /* PBXTextBookmark */; + 61FA7582115D895A00DA6ED0 /* PBXTextBookmark */ = 61FA7582115D895A00DA6ED0 /* PBXTextBookmark */; + 61FA7583115D895A00DA6ED0 /* PBXTextBookmark */ = 61FA7583115D895A00DA6ED0 /* PBXTextBookmark */; + 61FA7587115D897F00DA6ED0 /* PBXTextBookmark */ = 61FA7587115D897F00DA6ED0 /* PBXTextBookmark */; + 61FA7588115D897F00DA6ED0 /* PBXTextBookmark */ = 61FA7588115D897F00DA6ED0 /* PBXTextBookmark */; + 61FA758C115D89A300DA6ED0 /* PBXTextBookmark */ = 61FA758C115D89A300DA6ED0 /* PBXTextBookmark */; + 61FA758D115D89A300DA6ED0 /* PBXTextBookmark */ = 61FA758D115D89A300DA6ED0 /* PBXTextBookmark */; + 61FA7591115D89CA00DA6ED0 /* PBXTextBookmark */ = 61FA7591115D89CA00DA6ED0 /* PBXTextBookmark */; + 61FA7592115D89CA00DA6ED0 /* PBXTextBookmark */ = 61FA7592115D89CA00DA6ED0 /* PBXTextBookmark */; + 61FA7596115D89E300DA6ED0 /* PBXTextBookmark */ = 61FA7596115D89E300DA6ED0 /* PBXTextBookmark */; + 61FA7597115D89E300DA6ED0 /* PBXTextBookmark */ = 61FA7597115D89E300DA6ED0 /* PBXTextBookmark */; + 61FA759B115D89F400DA6ED0 /* PBXTextBookmark */ = 61FA759B115D89F400DA6ED0 /* PBXTextBookmark */; + 61FA759C115D89F400DA6ED0 /* PBXTextBookmark */ = 61FA759C115D89F400DA6ED0 /* PBXTextBookmark */; + 61FA75A0115D8A2200DA6ED0 /* PBXTextBookmark */ = 61FA75A0115D8A2200DA6ED0 /* PBXTextBookmark */; + 61FA75A1115D8A2200DA6ED0 /* PBXTextBookmark */ = 61FA75A1115D8A2200DA6ED0 /* PBXTextBookmark */; + 61FA75A5115D8A3400DA6ED0 /* PBXTextBookmark */ = 61FA75A5115D8A3400DA6ED0 /* PBXTextBookmark */; + 61FA75A6115D8A3400DA6ED0 /* PBXTextBookmark */ = 61FA75A6115D8A3400DA6ED0 /* PBXTextBookmark */; + 61FA75AA115D8A4500DA6ED0 /* PBXTextBookmark */ = 61FA75AA115D8A4500DA6ED0 /* PBXTextBookmark */; + 61FA75AB115D8A4500DA6ED0 /* PBXTextBookmark */ = 61FA75AB115D8A4500DA6ED0 /* PBXTextBookmark */; + 61FA75AF115D8A5D00DA6ED0 /* PBXTextBookmark */ = 61FA75AF115D8A5D00DA6ED0 /* PBXTextBookmark */; + 61FA75B0115D8A5D00DA6ED0 /* PBXTextBookmark */ = 61FA75B0115D8A5D00DA6ED0 /* PBXTextBookmark */; + 61FA75B4115D8A8100DA6ED0 /* PBXTextBookmark */ = 61FA75B4115D8A8100DA6ED0 /* PBXTextBookmark */; + 61FA75B5115D8A8100DA6ED0 /* PBXTextBookmark */ = 61FA75B5115D8A8100DA6ED0 /* PBXTextBookmark */; + 61FA75B9115D8A9400DA6ED0 /* PBXTextBookmark */ = 61FA75B9115D8A9400DA6ED0 /* PBXTextBookmark */; + 61FA75BA115D8A9400DA6ED0 /* PBXTextBookmark */ = 61FA75BA115D8A9400DA6ED0 /* PBXTextBookmark */; }; sourceControlManager = 617987DF114AA2EB00BA94A9 /* Source Control */; userBuildSettings = { @@ -374,7 +423,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 49"; rLen = 0; - rLoc = 1288; + rLoc = 1460; rType = 0; vrLen = 165; vrLoc = 1159; @@ -384,7 +433,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 49"; rLen = 0; - rLoc = 1288; + rLoc = 1460; rType = 0; vrLen = 165; vrLoc = 1159; @@ -846,9 +895,9 @@ }; 617987FE114AA34C00BA94A9 /* uKeys.pas */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1818, 6812}}"; + sepNavIntBoundsRect = "{{0, 0}, {1818, 6851}}"; sepNavSelRange = "{2954, 0}"; - sepNavVisRange = "{2887, 172}"; + sepNavVisRange = "{2760, 389}"; sepNavWindowFrame = "{{674, 505}, {921, 605}}"; }; }; @@ -1006,10 +1055,10 @@ }; 61798875114AA4D000BA94A9 /* SettingsViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {901, 4251}}"; + sepNavIntBoundsRect = "{{0, 0}, {901, 4225}}"; sepNavSelRange = "{2369, 24}"; - sepNavVisRange = "{2204, 1372}"; - sepNavWindowFrame = "{{984, 333}, {927, 845}}"; + sepNavVisRange = "{2231, 1568}"; + sepNavWindowFrame = "{{38, 307}, {927, 845}}"; }; }; 61798877114AA4D000BA94A9 /* TeamEditViewController.h */ = { @@ -1125,17 +1174,17 @@ }; 6179939D1150226700BA94A9 /* overlayViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {868, 590}}"; + sepNavIntBoundsRect = "{{0, 0}, {551, 429}}"; sepNavSelRange = "{257, 0}"; - sepNavVisRange = "{0, 767}"; + sepNavVisRange = "{258, 283}"; sepNavWindowFrame = "{{381, 378}, {922, 717}}"; }; }; 6179939E1150226700BA94A9 /* overlayViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1069, 3783}}"; - sepNavSelRange = "{6282, 0}"; - sepNavVisRange = "{4455, 2335}"; + sepNavIntBoundsRect = "{{0, 0}, {1041, 3549}}"; + sepNavSelRange = "{5058, 0}"; + sepNavVisRange = "{4241, 1866}"; sepNavWindowFrame = "{{1027, -17}, {927, 718}}"; }; }; @@ -1145,18 +1194,18 @@ }; 618AFBED115BE8AE003D411B /* popupMenuViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {873, 247}}"; + sepNavIntBoundsRect = "{{0, 0}, {873, 260}}"; sepNavSelRange = "{225, 0}"; - sepNavVisRange = "{93, 257}"; + sepNavVisRange = "{93, 282}"; sepNavWindowFrame = "{{56, 154}, {927, 845}}"; }; }; 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1146, 1833}}"; - sepNavSelRange = "{3434, 0}"; - sepNavVisRange = "{2281, 1719}"; - sepNavWindowFrame = "{{15, 328}, {927, 845}}"; + sepNavIntBoundsRect = "{{0, 0}, {1139, 1768}}"; + sepNavSelRange = "{1236, 0}"; + sepNavVisRange = "{975, 217}"; + sepNavWindowFrame = "{{304, 160}, {927, 845}}"; }; }; 618AFC06115BE92A003D411B /* PBXTextBookmark */ = { @@ -1280,7 +1329,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 49"; rLen = 0; - rLoc = 1288; + rLoc = 1460; rType = 0; vrLen = 163; vrLoc = 1161; @@ -1290,7 +1339,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 49"; rLen = 0; - rLoc = 1288; + rLoc = 1460; rType = 0; vrLen = 163; vrLoc = 1161; @@ -1300,8 +1349,8 @@ comments = "Expected expression before 'UIActionSheet'"; fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; fallbackIsa = XCBuildMessageTextBookmark; - rLen = 1; - rLoc = 124; + rLen = 0; + rLoc = 134; rType = 1; }; 61FA7433115D6BF200DA6ED0 /* PBXTextBookmark */ = { @@ -1309,7 +1358,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 124"; rLen = 0; - rLoc = 3521; + rLoc = 4129; rType = 0; vrLen = 567; vrLoc = 3333; @@ -1323,7 +1372,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 49"; rLen = 0; - rLoc = 1288; + rLoc = 1460; rType = 0; vrLen = 163; vrLoc = 1161; @@ -1343,7 +1392,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 124"; rLen = 0; - rLoc = 3521; + rLoc = 4129; rType = 0; vrLen = 438; vrLoc = 3368; @@ -1353,7 +1402,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 124"; rLen = 0; - rLoc = 3521; + rLoc = 4129; rType = 0; vrLen = 257; vrLoc = 3383; @@ -1377,7 +1426,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 125"; rLen = 0; - rLoc = 3521; + rLoc = 4129; rType = 0; vrLen = 253; vrLoc = 3369; @@ -1407,7 +1456,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 125"; rLen = 0; - rLoc = 3521; + rLoc = 4129; rType = 0; vrLen = 253; vrLoc = 3369; @@ -1437,7 +1486,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 125"; rLen = 0; - rLoc = 3521; + rLoc = 4129; rType = 0; vrLen = 253; vrLoc = 3369; @@ -1477,7 +1526,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 125"; rLen = 0; - rLoc = 3521; + rLoc = 4129; rType = 0; vrLen = 524; vrLoc = 3463; @@ -1487,7 +1536,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 125"; rLen = 0; - rLoc = 3521; + rLoc = 4129; rType = 0; vrLen = 347; vrLoc = 3369; @@ -1517,7 +1566,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 125"; rLen = 0; - rLoc = 3521; + rLoc = 4129; rType = 0; vrLen = 253; vrLoc = 3369; @@ -1547,7 +1596,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 125"; rLen = 0; - rLoc = 3521; + rLoc = 4129; rType = 0; vrLen = 253; vrLoc = 3369; @@ -1577,7 +1626,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 125"; rLen = 0; - rLoc = 3521; + rLoc = 4129; rType = 0; vrLen = 495; vrLoc = 3463; @@ -1587,7 +1636,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 125"; rLen = 0; - rLoc = 3521; + rLoc = 4129; rType = 0; vrLen = 253; vrLoc = 3369; @@ -1597,7 +1646,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 126"; rLen = 0; - rLoc = 3694; + rLoc = 4129; rType = 0; vrLen = 1125; vrLoc = 3129; @@ -1607,7 +1656,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 125"; rLen = 0; - rLoc = 3533; + rLoc = 4129; rType = 0; vrLen = 444; vrLoc = 3369; @@ -1617,7 +1666,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 49"; rLen = 0; - rLoc = 1288; + rLoc = 1460; rType = 0; vrLen = 163; vrLoc = 1161; @@ -1647,7 +1696,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 180"; rLen = 0; - rLoc = 6116; + rLoc = 4611; rType = 0; vrLen = 2367; vrLoc = 4576; @@ -1667,7 +1716,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 126"; rLen = 0; - rLoc = 3997; + rLoc = 3753; rType = 0; vrLen = 1685; vrLoc = 2022; @@ -1677,7 +1726,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 84"; rLen = 0; - rLoc = 2344; + rLoc = 2297; rType = 0; vrLen = 1714; vrLoc = 2019; @@ -1711,7 +1760,7 @@ fRef = 618AFBED115BE8AE003D411B /* popupMenuViewController.h */; name = "popupMenuViewController.h: 15"; rLen = 0; - rLoc = 414; + rLoc = 436; rType = 0; vrLen = 403; vrLoc = 0; @@ -1721,7 +1770,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 84"; rLen = 0; - rLoc = 2344; + rLoc = 2297; rType = 0; vrLen = 2041; vrLoc = 1581; @@ -1731,7 +1780,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 45"; rLen = 0; - rLoc = 1184; + rLoc = 1194; rType = 0; vrLen = 1543; vrLoc = 823; @@ -1778,7 +1827,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 180"; rLen = 0; - rLoc = 6120; + rLoc = 4611; rType = 0; vrLen = 2428; vrLoc = 4576; @@ -1798,7 +1847,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 45"; rLen = 0; - rLoc = 1184; + rLoc = 1194; rType = 0; vrLen = 1543; vrLoc = 823; @@ -1828,7 +1877,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 180"; rLen = 0; - rLoc = 6120; + rLoc = 4611; rType = 0; vrLen = 2428; vrLoc = 4576; @@ -1838,7 +1887,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 125"; rLen = 0; - rLoc = 3533; + rLoc = 4129; rType = 0; vrLen = 725; vrLoc = 3463; @@ -1858,7 +1907,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 158"; rLen = 0; - rLoc = 4860; + rLoc = 4611; rType = 0; vrLen = 1762; vrLoc = 3428; @@ -1868,7 +1917,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 45"; rLen = 0; - rLoc = 1184; + rLoc = 1194; rType = 0; vrLen = 1440; vrLoc = 823; @@ -1898,7 +1947,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 158"; rLen = 0; - rLoc = 4899; + rLoc = 4611; rType = 0; vrLen = 2337; vrLoc = 4453; @@ -1908,7 +1957,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 45"; rLen = 0; - rLoc = 1184; + rLoc = 1194; rType = 0; vrLen = 1440; vrLoc = 823; @@ -1938,7 +1987,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 48"; rLen = 0; - rLoc = 1263; + rLoc = 1436; rType = 0; vrLen = 1317; vrLoc = 0; @@ -1958,7 +2007,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 158"; rLen = 0; - rLoc = 4899; + rLoc = 4611; rType = 0; vrLen = 2115; vrLoc = 4113; @@ -1968,7 +2017,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 158"; rLen = 0; - rLoc = 4899; + rLoc = 4611; rType = 0; vrLen = 1958; vrLoc = 4113; @@ -1988,7 +2037,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 125"; rLen = 0; - rLoc = 3533; + rLoc = 4129; rType = 0; vrLen = 685; vrLoc = 3486; @@ -2047,7 +2096,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 97"; rLen = 0; - rLoc = 2608; + rLoc = 2364; rType = 0; vrLen = 1678; vrLoc = 2055; @@ -2057,7 +2106,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 97"; rLen = 0; - rLoc = 2608; + rLoc = 2364; rType = 0; vrLen = 1716; vrLoc = 2017; @@ -2067,7 +2116,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 168"; rLen = 0; - rLoc = 5460; + rLoc = 4611; rType = 0; vrLen = 1958; vrLoc = 4113; @@ -2097,7 +2146,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 121"; rLen = 0; - rLoc = 3595; + rLoc = 3351; rType = 0; vrLen = 1733; vrLoc = 2017; @@ -2107,7 +2156,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 168"; rLen = 0; - rLoc = 5460; + rLoc = 4611; rType = 0; vrLen = 1958; vrLoc = 4113; @@ -2137,7 +2186,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 106"; rLen = 0; - rLoc = 2875; + rLoc = 2631; rType = 0; vrLen = 1741; vrLoc = 2017; @@ -2147,7 +2196,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 168"; rLen = 0; - rLoc = 5460; + rLoc = 4611; rType = 0; vrLen = 1958; vrLoc = 4113; @@ -2177,7 +2226,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 124"; rLen = 0; - rLoc = 3595; + rLoc = 3351; rType = 0; vrLen = 1914; vrLoc = 2017; @@ -2187,7 +2236,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 168"; rLen = 0; - rLoc = 5460; + rLoc = 4611; rType = 0; vrLen = 1958; vrLoc = 4113; @@ -2217,7 +2266,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 98"; rLen = 0; - rLoc = 2655; + rLoc = 2411; rType = 0; vrLen = 1737; vrLoc = 2017; @@ -2227,7 +2276,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 168"; rLen = 0; - rLoc = 5460; + rLoc = 4611; rType = 0; vrLen = 1958; vrLoc = 4113; @@ -2257,7 +2306,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 122"; rLen = 0; - rLoc = 3595; + rLoc = 3351; rType = 0; vrLen = 1716; vrLoc = 2017; @@ -2267,7 +2316,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 168"; rLen = 0; - rLoc = 5460; + rLoc = 4611; rType = 0; vrLen = 1958; vrLoc = 4113; @@ -2297,7 +2346,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 122"; rLen = 0; - rLoc = 3595; + rLoc = 3351; rType = 0; vrLen = 1716; vrLoc = 2017; @@ -2307,7 +2356,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 122"; rLen = 0; - rLoc = 3595; + rLoc = 3351; rType = 0; vrLen = 1715; vrLoc = 2017; @@ -2317,7 +2366,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 168"; rLen = 0; - rLoc = 5460; + rLoc = 4611; rType = 0; vrLen = 1958; vrLoc = 4113; @@ -2347,7 +2396,7 @@ fRef = 618AFBED115BE8AE003D411B /* popupMenuViewController.h */; name = "popupMenuViewController.h: 15"; rLen = 0; - rLoc = 414; + rLoc = 436; rType = 0; vrLen = 403; vrLoc = 0; @@ -2357,7 +2406,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 88"; rLen = 0; - rLoc = 2441; + rLoc = 2297; rType = 0; vrLen = 1715; vrLoc = 2017; @@ -2367,7 +2416,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 69"; rLen = 0; - rLoc = 1735; + rLoc = 1931; rType = 0; vrLen = 1612; vrLoc = 1317; @@ -2377,7 +2426,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 168"; rLen = 0; - rLoc = 5460; + rLoc = 4611; rType = 0; vrLen = 1958; vrLoc = 4113; @@ -2407,7 +2456,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 69"; rLen = 0; - rLoc = 1735; + rLoc = 1931; rType = 0; vrLen = 1612; vrLoc = 1317; @@ -2417,7 +2466,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 168"; rLen = 0; - rLoc = 5460; + rLoc = 4611; rType = 0; vrLen = 1958; vrLoc = 4113; @@ -2447,7 +2496,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 182"; rLen = 0; - rLoc = 6232; + rLoc = 4722; rType = 0; vrLen = 2383; vrLoc = 4576; @@ -2457,7 +2506,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 98"; rLen = 0; - rLoc = 2692; + rLoc = 2448; rType = 0; vrLen = 1701; vrLoc = 2013; @@ -2487,7 +2536,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 125"; rLen = 0; - rLoc = 3759; + rLoc = 3515; rType = 0; vrLen = 1692; vrLoc = 2188; @@ -2497,7 +2546,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 182"; rLen = 0; - rLoc = 6282; + rLoc = 4772; rType = 0; vrLen = 2335; vrLoc = 4455; @@ -2527,7 +2576,7 @@ fRef = 618AFBED115BE8AE003D411B /* popupMenuViewController.h */; name = "popupMenuViewController.h: 14"; rLen = 0; - rLoc = 349; + rLoc = 372; rType = 0; vrLen = 422; vrLoc = 0; @@ -2537,7 +2586,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 104"; rLen = 0; - rLoc = 2826; + rLoc = 2582; rType = 0; vrLen = 1961; vrLoc = 1469; @@ -2547,7 +2596,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 137"; rLen = 0; - rLoc = 3982; + rLoc = 3738; rType = 0; vrLen = 1672; vrLoc = 2342; @@ -2557,7 +2606,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 182"; rLen = 0; - rLoc = 6282; + rLoc = 4772; rType = 0; vrLen = 2335; vrLoc = 4455; @@ -2587,7 +2636,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 106"; rLen = 0; - rLoc = 2826; + rLoc = 2582; rType = 0; vrLen = 1616; vrLoc = 2345; @@ -2597,7 +2646,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 182"; rLen = 0; - rLoc = 6282; + rLoc = 4772; rType = 0; vrLen = 2335; vrLoc = 4455; @@ -2627,7 +2676,7 @@ fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; name = "popupMenuViewController.m: 117"; rLen = 0; - rLoc = 3434; + rLoc = 3190; rType = 0; vrLen = 1719; vrLoc = 2281; @@ -2637,7 +2686,7 @@ fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; name = "overlayViewController.m: 182"; rLen = 0; - rLoc = 6282; + rLoc = 4772; rType = 0; vrLen = 2335; vrLoc = 4455; @@ -2652,6 +2701,496 @@ vrLen = 1372; vrLoc = 2204; }; + 61FA7548115D839700DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBED115BE8AE003D411B /* popupMenuViewController.h */; + name = "popupMenuViewController.h: 12"; + rLen = 0; + rLoc = 225; + rType = 0; + vrLen = 261; + vrLoc = 93; + }; + 61FA7549115D839700DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBED115BE8AE003D411B /* popupMenuViewController.h */; + name = "popupMenuViewController.h: 18"; + rLen = 0; + rLoc = 485; + rType = 0; + vrLen = 492; + vrLoc = 0; + }; + 61FA754A115D839700DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 117"; + rLen = 0; + rLoc = 3190; + rType = 0; + vrLen = 1714; + vrLoc = 1336; + }; + 61FA754B115D839700DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 79"; + rLen = 0; + rLoc = 2297; + rType = 0; + vrLen = 1837; + vrLoc = 1194; + }; + 61FA754C115D839700DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 182"; + rLen = 0; + rLoc = 4772; + rType = 0; + vrLen = 2335; + vrLoc = 4455; + }; + 61FA755C115D859C00DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBED115BE8AE003D411B /* popupMenuViewController.h */; + name = "popupMenuViewController.h: 12"; + rLen = 0; + rLoc = 225; + rType = 0; + vrLen = 282; + vrLoc = 93; + }; + 61FA755D115D859C00DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 118"; + rLen = 0; + rLoc = 4129; + rType = 0; + vrLen = 1452; + vrLoc = 3164; + }; + 61FA755E115D859C00DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 50"; + rLen = 0; + rLoc = 1278; + rType = 0; + vrLen = 1867; + vrLoc = 1894; + }; + 61FA755F115D87C200DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBED115BE8AE003D411B /* popupMenuViewController.h */; + name = "popupMenuViewController.h: 12"; + rLen = 0; + rLoc = 225; + rType = 0; + vrLen = 282; + vrLoc = 93; + }; + 61FA7560115D87C200DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 48"; + rLen = 0; + rLoc = 1236; + rType = 0; + vrLen = 338; + vrLoc = 1123; + }; + 61FA7561115D87C200DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939D1150226700BA94A9 /* overlayViewController.h */; + name = "overlayViewController.h: 12"; + rLen = 0; + rLoc = 257; + rType = 0; + vrLen = 283; + vrLoc = 258; + }; + 61FA7562115D87C200DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 115"; + rLen = 0; + rLoc = 3341; + rType = 0; + vrLen = 220; + vrLoc = 3225; + }; + 61FA7563115D87C200DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 118"; + rLen = 0; + rLoc = 4129; + rType = 0; + vrLen = 1452; + vrLoc = 3164; + }; + 61FA7564115D87C200DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 50"; + rLen = 0; + rLoc = 1278; + rType = 0; + vrLen = 1867; + vrLoc = 1894; + }; + 61FA756B115D887200DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 115"; + rLen = 0; + rLoc = 3341; + rType = 0; + vrLen = 220; + vrLoc = 3225; + }; + 61FA756C115D887200DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 48"; + rLen = 0; + rLoc = 1236; + rType = 0; + vrLen = 338; + vrLoc = 1123; + }; + 61FA756D115D887200DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 48"; + rLen = 0; + rLoc = 1236; + rType = 0; + vrLen = 219; + vrLoc = 975; + }; + 61FA756E115D887200DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 118"; + rLen = 0; + rLoc = 4129; + rType = 0; + vrLen = 1452; + vrLoc = 3164; + }; + 61FA756F115D887200DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 158"; + rLen = 0; + rLoc = 4994; + rType = 0; + vrLen = 1878; + vrLoc = 4241; + }; + 61FA7572115D88A600DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 48"; + rLen = 0; + rLoc = 1236; + rType = 0; + vrLen = 219; + vrLoc = 975; + }; + 61FA7573115D88A600DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 156"; + rLen = 0; + rLoc = 4994; + rType = 0; + vrLen = 1871; + vrLoc = 4241; + }; + 61FA7578115D891A00DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 48"; + rLen = 0; + rLoc = 1236; + rType = 0; + vrLen = 217; + vrLoc = 975; + }; + 61FA7579115D891A00DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 157"; + rLen = 0; + rLoc = 4911; + rType = 0; + vrLen = 1866; + vrLoc = 4241; + }; + 61FA757D115D893D00DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 48"; + rLen = 0; + rLoc = 1236; + rType = 0; + vrLen = 217; + vrLoc = 975; + }; + 61FA757E115D893D00DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 157"; + rLen = 0; + rLoc = 4899; + rType = 0; + vrLen = 1869; + vrLoc = 4241; + }; + 61FA7582115D895A00DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 48"; + rLen = 0; + rLoc = 1236; + rType = 0; + vrLen = 217; + vrLoc = 975; + }; + 61FA7583115D895A00DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 157"; + rLen = 0; + rLoc = 4899; + rType = 0; + vrLen = 1868; + vrLoc = 4241; + }; + 61FA7587115D897F00DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 48"; + rLen = 0; + rLoc = 1236; + rType = 0; + vrLen = 217; + vrLoc = 975; + }; + 61FA7588115D897F00DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 155"; + rLen = 0; + rLoc = 4790; + rType = 0; + vrLen = 1866; + vrLoc = 4241; + }; + 61FA758C115D89A300DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 48"; + rLen = 0; + rLoc = 1236; + rType = 0; + vrLen = 217; + vrLoc = 975; + }; + 61FA758D115D89A300DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 157"; + rLen = 0; + rLoc = 4899; + rType = 0; + vrLen = 1866; + vrLoc = 4241; + }; + 61FA7591115D89CA00DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 48"; + rLen = 0; + rLoc = 1236; + rType = 0; + vrLen = 217; + vrLoc = 975; + }; + 61FA7592115D89CA00DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 161"; + rLen = 0; + rLoc = 5042; + rType = 0; + vrLen = 1863; + vrLoc = 4241; + }; + 61FA7596115D89E300DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 48"; + rLen = 0; + rLoc = 1236; + rType = 0; + vrLen = 217; + vrLoc = 975; + }; + 61FA7597115D89E300DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 161"; + rLen = 0; + rLoc = 5058; + rType = 0; + vrLen = 1865; + vrLoc = 4241; + }; + 61FA759B115D89F400DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 48"; + rLen = 0; + rLoc = 1236; + rType = 0; + vrLen = 217; + vrLoc = 975; + }; + 61FA759C115D89F400DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 161"; + rLen = 0; + rLoc = 5127; + rType = 0; + vrLen = 1863; + vrLoc = 4241; + }; + 61FA75A0115D8A2200DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 48"; + rLen = 0; + rLoc = 1236; + rType = 0; + vrLen = 217; + vrLoc = 975; + }; + 61FA75A1115D8A2200DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 161"; + rLen = 0; + rLoc = 5052; + rType = 0; + vrLen = 1863; + vrLoc = 4241; + }; + 61FA75A5115D8A3400DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 48"; + rLen = 0; + rLoc = 1236; + rType = 0; + vrLen = 217; + vrLoc = 975; + }; + 61FA75A6115D8A3400DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 161"; + rLen = 0; + rLoc = 5056; + rType = 0; + vrLen = 1863; + vrLoc = 4241; + }; + 61FA75AA115D8A4500DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 48"; + rLen = 0; + rLoc = 1236; + rType = 0; + vrLen = 217; + vrLoc = 975; + }; + 61FA75AB115D8A4500DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 161"; + rLen = 0; + rLoc = 5058; + rType = 0; + vrLen = 1862; + vrLoc = 4241; + }; + 61FA75AF115D8A5D00DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 48"; + rLen = 0; + rLoc = 1236; + rType = 0; + vrLen = 217; + vrLoc = 975; + }; + 61FA75B0115D8A5D00DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 159"; + rLen = 0; + rLoc = 4989; + rType = 0; + vrLen = 1866; + vrLoc = 4241; + }; + 61FA75B4115D8A8100DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 48"; + rLen = 0; + rLoc = 1236; + rType = 0; + vrLen = 217; + vrLoc = 975; + }; + 61FA75B5115D8A8100DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 161"; + rLen = 0; + rLoc = 5056; + rType = 0; + vrLen = 1866; + vrLoc = 4241; + }; + 61FA75B9115D8A9400DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 618AFBEE115BE8AE003D411B /* popupMenuViewController.m */; + name = "popupMenuViewController.m: 48"; + rLen = 0; + rLoc = 1236; + rType = 0; + vrLen = 217; + vrLoc = 975; + }; + 61FA75BA115D8A9400DA6ED0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6179939E1150226700BA94A9 /* overlayViewController.m */; + name = "overlayViewController.m: 161"; + rLen = 0; + rLoc = 5058; + rType = 0; + vrLen = 1866; + vrLoc = 4241; + }; 928301160F10CAFC00CC5A3C /* fpc */ = { activeExec = 0; }; diff -r 51629e69da51 -r 9d05c8000ed4 share/hedgewars/Data/Locale/hedgewars_pt_PT.ts --- a/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Fri Mar 26 23:47:12 2010 +0000 +++ b/share/hedgewars/Data/Locale/hedgewars_pt_PT.ts Sat Mar 27 00:03:25 2010 +0000 @@ -29,10 +29,6 @@ Editar esquemas - Edit weapons - Editar armas - - Error Erro @@ -40,6 +36,10 @@ Illegal ammo scheme Esquema de armas inválido + + Edit weapons + Editar armas + HWChatWidget @@ -109,6 +109,10 @@ Mapa + Themes + Temas + + Filter Filtro @@ -136,10 +140,6 @@ Wacky Invulgar - - Themes - Temas - HWNetServersModel @@ -171,6 +171,10 @@ Sala destruída + Quit reason: + Motivo de saída: + + You got kicked Foi expulso @@ -179,10 +183,6 @@ Password - Quit reason: - Motivo de saída: - - Your nickname %1 is registered on Hedgewars.org Please provide your password @@ -329,11 +329,27 @@ Weapons set - Esquema de armas + Esquema de armas Edit - Editar + Editar + + + Delete team + Apagar equipa + + + New weapon scheme + Novo esquema de armas + + + Edit weapon scheme + Editar esquema de armas + + + Delete weapon scheme + Apagar esquema de armas @@ -382,10 +398,6 @@ Actualizar - Admin features - Recursos de administrador - - Error Erro @@ -394,6 +406,10 @@ OK + Admin features + Recursos de administrador + + Room Name: Nome da Sala @@ -572,16 +588,16 @@ QAction + Kick + Expulsar + + Info Informação - Kick - Kickar - - - Ban - Banir + Start + Iniciar Restrict Joins @@ -592,8 +608,8 @@ Restringir adição de equipas - Start - Iniciar + Ban + Banir Follow @@ -619,6 +635,10 @@ QCheckBox + Check for updates at startup + Verificar por actualizações no arranque + + Fullscreen Ecrã completo @@ -647,14 +667,6 @@ Adicionar data e hora ao nome do ficheiro de gravação - Check for updates at startup - Verificar por actualizações no arranque - - - Frontend effects (requires restart) - Efeitos no frontend (é necessário reiniciar) - - Reduced quality Qualidade reduzida @@ -693,6 +705,10 @@ (System default) (Definições por omissão) + + Mission + Missão + QGroupBox @@ -729,6 +745,10 @@ Jogo em rede + Playing teams + Equipas a jogar + + Game Modifiers Modificadores de jogo @@ -737,10 +757,6 @@ Definições básicas - Playing teams - Equipas a jogar - - Team Settings Configurações de Equipa @@ -752,6 +768,14 @@ QLabel + Mines Time + Tempo das minas + + + Mines + Minas + + Version Versão @@ -780,10 +804,6 @@ Agradecimentos especiais: - Game scheme - Esquema de jogo - - Weapons Armas @@ -808,10 +828,6 @@ Limite de FPS - Initial sound volume - Volume de som inicial - - Server name: Nome do servidor: @@ -820,6 +836,10 @@ Porta do servidor: + Initial sound volume + Volume de som inicial + + Damage Modifier Modificador de dano @@ -836,20 +856,16 @@ Tempo até Morte Súbita + Scheme Name: + Nome do esquema: + + Crate Drops Queda de caixas - Mines Time - Tempo das minas - - - Mines - Minas - - - Scheme Name: - Nome do esquema: + Game scheme + Esquema de jogo % Dud Mines @@ -883,6 +899,10 @@ Restart game to apply Reiniciar o jogo para aplicar as definições + + Explosives + Explosivos + QLineEdit @@ -995,10 +1015,6 @@ Iniciar - Ready - Preparado - - Go! Ir! @@ -1023,6 +1039,10 @@ Configurar + Ready + Preparado + + Random Team Equipa aleatória @@ -1095,6 +1115,18 @@ ToggleButtonWidget + Vampirism + Vampirismo + + + Karma + Karma + + + Artillery + Artilharia + + Fort Mode Modo Forte @@ -1127,18 +1159,6 @@ Adicionar minas - Vampirism - Vampirismo - - - Karma - Karma - - - Artillery - Artilharia - - Random Order Ordem Aleatória diff -r 51629e69da51 -r 9d05c8000ed4 share/hedgewars/Data/Locale/pt_PT.txt --- a/share/hedgewars/Data/Locale/pt_PT.txt Fri Mar 26 23:47:12 2010 +0000 +++ b/share/hedgewars/Data/Locale/pt_PT.txt Sat Mar 27 00:03:25 2010 +0000 @@ -3,7 +3,7 @@ 00:00=Granada 00:01=Bomba de Fragmentos 00:02=Bazuca -00:03=OVNI +00:03=Abelha Teleguiada 00:04=Caçadeira 00:05=Martelo Pneumático 00:06=Saltar o turno @@ -41,6 +41,7 @@ 00:38=Sniper 00:39=Disco Voador 00:40=Coquetail Molotov +00:41=Passarito 01:00=Vamos lutar! 01:01=Ronda empatada @@ -403,12 +404,13 @@ 03:38=Arma (multiplos tiro) 03:39=Utilitário de Transporte 03:40=Granada Incendiária +03:41=Enorme fã do Squawks ; Weapon Descriptions (use | as line breaks) 04:00=Ataca os teus inimigos usando uma simples granada.|Explodirá quando o tempo chegar a zero.|1-5: Define o temporizador da granada|Ataque: Deixa premido para lançar com mais força 04:01=Ataca os teus inimigos usando uma bomba de fragmentos.|Dividir-se-á em pequenas bombas quando o temporizador|chegar a zero.|1-5: Define o temporizador da granada|Ataque: Deixa premido para lançar com mais força 04:02=Ataca os teus inimigos usando um projéctil balístico|que pode ser influenciado pelo vento.|Ataque: Deixa premido para disparar com mais força -04:03=Lança uma bomba teleguiada que ira perseguir o|alvo seleccionado. Não dispares com muita força|para aumentar a precisão.|Cursor: Escolher o alvo|Ataque: Deixa premido para disparar com mais força +04:03=Lança uma abelha teleguiada que ira perseguir o|alvo seleccionado. Não dispares com muita força|para aumentar a precisão.|Cursor: Escolher o alvo|Ataque: Deixa premido para disparar com mais força 04:04=Ataca o teu inimigo utilizando uma caçadeira com dois tiros.|Como o tiro se espalha não precisas de acertar em cheio|para magoar os teus oponentes.|Ataque: Disparar (múltiplas vezes) 04:05=Move-te pelo subsolo! Usa o martelo pneumático para|escavar um buraco no chão e alcançar outras áreas.|Ataque: Começar ou parar de escavar 04:06=Aborrecido? Não tens maneira de atacar?|Preferes guardar as munições?|Não há problema! Passa o turno, covarde!|Ataque: Passa o turno @@ -419,7 +421,7 @@ 04:11=Livra-te de ouriços inimigos atirando-os por cima das|bordas do mapa e para dentro de água. Ou que tal|bater numas minas para os teus amigos?|Ataque: Bater em tudo o que estiver à tua frente 04:12=Chega-te bem pertinho e solta o poder desta|quase mortal técnica de artes marciais.|Ataque: Faz um Soco de Fogo 04:13=UNUSED -04:14=Tens medo de alturas? É melhor agarrares um pára-quedas.|Abrir-se-á assim que caíres de demasiado alto salvando o|teu ouriço do dano da queda.|Ataque: Abrir o pára-quedas +04:14=Tens medo de alturas? É melhor agarrares um pára-quedas.|Abrir-se-á assim que caíres de demasiado alto salvando o|teu ouriço do dano da queda.|Ataque: Abrir o pára-quedas|Saltar: Larga granadas ou armas similares 04:15=Chama um avião para atacar os teus inimigos|largando bombas sobre eles.|Esquerda/Direita: Determina a direcção do ataque|Cursor: Selecciona a zona alvo 04:16=Chama um avião para largar varias minas na|área alvo.|Esquerda/Direita: Determina a direcção do ataque|Cursor: Selecciona a zona alvo 04:17=Percisas de um abrigo? Usa o maçarico para|escavar um túnel no terreno criando cobertura.|Ataque: Começar ou parar de escavar @@ -444,8 +446,9 @@ 04:36=Há dias em que a tua pontaria anda simplesmente terrível.|Obtém alguma ajuda utilizando a tecnologia moderna.|Ataque: Activar 04:37=Não temas a luz do dia. Só vai durar um turno|mas vais poder absorver o dano que fizeres|aos outros ouriços.|Ataque: Activar 04:38=A sniper pode ser a arma mais devastadora no teu|arsenal, mas é muito pouco eficiente ao perto.|O dano aumenta proporcionalmente à distancia do alvo.|Ataque: Disparar (duas vezes) -04:39=Voa para outras partes do mapa usando o disco voador.|Este utilitário difícil de controlar é capaz de te levar|a quase qualquer posição no campo de batalha.|Ataque: Activar|Cima/Esquerda/Direita: Aplica força nessa direcção +04:39=Voa para outras partes do mapa usando o disco voador.|Este utilitário difícil de controlar é capaz de te levar|a quase qualquer posição no campo de batalha.|Ataque: Activar|Cima/Esquerda/Direita: Aplica força nessa direcção|Saltar: Larga granadas ou armas similares 04:40=Pôe o chão a arder com esta garrafa cheia de|liquido altamente inflamável.|Ataque: Deixa premido para atirar com mais força +04:41=Prova que a natureza está mais avançada que o que|poderiam imaginar. Este passarito consegue transportar o teu ouriço|e largar ovos nos teus enimigos!|Attack: Activar e largar ovos|Cima/Esquerda/Direita: Bater as asas nessa direcção ; Game goal strings 05:00=Modos de Jogo @@ -463,4 +466,4 @@ 05:12=Tempo das minas: As minas detonam passado %1 segundo(s) 05:13=Tempo das minas: As minas detonam instantaneamente 05:14=Tempo das minas: As minas detonam passado 0 - 3 segundos -05:15=Modificador de Dano: Todas as armas fazem %1% de dano \ No newline at end of file +05:15=Modificador de Dano: Todas as armas fazem %1% de dano