diff --git a/Borepin/Borepin/Page/MachinePage.xaml b/Borepin/Borepin/Page/MachinePage.xaml
index 5a0cfaf..3a0576f 100644
--- a/Borepin/Borepin/Page/MachinePage.xaml
+++ b/Borepin/Borepin/Page/MachinePage.xaml
@@ -19,33 +19,35 @@
     <ContentPage.Content>
         <ScrollView>
             <StackLayout Padding="20">
-                <StackLayout IsVisible="{Binding IsBusy}">
+                <StackLayout IsVisible="{Binding IsConnected}">
+                    <StackLayout IsVisible="{Binding IsBusy}">
                         <ActivityIndicator IsRunning="{Binding IsBusy}"></ActivityIndicator>
                     </StackLayout>
-                <StackLayout IsVisible="{Binding IsBusy, Converter={StaticResource InvertBoolConverter}}">
-                    <Label Text="{Binding MachineItem.Name}" Style="{StaticResource LabelStyle_Title}"/>
-                    <Label Text="{Binding MachineItem.Description}" Style="{StaticResource Style_Label_Text_Center}"/>
-                    <StackLayout Orientation="Horizontal" IsVisible="{Binding MachineItem.CurrentUser, Converter={StaticResource IsNotNullBoolConverter}}">
-                        <Label Text="{x:Static resource_text:TextResource.MachinePage_CurrentUser}" Style="{StaticResource Style_Label_Property_Title}"/>
-                        <Label Text="{Binding MachineItem.CurrentUser.Username}" Style="{StaticResource Style_Label_Property_Text}"/>
-                    </StackLayout>
-
-                    <Button Text="{x:Static resource_text:TextResource.MachinePage_Use}" IsVisible="{Binding MachineItem.CanUse}" Command="{Binding UseMachineCommand}" Style="{StaticResource Style_Button_Primary}"/>
-                    <Label Text="{x:Static resource_text:TextResource.MachinePage_CanNotUseByPermission}" IsVisible="{Binding MachineItem.CanNotUseByPermission}" Style="{StaticResource Style_Label_Text_Center}"/>
-                    <Button Text="{x:Static resource_text:TextResource.MachinePage_GiveBack}" IsVisible="{Binding MachineItem.CanInUse}" Command="{Binding GiveBackMachineCommand}" Style="{StaticResource Style_Button_Primary}"/>
-                    <Button VerticalOptions="End" Text="{x:Static resource_text:TextResource.MachinePage_OpenWiki}" IsVisible="{Binding MachineItem.Wiki, Converter={StaticResource IsNotNullBoolConverter}}" Command="{Binding OpenWikiCommand}" Style="{StaticResource Style_Button_Primary}"/>
-                    <StackLayout Grid.Row="2" VerticalOptions="End" IsVisible="{Binding MachineItem.CanManage}">
-                        <Label Text="{x:Static resource_text:TextResource.MachinePage_ManageMachine}" Style="{StaticResource Style_Label_Property_Title}"/>
-                        <StackLayout Margin="10, 0, 0, 20" Orientation="Horizontal" IsVisible="{Binding MachineItem.LastUser, Converter={StaticResource IsNotNullBoolConverter}}">
-                            <Label Text="{x:Static resource_text:TextResource.MachinePage_LastUser}" Style="{StaticResource Style_Label_Property_Title}"/>
-                            <Label Text="{Binding MachineItem.LastUser.Username}" Style="{StaticResource Style_Label_Property_Text}" Margin="10, 0, 0, 0"/>
+                    <StackLayout IsVisible="{Binding IsBusy, Converter={StaticResource InvertBoolConverter}}">
+                        <Label Text="{Binding MachineItem.Name}" Style="{StaticResource LabelStyle_Title}"/>
+                        <Label Text="{Binding MachineItem.Description}" Style="{StaticResource Style_Label_Text_Center}"/>
+                        <StackLayout Orientation="Horizontal" IsVisible="{Binding MachineItem.CurrentUser, Converter={StaticResource IsNotNullBoolConverter}}">
+                            <Label Text="{x:Static resource_text:TextResource.MachinePage_CurrentUser}" Style="{StaticResource Style_Label_Property_Title}"/>
+                            <Label Text="{Binding MachineItem.CurrentUser.Username}" Style="{StaticResource Style_Label_Property_Text}"/>
+                        </StackLayout>
+
+                        <Button Text="{x:Static resource_text:TextResource.MachinePage_Use}" IsVisible="{Binding MachineItem.CanUse}" Command="{Binding UseMachineCommand}" Style="{StaticResource Style_Button_Primary}"/>
+                        <Label Text="{x:Static resource_text:TextResource.MachinePage_CanNotUseByPermission}" IsVisible="{Binding MachineItem.CanNotUseByPermission}" Style="{StaticResource Style_Label_Text_Center}"/>
+                        <Button Text="{x:Static resource_text:TextResource.MachinePage_GiveBack}" IsVisible="{Binding MachineItem.CanInUse}" Command="{Binding GiveBackMachineCommand}" Style="{StaticResource Style_Button_Primary}"/>
+                        <Button VerticalOptions="End" Text="{x:Static resource_text:TextResource.MachinePage_OpenWiki}" IsVisible="{Binding MachineItem.Wiki, Converter={StaticResource IsNotNullBoolConverter}}" Command="{Binding OpenWikiCommand}" Style="{StaticResource Style_Button_Primary}"/>
+                        <StackLayout Grid.Row="2" VerticalOptions="End" IsVisible="{Binding MachineItem.CanManage}">
+                            <Label Text="{x:Static resource_text:TextResource.MachinePage_ManageMachine}" Style="{StaticResource Style_Label_Property_Title}"/>
+                            <StackLayout Margin="10, 0, 0, 20" Orientation="Horizontal" IsVisible="{Binding MachineItem.LastUser, Converter={StaticResource IsNotNullBoolConverter}}">
+                                <Label Text="{x:Static resource_text:TextResource.MachinePage_LastUser}" Style="{StaticResource Style_Label_Property_Title}"/>
+                                <Label Text="{Binding MachineItem.LastUser.Username}" Style="{StaticResource Style_Label_Property_Text}" Margin="10, 0, 0, 0"/>
+                            </StackLayout>
+                            <Button Text="{x:Static resource_text:TextResource.MachinePage_ForceFree}" Command="{Binding ForceFreeMachineCommand}" Style="{StaticResource Style_Button_Primary}"/>
+                            <Button Text="{x:Static resource_text:TextResource.MachinePage_ForceBlock}" Command="{Binding ForceBlockMachineCommand}" Style="{StaticResource Style_Button_Admin}"/>
+                            <Button Text="{x:Static resource_text:TextResource.MachinePage_ForceDisable}" Command="{Binding ForceDisableMachineCommand}" Style="{StaticResource Style_Button_Admin}"/>
                         </StackLayout>
-                        <Button Text="{x:Static resource_text:TextResource.MachinePage_ForceFree}" Command="{Binding ForceFreeMachineCommand}" Style="{StaticResource Style_Button_Primary}"/>
-                        <Button Text="{x:Static resource_text:TextResource.MachinePage_ForceBlock}" Command="{Binding ForceBlockMachineCommand}" Style="{StaticResource Style_Button_Admin}"/>
-                        <Button Text="{x:Static resource_text:TextResource.MachinePage_ForceDisable}" Command="{Binding ForceDisableMachineCommand}" Style="{StaticResource Style_Button_Admin}"/>
                     </StackLayout>
-                    <Label Text="{x:Static resource_text:TextResource.PLEASECONNECTTOSERVER}" IsVisible="{Binding IsConnected, Converter={StaticResource InvertBoolConverter}}"></Label>
                 </StackLayout>
+                <Label Text="{x:Static resource_text:TextResource.PLEASECONNECTTOSERVER}" IsVisible="{Binding IsConnected, Converter={StaticResource InvertBoolConverter}}"></Label>
             </StackLayout>
         </ScrollView>
     </ContentPage.Content>
diff --git a/Borepin/Borepin/Page/UserListPage.xaml b/Borepin/Borepin/Page/UserListPage.xaml
index 0bd7d02..47f1c44 100644
--- a/Borepin/Borepin/Page/UserListPage.xaml
+++ b/Borepin/Borepin/Page/UserListPage.xaml
@@ -4,7 +4,7 @@
              xmlns:views="clr-namespace:Borepin.View"
              x:Class="Borepin.Page.UserListPage"
              xmlns:converters="clr-namespace:Borepin.Converter"
-             xmlns:resource_text="clr-namespace:Borepin.Resources.Text"
+             xmlns:resource_text="clr-namespace:Borepin.Resources.Text" xmlns:prism="http://prismlibrary.com"
              Title="{x:Static resource_text:TextResource.TITLE_Users}">
     <NavigationPage.TitleView>
         <Button Text="Refresh" HorizontalOptions="End" BackgroundColor="{StaticResource SecondColor}" TextColor="{StaticResource FirstColor}" Command="{Binding RefreshCommand}"/>
@@ -23,7 +23,12 @@
             <StackLayout IsVisible="{Binding IsBusy, Converter={StaticResource InvertBoolConverter}}">
                 <StackLayout IsVisible="{Binding IsConnected}">
                     <Button Text="{x:Static resource_text:TextResource.UserListPage_AddUser}" Command="{Binding AddUserCommand}" Style="{StaticResource Style_Button_Primary}"/>
-                    <ListView ItemsSource="{Binding UserListItemViewModel_List}" SelectionMode="None" SeparatorColor="Transparent">
+                    <SearchBar Text="{Binding SearchUsername}" SearchCommand="{Binding SearchUserCommand}">
+                        <SearchBar.Behaviors>
+                            <prism:EventToCommandBehavior EventName="TextChanged" Command="{Binding SearchUserCommand}"/>
+                        </SearchBar.Behaviors>
+                    </SearchBar>
+                    <ListView ItemsSource="{Binding FilteredUserListItemViewModel_List}" SelectionMode="None" SeparatorColor="Transparent">
                         <ListView.ItemTemplate>
                             <DataTemplate>
                                 <ViewCell>
diff --git a/Borepin/Borepin/PageModel/MachineListPageModel.cs b/Borepin/Borepin/PageModel/MachineListPageModel.cs
index 78db4d8..d85d9fa 100644
--- a/Borepin/Borepin/PageModel/MachineListPageModel.cs
+++ b/Borepin/Borepin/PageModel/MachineListPageModel.cs
@@ -45,7 +45,7 @@ namespace Borepin.PageModel
             };
             MachineViewModelListGroup viewmodel_group_uncategorised = new MachineViewModelListGroup()
             {
-                Category = null,
+                Category = String.Empty,
             };
 
             foreach (Machine machine in machine_list)
@@ -67,7 +67,7 @@ namespace Borepin.PageModel
                     MachineListItemViewModel new_viewmodel = new MachineListItemViewModel(_NavigationService, _PageDialogService);
                     tasks.Add(new_viewmodel.LoadInstance(machine));
 
-                    viewmodel_group_inusebyme.Add(new_viewmodel);
+                    viewmodel_group_uncategorised.Add(new_viewmodel);
                 }
                 else
                 {
@@ -100,7 +100,7 @@ namespace Borepin.PageModel
                 viewmodel_group.Sort_Machines();
             }
 
-            viewmodel_group_uncategorised.Category = Resources.Text.TextResource.Uncategorised;
+            viewmodel_group_uncategorised.Category = String.Empty;
             List<MachineViewModelListGroup> viewmodel_group_list_sorted = new List<MachineViewModelListGroup>();
             if(viewmodel_group_inusebyme.Count != 0)
             {
diff --git a/Borepin/Borepin/PageModel/StartPageModel.cs b/Borepin/Borepin/PageModel/StartPageModel.cs
index 087a74b..646d0f4 100644
--- a/Borepin/Borepin/PageModel/StartPageModel.cs
+++ b/Borepin/Borepin/PageModel/StartPageModel.cs
@@ -2,10 +2,14 @@
 using Borepin.Service;
 using Borepin.Service.Storage;
 using FabAccessAPI;
+using FabAccessAPI.Exceptions;
 using Prism.AppModel;
 using Prism.Navigation;
 using Prism.Services;
+using Prism.Services.Dialogs;
+using System;
 using System.Collections.Generic;
+using System.Security.Authentication;
 using Xamarin.Forms;
 
 namespace Borepin.PageModel
@@ -65,8 +69,23 @@ namespace Borepin.PageModel
                         }
                     });
                 }
-                catch
+                catch(Exception ex)
                 {
+                    if (ex is AuthenticationFailedException)
+                    {
+                        Device.BeginInvokeOnMainThread(async () =>
+                        {
+                            await _PageDialogService.DisplayAlertAsync(Resources.Text.TextResource.ALERT_ConnectionFailed, Resources.Text.TextResource.ALERT_AuthServer, Resources.Text.TextResource.OK).ConfigureAwait(false);
+                        });
+                    }
+                    else if (ex is ConnectingFailedException)
+                    {
+                        Device.BeginInvokeOnMainThread(async () =>
+                        {
+                            await _PageDialogService.DisplayAlertAsync(Resources.Text.TextResource.ALERT_ConnectionFailed, Resources.Text.TextResource.ALERT_UnableServer, Resources.Text.TextResource.OK).ConfigureAwait(false);
+                        });
+                    }
+
                     Device.BeginInvokeOnMainThread(async () =>
                     {
                         INavigationResult result = await _NavigationService.NavigateAsync("/MainPage/NavigationPage/ServerListPage").ConfigureAwait(false);
diff --git a/Borepin/Borepin/PageModel/UserListPageModel.cs b/Borepin/Borepin/PageModel/UserListPageModel.cs
index 9497e7b..98bc238 100644
--- a/Borepin/Borepin/PageModel/UserListPageModel.cs
+++ b/Borepin/Borepin/PageModel/UserListPageModel.cs
@@ -22,6 +22,7 @@ namespace Borepin.PageModel
         {
             RefreshCommand = new DelegateCommand(async ()=> await RefreshCommandExecute().ConfigureAwait(true));
             AddUserCommand = new DelegateCommand(AddUserCommandExecute);
+            SearchUserCommand = new DelegateCommand(SearchUserCommandExecute);
         }
         #endregion
 
@@ -42,6 +43,8 @@ namespace Borepin.PageModel
 
             await Task.WhenAll(tasks).ConfigureAwait(false);
             UserListItemViewModel_List = new List<UserListItemViewModel>(viewmodel_list.OrderBy(x => x.User.Username, StringComparison.OrdinalIgnoreCase.WithNaturalSort()));
+        
+            FilteredUserListItemViewModel_List = new List<UserListItemViewModel>(viewmodel_list.OrderBy(x => x.User.Username, StringComparison.OrdinalIgnoreCase.WithNaturalSort()));
         }
         #endregion
 
@@ -53,12 +56,26 @@ namespace Borepin.PageModel
             set => SetProperty(ref _UserListItemViewModel_List, value);
         }
 
+        private IList<UserListItemViewModel> _FilteredUserListItemViewModel_List;
+        public IList<UserListItemViewModel> FilteredUserListItemViewModel_List
+        {
+            get => _FilteredUserListItemViewModel_List;
+            set => SetProperty(ref _FilteredUserListItemViewModel_List, value);
+        }
+
         private bool _IsRefreshing;
         public bool IsRefreshing
         {
             get => _IsRefreshing;
             set => SetProperty(ref _IsRefreshing, value);
         }
+
+        private string _SearchUsername;
+        public string SearchUsername
+        {
+            get => _SearchUsername;
+            set => SetProperty(ref _SearchUsername, value);
+        }
         #endregion
 
         #region Commands
@@ -95,6 +112,18 @@ namespace Borepin.PageModel
                 }
             });
         }
+
+        private ICommand _SerachUserCommand;
+        public ICommand SearchUserCommand
+        {
+            get => _SerachUserCommand;
+            set => SetProperty(ref _SerachUserCommand, value);
+        }
+        public void SearchUserCommandExecute()
+        {
+            List<UserListItemViewModel> users = new List<UserListItemViewModel>(UserListItemViewModel_List);
+            FilteredUserListItemViewModel_List = users.FindAll(x => x.User.Username.Contains(SearchUsername));
+        }
         #endregion
     }
 }
diff --git a/Borepin/Borepin/Resources/Text/TextResource.Designer.cs b/Borepin/Borepin/Resources/Text/TextResource.Designer.cs
index 70780d3..1dc0baf 100644
--- a/Borepin/Borepin/Resources/Text/TextResource.Designer.cs
+++ b/Borepin/Borepin/Resources/Text/TextResource.Designer.cs
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -13,13 +13,13 @@ namespace Borepin.Resources.Text {
     
     
     /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class TextResource {
@@ -33,7 +33,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Login.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Login ähnelt.
         /// </summary>
         internal static string AddServerProcess_AuthPlainPage_Login {
             get {
@@ -70,7 +70,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Login with Card.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Login with Card ähnelt.
         /// </summary>
         internal static string AddServerProcess_ChooseAuthTypePage_LoginCard {
             get {
@@ -79,7 +79,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Login with Password.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Login with Password ähnelt.
         /// </summary>
         internal static string AddServerProcess_ChooseAuthTypePage_LoginPassword {
             get {
@@ -88,7 +88,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Register.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Register ähnelt.
         /// </summary>
         internal static string AddServerProcess_ChooseAuthTypePage_Register {
             get {
@@ -97,7 +97,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Sign In:.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Sign In: ähnelt.
         /// </summary>
         internal static string AddServerProcess_ChooseAuthTypePage_SignIn {
             get {
@@ -106,7 +106,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Sign Up:.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Sign Up: ähnelt.
         /// </summary>
         internal static string AddServerProcess_ChooseAuthTypePage_SignUp {
             get {
@@ -115,7 +115,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connect to Server.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Connect to Server ähnelt.
         /// </summary>
         internal static string AddServerProcess_SelectServerPage_Connect {
             get {
@@ -124,9 +124,9 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to FabAccess is a decentralized machine management system. Each Space thus uses its own server.
+        ///   Sucht eine lokalisierte Zeichenfolge, die FabAccess is a decentralized machine management system. Each Space thus uses its own server.
         ///Ask your Space for the address of your server.
-        ///You can also put down several servers and then connect to the desired server..
+        ///You can also put down several servers and then connect to the desired server. ähnelt.
         /// </summary>
         internal static string AddServerProcess_SelectServerPage_Info {
             get {
@@ -135,7 +135,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Add User.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Add User ähnelt.
         /// </summary>
         internal static string AddUserPage_AddUser {
             get {
@@ -144,7 +144,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Alert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Alert ähnelt.
         /// </summary>
         internal static string ALERT {
             get {
@@ -153,7 +153,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Server address is invaild..
+        ///   Sucht eine lokalisierte Zeichenfolge, die Server address is invaild. ähnelt.
         /// </summary>
         internal static string ALERT_AddressInvalid {
             get {
@@ -162,7 +162,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Add User failed.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Add User failed ähnelt.
         /// </summary>
         internal static string ALERT_AddUserFailed {
             get {
@@ -171,7 +171,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to authenticate to server..
+        ///   Sucht eine lokalisierte Zeichenfolge, die Unable to authenticate to server. ähnelt.
         /// </summary>
         internal static string ALERT_AuthServer {
             get {
@@ -180,7 +180,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connection failed.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Connection failed ähnelt.
         /// </summary>
         internal static string ALERT_ConnectionFailed {
             get {
@@ -189,7 +189,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connection already exist. Please delete old Connection before adding the new Connection..
+        ///   Sucht eine lokalisierte Zeichenfolge, die Connection already exist. Please delete old Connection before adding the new Connection. ähnelt.
         /// </summary>
         internal static string ALERT_DuplicateConnection {
             get {
@@ -198,7 +198,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Password is invalid..
+        ///   Sucht eine lokalisierte Zeichenfolge, die Password is invalid. ähnelt.
         /// </summary>
         internal static string ALERT_PasswordInvalid {
             get {
@@ -207,7 +207,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to QR Code is invalid.
+        ///   Sucht eine lokalisierte Zeichenfolge, die QR Code is invalid ähnelt.
         /// </summary>
         internal static string Alert_QRInvalid {
             get {
@@ -216,7 +216,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unable to connect to server..
+        ///   Sucht eine lokalisierte Zeichenfolge, die Unable to connect to server. ähnelt.
         /// </summary>
         internal static string ALERT_UnableServer {
             get {
@@ -225,7 +225,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unexpected Error..
+        ///   Sucht eine lokalisierte Zeichenfolge, die Unexpected Error. ähnelt.
         /// </summary>
         internal static string ALERT_UnexpectedError {
             get {
@@ -234,7 +234,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to User allready exist..
+        ///   Sucht eine lokalisierte Zeichenfolge, die User allready exist. ähnelt.
         /// </summary>
         internal static string ALERT_UserExist {
             get {
@@ -243,7 +243,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Username is invalid..
+        ///   Sucht eine lokalisierte Zeichenfolge, die Username is invalid. ähnelt.
         /// </summary>
         internal static string ALERT_UsernameInvalid {
             get {
@@ -252,7 +252,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to It&apos;s Bionade.
+        ///   Sucht eine lokalisierte Zeichenfolge, die It&apos;s Bionade ähnelt.
         /// </summary>
         internal static string Bionade {
             get {
@@ -261,7 +261,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Build.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Build ähnelt.
         /// </summary>
         internal static string BUILD {
             get {
@@ -270,7 +270,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cancel.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Cancel ähnelt.
         /// </summary>
         internal static string CANCEL {
             get {
@@ -279,7 +279,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Confirm.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Confirm ähnelt.
         /// </summary>
         internal static string CONFIRM {
             get {
@@ -288,7 +288,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Delete.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Delete ähnelt.
         /// </summary>
         internal static string DELETE {
             get {
@@ -297,7 +297,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Delete Server.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Delete Server ähnelt.
         /// </summary>
         internal static string DIALOG_DeleteServer {
             get {
@@ -306,7 +306,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &quot;Do you really want to delete this Server?&quot;.
+        ///   Sucht eine lokalisierte Zeichenfolge, die &quot;Do you really want to delete this Server?&quot; ähnelt.
         /// </summary>
         internal static string DIALOG_DeleteServerConfirm {
             get {
@@ -315,7 +315,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Delete User.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Delete User ähnelt.
         /// </summary>
         internal static string DIALOG_DeleteUser {
             get {
@@ -324,7 +324,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Do you really want to delete this User?.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Do you really want to delete this User? ähnelt.
         /// </summary>
         internal static string DIALOG_DeleteUserConfirm {
             get {
@@ -333,7 +333,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to FabAccess.
+        ///   Sucht eine lokalisierte Zeichenfolge, die FabAccess ähnelt.
         /// </summary>
         internal static string FABACCESS {
             get {
@@ -342,7 +342,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Host.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Host ähnelt.
         /// </summary>
         internal static string HOST {
             get {
@@ -351,7 +351,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to In Use By Me.
+        ///   Sucht eine lokalisierte Zeichenfolge, die In Use By Me ähnelt.
         /// </summary>
         internal static string InUseByMe {
             get {
@@ -360,8 +360,17 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You do not have the authorization to use this machine.
-        ///Ask in your Space if you can be trained on the machine to be unlocked for the machine..
+        ///   Sucht eine lokalisierte Zeichenfolge, die Machine ähnelt.
+        /// </summary>
+        internal static string MACHINE {
+            get {
+                return ResourceManager.GetString("MACHINE", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die You do not have the authorization to use this machine.
+        ///Ask in your Space if you can be trained on the machine to be unlocked for the machine. ähnelt.
         /// </summary>
         internal static string MachinePage_CanNotUseByPermission {
             get {
@@ -370,7 +379,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Current User:.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Current User: ähnelt.
         /// </summary>
         internal static string MachinePage_CurrentUser {
             get {
@@ -379,7 +388,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Block Machine.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Block Machine ähnelt.
         /// </summary>
         internal static string MachinePage_ForceBlock {
             get {
@@ -388,7 +397,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Disable Machine.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Disable Machine ähnelt.
         /// </summary>
         internal static string MachinePage_ForceDisable {
             get {
@@ -397,7 +406,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Free Machine.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Free Machine ähnelt.
         /// </summary>
         internal static string MachinePage_ForceFree {
             get {
@@ -406,7 +415,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to GiveBack.
+        ///   Sucht eine lokalisierte Zeichenfolge, die GiveBack ähnelt.
         /// </summary>
         internal static string MachinePage_GiveBack {
             get {
@@ -415,7 +424,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Last User:.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Last User: ähnelt.
         /// </summary>
         internal static string MachinePage_LastUser {
             get {
@@ -424,7 +433,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Manage Machine:.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Manage Machine: ähnelt.
         /// </summary>
         internal static string MachinePage_ManageMachine {
             get {
@@ -433,7 +442,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Open Wiki.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Open Wiki ähnelt.
         /// </summary>
         internal static string MachinePage_OpenWiki {
             get {
@@ -442,7 +451,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Use.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Use ähnelt.
         /// </summary>
         internal static string MachinePage_Use {
             get {
@@ -451,7 +460,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Build.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Build ähnelt.
         /// </summary>
         internal static string MainPage_Build {
             get {
@@ -460,7 +469,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Machines.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Machines ähnelt.
         /// </summary>
         internal static string MainPage_Machines {
             get {
@@ -469,7 +478,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to My Profile.
+        ///   Sucht eine lokalisierte Zeichenfolge, die My Profile ähnelt.
         /// </summary>
         internal static string MainPage_Profile {
             get {
@@ -478,7 +487,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Servers.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Servers ähnelt.
         /// </summary>
         internal static string MainPage_Servers {
             get {
@@ -487,7 +496,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Users.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Users ähnelt.
         /// </summary>
         internal static string MainPage_Users {
             get {
@@ -496,7 +505,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Version.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Version ähnelt.
         /// </summary>
         internal static string MainPage_Version {
             get {
@@ -505,7 +514,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Ok.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Ok ähnelt.
         /// </summary>
         internal static string OK {
             get {
@@ -514,7 +523,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to or.
+        ///   Sucht eine lokalisierte Zeichenfolge, die or ähnelt.
         /// </summary>
         internal static string OR {
             get {
@@ -523,7 +532,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Password.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Password ähnelt.
         /// </summary>
         internal static string PASSWORD {
             get {
@@ -532,7 +541,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Please connect to Server.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Please connect to Server ähnelt.
         /// </summary>
         internal static string PLEASECONNECTTOSERVER {
             get {
@@ -541,7 +550,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Change Password.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Change Password ähnelt.
         /// </summary>
         internal static string ProfilePage_ChangePassword {
             get {
@@ -550,7 +559,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to New Password.
+        ///   Sucht eine lokalisierte Zeichenfolge, die New Password ähnelt.
         /// </summary>
         internal static string ProfilePage_NewPassword {
             get {
@@ -559,7 +568,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Old Password.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Old Password ähnelt.
         /// </summary>
         internal static string ProfilePage_OldPassword {
             get {
@@ -568,7 +577,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update Password.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Update Password ähnelt.
         /// </summary>
         internal static string ProfilePage_UpdatePassword {
             get {
@@ -577,7 +586,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Scan QR-Code.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Scan QR-Code ähnelt.
         /// </summary>
         internal static string SCANQR {
             get {
@@ -586,7 +595,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Active Connection.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Active Connection ähnelt.
         /// </summary>
         internal static string ServerListPage_ActiveConnection {
             get {
@@ -595,7 +604,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connect to new Server.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Connect to new Server ähnelt.
         /// </summary>
         internal static string ServerListPage_ConnectToNewServer {
             get {
@@ -604,7 +613,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Last Connections.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Last Connections ähnelt.
         /// </summary>
         internal static string ServerListPage_LastConnection {
             get {
@@ -613,7 +622,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connect.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Connect ähnelt.
         /// </summary>
         internal static string ServerPage_Connect {
             get {
@@ -622,7 +631,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Disconnect.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Disconnect ähnelt.
         /// </summary>
         internal static string ServerPage_Disconnect {
             get {
@@ -631,7 +640,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Is Default Connection.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Is Default Connection ähnelt.
         /// </summary>
         internal static string ServerPage_IsDefault {
             get {
@@ -640,7 +649,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Set as Default Connection.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Set as Default Connection ähnelt.
         /// </summary>
         internal static string ServerPage_SetDefault {
             get {
@@ -649,7 +658,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connection failed.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Connection failed ähnelt.
         /// </summary>
         internal static string ServerPageModel_ConnectionFailed {
             get {
@@ -658,7 +667,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Login to your Space.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Login to your Space ähnelt.
         /// </summary>
         internal static string SetUpProcess_ScanPage_Button {
             get {
@@ -667,7 +676,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Begin working.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Begin working ähnelt.
         /// </summary>
         internal static string SetUpProcess_WelcomePage_Button {
             get {
@@ -676,7 +685,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Automate your Space with FabAccess.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Automate your Space with FabAccess ähnelt.
         /// </summary>
         internal static string SetUpProcess_WelcomePage_Text {
             get {
@@ -685,7 +694,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Welcome.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Welcome ähnelt.
         /// </summary>
         internal static string SetUpProcess_WelcomePage_Title {
             get {
@@ -694,7 +703,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connecting to Server.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Connecting to Server ähnelt.
         /// </summary>
         internal static string StartPage_Connecting {
             get {
@@ -703,7 +712,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Starting App.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Starting App ähnelt.
         /// </summary>
         internal static string StartPage_Starting {
             get {
@@ -712,7 +721,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Add User.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Add User ähnelt.
         /// </summary>
         internal static string TITLE_AddUser {
             get {
@@ -721,7 +730,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connect to Server.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Connect to Server ähnelt.
         /// </summary>
         internal static string TITLE_ConnectToServer {
             get {
@@ -730,7 +739,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Machine.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Machine ähnelt.
         /// </summary>
         internal static string TITLE_Machine {
             get {
@@ -739,7 +748,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Machines.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Machines ähnelt.
         /// </summary>
         internal static string TITLE_Machines {
             get {
@@ -748,7 +757,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to My Profile.
+        ///   Sucht eine lokalisierte Zeichenfolge, die My Profile ähnelt.
         /// </summary>
         internal static string TITLE_Profile {
             get {
@@ -757,7 +766,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Server.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Server ähnelt.
         /// </summary>
         internal static string TITLE_Server {
             get {
@@ -766,7 +775,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Servers.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Servers ähnelt.
         /// </summary>
         internal static string TITLE_Servers {
             get {
@@ -775,7 +784,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Settings.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Settings ähnelt.
         /// </summary>
         internal static string TITLE_Settings {
             get {
@@ -784,7 +793,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to User.
+        ///   Sucht eine lokalisierte Zeichenfolge, die User ähnelt.
         /// </summary>
         internal static string TITLE_User {
             get {
@@ -793,7 +802,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Users.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Users ähnelt.
         /// </summary>
         internal static string TITLE_Users {
             get {
@@ -802,7 +811,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Uncategorised.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Uncategorised ähnelt.
         /// </summary>
         internal static string Uncategorised {
             get {
@@ -811,7 +820,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Add User.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Add User ähnelt.
         /// </summary>
         internal static string UserListPage_AddUser {
             get {
@@ -820,7 +829,16 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Username.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Search Username ... ähnelt.
+        /// </summary>
+        internal static string UserListPage_SearchUser {
+            get {
+                return ResourceManager.GetString("UserListPage_SearchUser", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Username ähnelt.
         /// </summary>
         internal static string USERNAME {
             get {
@@ -829,7 +847,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Update Password.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Update Password ähnelt.
         /// </summary>
         internal static string UserPage_ChangePassword {
             get {
@@ -838,7 +856,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to New Password.
+        ///   Sucht eine lokalisierte Zeichenfolge, die New Password ähnelt.
         /// </summary>
         internal static string UserPage_NewPassword {
             get {
@@ -847,7 +865,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Force Password Update.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Force Password Update ähnelt.
         /// </summary>
         internal static string UserPage_UpdatePassword {
             get {
@@ -856,7 +874,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Version.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Version ähnelt.
         /// </summary>
         internal static string VERSION {
             get {
@@ -865,7 +883,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to YAY.
+        ///   Sucht eine lokalisierte Zeichenfolge, die YAY ähnelt.
         /// </summary>
         internal static string YAY {
             get {
diff --git a/Borepin/Borepin/Resources/Text/TextResource.resx b/Borepin/Borepin/Resources/Text/TextResource.resx
index ff8668f..fd73670 100644
--- a/Borepin/Borepin/Resources/Text/TextResource.resx
+++ b/Borepin/Borepin/Resources/Text/TextResource.resx
@@ -218,6 +218,9 @@ You can also put down several servers and then connect to the desired server.</v
   <data name="InUseByMe" xml:space="preserve">
     <value>In Use By Me</value>
   </data>
+  <data name="MACHINE" xml:space="preserve">
+    <value>Machine</value>
+  </data>
   <data name="MachinePage_CanNotUseByPermission" xml:space="preserve">
     <value>You do not have the authorization to use this machine.
 Ask in your Space if you can be trained on the machine to be unlocked for the machine.</value>
@@ -372,6 +375,9 @@ Ask in your Space if you can be trained on the machine to be unlocked for the ma
   <data name="UserListPage_AddUser" xml:space="preserve">
     <value>Add User</value>
   </data>
+  <data name="UserListPage_SearchUser" xml:space="preserve">
+    <value>Search Username ...</value>
+  </data>
   <data name="USERNAME" xml:space="preserve">
     <value>Username</value>
   </data>