Applied i18n strings to missing parts in app extension

src/App/Resources/AppResources.Designer.cs

@@ -529,6 +529,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Extension Activated!.
+        /// </summary>
+        public static string ExtensionActivated {
+            get {
+                return ResourceManager.GetString("ExtensionActivated", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Almost done!.
         /// </summary>
@@ -1465,6 +1474,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Sites.
+        /// </summary>
+        public static string Sites {
+            get {
+                return ResourceManager.GetString("Sites", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Site updated..
         /// </summary>

src/App/Resources/AppResources.resx

@@ -744,4 +744,11 @@
   <data name="Lost2FAApp" xml:space="preserve">
     <value>Lost authenticator app?</value>
   </data>
+  <data name="Sites" xml:space="preserve">
+    <value>Sites</value>
+    <comment>Screen title</comment>
+  </data>
+  <data name="ExtensionActivated" xml:space="preserve">
+    <value>Extension Activated!</value>
+  </data>
 </root>

src/iOS.Extension/LockFingerprintViewController.cs

@@ -34,8 +34,11 @@ namespace Bit.iOS.Extension
             _settings = Resolver.Resolve<ISettings>();
             _fingerprint = Resolver.Resolve<IFingerprint>();
 
+            NavItem.Title = AppResources.VerifyFingerprint;
+            CancelButton.Title = AppResources.Cancel;
             View.BackgroundColor = new UIColor(red: 0.94f, green: 0.94f, blue: 0.96f, alpha: 1.0f);
 
+            UseButton.SetTitle(AppResources.UseFingerprintToUnlock, UIControlState.Normal);
             var descriptor = UIFontDescriptor.PreferredBody;
             UseButton.Font = UIFont.FromDescriptor(descriptor, descriptor.PointSize);
             UseButton.BackgroundColor = new UIColor(red: 0.24f, green: 0.55f, blue: 0.74f, alpha: 1.0f);

src/iOS.Extension/LockFingerprintViewController.designer.cs

@@ -1,4 +1,4 @@
-// WARNING
+// WARNING
 //
 // This file has been generated automatically by Xamarin Studio from the outlets and
 // actions declared in your storyboard file.
@@ -22,18 +22,22 @@ namespace Bit.iOS.Extension
         [GeneratedCode ("iOS Designer", "1.0")]
         UIKit.UIButton FingerprintButton { get; set; }
 
+        [Outlet]
+        [GeneratedCode ("iOS Designer", "1.0")]
+        UIKit.UINavigationItem NavItem { get; set; }
+
         [Outlet]
         [GeneratedCode ("iOS Designer", "1.0")]
         UIKit.UIButton UseButton { get; set; }
 
+        [Action ("CancelButton_Activated:")]
+        [GeneratedCode ("iOS Designer", "1.0")]
+        partial void CancelButton_Activated (UIKit.UIBarButtonItem sender);
+
         [Action ("FingerprintButton_TouchUpInside:")]
         [GeneratedCode ("iOS Designer", "1.0")]
         partial void FingerprintButton_TouchUpInside (UIKit.UIButton sender);
 
-        [Action("CancelButton_Activated:")]
-        [GeneratedCode("iOS Designer", "1.0")]
-        partial void CancelButton_Activated(UIKit.UIBarButtonItem sender);
-
         void ReleaseDesignerOutlets ()
         {
             if (CancelButton != null) {
@@ -46,6 +50,11 @@ namespace Bit.iOS.Extension
                 FingerprintButton = null;
             }
 
+            if (NavItem != null) {
+                NavItem.Dispose ();
+                NavItem = null;
+            }
+
             if (UseButton != null) {
                 UseButton.Dispose ();
                 UseButton = null;

src/iOS.Extension/LockPasswordViewController.cs

@@ -41,6 +41,9 @@ namespace Bit.iOS.Extension
             _authService = Resolver.Resolve<IAuthService>();
             _cryptoService = Resolver.Resolve<ICryptoService>();
 
+            NavItem.Title = AppResources.VerifyMasterPassword;
+            CancelButton.Title = AppResources.Cancel;
+            SubmitButton.Title = AppResources.Submit;
             View.BackgroundColor = new UIColor(red: 0.94f, green: 0.94f, blue: 0.96f, alpha: 1.0f);
 
             var descriptor = UIFontDescriptor.PreferredBody;

src/iOS.Extension/LockPasswordViewController.designer.cs

@@ -1,4 +1,4 @@
-// WARNING
+// WARNING
 //
 // This file has been generated automatically by Xamarin Studio from the outlets and
 // actions declared in your storyboard file.
@@ -22,6 +22,10 @@ namespace Bit.iOS.Extension
         [GeneratedCode ("iOS Designer", "1.0")]
         UIKit.UITableView MainTableView { get; set; }
 
+        [Outlet]
+        [GeneratedCode ("iOS Designer", "1.0")]
+        UIKit.UINavigationItem NavItem { get; set; }
+
         [Outlet]
         [GeneratedCode ("iOS Designer", "1.0")]
         UIKit.UIBarButtonItem SubmitButton { get; set; }
@@ -46,6 +50,11 @@ namespace Bit.iOS.Extension
                 MainTableView = null;
             }
 
+            if (NavItem != null) {
+                NavItem.Dispose ();
+                NavItem = null;
+            }
+
             if (SubmitButton != null) {
                 SubmitButton.Dispose ();
                 SubmitButton = null;

src/iOS.Extension/LockPinViewController.cs

@@ -35,11 +35,14 @@ namespace Bit.iOS.Extension
             _settings = Resolver.Resolve<ISettings>();
             _authService = Resolver.Resolve<IAuthService>();
 
+            NavItem.Title = AppResources.VerifyPIN;
+            CancelButton.Title = AppResources.Cancel;
             View.BackgroundColor = new UIColor(red: 0.94f, green: 0.94f, blue: 0.96f, alpha: 1.0f);
 
             var descriptor = UIFontDescriptor.PreferredBody;
             PinLabel.Font = UIFont.FromName("Courier", 35);
 
+            InstructionLabel.Text = AppResources.EnterPIN;
             InstructionLabel.LineBreakMode = UILineBreakMode.WordWrap;
             InstructionLabel.Lines = 0;
             InstructionLabel.Font = UIFont.FromDescriptor(descriptor, descriptor.PointSize * 0.8f);

src/iOS.Extension/LockPinViewController.designer.cs

@@ -1,4 +1,4 @@
-// WARNING
+// WARNING
 //
 // This file has been generated automatically by Xamarin Studio from the outlets and
 // actions declared in your storyboard file.
@@ -22,6 +22,10 @@ namespace Bit.iOS.Extension
         [GeneratedCode ("iOS Designer", "1.0")]
         UIKit.UILabel InstructionLabel { get; set; }
 
+        [Outlet]
+        [GeneratedCode ("iOS Designer", "1.0")]
+        UIKit.UINavigationItem NavItem { get; set; }
+
         [Outlet]
         [GeneratedCode ("iOS Designer", "1.0")]
         UIKit.UILabel PinLabel { get; set; }
@@ -30,10 +34,9 @@ namespace Bit.iOS.Extension
         [GeneratedCode ("iOS Designer", "1.0")]
         UIKit.UITextField PinTextField { get; set; }
 
-
         [Action ("CancelButton_Activated:")]
         [GeneratedCode ("iOS Designer", "1.0")]
-        partial void CancelButton_Activated (UIBarButtonItem sender);
+        partial void CancelButton_Activated (UIKit.UIBarButtonItem sender);
 
         void ReleaseDesignerOutlets ()
         {
@@ -47,6 +50,11 @@ namespace Bit.iOS.Extension
                 InstructionLabel = null;
             }
 
+            if (NavItem != null) {
+                NavItem.Dispose ();
+                NavItem = null;
+            }
+
             if (PinLabel != null) {
                 PinLabel.Dispose ();
                 PinLabel = null;

src/iOS.Extension/MainInterface.storyboard

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="64">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
@@ -130,6 +130,7 @@
                         <outlet property="SaveBarButton" destination="3748" id="name-outlet-3748"/>
                         <outlet property="CancelBarButton" destination="3747" id="name-outlet-3747"/>
                         <segue id="4805" destination="4574" kind="show" identifier="passwordGeneratorSegue"/>
+                        <outlet property="NavItem" destination="2252" id="name-outlet-2252"/>
                     </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="2093" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -211,6 +212,7 @@
                         <textAttributes key="titleTextAttributes">
                             <color key="textColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
                         </textAttributes>
+                        <color key="tintColor" colorSpace="calibratedRGB" red="0" green="0.52549019607843139" blue="1" alpha="1"/>
                     </navigationBar>
                     <connections>
                         <segue destination="4576" kind="relationship" relationship="rootViewController" id="4575"/>
@@ -227,7 +229,7 @@
                         <viewControllerLayoutGuide type="top" id="4571"/>
                         <viewControllerLayoutGuide type="bottom" id="4572"/>
                     </layoutGuides>
-                    <navigationItem key="navigationItem" title="Generate Password" id="4580">
+                    <navigationItem key="navigationItem" id="4580" title="Generate Password">
                         <barButtonItem key="leftBarButtonItem" title="Cancel" id="4807">
                             <color key="tintColor" colorSpace="calibratedWhite" white="1" alpha="1"/>
                             <connections>
@@ -247,6 +249,7 @@
                         <outlet property="BaseView" destination="4930" id="name-outlet-4930"/>
                         <outlet property="OptionsContainer" destination="4933" id="name-outlet-4933"/>
                         <outlet property="PasswordLabel" destination="4940" id="name-outlet-4940"/>
+                        <outlet property="NavItem" destination="4580" id="name-outlet-4580"/>
                     </connections>
                     <view contentMode="scaleToFill" id="4930" key="view">
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
@@ -339,7 +342,7 @@
                                 </state>
                                 <inset key="contentEdgeInsets" minX="0.0" minY="10" maxX="0.0" maxY="10"/>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="11144" translatesAutoresizingMaskIntoConstraints="NO">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="11144" translatesAutoresizingMaskIntoConstraints="NO" misplaced="YES">
                                 <rect key="frame" x="254.5" y="234" width="91" height="92"/>
                                 <color key="tintColor" colorSpace="calibratedRGB" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1"/>
                                 <state key="normal" image="fingerprint.png">
@@ -371,6 +374,7 @@
                         <outlet property="UseButton" destination="6777" id="name-outlet-6777"/>
                         <outlet property="CancelButton" destination="6800" id="name-outlet-6800"/>
                         <outlet property="FingerprintButton" destination="11144" id="name-outlet-11144"/>
+                        <outlet property="NavItem" destination="6518" id="name-outlet-6518"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="6520" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -437,6 +441,7 @@
                         <outlet property="PinTextField" destination="7350" id="name-outlet-7350"/>
                         <outlet property="PinLabel" destination="7373" id="name-outlet-7373"/>
                         <outlet property="InstructionLabel" destination="10516" id="name-outlet-10516"/>
+                        <outlet property="NavItem" destination="6803" id="name-outlet-6803"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="6813" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -511,6 +516,7 @@
                         <outlet property="SubmitButton" destination="8269" id="name-outlet-8269"/>
                         <outlet property="CancelButton" destination="8268" id="name-outlet-8268"/>
                         <outlet property="MainTableView" destination="7414" id="name-outlet-7414"/>
+                        <outlet property="NavItem" destination="8265" id="name-outlet-8265"/>
                     </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="7419" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -570,6 +576,7 @@
                         <outlet property="BackButton" destination="11091" id="name-outlet-11091"/>
                         <outlet property="DescriptionLabel" destination="11093" id="name-outlet-11093"/>
                         <outlet property="IconImage" destination="11094" id="name-outlet-11094"/>
+                        <outlet property="NavItem" destination="10574" id="name-outlet-10574"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="10576" userLabel="First Responder" sceneMemberID="firstResponder"/>

src/iOS.Extension/PasswordGeneratorViewController.cs

@@ -48,6 +48,9 @@ namespace Bit.iOS.Extension
             _settings = Resolver.Resolve<ISettings>();
             _googleAnalyticsService = Resolver.Resolve<IGoogleAnalyticsService>();
 
+            NavItem.Title = AppResources.PasswordGenerator;
+            CancelBarButton.Title = AppResources.Cancel;
+            SelectBarButton.Title = AppResources.Select;
             View.BackgroundColor = new UIColor(red: 0.94f, green: 0.94f, blue: 0.96f, alpha: 1.0f);
 
             var descriptor = UIFontDescriptor.PreferredBody;

src/iOS.Extension/PasswordGeneratorViewController.designer.cs

@@ -1,4 +1,4 @@
-// WARNING
+// WARNING
 //
 // This file has been generated automatically by Xamarin Studio from the outlets and
 // actions declared in your storyboard file.
@@ -22,6 +22,10 @@ namespace Bit.iOS.Extension
         [GeneratedCode ("iOS Designer", "1.0")]
         UIKit.UIBarButtonItem CancelBarButton { get; set; }
 
+        [Outlet]
+        [GeneratedCode ("iOS Designer", "1.0")]
+        UIKit.UINavigationItem NavItem { get; set; }
+
         [Outlet]
         [GeneratedCode ("iOS Designer", "1.0")]
         UIKit.UIView OptionsContainer { get; set; }
@@ -54,6 +58,11 @@ namespace Bit.iOS.Extension
                 CancelBarButton = null;
             }
 
+            if (NavItem != null) {
+                NavItem.Dispose ();
+                NavItem = null;
+            }
+
             if (OptionsContainer != null) {
                 OptionsContainer.Dispose ();
                 OptionsContainer = null;

src/iOS.Extension/SetupViewController.cs

@@ -31,7 +31,11 @@ namespace Bit.iOS.Extension
 {AppResources.ExtensionSetup2}";
             DescriptionLabel.Font = UIFont.FromDescriptor(descriptor, descriptor.PointSize);
             DescriptionLabel.TextColor = new UIColor(red: 0.47f, green: 0.47f, blue: 0.47f, alpha: 1.0f);
+
+            ActivatedLabel.Text = AppResources.ExtensionActivated;
             ActivatedLabel.Font = UIFont.FromDescriptor(descriptor, descriptor.PointSize * 1.3f);
+
+            BackButton.Title = AppResources.Back;
             base.ViewDidLoad();
         }
 

src/iOS.Extension/SetupViewController.designer.cs

@@ -1,4 +1,4 @@
-// WARNING
+// WARNING
 //
 // This file has been generated automatically by Xamarin Studio from the outlets and
 // actions declared in your storyboard file.
@@ -30,6 +30,10 @@ namespace Bit.iOS.Extension
         [GeneratedCode ("iOS Designer", "1.0")]
         UIKit.UIImageView IconImage { get; set; }
 
+        [Outlet]
+        [GeneratedCode ("iOS Designer", "1.0")]
+        UIKit.UINavigationItem NavItem { get; set; }
+
         [Action ("BackButton_Activated:")]
         [GeneratedCode ("iOS Designer", "1.0")]
         partial void BackButton_Activated (UIKit.UIBarButtonItem sender);
@@ -55,6 +59,11 @@ namespace Bit.iOS.Extension
                 IconImage.Dispose ();
                 IconImage = null;
             }
+
+            if (NavItem != null) {
+                NavItem.Dispose ();
+                NavItem = null;
+            }
         }
     }
 }

src/iOS.Extension/SiteAddViewController.cs

@@ -54,6 +54,9 @@ namespace Bit.iOS.Extension
             _folderService = Resolver.Resolve<IFolderService>();
             _googleAnalyticsService = Resolver.Resolve<IGoogleAnalyticsService>();
 
+            NavItem.Title = AppResources.AddSite;
+            CancelBarButton.Title = AppResources.Cancel;
+            SaveBarButton.Title = AppResources.Save;
             View.BackgroundColor = new UIColor(red: 0.94f, green: 0.94f, blue: 0.96f, alpha: 1.0f);
 
             NameCell.TextField.Text = Context?.Url?.Host ?? string.Empty;

src/iOS.Extension/SiteAddViewController.designer.cs

@@ -1,4 +1,4 @@
-// WARNING
+// WARNING
 //
 // This file has been generated automatically by Xamarin Studio from the outlets and
 // actions declared in your storyboard file.
@@ -11,39 +11,45 @@ using UIKit;
 
 namespace Bit.iOS.Extension
 {
-	[Register ("SiteAddViewController")]
+    [Register ("SiteAddViewController")]
-	partial class SiteAddViewController
+    partial class SiteAddViewController
-	{
+    {
-		[Outlet]
+        [Outlet]
-		[GeneratedCode ("iOS Designer", "1.0")]
+        [GeneratedCode ("iOS Designer", "1.0")]
-		UIBarButtonItem CancelBarButton { get; set; }
+        UIKit.UIBarButtonItem CancelBarButton { get; set; }
 
-		[Outlet]
+        [Outlet]
-		[GeneratedCode ("iOS Designer", "1.0")]
+        [GeneratedCode ("iOS Designer", "1.0")]
-		UIBarButtonItem SaveBarButton { get; set; }
+        UIKit.UINavigationItem NavItem { get; set; }
 
-		[Action ("CancelBarButton_Activated:")]
+        [Outlet]
-		[GeneratedCode ("iOS Designer", "1.0")]
+        [GeneratedCode ("iOS Designer", "1.0")]
-		partial void CancelBarButton_Activated (UIBarButtonItem sender);
+        UIKit.UIBarButtonItem SaveBarButton { get; set; }
 
-		[Action ("SaveBarButton_Activated:")]
+        [Action ("CancelBarButton_Activated:")]
-		[GeneratedCode ("iOS Designer", "1.0")]
+        [GeneratedCode ("iOS Designer", "1.0")]
-		partial void SaveBarButton_Activated (UIBarButtonItem sender);
+        partial void CancelBarButton_Activated (UIKit.UIBarButtonItem sender);
 
-		void ReleaseDesignerOutlets ()
+        [Action ("SaveBarButton_Activated:")]
-		{
+        [GeneratedCode ("iOS Designer", "1.0")]
-			if (CancelBarButton != null) {
+        partial void SaveBarButton_Activated (UIKit.UIBarButtonItem sender);
-				CancelBarButton.Dispose ();
+
-				CancelBarButton = null;
+        void ReleaseDesignerOutlets ()
-			}
+        {
-			if (SaveBarButton != null) {
+            if (CancelBarButton != null) {
-				SaveBarButton.Dispose ();
+                CancelBarButton.Dispose ();
-				SaveBarButton = null;
+                CancelBarButton = null;
-			}
+            }
-			if (TableView != null) {
+
-				TableView.Dispose ();
+            if (NavItem != null) {
-				TableView = null;
+                NavItem.Dispose ();
-			}
+                NavItem = null;
-		}
+            }
-	}
+
-}
+            if (SaveBarButton != null) {
+                SaveBarButton.Dispose ();
+                SaveBarButton = null;
+            }
+        }
+    }
+}

src/iOS.Extension/SiteListViewController.cs

@@ -35,10 +35,15 @@ namespace Bit.iOS.Extension
         public async override void ViewDidLoad()
         {
             base.ViewDidLoad();
+            NavItem.Title = AppResources.Sites;
             if(!CanAutoFill())
             {
                 CancelBarButton.Title = AppResources.Close;
             }
+            else
+            {
+                CancelBarButton.Title = AppResources.Cancel;
+            }
 
             TableView.RowHeight = UITableView.AutomaticDimension;
             TableView.EstimatedRowHeight = 44;

src/iOS.Extension/SiteListViewController.designer.cs

@@ -1,4 +1,4 @@
-// WARNING
+// WARNING
 //
 // This file has been generated automatically by Xamarin Studio from the outlets and
 // actions declared in your storyboard file.
@@ -11,47 +11,45 @@ using UIKit;
 
 namespace Bit.iOS.Extension
 {
-	[Register ("SiteListViewController")]
+    [Register ("SiteListViewController")]
-	partial class SiteListViewController
+    partial class SiteListViewController
-	{
+    {
-		[Outlet]
+        [Outlet]
-		[GeneratedCode ("iOS Designer", "1.0")]
+        [GeneratedCode ("iOS Designer", "1.0")]
-		UIBarButtonItem AddBarButton { get; set; }
+        UIKit.UIBarButtonItem AddBarButton { get; set; }
 
-		[Outlet]
+        [Outlet]
-		[GeneratedCode ("iOS Designer", "1.0")]
+        [GeneratedCode ("iOS Designer", "1.0")]
-		UIBarButtonItem CancelBarButton { get; set; }
+        UIKit.UIBarButtonItem CancelBarButton { get; set; }
 
-		[Outlet]
+        [Outlet]
-		[GeneratedCode ("iOS Designer", "1.0")]
+        [GeneratedCode ("iOS Designer", "1.0")]
-		UINavigationItem NavItem { get; set; }
+        UIKit.UINavigationItem NavItem { get; set; }
 
-		[Action ("AddBarButton_Activated:")]
+        [Action ("AddBarButton_Activated:")]
-		[GeneratedCode ("iOS Designer", "1.0")]
+        [GeneratedCode ("iOS Designer", "1.0")]
-		partial void AddBarButton_Activated (UIBarButtonItem sender);
+        partial void AddBarButton_Activated (UIKit.UIBarButtonItem sender);
 
-		[Action ("CancelBarButton_Activated:")]
+        [Action ("CancelBarButton_Activated:")]
-		[GeneratedCode ("iOS Designer", "1.0")]
+        [GeneratedCode ("iOS Designer", "1.0")]
-		partial void CancelBarButton_Activated (UIBarButtonItem sender);
+        partial void CancelBarButton_Activated (UIKit.UIBarButtonItem sender);
 
-		void ReleaseDesignerOutlets ()
+        void ReleaseDesignerOutlets ()
-		{
+        {
-			if (AddBarButton != null) {
+            if (AddBarButton != null) {
-				AddBarButton.Dispose ();
+                AddBarButton.Dispose ();
-				AddBarButton = null;
+                AddBarButton = null;
-			}
+            }
-			if (CancelBarButton != null) {
+
-				CancelBarButton.Dispose ();
+            if (CancelBarButton != null) {
-				CancelBarButton = null;
+                CancelBarButton.Dispose ();
-			}
+                CancelBarButton = null;
-			if (NavItem != null) {
+            }
-				NavItem.Dispose ();
+
-				NavItem = null;
+            if (NavItem != null) {
-			}
+                NavItem.Dispose ();
-			if (TableView != null) {
+                NavItem = null;
-				TableView.Dispose ();
+            }
-				TableView = null;
+        }
-			}
+    }
-		}
+}
-	}
-}