Merge lp:~jose-exposito89/ubuntuone-ios-files/i18n into lp:ubuntuone-ios-files

[José Expósito]

Added full support for translations and Spanish translation

[lp:~jose-exposito89/ubuntuone-ios-files/i18n]

63. By José Expósito on 2012-08-27

Added mising translations in U1FilePreviewViewController and U1UploadsPoolViewController

[Zachery Bir (urbanape)]

Looks good! Thanks for contributing!

review: Approve

[Natalia Bidart (nataliabidart)]

Setting MP as Rejected to reduce numbers of landing candidates in @reviewlist.
Change status again if this MP is still current.

Unmerged revisions

63. By José Expósito on 2012-08-27

Added mising translations in U1FilePreviewViewController and U1UploadsPoolViewController

62. By José Expósito on 2012-08-26

Added missing files

61. By José Expósito on 2012-08-26

Added full support for translations and added spanish translation

=== modified file 'Dependencies/PullToRefresh/Classes/PullRefreshTableViewController.m'
--- Dependencies/PullToRefresh/Classes/PullRefreshTableViewController.m	2011-08-31 14:56:30 +0000
+++ Dependencies/PullToRefresh/Classes/PullRefreshTableViewController.m	2012-08-27 11:27:21 +0000
@@ -67,9 +67,9 @@
 }
 
 - (void)setupStrings{
-  textPull = [[NSString alloc] initWithString:@"Pull down to refresh..."];
-  textRelease = [[NSString alloc] initWithString:@"Release to refresh..."];
-  textLoading = [[NSString alloc] initWithString:@"Loading..."];
+  textPull = [[NSString alloc] initWithString:NSLocalizedString(@"Pull down to refresh...", nil)];
+  textRelease = [[NSString alloc] initWithString:NSLocalizedString(@"Release to refresh...", nil)];
+  textLoading = [[NSString alloc] initWithString:NSLocalizedString(@"Loading...", nil)];
 }
 
 - (void)addPullToRefreshHeader {
 
=== modified file 'Files.xcodeproj/project.pbxproj'
--- Files.xcodeproj/project.pbxproj	2012-08-10 03:19:46 +0000
+++ Files.xcodeproj/project.pbxproj	2012-08-27 11:27:21 +0000
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		8291508C15EA62A700052570 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8291508E15EA62A700052570 /* Localizable.strings */; };
 		910393E81475B118004DE69D /* U1AutoUploadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 910393E71475B118004DE69D /* U1AutoUploadOperation.m */; };
 		913A54AF1451EFE70081FD67 /* progress_view_background.png in Resources */ = {isa = PBXBuildFile; fileRef = 913A54AD1451EFE70081FD67 /* progress_view_background.png */; };
 		913A54B01451EFE70081FD67 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 913A54AE1451EFE70081FD67 /* [e-mail] */; };
@@ -232,6 +233,8 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		821195B515EA64E200C6F3BC /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
+		8291508D15EA62A700052570 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		910393E61475B118004DE69D /* U1AutoUploadOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1AutoUploadOperation.h; sourceTree = "<group>"; };
 		910393E71475B118004DE69D /* U1AutoUploadOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1AutoUploadOperation.m; sourceTree = "<group>"; };
 		913A54AD1451EFE70081FD67 /* progress_view_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = progress_view_background.png; path = Assets/progress_view_background.png; sourceTree = "<group>"; };
@@ -591,6 +594,14 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		8291508815EA628000052570 /* Translations */ = {
+			isa = PBXGroup;
+			children = (
+				8291508E15EA62A700052570 /* Localizable.strings */,
+			);
+			name = Translations;
+			sourceTree = "<group>";
+		};
 		960D45F91409E09F00B73177 /* PullToRefresh */ = {
 			isa = PBXGroup;
 			children = (
@@ -859,6 +870,7 @@
 		96E860BB13F7251D0026783D /* Files */ = {
 			isa = PBXGroup;
 			children = (
+				8291508815EA628000052570 /* Translations */,
 				96783E6513F8ABC70092C6A1 /* Assets */,
 				96E860BC13F7251D0026783D /* Supporting Files */,
 				96733AEC140DFABB0074D545 /* SSO */,
@@ -1253,6 +1265,7 @@
 				96C2C17D14C633A7006E1D57 /* U1SSOSignUpViewController.xib in Resources */,
 				9656A78914C692450033A4D7 /* U1SSOEmailVerificationViewController.xib in Resources */,
 				96DF409514D7A86A00896B6E /* SVProgressHUD.bundle in Resources */,
+				8291508C15EA62A700052570 /* Localizable.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1413,6 +1426,15 @@
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
+		8291508E15EA62A700052570 /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				8291508D15EA62A700052570 /* en */,
+				821195B515EA64E200C6F3BC /* es */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
 		96E860BE13F7251D0026783D /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
 
=== modified file 'Files/U1FileDetailsViewController.h'
--- Files/U1FileDetailsViewController.h	2011-12-08 19:23:49 +0000
+++ Files/U1FileDetailsViewController.h	2012-08-27 11:27:21 +0000
@@ -42,4 +42,9 @@
 
 - (id)initWithNode:(U1FileNode*)node;
 
+@property (retain, nonatomic) IBOutlet UILabel *sizeLabelDescription;
+@property (retain, nonatomic) IBOutlet UILabel *modifiedLabelDescription;
+@property (retain, nonatomic) IBOutlet UILabel *viewCellLabel;
+@property (retain, nonatomic) IBOutlet UILabel *publishCellLabel;
+
 @end
 
=== modified file 'Files/U1FileDetailsViewController.m'
--- Files/U1FileDetailsViewController.m	2012-04-27 02:27:26 +0000
+++ Files/U1FileDetailsViewController.m	2012-08-27 11:27:21 +0000
@@ -52,6 +52,10 @@
 
 
 @implementation U1FileDetailsViewController
+@synthesize sizeLabelDescription;
+@synthesize modifiedLabelDescription;
+@synthesize viewCellLabel;
+@synthesize publishCellLabel;
 
 @synthesize loadingContainerView, fileAncillaryDetailsView, iconImageView, nameLabel, loadingActivityView, sizeLabel, createdLabel, modifiedLabel, toolbar, publicURLLabel, renameTextField, sectionOneCells, sectionTwoCells, actionsTableView, publishSwitch, publishStatusLabel;
 @synthesize node, docController, filesClient, contentURL, fileInfo;
@@ -127,6 +131,10 @@
 	[actionsTableView release];
 	[publishSwitch release];
 	[publishStatusLabel release];
+    [sizeLabelDescription release];
+    [modifiedLabelDescription release];
+    [viewCellLabel release];
+    [publishCellLabel release];
 	[super dealloc];
 }
 
@@ -144,6 +152,11 @@
 {
 	[super viewDidLoad];
 	
+    self.sizeLabelDescription.text     = NSLocalizedString(@"Size:", nil);
+    self.modifiedLabelDescription.text = NSLocalizedString(@"Modified:", nil);
+    self.viewCellLabel.text            = NSLocalizedString(@"View", nil);
+    self.publishCellLabel.text         = NSLocalizedString(@"Published", nil);
+    
 	[self.nameLabel setText:self.title];
 	NSString *sizeString = [sizeTransformer() transformedValue:[self.node size]];
 	[self.sizeLabel setText:sizeString];
@@ -188,6 +201,10 @@
 	[actionsTableView release], actionsTableView = nil;
 	[publishSwitch release], publishSwitch = nil;
 	[publishStatusLabel release], publishStatusLabel = nil;
+    [self setSizeLabelDescription:nil];
+    [self setModifiedLabelDescription:nil];
+    [self setViewCellLabel:nil];
+    [self setPublishCellLabel:nil];
 	[super viewDidUnload];
 }
 
@@ -262,7 +279,7 @@
 
 - (IBAction)deleteItem:(UIBarButtonItem*)sender;
 {
-	UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Are you sure you want to delete this file?\nIt will be deleted everywhere in the Ubuntu One service.", @"")
+	UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Are you sure you want to delete this file?\nIt will be deleted everywhere in the Ubuntu One service", @"")
 															 delegate:self
 													cancelButtonTitle:NSLocalizedString(@"Cancel", @"")
 											   destructiveButtonTitle:NSLocalizedString(@"Delete", @"")
 
=== modified file 'Files/U1FileDetailsViewController.xib'
--- Files/U1FileDetailsViewController.xib	2012-04-27 02:27:26 +0000
+++ Files/U1FileDetailsViewController.xib	2012-08-27 11:27:21 +0000
@@ -2,24 +2,24 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1296</int>
-		<string key="IBDocument.SystemVersion">11D50</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
-		<string key="IBDocument.AppKitVersion">1138.32</string>
-		<string key="IBDocument.HIToolboxVersion">568.00</string>
+		<string key="IBDocument.SystemVersion">12B19</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
+		<string key="IBDocument.AppKitVersion">1187</string>
+		<string key="IBDocument.HIToolboxVersion">624.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">1181</string>
+			<string key="NS.object.0">1498</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBProxyObject</string>
+			<string>IBUIBarButtonItem</string>
 			<string>IBUIImageView</string>
 			<string>IBUILabel</string>
-			<string>IBUIToolbar</string>
 			<string>IBUISwitch</string>
-			<string>IBUITextField</string>
-			<string>IBUIBarButtonItem</string>
 			<string>IBUITableView</string>
 			<string>IBUITableViewCell</string>
+			<string>IBUITextField</string>
+			<string>IBUIToolbar</string>
 			<string>IBUIView</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
@@ -47,7 +47,6 @@
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrameSize">{320, 416}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="959604046"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
@@ -75,7 +74,6 @@
 												<int key="NSvFlags">292</int>
 												<string key="NSFrame">{{20, 20}, {64, 64}}</string>
 												<reference key="NSSuperview" ref="346642923"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="675538218"/>
 												<int key="IBUIContentMode">1</int>
 												<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -86,7 +84,6 @@
 												<int key="NSvFlags">292</int>
 												<string key="NSFrame">{{105, 20}, {195, 48}}</string>
 												<reference key="NSSuperview" ref="346642923"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="1038751454"/>
 												<bool key="IBUIOpaque">NO</bool>
 												<bool key="IBUIClipsSubviews">YES</bool>
@@ -119,7 +116,6 @@
 												<int key="NSvFlags">-2147483356</int>
 												<string key="NSFrame">{{105, 20}, {195, 31}}</string>
 												<reference key="NSSuperview" ref="346642923"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="12890828"/>
 												<bool key="IBUIOpaque">NO</bool>
 												<bool key="IBUIClipsSubviews">YES</bool>
@@ -146,9 +142,8 @@
 													<object class="IBUILabel" id="723802363">
 														<reference key="NSNextResponder" ref="12890828"/>
 														<int key="NSvFlags">292</int>
-														<string key="NSFrame">{{40, 0}, {155, 20}}</string>
+														<string key="NSFrame">{{83, 0}, {112, 20}}</string>
 														<reference key="NSSuperview" ref="12890828"/>
-														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="215006113"/>
 														<bool key="IBUIOpaque">NO</bool>
 														<bool key="IBUIClipsSubviews">YES</bool>
@@ -175,9 +170,8 @@
 													<object class="IBUILabel" id="568016573">
 														<reference key="NSNextResponder" ref="12890828"/>
 														<int key="NSvFlags">292</int>
-														<string key="NSFrame">{{0, 1}, {32, 18}}</string>
+														<string key="NSFrame">{{0, 1}, {75, 18}}</string>
 														<reference key="NSSuperview" ref="12890828"/>
-														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="723802363"/>
 														<bool key="IBUIOpaque">NO</bool>
 														<bool key="IBUIClipsSubviews">YES</bool>
@@ -204,9 +198,8 @@
 													<object class="IBUILabel" id="215006113">
 														<reference key="NSNextResponder" ref="12890828"/>
 														<int key="NSvFlags">292</int>
-														<string key="NSFrame">{{0, 21}, {63, 18}}</string>
+														<string key="NSFrame">{{0, 21}, {75, 18}}</string>
 														<reference key="NSSuperview" ref="12890828"/>
-														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="759648964"/>
 														<bool key="IBUIOpaque">NO</bool>
 														<bool key="IBUIClipsSubviews">YES</bool>
@@ -224,9 +217,8 @@
 													<object class="IBUILabel" id="759648964">
 														<reference key="NSNextResponder" ref="12890828"/>
 														<int key="NSvFlags">292</int>
-														<string key="NSFrame">{{71, 21}, {124, 19}}</string>
+														<string key="NSFrame">{{83, 21}, {112, 19}}</string>
 														<reference key="NSSuperview" ref="12890828"/>
-														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="591885325"/>
 														<bool key="IBUIOpaque">NO</bool>
 														<bool key="IBUIClipsSubviews">YES</bool>
@@ -244,7 +236,6 @@
 												</array>
 												<string key="NSFrame">{{105, 76}, {195, 59}}</string>
 												<reference key="NSSuperview" ref="346642923"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="568016573"/>
 												<object class="NSColor" key="IBUIBackgroundColor" id="436719790">
 													<int key="NSColorSpace">3</int>
@@ -256,7 +247,6 @@
 										</array>
 										<string key="NSFrameSize">{320, 104}</string>
 										<reference key="NSSuperview" ref="149170707"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="749932571"/>
 										<reference key="IBUIBackgroundColor" ref="436719790"/>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -264,7 +254,6 @@
 								</array>
 								<string key="NSFrameSize">{320, 372}</string>
 								<reference key="NSSuperview" ref="959604046"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="346642923"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">10</int>
@@ -340,7 +329,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 372}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="149170707"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
@@ -354,7 +342,6 @@
 						<int key="NSvFlags">266</int>
 						<string key="NSFrame">{{0, 372}, {320, 44}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -385,7 +372,6 @@
 				</array>
 				<string key="NSFrame">{{0, 64}, {320, 416}}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="822782837"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
@@ -411,7 +397,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{10, 0}, {280, 43}}</string>
 								<reference key="NSSuperview" ref="277406904"/>
-								<reference key="NSWindow"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
 								<int key="IBUIContentMode">4</int>
@@ -440,7 +425,6 @@
 						</array>
 						<string key="NSFrameSize">{300, 43}</string>
 						<reference key="NSSuperview" ref="215257660"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1062861027"/>
 						<reference key="IBUIBackgroundColor" ref="436719790"/>
 						<bool key="IBUIOpaque">NO</bool>
@@ -452,7 +436,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 44}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="277406904"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<int key="IBUISelectionStyle">2</int>
@@ -474,7 +457,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{10, 0}, {280, 43}}</string>
 								<reference key="NSSuperview" ref="488107434"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="118953615"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
@@ -493,7 +475,6 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{206, 8}, {94, 27}}</string>
 								<reference key="NSSuperview" ref="488107434"/>
-								<reference key="NSWindow"/>
 								<reference key="IBUIBackgroundColor" ref="436719790"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -507,7 +488,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 43}</string>
 						<reference key="NSSuperview" ref="504068980"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="16747584"/>
 						<reference key="IBUIBackgroundColor" ref="436719790"/>
 						<bool key="IBUIOpaque">NO</bool>
@@ -519,7 +499,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 44}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="488107434"/>
 				<int key="IBUITag">1</int>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -539,7 +518,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{10, 0}, {300, 43}}</string>
 								<reference key="NSSuperview" ref="1037596391"/>
-								<reference key="NSWindow"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
 								<int key="IBUIContentMode">4</int>
@@ -565,7 +543,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 43}</string>
 						<reference key="NSSuperview" ref="502759082"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="827181736"/>
 						<reference key="IBUIBackgroundColor" ref="436719790"/>
 						<bool key="IBUIOpaque">NO</bool>
@@ -577,7 +554,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 44}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="1037596391"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<int key="IBUISelectionStyle">2</int>
@@ -716,6 +692,38 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">modifiedLabelDescription</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="215006113"/>
+					</object>
+					<int key="connectionID">111</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">sizeLabelDescription</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="568016573"/>
+					</object>
+					<int key="connectionID">112</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">viewCellLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="1062861027"/>
+					</object>
+					<int key="connectionID">113</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">publishCellLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="16747584"/>
+					</object>
+					<int key="connectionID">114</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">delegate</string>
 						<reference key="source" ref="1038751454"/>
 						<reference key="destination" ref="372490531"/>
@@ -985,114 +993,9 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">108</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">U1FileDetailsViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="actionsTableView">UITableView</string>
-						<string key="createdLabel">UILabel</string>
-						<string key="fileAncillaryDetailsView">UIView</string>
-						<string key="iconImageView">UIImageView</string>
-						<string key="loadingActivityView">UIActivityIndicatorView</string>
-						<string key="loadingContainerView">UIView</string>
-						<string key="modifiedLabel">UILabel</string>
-						<string key="nameLabel">UILabel</string>
-						<string key="publicURLLabel">UITextView</string>
-						<string key="publishStatusLabel">UILabel</string>
-						<string key="publishSwitch">UISwitch</string>
-						<string key="renameTextField">UITextField</string>
-						<string key="sizeLabel">UILabel</string>
-						<string key="toolbar">UIToolbar</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="actionsTableView">
-							<string key="name">actionsTableView</string>
-							<string key="candidateClassName">UITableView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="createdLabel">
-							<string key="name">createdLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="fileAncillaryDetailsView">
-							<string key="name">fileAncillaryDetailsView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="iconImageView">
-							<string key="name">iconImageView</string>
-							<string key="candidateClassName">UIImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="loadingActivityView">
-							<string key="name">loadingActivityView</string>
-							<string key="candidateClassName">UIActivityIndicatorView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="loadingContainerView">
-							<string key="name">loadingContainerView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="modifiedLabel">
-							<string key="name">modifiedLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="nameLabel">
-							<string key="name">nameLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="publicURLLabel">
-							<string key="name">publicURLLabel</string>
-							<string key="candidateClassName">UITextView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="publishStatusLabel">
-							<string key="name">publishStatusLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="publishSwitch">
-							<string key="name">publishSwitch</string>
-							<string key="candidateClassName">UISwitch</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="renameTextField">
-							<string key="name">renameTextField</string>
-							<string key="candidateClassName">UITextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="sizeLabel">
-							<string key="name">sizeLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="toolbar">
-							<string key="name">toolbar</string>
-							<string key="candidateClassName">UIToolbar</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toManyOutletInfosByName">
-						<object class="IBToManyOutletInfo" key="sectionOneCells">
-							<string key="name">sectionOneCells</string>
-							<string key="candidateClassName">UITableViewCell</string>
-							<string key="collectionClassName">NSArray</string>
-						</object>
-						<object class="IBToManyOutletInfo" key="sectionTwoCells">
-							<string key="name">sectionTwoCells</string>
-							<string key="candidateClassName">UITableViewCell</string>
-							<string key="collectionClassName">NSArray</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/U1FileDetailsViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">U1TopPinningLabel</string>
-					<string key="superclassName">UILabel</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/U1TopPinningLabel.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+			<int key="maxID">114</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
@@ -1105,6 +1008,6 @@
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<string key="IBCocoaTouchPluginVersion">1181</string>
+		<string key="IBCocoaTouchPluginVersion">1498</string>
 	</data>
 </archive>
 
=== modified file 'Files/U1FilePreviewViewController.h'
--- Files/U1FilePreviewViewController.h	2011-12-15 18:56:28 +0000
+++ Files/U1FilePreviewViewController.h	2012-08-27 11:27:21 +0000
@@ -28,6 +28,8 @@
 @property (nonatomic, retain) IBOutlet UIView *previewContainerView;
 
 @property (nonatomic, retain) IBOutlet UIToolbar *toolBar;
+@property (retain, nonatomic) IBOutlet UILabel *downloadingFileLabel;
+
 - (id)initWithNode:(U1FileNode*)node;
 
 @end
 
=== modified file 'Files/U1FilePreviewViewController.m'
--- Files/U1FilePreviewViewController.m	2012-04-27 02:27:26 +0000
+++ Files/U1FilePreviewViewController.m	2012-08-27 11:27:21 +0000
@@ -32,6 +32,7 @@
 
 
 @implementation U1FilePreviewViewController
+@synthesize downloadingFileLabel;
 
 @synthesize containerView, downloadContainerView, downloadProgressView, previewContainerView;
 @synthesize node, filesClient, fileInfo, previewController, toolBar, docController;
@@ -58,6 +59,7 @@
     [docController release];
 	[previewController release];
 	[toolBar release];
+    [downloadingFileLabel release];
 	[super dealloc];
 }
 
@@ -69,6 +71,8 @@
 		
 	}];
     self.docController = [UIDocumentInteractionController interactionControllerWithURL:fileInfo.fileURL];
+    
+    self.downloadingFileLabel.text = NSLocalizedString(@"Downloading File...", nil);
 }
 
 - (void)viewDidUnload;
@@ -79,6 +83,7 @@
 	[downloadContainerView release], downloadContainerView = nil;
 	[downloadProgressView release], downloadProgressView = nil;
 	[previewContainerView release], previewContainerView = nil;
+    [self setDownloadingFileLabel:nil];
 	[super viewDidUnload];
 }
 
 
=== modified file 'Files/U1FilePreviewViewController.xib'
--- Files/U1FilePreviewViewController.xib	2012-04-27 02:27:26 +0000
+++ Files/U1FilePreviewViewController.xib	2012-08-27 11:27:21 +0000
@@ -2,21 +2,21 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1296</int>
-		<string key="IBDocument.SystemVersion">11D50</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
-		<string key="IBDocument.AppKitVersion">1138.32</string>
-		<string key="IBDocument.HIToolboxVersion">568.00</string>
+		<string key="IBDocument.SystemVersion">12B19</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
+		<string key="IBDocument.AppKitVersion">1187</string>
+		<string key="IBDocument.HIToolboxVersion">624.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">1181</string>
+			<string key="NS.object.0">1498</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBProxyObject</string>
+			<string>IBUIBarButtonItem</string>
+			<string>IBUILabel</string>
 			<string>IBUIProgressView</string>
-			<string>IBUIBarButtonItem</string>
 			<string>IBUIToolbar</string>
 			<string>IBUIView</string>
-			<string>IBUILabel</string>
-			<string>IBProxyObject</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -43,7 +43,6 @@
 						<int key="NSvFlags">266</int>
 						<string key="NSFrame">{{0, 372}, {320, 44}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -84,7 +83,6 @@
 										<int key="NSvFlags">292</int>
 										<string key="NSFrame">{{125, 175}, {70, 21}}</string>
 										<reference key="NSSuperview" ref="77920402"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="192602212"/>
 										<bool key="IBUIOpaque">NO</bool>
 										<bool key="IBUIClipsSubviews">YES</bool>
@@ -112,7 +110,6 @@
 								</array>
 								<string key="NSFrameSize">{320, 372}</string>
 								<reference key="NSSuperview" ref="747227964"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="748563573"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">3</int>
@@ -129,10 +126,9 @@
 								<array class="NSMutableArray" key="NSSubviews">
 									<object class="IBUIProgressView" id="804375426">
 										<reference key="NSNextResponder" ref="192602212"/>
-										<int key="NSvFlags">292</int>
+										<int key="NSvFlags">258</int>
 										<string key="NSFrame">{{85, 181}, {150, 9}}</string>
 										<reference key="NSSuperview" ref="192602212"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="921128121"/>
 										<bool key="IBUIOpaque">NO</bool>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -143,10 +139,9 @@
 									</object>
 									<object class="IBUILabel" id="149709600">
 										<reference key="NSNextResponder" ref="192602212"/>
-										<int key="NSvFlags">292</int>
-										<string key="NSFrame">{{96, 154}, {129, 19}}</string>
+										<int key="NSvFlags">290</int>
+										<string key="NSFrame">{{20, 154}, {280, 19}}</string>
 										<reference key="NSSuperview" ref="192602212"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="804375426"/>
 										<bool key="IBUIOpaque">NO</bool>
 										<bool key="IBUIClipsSubviews">YES</bool>
@@ -158,6 +153,7 @@
 										<nil key="IBUIHighlightedColor"/>
 										<int key="IBUIBaselineAdjustment">1</int>
 										<float key="IBUIMinimumFontSize">10</float>
+										<int key="IBUITextAlignment">1</int>
 										<object class="IBUIFontDescription" key="IBUIFontDescription">
 											<int key="type">1</int>
 											<double key="pointSize">15</double>
@@ -171,7 +167,6 @@
 								</array>
 								<string key="NSFrameSize">{320, 372}</string>
 								<reference key="NSSuperview" ref="747227964"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="149709600"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">3</int>
@@ -183,7 +178,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 372}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="77920402"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
@@ -195,7 +189,6 @@
 				</array>
 				<string key="NSFrame">{{0, 64}, {320, 416}}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="747227964"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
@@ -279,6 +272,14 @@
 					<int key="connectionID">25</int>
 				</object>
 				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">downloadingFileLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="149709600"/>
+					</object>
+					<int key="connectionID">26</int>
+				</object>
+				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">deleteItem:</string>
 						<reference key="source" ref="134023548"/>
@@ -415,49 +416,9 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">25</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">U1FilePreviewViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="containerView">UIView</string>
-						<string key="downloadContainerView">UIView</string>
-						<string key="downloadProgressView">UIProgressView</string>
-						<string key="previewContainerView">UIView</string>
-						<string key="toolBar">UIToolbar</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="containerView">
-							<string key="name">containerView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="downloadContainerView">
-							<string key="name">downloadContainerView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="downloadProgressView">
-							<string key="name">downloadProgressView</string>
-							<string key="candidateClassName">UIProgressView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="previewContainerView">
-							<string key="name">previewContainerView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="toolBar">
-							<string key="name">toolBar</string>
-							<string key="candidateClassName">UIToolbar</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/U1FilePreviewViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+			<int key="maxID">26</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
@@ -466,6 +427,6 @@
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<string key="IBCocoaTouchPluginVersion">1181</string>
+		<string key="IBCocoaTouchPluginVersion">1498</string>
 	</data>
 </archive>
 
=== modified file 'Files/U1FolderViewController.m'
--- Files/U1FolderViewController.m	2012-08-10 03:19:46 +0000
+++ Files/U1FolderViewController.m	2012-08-27 11:27:21 +0000
@@ -257,7 +257,7 @@
 	{
 		[cell.imageView setImage:[UIImage imageNamed:@"ic_folder"]];
 		NSString *fuzzyDate = [self.fuzzyDateTransformer transformedValue:aNode.modificationDate];
-		[cell.detailLabel setText:[NSString stringWithFormat:@"modified %@", fuzzyDate]];
+		[cell.detailLabel setText:[NSString stringWithFormat:NSLocalizedString(@"Modified %@", @"Folder modification time"), fuzzyDate]];
 	}
 	else
 	{
@@ -274,7 +274,7 @@
 		NSString *detailString = sizeString;
 		NSString *fuzzyDate = [self.fuzzyDateTransformer transformedValue:aNode.modificationDate];
 		if (aNode.modificationDate)
-			detailString = [sizeString stringByAppendingFormat:@", modified %@", fuzzyDate];
+			detailString = [sizeString stringByAppendingFormat:NSLocalizedString(@", modified %@", @"File modification time"), fuzzyDate];
 		[cell.detailLabel setText:detailString];
 	}
 }
@@ -439,7 +439,7 @@
 	int numItems = [[[self.resultsController sections] objectAtIndex:0] numberOfObjects];
 	NSNumber *folderRawSize = [[self.resultsController fetchedObjects] valueForKeyPath:@"@sum.size"];
 	NSString *folderSize = [self.byteSizeTransformer transformedValue:folderRawSize];
-	[self.footerLabel setText:[NSString stringWithFormat:@"%d items, %@", numItems, folderSize]];
+	[self.footerLabel setText:[NSString stringWithFormat:NSLocalizedString(@"%d items, %@", @"N items, S.S MB"), numItems, folderSize]];
 }
 
 @end
 
=== modified file 'Files/U1LoginController.m'
--- Files/U1LoginController.m	2012-05-18 18:40:15 +0000
+++ Files/U1LoginController.m	2012-08-27 11:27:21 +0000
@@ -326,7 +326,7 @@
 	else if (errorMessage == nil)
 		errorMessage = NSLocalizedString(@"An error occured trying to sign in, please try again.", @"Login Error Message");
 
-	UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Ubuntu One", nil) message:errorMessage delegate:self cancelButtonTitle:@"Dismiss" otherButtonTitles:nil];
+	UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Ubuntu One" message:errorMessage delegate:self cancelButtonTitle:NSLocalizedString(@"Ok", nil) otherButtonTitles:nil];
 	[alert show];
 	[alert release];
 	[self.loginViewController.view setUserInteractionEnabled:YES];
 
=== modified file 'Files/U1SSOCredentialsViewController.h'
--- Files/U1SSOCredentialsViewController.h	2012-01-19 15:52:37 +0000
+++ Files/U1SSOCredentialsViewController.h	2012-08-27 11:27:21 +0000
@@ -32,7 +32,12 @@
 @property (nonatomic, retain) IBOutlet UIButton *loginButton;
 @property (nonatomic, copy) void (^loginAction)(NSString *username, NSString *password);
 
+@property (retain, nonatomic) IBOutlet UILabel *emailLabel;
+@property (retain, nonatomic) IBOutlet UILabel *passwordLabel;
+
 - (IBAction)logIn:(id)sender;
 - (void)reset;
 
+
+
 @end
 
=== modified file 'Files/U1SSOCredentialsViewController.m'
--- Files/U1SSOCredentialsViewController.m	2012-01-19 15:52:37 +0000
+++ Files/U1SSOCredentialsViewController.m	2012-08-27 11:27:21 +0000
@@ -17,6 +17,8 @@
 
 
 @implementation U1SSOCredentialsViewController
+@synthesize emailLabel;
+@synthesize passwordLabel;
 
 @synthesize emailField;
 @synthesize passwordField;
@@ -33,6 +35,8 @@
     [patternView release];
 	[loginButton release];
 	[spinner release];
+    [emailLabel release];
+    [passwordLabel release];
     [super dealloc];
 }
 
@@ -43,6 +47,8 @@
     [self setPatternView:nil];
 	[self setLoginButton:nil];
 	[self setSpinner:nil];
+    [self setEmailLabel:nil];
+    [self setPasswordLabel:nil];
 	[super viewDidUnload];
 }
 
@@ -57,6 +63,10 @@
 	// The following should not be necessary but without it the pattern color is opaque...
 	// http://stackoverflow.com/questions/3899398/uicolor-colorwithpatternimage-alpha-blending-problem-solution-ios-sdk-4-1/5348396#5348396
 //	[self.patternView.layer setOpaque:NO];
+    
+    self.emailLabel.text = NSLocalizedString(@"Email", nil);
+    self.passwordLabel.text = NSLocalizedString(@"Password", nil);
+    [self.loginButton setTitle:NSLocalizedString(@"Sign in", nil) forState:UIControlStateNormal];
 }
 
 - (IBAction)logIn:(id)sender;
 
=== modified file 'Files/U1SSOCredentialsViewController.xib'
--- Files/U1SSOCredentialsViewController.xib	2012-01-19 15:52:37 +0000
+++ Files/U1SSOCredentialsViewController.xib	2012-08-27 11:27:21 +0000
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
 	<data>
-		<int key="IBDocument.SystemTarget">1280</int>
-		<string key="IBDocument.SystemVersion">10K549</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1038.36</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<int key="IBDocument.SystemTarget">1296</int>
+		<string key="IBDocument.SystemVersion">12B19</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
+		<string key="IBDocument.AppKitVersion">1187</string>
+		<string key="IBDocument.HIToolboxVersion">624.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">933</string>
+			<string key="NS.object.0">1498</string>
 		</object>
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<string>IBProxyObject</string>
+			<string>IBUIActivityIndicatorView</string>
+			<string>IBUIButton</string>
 			<string>IBUILabel</string>
-			<string>IBUIButton</string>
-			<string>IBUIActivityIndicatorView</string>
+			<string>IBUITextField</string>
 			<string>IBUIView</string>
-			<string>IBUITextField</string>
-			<string>IBProxyObject</string>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -38,7 +38,7 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="191373211">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">274</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -47,6 +47,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{21, 33}, {279, 31}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1028176743"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -82,6 +83,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{20, 100}, {280, 31}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1065737352"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -107,6 +109,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{20, 11}, {40, 20}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="391813410"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -138,6 +141,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{20, 79}, {72, 20}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="965235407"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -157,6 +161,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{21, 143}, {275, 45}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="IBUIContentStretch">{{0.5, 0}, {0.5, 1}}</string>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -192,6 +197,7 @@
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{278, 11}, {20, 20}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="327454090"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -199,6 +205,8 @@
 					</object>
 				</object>
 				<string key="NSFrame">{{0, 64}, {320, 416}}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
 					<bytes key="NSWhite">MQA</bytes>
@@ -255,6 +263,22 @@
 					<int key="connectionID">23</int>
 				</object>
 				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">emailLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="522019067"/>
+					</object>
+					<int key="connectionID">31</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">passwordLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="1028176743"/>
+					</object>
+					<int key="connectionID">32</int>
+				</object>
+				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">logIn:</string>
 						<reference key="source" ref="1065737352"/>
@@ -349,7 +373,7 @@
 					<string>6.IBPluginDependency</string>
 					<string>7.IBPluginDependency</string>
 				</object>
-				<object class="NSMutableArray" key="dict.values">
+				<object class="NSArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>U1SSOCredentialsViewController</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -377,7 +401,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">30</int>
+			<int key="maxID">32</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -390,16 +414,106 @@
 						<string key="minorKey">./Classes/U1OrangeButton.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">U1SSOCredentialsViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">logIn:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">logIn:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">logIn:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>emailField</string>
+							<string>emailLabel</string>
+							<string>loginButton</string>
+							<string>passwordField</string>
+							<string>passwordLabel</string>
+							<string>patternView</string>
+							<string>spinner</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>UITextField</string>
+							<string>UILabel</string>
+							<string>UIButton</string>
+							<string>UITextField</string>
+							<string>UILabel</string>
+							<string>UIView</string>
+							<string>UIActivityIndicatorView</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>emailField</string>
+							<string>emailLabel</string>
+							<string>loginButton</string>
+							<string>passwordField</string>
+							<string>passwordLabel</string>
+							<string>patternView</string>
+							<string>spinner</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">emailField</string>
+								<string key="candidateClassName">UITextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">emailLabel</string>
+								<string key="candidateClassName">UILabel</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">loginButton</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">passwordField</string>
+								<string key="candidateClassName">UITextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">passwordLabel</string>
+								<string key="candidateClassName">UILabel</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">patternView</string>
+								<string key="candidateClassName">UIView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">spinner</string>
+								<string key="candidateClassName">UIActivityIndicatorView</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/U1SSOCredentialsViewController.h</string>
+					</object>
+				</object>
 			</object>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+			<real value="1296" key="NS.object.0"/>
+		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
 			<integer value="3000" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<string key="IBCocoaTouchPluginVersion">933</string>
+		<string key="IBCocoaTouchPluginVersion">1498</string>
 	</data>
 </archive>
 
=== modified file 'Files/U1SSOEmailVerificationViewController.m'
--- Files/U1SSOEmailVerificationViewController.m	2012-01-19 15:52:37 +0000
+++ Files/U1SSOEmailVerificationViewController.m	2012-08-27 11:27:21 +0000
@@ -16,6 +16,34 @@
 #import "U1SSOEmailVerificationViewController.h"
 
 
+@interface U1SSOEmailVerificationViewController ()
+
+    @property (retain, nonatomic) IBOutlet UILabel *title;
+    @property (retain, nonatomic) IBOutlet UILabel *description;
+
+@end
+
 @implementation U1SSOEmailVerificationViewController
-
+@synthesize title;
+@synthesize description;
+
+- (void)viewDidLoad
+{
+    self.title.text = NSLocalizedString(@"Congratulations", nil);
+    self.description.text = NSLocalizedString(@"A confirmation email has been sent to the address you provided.\n\nSimply follow the link in the email to activate your Ubuntu One account.", nil);
+}
+
+- (void)dealloc
+{
+    [title release];
+    [description release];
+    [super dealloc];
+}
+
+- (void)viewDidUnload
+{
+    [self setTitle:nil];
+    [self setDescription:nil];
+    [super viewDidUnload];
+}
 @end
 
=== modified file 'Files/U1SSOEmailVerificationViewController.xib'
--- Files/U1SSOEmailVerificationViewController.xib	2012-01-19 15:52:37 +0000
+++ Files/U1SSOEmailVerificationViewController.xib	2012-08-27 11:27:21 +0000
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1280</int>
-		<string key="IBDocument.SystemVersion">10K549</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1038.36</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<int key="IBDocument.SystemTarget">1296</int>
+		<string key="IBDocument.SystemVersion">12B19</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
+		<string key="IBDocument.AppKitVersion">1187</string>
+		<string key="IBDocument.HIToolboxVersion">624.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">933</string>
+			<string key="NS.object.0">1498</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBProxyObject</string>
 			<string>IBUIImageView</string>
+			<string>IBUILabel</string>
 			<string>IBUIView</string>
-			<string>IBUILabel</string>
-			<string>IBProxyObject</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -41,7 +41,6 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{0, -44}, {320, 416}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="362114594"/>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -55,7 +54,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{35, 28}, {250, 172}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="427494806"/>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<int key="IBUIContentMode">5</int>
@@ -71,7 +69,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{76, 216}, {169, 27}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="828632858"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -101,8 +98,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{35, 251}, {250, 97}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<int key="IBUIContentMode">7</int>
@@ -129,7 +124,6 @@
 				</array>
 				<string key="NSFrame">{{0, 64}, {320, 416}}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="897675393"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
@@ -155,6 +149,22 @@
 					</object>
 					<int key="connectionID">3</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">title</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="427494806"/>
+					</object>
+					<int key="connectionID">9</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">description</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="828632858"/>
+					</object>
+					<int key="connectionID">10</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -223,28 +233,21 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">8</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">U1SSOEmailVerificationViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/U1SSOEmailVerificationViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+			<int key="maxID">10</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+			<real value="1296" key="NS.object.0"/>
+		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<string key="ios_files_bg.png">{320, 460}</string>
 			<string key="slide0.png">{250, 200}</string>
 		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">933</string>
+		<string key="IBCocoaTouchPluginVersion">1498</string>
 	</data>
 </archive>
 
=== modified file 'Files/U1SSOLandingPageViewController.h'
--- Files/U1SSOLandingPageViewController.h	2012-01-19 15:52:37 +0000
+++ Files/U1SSOLandingPageViewController.h	2012-08-27 11:27:21 +0000
@@ -27,4 +27,7 @@
 - (IBAction)signIn:(id)sender;
 - (IBAction)signUp:(id)sender;
 
+@property (retain, nonatomic) IBOutlet UIButton *signInButton;
+@property (retain, nonatomic) IBOutlet UIButton *signUpButton;
+
 @end
 
=== modified file 'Files/U1SSOLandingPageViewController.m'
--- Files/U1SSOLandingPageViewController.m	2012-01-19 15:52:37 +0000
+++ Files/U1SSOLandingPageViewController.m	2012-08-27 11:27:21 +0000
@@ -19,13 +19,16 @@
 
 
 @implementation U1SSOLandingPageViewController
-
+@synthesize signInButton;
+@synthesize signUpButton;
 @synthesize signInAction, signUpAction;
 
 - (void)dealloc;
 {
 	[signInAction release];
 	[signUpAction release];
+    [signInButton release];
+    [signUpButton release];
 	[super dealloc];
 }
 
@@ -41,4 +44,19 @@
 		signUpAction(sender);
 }
 
+- (void)viewDidLoad
+{
+    [self.signInButton setTitle:NSLocalizedString(@"Sign in", nil) forState:UIControlStateNormal];
+    [self.signUpButton setTitle:NSLocalizedString(@"I don't have an account", nil) forState:UIControlStateNormal];
+}
+
+- (void)viewDidUnload
+{
+    [self setSignInButton:nil];
+    [self setSignUpButton:nil];
+    [self setSignInButton:nil];
+    [self setSignUpButton:nil];
+    [self setSignUpButton:nil];
+    [super viewDidUnload];
+}
 @end
 
=== modified file 'Files/U1SSOLandingPageViewController.xib'
--- Files/U1SSOLandingPageViewController.xib	2012-01-19 15:52:37 +0000
+++ Files/U1SSOLandingPageViewController.xib	2012-08-27 11:27:21 +0000
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1280</int>
-		<string key="IBDocument.SystemVersion">10K549</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1038.36</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<int key="IBDocument.SystemTarget">1296</int>
+		<string key="IBDocument.SystemVersion">12B19</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
+		<string key="IBDocument.AppKitVersion">1187</string>
+		<string key="IBDocument.HIToolboxVersion">624.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">933</string>
+			<string key="NS.object.0">1498</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBProxyObject</string>
 			<string>IBUIButton</string>
 			<string>IBUIImageView</string>
 			<string>IBUIView</string>
-			<string>IBProxyObject</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -155,7 +155,7 @@
 							<integer value="1"/>
 							<integer value="3"/>
 						</array>
-						<array class="NSMutableArray" key="dict.values">
+						<array key="dict.values">
 							<string>{320, 480}</string>
 							<string>{480, 320}</string>
 						</array>
@@ -177,6 +177,22 @@
 					<int key="connectionID">3</int>
 				</object>
 				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">signInButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="167575446"/>
+					</object>
+					<int key="connectionID">17</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">signUpButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="325598511"/>
+					</object>
+					<int key="connectionID">19</int>
+				</object>
+				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">signIn:</string>
 						<reference key="source" ref="167575446"/>
@@ -271,7 +287,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">14</int>
+			<int key="maxID">19</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -300,6 +316,20 @@
 							<string key="candidateClassName">id</string>
 						</object>
 					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="signInButton">UIButton</string>
+						<string key="signUpButton">UIButton</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="signInButton">
+							<string key="name">signInButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="signUpButton">
+							<string key="name">signUpButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">./Classes/U1SSOLandingPageViewController.h</string>
@@ -309,6 +339,10 @@
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+			<real value="1296" key="NS.object.0"/>
+		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
@@ -316,6 +350,6 @@
 			<string key="slide0.png">{250, 200}</string>
 			<string key="slide0_logo.png">{88, 36}</string>
 		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">933</string>
+		<string key="IBCocoaTouchPluginVersion">1498</string>
 	</data>
 </archive>
 
=== modified file 'Files/U1SSOSignUpViewController.m'
--- Files/U1SSOSignUpViewController.m	2012-05-18 18:41:43 +0000
+++ Files/U1SSOSignUpViewController.m	2012-08-27 11:27:21 +0000
@@ -59,10 +59,28 @@
 - (BOOL)validateFields;
 - (void)keyboardWasShown:(NSNotification *)notification;
 - (void) keyboardWillHide:(NSNotification *)notification;
+
+@property (retain, nonatomic) IBOutlet UILabel *signUpTitleLabel;
+@property (retain, nonatomic) IBOutlet UILabel *signUpTitleDescriptionLabel;
+@property (retain, nonatomic) IBOutlet UILabel *passwordDescriptionLabel;
+@property (retain, nonatomic) IBOutlet UILabel *captchaHelpLabel;
+@property (retain, nonatomic) IBOutlet UILabel *captchaInstructionsLabel;
+@property (retain, nonatomic) IBOutlet UILabel *termsOfserviceLabel;
+@property (retain, nonatomic) IBOutlet UILabel *termsOfServiceLinkLabel;
+@property (retain, nonatomic) IBOutlet UIButton *signInButton;
+
 @end
 
 
 @implementation U1SSOSignUpViewController
+@synthesize signUpTitleLabel;
+@synthesize signUpTitleDescriptionLabel;
+@synthesize passwordDescriptionLabel;
+@synthesize captchaHelpLabel;
+@synthesize captchaInstructionsLabel;
+@synthesize termsOfserviceLabel;
+@synthesize termsOfServiceLinkLabel;
+@synthesize signInButton;
 
 @synthesize ssoProvider, signUpAction;
 @synthesize scrollView;
@@ -97,12 +115,28 @@
 	[captchaLoadingIndicator release];
 	[captchaErrorLabel release];
 	[captchaId release];
+    [signUpTitleLabel release];
+    [signUpTitleDescriptionLabel release];
+    [passwordDescriptionLabel release];
+    [captchaHelpLabel release];
+    [captchaInstructionsLabel release];
+    [termsOfserviceLabel release];
+    [termsOfServiceLinkLabel release];
+    [signInButton release];
 	[super dealloc];
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
 - (void)viewDidUnload;
 {
+    [self setSignInButton:nil];
+    [self setTermsOfServiceLinkLabel:nil];
+    [self setTermsOfserviceLabel:nil];
+    [self setCaptchaInstructionsLabel:nil];
+    [self setCaptchaHelpLabel:nil];
+    [self setPasswordDescriptionLabel:nil];
+    [self setSignUpTitleDescriptionLabel:nil];
+    [self setSignUpTitleLabel:nil];
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
@@ -123,6 +157,20 @@
 											 selector:@selector(keyboardWillHide:)
 												 name:UIKeyboardWillHideNotification
 											   object:nil];
+    
+    // i18n
+    self.signUpTitleLabel.text = NSLocalizedString(@"Sign up", nil);
+    self.signUpTitleDescriptionLabel.text = NSLocalizedString(@"Please provide a few details below to register for your Ubuntu One account", nil);
+    self.fullNameLabel.text = NSLocalizedString(@"Full name", nil);
+    self.emailLabel.text = NSLocalizedString(@"Email", nil);
+    self.passwordLabel.text = NSLocalizedString(@"Password", nil);
+    self.passwordDescriptionLabel.text = NSLocalizedString(@"Must be at least 8 characters long and must contain at least one number and one upper case letter", nil);
+    self.captchaLabel.text = NSLocalizedString(@"Security", nil);
+    self.captchaHelpLabel.text = NSLocalizedString(@"(Can't read? Tap the image)", nil);
+    self.captchaInstructionsLabel.text = NSLocalizedString(@"Type the two words:", nil);
+    self.termsOfserviceLabel.text = NSLocalizedString(@"By creating an account you agree to the Ubuntu Account", nil);
+    self.termsOfServiceLinkLabel.text = NSLocalizedString(@"Terms of Service", nil);
+    [self.signInButton setTitle:NSLocalizedString(@"Sign up", nil) forState:UIControlStateNormal];
 }
 
 - (void)keyboardWasShown:(NSNotification *)notification;
 
=== modified file 'Files/U1SSOSignUpViewController.xib'
--- Files/U1SSOSignUpViewController.xib	2012-02-06 18:05:36 +0000
+++ Files/U1SSOSignUpViewController.xib	2012-08-27 11:27:21 +0000
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1280</int>
-		<string key="IBDocument.SystemVersion">10K549</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1038.36</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<int key="IBDocument.SystemTarget">1296</int>
+		<string key="IBDocument.SystemVersion">12B19</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
+		<string key="IBDocument.AppKitVersion">1187</string>
+		<string key="IBDocument.HIToolboxVersion">624.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">933</string>
+			<string key="NS.object.0">1498</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBUIView</string>
 			<string>IBProxyObject</string>
+			<string>IBUIActivityIndicatorView</string>
+			<string>IBUIButton</string>
+			<string>IBUIImageView</string>
 			<string>IBUILabel</string>
-			<string>IBUIImageView</string>
-			<string>IBUIActivityIndicatorView</string>
+			<string>IBUIScrollView</string>
 			<string>IBUITextField</string>
-			<string>IBUIScrollView</string>
-			<string>IBUIButton</string>
+			<string>IBUIView</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -46,7 +46,6 @@
 						<string key="NSFrameSize">{320, 460}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<bool key="IBUIMultipleTouchEnabled">YES</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -75,8 +74,8 @@
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUILabel" id="849601266">
 						<reference key="NSNextResponder" ref="629509686"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{10, 12}, {55, 19}}</string>
+						<int key="NSvFlags">290</int>
+						<string key="NSFrame">{{10, 12}, {300, 19}}</string>
 						<reference key="NSSuperview" ref="629509686"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="46520390"/>
@@ -105,8 +104,8 @@
 					</object>
 					<object class="IBUILabel" id="46520390">
 						<reference key="NSNextResponder" ref="629509686"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{10, 28}, {290, 40}}</string>
+						<int key="NSvFlags">290</int>
+						<string key="NSFrame">{{10, 28}, {300, 40}}</string>
 						<reference key="NSSuperview" ref="629509686"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="720438318"/>
@@ -193,7 +192,7 @@
 					</object>
 					<object class="IBUILabel" id="49460719">
 						<reference key="NSNextResponder" ref="629509686"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">294</int>
 						<string key="NSFrame">{{10, 434}, {71, 19}}</string>
 						<reference key="NSSuperview" ref="629509686"/>
 						<reference key="NSWindow"/>
@@ -254,8 +253,8 @@
 					</object>
 					<object class="IBUILabel" id="809258214">
 						<reference key="NSNextResponder" ref="629509686"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{77, 434}, {213, 19}}</string>
+						<int key="NSvFlags">291</int>
+						<string key="NSFrame">{{90, 434}, {213, 19}}</string>
 						<reference key="NSSuperview" ref="629509686"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1022502844"/>
@@ -274,7 +273,7 @@
 					</object>
 					<object class="IBUILabel" id="586059788">
 						<reference key="NSNextResponder" ref="629509686"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">290</int>
 						<string key="NSFrame">{{10, 636}, {290, 40}}</string>
 						<reference key="NSSuperview" ref="629509686"/>
 						<reference key="NSWindow"/>
@@ -290,13 +289,14 @@
 						<int key="IBUIBaselineAdjustment">1</int>
 						<float key="IBUIMinimumFontSize">10</float>
 						<int key="IBUINumberOfLines">2</int>
+						<int key="IBUITextAlignment">1</int>
 						<reference key="IBUIFontDescription" ref="887972801"/>
 						<reference key="IBUIFont" ref="837930100"/>
 					</object>
 					<object class="IBUILabel" id="318468596">
 						<reference key="NSNextResponder" ref="629509686"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{127, 656}, {114, 19}}</string>
+						<int key="NSvFlags">295</int>
+						<string key="NSFrame">{{10, 684}, {293, 19}}</string>
 						<reference key="NSSuperview" ref="629509686"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="237826680"/>
@@ -313,6 +313,7 @@
 						<nil key="IBUIHighlightedColor"/>
 						<int key="IBUIBaselineAdjustment">1</int>
 						<float key="IBUIMinimumFontSize">10</float>
+						<int key="IBUITextAlignment">1</int>
 						<object class="IBUIFontDescription" key="IBUIFontDescription">
 							<string key="name">Helvetica</string>
 							<string key="family">Helvetica</string>
@@ -323,11 +324,10 @@
 					</object>
 					<object class="IBUIButton" id="237826680">
 						<reference key="NSNextResponder" ref="629509686"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{23, 687}, {275, 45}}</string>
+						<int key="NSvFlags">269</int>
+						<string key="NSFrame">{{20, 719}, {275, 45}}</string>
 						<reference key="NSSuperview" ref="629509686"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<int key="IBUIContentHorizontalAlignment">0</int>
@@ -704,7 +704,7 @@
 						<reference key="IBUIFont" ref="837930100"/>
 					</object>
 				</array>
-				<string key="NSFrameSize">{320, 762}</string>
+				<string key="NSFrameSize">{320, 784}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="849601266"/>
@@ -880,6 +880,70 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">signUpTitleLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="849601266"/>
+					</object>
+					<int key="connectionID">71</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">signUpTitleDescriptionLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="46520390"/>
+					</object>
+					<int key="connectionID">72</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">passwordDescriptionLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="203826180"/>
+					</object>
+					<int key="connectionID">73</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">captchaHelpLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="809258214"/>
+					</object>
+					<int key="connectionID">74</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">captchaInstructionsLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="803081875"/>
+					</object>
+					<int key="connectionID">75</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">termsOfserviceLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="586059788"/>
+					</object>
+					<int key="connectionID">76</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">termsOfServiceLinkLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="318468596"/>
+					</object>
+					<int key="connectionID">77</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">signInButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="237826680"/>
+					</object>
+					<int key="connectionID">79</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">contentView</string>
 						<reference key="source" ref="980218375"/>
 						<reference key="destination" ref="629509686"/>
@@ -972,10 +1036,7 @@
 							<reference ref="49460719"/>
 							<reference ref="803081875"/>
 							<reference ref="203826180"/>
-							<reference ref="809258214"/>
 							<reference ref="586059788"/>
-							<reference ref="318468596"/>
-							<reference ref="237826680"/>
 							<reference ref="874486633"/>
 							<reference ref="185575436"/>
 							<reference ref="812140112"/>
@@ -995,6 +1056,9 @@
 							<reference ref="453675168"/>
 							<reference ref="253305833"/>
 							<reference ref="525956263"/>
+							<reference ref="809258214"/>
+							<reference ref="318468596"/>
+							<reference ref="237826680"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -1210,7 +1274,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">70</int>
+			<int key="maxID">79</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1242,7 +1306,9 @@
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="captchaErrorIndicator">UIImageView</string>
 						<string key="captchaErrorLabel">UILabel</string>
+						<string key="captchaHelpLabel">UILabel</string>
 						<string key="captchaImageView">UIImageView</string>
+						<string key="captchaInstructionsLabel">UILabel</string>
 						<string key="captchaLabel">UILabel</string>
 						<string key="captchaLoadingIndicator">UIActivityIndicatorView</string>
 						<string key="captchaTextField">UITextField</string>
@@ -1254,11 +1320,17 @@
 						<string key="fullNameErrorLabel">UILabel</string>
 						<string key="fullNameLabel">UILabel</string>
 						<string key="fullNameTextField">UITextField</string>
+						<string key="passwordDescriptionLabel">UILabel</string>
 						<string key="passwordErrorIndicator">UIImageView</string>
 						<string key="passwordErrorLabel">UILabel</string>
 						<string key="passwordLabel">UILabel</string>
 						<string key="passwordTextField">UITextField</string>
 						<string key="scrollView">UIScrollView</string>
+						<string key="signInButton">UIButton</string>
+						<string key="signUpTitleDescriptionLabel">UILabel</string>
+						<string key="signUpTitleLabel">UILabel</string>
+						<string key="termsOfServiceLinkLabel">UILabel</string>
+						<string key="termsOfserviceLabel">UILabel</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
 						<object class="IBToOneOutletInfo" key="captchaErrorIndicator">
@@ -1269,10 +1341,18 @@
 							<string key="name">captchaErrorLabel</string>
 							<string key="candidateClassName">UILabel</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="captchaHelpLabel">
+							<string key="name">captchaHelpLabel</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="captchaImageView">
 							<string key="name">captchaImageView</string>
 							<string key="candidateClassName">UIImageView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="captchaInstructionsLabel">
+							<string key="name">captchaInstructionsLabel</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="captchaLabel">
 							<string key="name">captchaLabel</string>
 							<string key="candidateClassName">UILabel</string>
@@ -1317,6 +1397,10 @@
 							<string key="name">fullNameTextField</string>
 							<string key="candidateClassName">UITextField</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="passwordDescriptionLabel">
+							<string key="name">passwordDescriptionLabel</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="passwordErrorIndicator">
 							<string key="name">passwordErrorIndicator</string>
 							<string key="candidateClassName">UIImageView</string>
@@ -1337,6 +1421,26 @@
 							<string key="name">scrollView</string>
 							<string key="candidateClassName">UIScrollView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="signInButton">
+							<string key="name">signInButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="signUpTitleDescriptionLabel">
+							<string key="name">signUpTitleDescriptionLabel</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="signUpTitleLabel">
+							<string key="name">signUpTitleLabel</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="termsOfServiceLinkLabel">
+							<string key="name">termsOfServiceLinkLabel</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="termsOfserviceLabel">
+							<string key="name">termsOfserviceLabel</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
@@ -1366,12 +1470,16 @@
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+			<real value="1296" key="NS.object.0"/>
+		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<string key="NS.key.0">indicator_input_error.png</string>
 			<string key="NS.object.0">{15, 15}</string>
 		</object>
-		<string key="IBCocoaTouchPluginVersion">933</string>
+		<string key="IBCocoaTouchPluginVersion">1498</string>
 	</data>
 </archive>
 
=== modified file 'Files/U1SettingsViewController.h'
--- Files/U1SettingsViewController.h	2011-12-13 20:15:22 +0000
+++ Files/U1SettingsViewController.h	2012-08-27 11:27:21 +0000
@@ -23,6 +23,7 @@
 @property (retain) IBOutlet U1NavigationBar *navBar;
 @property (retain) IBOutlet UITableViewCell *autoUploadToggleCell;
 @property (retain) IBOutlet UISwitch *autoUploadToggle;
+@property (retain, nonatomic) IBOutlet UILabel *autoUploadTogleCellLabel;
 @property (retain) IBOutlet UITableViewCell *wifiOnlyToggleCell;
 @property (retain) IBOutlet UILabel *wifiOnlyToggleLabel;
 @property (retain) IBOutlet UISwitch *wifiOnlyToggle;
@@ -31,9 +32,11 @@
 @property (retain) IBOutlet UISwitch *includeVideoToggle;
 @property (retain) IBOutlet UITableViewCell *disableSleepToggleCell;
 @property (retain) IBOutlet UILabel *disableSleepToggleLabel;
+@property (retain, nonatomic) IBOutlet UILabel *disableSleepToggleDescription;
 @property (retain) IBOutlet UISwitch *disableSleepToggle;
 @property (retain) IBOutlet UITableView *tableView;
 
+
 - (IBAction)toggleAutoUpload:(id)sender;
 - (IBAction)toggleWifiOnly:(id)sender;
 - (IBAction)toggleIncludeVideo:(id)sender;
 
=== modified file 'Files/U1SettingsViewController.m'
--- Files/U1SettingsViewController.m	2012-08-10 03:19:46 +0000
+++ Files/U1SettingsViewController.m	2012-08-27 11:27:21 +0000
@@ -42,7 +42,8 @@
 
 
 @implementation U1SettingsViewController
-
+@synthesize disableSleepToggleDescription;
+@synthesize autoUploadTogleCellLabel;
 @synthesize navBar, tableView;
 @synthesize autoUploadToggleCell, autoUploadToggle;
 @synthesize wifiOnlyToggleCell, wifiOnlyToggleLabel, wifiOnlyToggle;
@@ -77,6 +78,8 @@
 	[disableSleepToggle release];
 	[filesClient release];
 	[accountInfo release];
+    [autoUploadTogleCellLabel release];
+    [disableSleepToggleDescription release];
 	[super dealloc];
 }
 
@@ -90,6 +93,15 @@
 	return accountLoadingCell;
 }
 
+- (void)viewDidLoad
+{
+    self.autoUploadTogleCellLabel.text      = NSLocalizedString(@"Enabled", nil);
+    self.includeVideoToggleLabel.text       = NSLocalizedString(@"Include Videos", nil);
+    self.wifiOnlyToggleLabel.text           = NSLocalizedString(@"Wifi-Only", nil);
+    self.disableSleepToggleLabel.text       = NSLocalizedString(@"Nightstand Mode", nil);
+    self.disableSleepToggleDescription.text = NSLocalizedString(@"Disables sleep while uploading if the device is charging", nil);
+}
+
 - (void)viewWillAppear:(BOOL)animated;
 {
 	[super viewWillAppear:animated];
@@ -103,7 +115,7 @@
 - (IBAction)signOut:(id)sender;
 {
 	// TODO: get actual copy for this from design team
-	UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:@"Signing out on this device will not affect other devices connected to Ubuntu One." delegate:self cancelButtonTitle:@"Cancel" destructiveButtonTitle:@"Sign Out" otherButtonTitles:nil];
+	UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:NSLocalizedString(@"Signing out on this device will not affect other devices connected to Ubuntu One", nil) delegate:self cancelButtonTitle:NSLocalizedString(@"Cancel", nil) destructiveButtonTitle:NSLocalizedString(@"Sign Out", nil) otherButtonTitles:nil];
 	[actionSheet showFromTabBar:self.tabBarController.tabBar];
 	[actionSheet release];
 }
@@ -235,7 +247,7 @@
 			{
 				case 0:
 					[cell.textLabel setText:NSLocalizedString(@"Name", nil)];
-					[cell.detailTextLabel setText:@"Loading..."];
+					[cell.detailTextLabel setText:NSLocalizedString(@"Loading...", nil)];
 					if (self.accountInfo)
 						[cell.detailTextLabel setText:[self.accountInfo objectForKey:@"visible_name"]];
 					break;
@@ -246,7 +258,7 @@
 					NSString *storageFormat = NSLocalizedString(@"%@ of %@ used", nil);
 					NSString *usedString = [byteSizeTransformer transformedValue:[self.accountInfo objectForKey:@"used_bytes"]];
 					NSString *totalString = [byteSizeTransformer transformedValue:[self.accountInfo objectForKey:@"max_bytes"]];
-					[cell.detailTextLabel setText:@"Loading..."];
+					[cell.detailTextLabel setText:NSLocalizedString(@"Loading...", nil)];
 					if (self.accountInfo)
 						[cell.detailTextLabel setText:[NSString stringWithFormat:storageFormat, usedString, totalString]];
 					[byteSizeTransformer release];
@@ -295,7 +307,7 @@
 		[footerView addSubview:signOutButton];
 		UIImage *buttonImage = [[UIImage imageNamed:@"ios_files_buttonBG"] stretchableImageWithLeftCapWidth:0 topCapHeight:0];
 		[signOutButton setBackgroundImage:buttonImage forState:UIControlStateNormal];
-		[signOutButton setTitle:@"Sign Out of Ubuntu One" forState:UIControlStateNormal];
+		[signOutButton setTitle:NSLocalizedString(@"Sign Out of Ubuntu One", nil) forState:UIControlStateNormal];
 		[signOutButton.titleLabel setFont:[UIFont boldSystemFontOfSize:14.f]];
 		[signOutButton.layer setCornerRadius:8.f];
 		[signOutButton setClipsToBounds:YES];
@@ -377,4 +389,10 @@
 	return self.disableSleepToggleCell;
 }
 
+- (void)viewDidUnload {
+    [self setAutoUploadTogleCellLabel:nil];
+    [self setDisableSleepToggleDescription:nil];
+    [super viewDidUnload];
+}
+
 @end
 
=== modified file 'Files/U1SettingsViewController.xib'
--- Files/U1SettingsViewController.xib	2011-12-15 18:56:43 +0000
+++ Files/U1SettingsViewController.xib	2012-08-27 11:27:21 +0000
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1280</int>
-		<string key="IBDocument.SystemVersion">10K549</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1038.36</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<int key="IBDocument.SystemTarget">1296</int>
+		<string key="IBDocument.SystemVersion">12B19</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
+		<string key="IBDocument.AppKitVersion">1187</string>
+		<string key="IBDocument.HIToolboxVersion">624.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">933</string>
+			<string key="NS.object.0">1498</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBProxyObject</string>
+			<string>IBUILabel</string>
 			<string>IBUISwitch</string>
 			<string>IBUITableView</string>
 			<string>IBUITableViewCell</string>
 			<string>IBUIView</string>
-			<string>IBUILabel</string>
-			<string>IBProxyObject</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -43,7 +43,7 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrameSize">{320, 460}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">10</int>
 							<object class="NSImage" key="NSImage">
@@ -116,7 +116,6 @@
 				</array>
 				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="703168831"/>
 				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -134,7 +133,7 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{217, 8}, {94, 27}}</string>
 								<reference key="NSSuperview" ref="289125020"/>
-								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								<int key="IBUIContentHorizontalAlignment">0</int>
@@ -142,10 +141,9 @@
 							</object>
 							<object class="IBUILabel" id="866302443">
 								<reference key="NSNextResponder" ref="289125020"/>
-								<int key="NSvFlags">292</int>
+								<int key="NSvFlags">278</int>
 								<string key="NSFrame">{{10, 11}, {193, 21}}</string>
 								<reference key="NSSuperview" ref="289125020"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="513262918"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
@@ -173,7 +171,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 43}</string>
 						<reference key="NSSuperview" ref="126074602"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="866302443"/>
 						<reference key="IBUIBackgroundColor" ref="509795101"/>
 						<bool key="IBUIOpaque">NO</bool>
@@ -185,7 +182,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 44}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="289125020"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<reference key="IBUIContentView" ref="289125020"/>
@@ -200,10 +196,9 @@
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="IBUILabel" id="160999426">
 								<reference key="NSNextResponder" ref="609546111"/>
-								<int key="NSvFlags">292</int>
+								<int key="NSvFlags">278</int>
 								<string key="NSFrame">{{10, 11}, {193, 21}}</string>
 								<reference key="NSSuperview" ref="609546111"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="520891560"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
@@ -220,10 +215,10 @@
 							</object>
 							<object class="IBUISwitch" id="520891560">
 								<reference key="NSNextResponder" ref="609546111"/>
-								<int key="NSvFlags">289</int>
+								<int key="NSvFlags">297</int>
 								<string key="NSFrame">{{217, 8}, {94, 27}}</string>
 								<reference key="NSSuperview" ref="609546111"/>
-								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								<int key="IBUIContentHorizontalAlignment">0</int>
@@ -233,7 +228,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 43}</string>
 						<reference key="NSSuperview" ref="2020695"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="160999426"/>
 						<reference key="IBUIBackgroundColor" ref="509795101"/>
 						<bool key="IBUIOpaque">NO</bool>
@@ -245,7 +239,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 44}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="609546111"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<reference key="IBUIContentView" ref="609546111"/>
@@ -260,10 +253,9 @@
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="IBUILabel" id="91193340">
 								<reference key="NSNextResponder" ref="849901570"/>
-								<int key="NSvFlags">292</int>
+								<int key="NSvFlags">278</int>
 								<string key="NSFrame">{{10, 11}, {193, 21}}</string>
 								<reference key="NSSuperview" ref="849901570"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="59829218"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
@@ -280,10 +272,10 @@
 							</object>
 							<object class="IBUISwitch" id="59829218">
 								<reference key="NSNextResponder" ref="849901570"/>
-								<int key="NSvFlags">289</int>
+								<int key="NSvFlags">297</int>
 								<string key="NSFrame">{{217, 8}, {94, 27}}</string>
 								<reference key="NSSuperview" ref="849901570"/>
-								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								<int key="IBUIContentHorizontalAlignment">0</int>
@@ -293,7 +285,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 43}</string>
 						<reference key="NSSuperview" ref="703802727"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="91193340"/>
 						<reference key="IBUIBackgroundColor" ref="509795101"/>
 						<bool key="IBUIOpaque">NO</bool>
@@ -305,7 +296,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 44}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="849901570"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<reference key="IBUIContentView" ref="849901570"/>
@@ -320,10 +310,9 @@
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="IBUILabel" id="1025321652">
 								<reference key="NSNextResponder" ref="61456725"/>
-								<int key="NSvFlags">292</int>
+								<int key="NSvFlags">294</int>
 								<string key="NSFrame">{{10, 12}, {193, 20}}</string>
 								<reference key="NSSuperview" ref="61456725"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="764022094"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
@@ -343,7 +332,6 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{217, 8}, {94, 27}}</string>
 								<reference key="NSSuperview" ref="61456725"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="792393428"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -352,10 +340,10 @@
 							</object>
 							<object class="IBUILabel" id="792393428">
 								<reference key="NSNextResponder" ref="61456725"/>
-								<int key="NSvFlags">292</int>
+								<int key="NSvFlags">302</int>
 								<string key="NSFrame">{{10, 40}, {280, 21}}</string>
 								<reference key="NSSuperview" ref="61456725"/>
-								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
 								<int key="IBUIContentMode">7</int>
@@ -382,7 +370,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 69}</string>
 						<reference key="NSSuperview" ref="328240698"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1025321652"/>
 						<reference key="IBUIBackgroundColor" ref="509795101"/>
 						<bool key="IBUIOpaque">NO</bool>
@@ -394,7 +381,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 70}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="61456725"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<reference key="IBUIContentView" ref="61456725"/>
@@ -509,6 +495,22 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">autoUploadTogleCellLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="91193340"/>
+					</object>
+					<int key="connectionID">62</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">disableSleepToggleDescription</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="792393428"/>
+					</object>
+					<int key="connectionID">64</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">dataSource</string>
 						<reference key="source" ref="703168831"/>
 						<reference key="destination" ref="372490531"/>
@@ -701,125 +703,17 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">61</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">U1NavigationBar</string>
-					<string key="superclassName">UINavigationBar</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/U1NavigationBar.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">U1SettingsViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="toggleAutoUpload:">id</string>
-						<string key="toggleDisableSleep:">id</string>
-						<string key="toggleIncludeVideo:">id</string>
-						<string key="toggleWifiOnly:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="toggleAutoUpload:">
-							<string key="name">toggleAutoUpload:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="toggleDisableSleep:">
-							<string key="name">toggleDisableSleep:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="toggleIncludeVideo:">
-							<string key="name">toggleIncludeVideo:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="toggleWifiOnly:">
-							<string key="name">toggleWifiOnly:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="autoUploadToggle">UISwitch</string>
-						<string key="autoUploadToggleCell">UITableViewCell</string>
-						<string key="disableSleepToggle">UISwitch</string>
-						<string key="disableSleepToggleCell">UITableViewCell</string>
-						<string key="disableSleepToggleLabel">UILabel</string>
-						<string key="includeVideoToggle">UISwitch</string>
-						<string key="includeVideoToggleCell">UITableViewCell</string>
-						<string key="includeVideoToggleLabel">UILabel</string>
-						<string key="navBar">U1NavigationBar</string>
-						<string key="tableView">UITableView</string>
-						<string key="wifiOnlyToggle">UISwitch</string>
-						<string key="wifiOnlyToggleCell">UITableViewCell</string>
-						<string key="wifiOnlyToggleLabel">UILabel</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="autoUploadToggle">
-							<string key="name">autoUploadToggle</string>
-							<string key="candidateClassName">UISwitch</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="autoUploadToggleCell">
-							<string key="name">autoUploadToggleCell</string>
-							<string key="candidateClassName">UITableViewCell</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="disableSleepToggle">
-							<string key="name">disableSleepToggle</string>
-							<string key="candidateClassName">UISwitch</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="disableSleepToggleCell">
-							<string key="name">disableSleepToggleCell</string>
-							<string key="candidateClassName">UITableViewCell</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="disableSleepToggleLabel">
-							<string key="name">disableSleepToggleLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="includeVideoToggle">
-							<string key="name">includeVideoToggle</string>
-							<string key="candidateClassName">UISwitch</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="includeVideoToggleCell">
-							<string key="name">includeVideoToggleCell</string>
-							<string key="candidateClassName">UITableViewCell</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="includeVideoToggleLabel">
-							<string key="name">includeVideoToggleLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="navBar">
-							<string key="name">navBar</string>
-							<string key="candidateClassName">U1NavigationBar</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableView">
-							<string key="name">tableView</string>
-							<string key="candidateClassName">UITableView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="wifiOnlyToggle">
-							<string key="name">wifiOnlyToggle</string>
-							<string key="candidateClassName">UISwitch</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="wifiOnlyToggleCell">
-							<string key="name">wifiOnlyToggleCell</string>
-							<string key="candidateClassName">UITableViewCell</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="wifiOnlyToggleLabel">
-							<string key="name">wifiOnlyToggleLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/U1SettingsViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+			<int key="maxID">64</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+			<real value="1296" key="NS.object.0"/>
+		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<string key="IBCocoaTouchPluginVersion">933</string>
+		<string key="IBCocoaTouchPluginVersion">1498</string>
 	</data>
 </archive>
 
=== modified file 'Files/U1UploadsPoolViewController.h'
--- Files/U1UploadsPoolViewController.h	2011-12-06 03:49:37 +0000
+++ Files/U1UploadsPoolViewController.h	2012-08-27 11:27:21 +0000
@@ -23,6 +23,8 @@
 @property (nonatomic, retain) IBOutlet UIView *autoUploadToggleView;
 @property (nonatomic, retain) IBOutlet UISwitch *autoUploadToggle;
 @property (retain) U1FilesClient *filesClient;
+@property (retain, nonatomic) IBOutlet UILabel *loadingCellLabel;
+@property (retain, nonatomic) IBOutlet UILabel *autoUploadCellLabel;
 
 - (IBAction)enableAutoUpload:(id)sender;
 
 
=== modified file 'Files/U1UploadsPoolViewController.m'
--- Files/U1UploadsPoolViewController.m	2011-12-14 19:43:35 +0000
+++ Files/U1UploadsPoolViewController.m	2012-08-27 11:27:21 +0000
@@ -43,6 +43,8 @@
 @synthesize loadingCell;
 @synthesize autoUploadToggleView, autoUploadToggle;
 @synthesize filesClient;
+@synthesize loadingCellLabel;
+@synthesize autoUploadCellLabel;
 @synthesize resultsController;
 
 - (id)init;
@@ -69,6 +71,8 @@
 	[resultsController release];
 	[autoUploadToggleView release];
 	[autoUploadToggle release];
+    [loadingCellLabel release];
+    [autoUploadCellLabel release];
 	[super dealloc];
 }
 
@@ -77,12 +81,17 @@
 	[super viewDidLoad];
 	[self updateFeedback:nil];
 	[self loadCurrentUploads];
+    
+    self.loadingCellLabel.text    = NSLocalizedString(@"Loading...", nil);
+    self.autoUploadCellLabel.text = NSLocalizedString(@"Auto-Upload Camera Roll", nil);
 }
 
 - (void)viewDidUnload;
 {
 	[loadingCell release], loadingCell = nil;
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
+    [self setLoadingCellLabel:nil];
+    [self setAutoUploadCellLabel:nil];
 	[super viewDidUnload];
 }
 
 
=== modified file 'Files/U1UploadsPoolViewController.xib'
--- Files/U1UploadsPoolViewController.xib	2011-11-08 19:57:59 +0000
+++ Files/U1UploadsPoolViewController.xib	2012-08-27 11:27:21 +0000
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1280</int>
-		<string key="IBDocument.SystemVersion">10K549</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1038.36</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<int key="IBDocument.SystemTarget">1296</int>
+		<string key="IBDocument.SystemVersion">12B19</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
+		<string key="IBDocument.AppKitVersion">1187</string>
+		<string key="IBDocument.HIToolboxVersion">624.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">933</string>
+			<string key="NS.object.0">1498</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBProxyObject</string>
+			<string>IBUIActivityIndicatorView</string>
 			<string>IBUIImageView</string>
 			<string>IBUILabel</string>
 			<string>IBUISwitch</string>
-			<string>IBUIActivityIndicatorView</string>
 			<string>IBUITableView</string>
 			<string>IBUITableViewCell</string>
 			<string>IBUIView</string>
@@ -66,8 +66,8 @@
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="IBUILabel" id="131881887">
 								<reference key="NSNextResponder" ref="783165177"/>
-								<int key="NSvFlags">292</int>
-								<string key="NSFrame">{{136, 17}, {75, 21}}</string>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrame">{{20, 17}, {280, 21}}</string>
 								<reference key="NSSuperview" ref="783165177"/>
 								<reference key="NSNextKeyView"/>
 								<bool key="IBUIOpaque">NO</bool>
@@ -83,6 +83,7 @@
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">1</int>
 								<float key="IBUIMinimumFontSize">10</float>
+								<int key="IBUITextAlignment">1</int>
 								<object class="IBUIFontDescription" key="IBUIFontDescription">
 									<string key="name">Helvetica</string>
 									<string key="family">Helvetica</string>
@@ -151,7 +152,7 @@
 					</object>
 					<object class="IBUISwitch" id="830315920">
 						<reference key="NSNextResponder" ref="534137793"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">297</int>
 						<string key="NSFrame">{{209, 13}, {94, 27}}</string>
 						<reference key="NSSuperview" ref="534137793"/>
 						<reference key="NSNextKeyView"/>
@@ -162,7 +163,7 @@
 					</object>
 					<object class="IBUILabel" id="592945301">
 						<reference key="NSNextResponder" ref="534137793"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">278</int>
 						<string key="NSFrame">{{20, 16}, {196, 21}}</string>
 						<reference key="NSSuperview" ref="534137793"/>
 						<reference key="NSNextKeyView" ref="830315920"/>
@@ -231,6 +232,22 @@
 					<int key="connectionID">24</int>
 				</object>
 				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">loadingCellLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="131881887"/>
+					</object>
+					<int key="connectionID">28</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">autoUploadCellLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="592945301"/>
+					</object>
+					<int key="connectionID">29</int>
+				</object>
+				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">enableAutoUpload:</string>
 						<reference key="source" ref="830315920"/>
@@ -329,17 +346,21 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">27</int>
+			<int key="maxID">29</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+			<real value="1296" key="NS.object.0"/>
+		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<string key="NS.key.0">progress_view_background.png</string>
 			<string key="NS.object.0">{320, 66}</string>
 		</object>
-		<string key="IBCocoaTouchPluginVersion">933</string>
+		<string key="IBCocoaTouchPluginVersion">1498</string>
 	</data>
 </archive>
 
=== added file 'Files/en.lproj/Localizable.strings'
--- Files/en.lproj/Localizable.strings	1970-01-01 00:00:00 +0000
+++ Files/en.lproj/Localizable.strings	2012-08-27 11:27:21 +0000
@@ -0,0 +1,14 @@
+//
+//  Copyright 2011 Canonical Ltd.
+//
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
=== added directory 'Files/es.lproj'
=== added file 'Files/es.lproj/Localizable.strings'
 Binary files Files/es.lproj/Localizable.strings	1970-01-01 00:00:00 +0000 and Files/es.lproj/Localizable.strings	2012-08-27 11:27:21 +0000 differ
=== modified file 'Files/iPhone/en.lproj/MainWindow_iPhone.xib'
--- Files/iPhone/en.lproj/MainWindow_iPhone.xib	2012-06-29 17:51:54 +0000
+++ Files/iPhone/en.lproj/MainWindow_iPhone.xib	2012-08-27 11:27:21 +0000
@@ -2,26 +2,26 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1024</int>
-		<string key="IBDocument.SystemVersion">11E2620</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
-		<string key="IBDocument.AppKitVersion">1138.47</string>
-		<string key="IBDocument.HIToolboxVersion">569.00</string>
+		<string key="IBDocument.SystemVersion">12B19</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
+		<string key="IBDocument.AppKitVersion">1187</string>
+		<string key="IBDocument.HIToolboxVersion">624.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">1181</string>
+			<string key="NS.object.0">1498</string>
 		</object>
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<string>IBProxyObject</string>
-			<string>IBUINavigationController</string>
-			<string>IBUIViewController</string>
 			<string>IBUICustomObject</string>
-			<string>IBUITabBarController</string>
-			<string>IBUIWindow</string>
-			<string>IBUITabBar</string>
 			<string>IBUINavigationBar</string>
+			<string>IBUINavigationController</string>
 			<string>IBUINavigationItem</string>
+			<string>IBUITabBar</string>
+			<string>IBUITabBarController</string>
 			<string>IBUITabBarItem</string>
+			<string>IBUIViewController</string>
+			<string>IBUIWindow</string>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -562,6 +562,6 @@
 				<string>{30, 30}</string>
 			</object>
 		</object>
-		<string key="IBCocoaTouchPluginVersion">1181</string>
+		<string key="IBCocoaTouchPluginVersion">1498</string>
 	</data>
 </archive>