Changeset 6565


Ignore:
Timestamp:
Oct 4, 2015, 4:44:49 PM (6 years ago)
Author:
konze
Message:

CrypCloudManager:

  • fixed spellings
  • adapted layout of createAccount and resetPassword screen to match l18n
Location:
trunk/CrypCloud/CrypCloudManager
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypCloud/CrypCloudManager/Properties/Resources.Designer.cs

    r6562 r6565  
    422422       
    423423        /// <summary>
    424         ///   Sucht eine lokalisierte Zeichenfolge, die We have send an verification email to the email address of the account. Please enter the verification code and your new password below. ähnelt.
     424        ///   Sucht eine lokalisierte Zeichenfolge, die We have send an verification email to the email address of the account. ähnelt.
    425425        /// </summary>
    426426        public static string _ResetPW_enterVerificationData {
     
    431431       
    432432        /// <summary>
     433        ///   Sucht eine lokalisierte Zeichenfolge, die Please enter the verification code and your new password below. ähnelt.
     434        /// </summary>
     435        public static string _ResetPW_enterVerificationData_2 {
     436            get {
     437                return ResourceManager.GetString("_ResetPW_enterVerificationData_2", resourceCulture);
     438            }
     439        }
     440       
     441        /// <summary>
    433442        ///   Sucht eine lokalisierte Zeichenfolge, die Reset Password ähnelt.
    434443        /// </summary>
     
    503512       
    504513        /// <summary>
    505         ///   Sucht eine lokalisierte Zeichenfolge, die Amount of Workers ähnelt.
     514        ///   Sucht eine lokalisierte Zeichenfolge, die Amount of workers ähnelt.
    506515        /// </summary>
    507516        public static string AmountOfWorker_Settings {
     
    522531       
    523532        /// <summary>
    524         ///   Sucht eine lokalisierte Zeichenfolge, die CrypCloud Settings ähnelt.
     533        ///   Sucht eine lokalisierte Zeichenfolge, die CrypCloud settings ähnelt.
    525534        /// </summary>
    526535        public static string CrypCloudSettings {
  • trunk/CrypCloud/CrypCloudManager/Properties/Resources.de.resx

    r6562 r6565  
    243243  </data>
    244244  <data name="_ResetPW_enterVerificationData" xml:space="preserve">
    245     <value>Ein Verifizierungscode wurde an die Email-Addresse Ihres Accounts verschickt. Bitte geben Sie den Code und ihr neues Passwort ein.</value>
     245    <value>Ein Verifizierungscode wurde an die Email-Addresse Ihres Accounts verschickt.</value>
    246246  </data>
    247247  <data name="_ResetPW_Header" xml:space="preserve">
     
    286286  </data>
    287287  <data name="CrypCloudSettings" xml:space="preserve">
    288     <value>CrypCloud Einstellungen</value>
     288    <value>CrypCloud-Einstellungen</value>
    289289  </data>
    290290  <data name="_JobList_btn_download" xml:space="preserve">
     
    297297    <value>Epoche:</value>
    298298  </data>
     299  <data name="_ResetPW_enterVerificationData_2" xml:space="preserve">
     300    <value>Bitte geben Sie den Code und ihr neues Passwort ein.</value>
     301  </data>
    299302</root>
  • trunk/CrypCloud/CrypCloudManager/Properties/Resources.resx

    r6562 r6565  
    243243  </data>
    244244  <data name="_ResetPW_enterVerificationData" xml:space="preserve">
    245     <value>We have send an verification email to the email address of the account. Please enter the verification code and your new password below.</value>
     245    <value>We have send an verification email to the email address of the account. </value>
    246246  </data>
    247247  <data name="_ResetPW_Header" xml:space="preserve">
     
    282282  </data>
    283283  <data name="AmountOfWorker_Settings" xml:space="preserve">
    284     <value>Amount of Workers</value>
     284    <value>Amount of workers</value>
    285285  </data>
    286286  <data name="CrypCloudSettings" xml:space="preserve">
    287     <value>CrypCloud Settings</value>
     287    <value>CrypCloud settings</value>
    288288  </data>
    289289  <data name="_JobList_btn_download" xml:space="preserve">
     
    296296    <value>Epoch:</value>
    297297  </data>
     298  <data name="_ResetPW_enterVerificationData_2" xml:space="preserve">
     299    <value>Please enter the verification code and your new password below.</value>
     300  </data>
    298301</root>
  • trunk/CrypCloud/CrypCloudManager/Screens/CreateAccount.xaml

    r6498 r6565  
    1818   
    1919    <UserControl.DataContext>
    20         <viewModels:CreateAccountVM/>
     20        <viewModels:CreateAccountVM IsActive="True" ShowErrorDialog="True" ShowInputDialog="True" ShowSuccessDialog="True" ShowVerificationDialog="True" ShowWaitDialog="True"/>
    2121    </UserControl.DataContext>
    2222
     
    5151                </Grid>
    5252                <Grid>
    53                     <Button Command="{Binding Path=BackCommand}" HorizontalAlignment="Left" Width="80" Height="30" >
     53                <Button Command="{Binding Path=BackCommand}" HorizontalAlignment="Left" Width="100" Height="30" >
    5454                        <StackPanel Orientation="Horizontal" >
    5555                            <Image Source="../Images/ButtonIcons/chevron-left_32.png" Width="16" />
     
    5858                    </Button>
    5959
    60                     <Button Name="RequestButton" Command="{Binding Path=RequestCommand}" Margin="0,0,100,0" HorizontalAlignment="Right" Width="80" Height="30">
     60                <Button Name="RequestButton" Command="{Binding Path=RequestCommand}" Margin="0,0,60,0" HorizontalAlignment="Right" Width="100" Height="30">
    6161                        <StackPanel Orientation="Horizontal" >
    6262                        <Label Content="{Loc _NextBtn}" />
     
    6565                    </Button>
    6666                   
    67                     <Button Command="{Binding Path=GoToVerification}"  HorizontalAlignment="Right" Width="80" Height="30">
     67                    <Button Command="{Binding Path=GoToVerification}"  HorizontalAlignment="Right" Width="100" Height="30" Margin="0,0,-45,0">
    6868                    <StackPanel Orientation="Horizontal" >
    6969                        <Label Content="{Loc _VerifyBtn}" />
     
    9595                <Label Content="{Loc _verificationCode_label}" Target="{Binding ElementName=VerificationCode}" Grid.Row="1" Grid.Column="0" />
    9696                <TextBox Text="{Binding Path=VerificationCode}" Grid.Row="1" Grid.Column="1" Height="24" MaxLength="40"/>
    97                 <Button Command="{Binding Path=VerificationCommand}"  Grid.Row="1" Grid.Column="2" Width="80" Height="30">
     97                <Button Command="{Binding Path=VerificationCommand}"  Grid.Row="1" Grid.Column="2" Width="100" Height="30" Margin="10,0,-10,1">
    9898                    <StackPanel Orientation="Horizontal" >
    9999                        <Image Source="../Images/ButtonIcons/check_16.png" Width="16" />
  • trunk/CrypCloud/CrypCloudManager/Screens/ResetPassword.xaml

    r6498 r6565  
    99
    1010    <UserControl.Resources>
    11         <ResourceDictionary>
     11        <ResourceDictionary> 
    1212            <converter:BoolToVisibilityConverter FalseValue="Collapsed" x:Key="show" />
    1313            <converter:BoolToVisibilityConverter TrueValue="Collapsed" FalseValue="Visible" x:Key="hide" />
     
    1919   
    2020    <UserControl.DataContext>
    21         <viewModels:ResetPasswordVM/>
     21        <viewModels:ResetPasswordVM IsActive="True" ShowErrorDialog="True" ShowInputDialog="True" ShowSuccessDialog="True" ShowVerificationDialog="True" ShowWaitDialog="True"/>
    2222    </UserControl.DataContext>
    2323
     
    2727        <!--  enter data -->
    2828        <StackPanel  Height="Auto" Visibility="{Binding Path=ShowInputDialog, Converter={converter:BoolToVisibilityConverter}}">
     29            <TextBlock Text="{Loc _ResetPW_enterData}"  TextAlignment="Center" HorizontalAlignment="Center"/>
     30
    2931            <Grid Height="90" Width="300" Margin="0,0,0,20">
    3032                <Grid.ColumnDefinitions>
     
    3739                    <RowDefinition Height="28" />
    3840                </Grid.RowDefinitions>
    39                 <TextBlock Text="{Loc _ResetPW_enterData}"  Grid.Row="0"  Grid.ColumnSpan="2" FlowDirection="LeftToRight" HorizontalAlignment="Center"/>
    40 
     41             
    4142                <Label Content="{Loc _Username_label}" Target="{Binding ElementName=UsernameField}" Grid.Row="1" Grid.Column="0" />
    4243                <Label Content="{Loc _Email_label}" Target="{Binding ElementName=EmailField}" Grid.Row="2" Grid.Column="0" />
     
    4647            </Grid>
    4748            <Grid>
    48                 <Button Command="{Binding Path=BackCommand}" HorizontalAlignment="Left" Width="80" Height="30" >
     49                <Button Command="{Binding Path=BackCommand}" HorizontalAlignment="Left" Width="100" Height="30" >
    4950                    <StackPanel Orientation="Horizontal" >
    5051                        <Image Source="../Images/ButtonIcons/chevron-left_32.png" Width="16" />
     
    5354                </Button>
    5455
    55                 <Button Name="RequestButton" Command="{Binding Path=RequestCommand}" Margin="0,0,0,0" HorizontalAlignment="Right" Width="80" Height="30">
     56                <Button Name="RequestButton" Command="{Binding Path=RequestCommand}" Margin="0,0,0,0" HorizontalAlignment="Right" Width="100" Height="30">
    5657                    <StackPanel Orientation="Horizontal" >
    5758                        <Label Content="{Loc _NextBtn}" />
     
    7071        <!--  enter verification code -->
    7172        <StackPanel  Visibility="{Binding Path=ShowVerificationDialog, Converter={converter:BoolToVisibilityConverter}}">
    72             <Grid Height="120" Width="300" Margin="0,0,0,20">
     73            <TextBlock Text="{Loc _ResetPW_enterVerificationData}" Width="500" TextAlignment="Center" HorizontalAlignment="Center"/>
     74            <TextBlock Text="{Loc _ResetPW_enterVerificationData_2}" Width="500" TextAlignment="Center" HorizontalAlignment="Center"/>
     75
     76            <Grid Height="120" Width="350" Margin="0,0,0,20">
    7377                <Grid.ColumnDefinitions>
    74                     <ColumnDefinition Width="100" />
     78                    <ColumnDefinition Width="125" />
    7579                    <ColumnDefinition Width="*" />
    7680                </Grid.ColumnDefinitions>
     
    8185                    <RowDefinition Height="28" />
    8286                </Grid.RowDefinitions>
    83                 <TextBlock Text="{Loc _ResetPW_enterVerificationData}"  Grid.Row="0"  Grid.ColumnSpan="2" FlowDirection="LeftToRight" HorizontalAlignment="Center"/>
    84 
     87               
    8588                <Label Content="{Loc _verificationCode_label}" Target="{Binding ElementName=VerificationCode}" Grid.Row="1" Grid.Column="0" />
    8689                <Label Content="{Loc _Password_label}" Target="{Binding ElementName=PasswordField}" Grid.Row="2" Grid.Column="0" />
     
    9295            </Grid>
    9396            <Grid>
    94                 <Button Command="{Binding Path=BackCommand}" HorizontalAlignment="Left" Width="80" Height="30" >
     97                <Button Command="{Binding Path=BackCommand}" HorizontalAlignment="Left" Width="100" Height="30" >
    9598                    <StackPanel Orientation="Horizontal" >
    9699                        <Image Source="../Images/ButtonIcons/chevron-left_32.png" Width="16" />
     
    114117            <Label FontSize="16" HorizontalContentAlignment="Center" Content="{Loc _ConnectingError}"/>
    115118            <TextBlock Text="{Binding Path=ErrorMessage}" Margin="15,15,15,15" FlowDirection="LeftToRight" HorizontalAlignment="Center"/>
    116             <Button  Command="{Binding Path=BackCommand}"  Height="30" Width="80">
     119            <Button  Command="{Binding Path=BackCommand}"  Height="30" Width="100">
    117120                <StackPanel Orientation="Horizontal" >
    118121                    <Image Source="../Images/ButtonIcons/chevron-left_32.png" Width="16" />
     
    126129                         VerticalAlignment="Center" HorizontalAlignment="Center" Margin="30">
    127130            <Label FontSize="16" HorizontalContentAlignment="Center" Content="{Loc _ResetPW_successHeader}" />
    128             <TextBlock Text="{Loc _ResetPW_successText}" Margin="15,15,15,15" FlowDirection="LeftToRight" HorizontalAlignment="Center"/>
    129             <Button Command="{Binding Path=BackCommand}" Height="30" Width="80">
     131            <TextBlock Text="{Loc _ResetPW_successText}" Width="500" Margin="15,15,15,15" FlowDirection="LeftToRight" TextAlignment="Center" HorizontalAlignment="Center"/>
     132            <Button Command="{Binding Path=BackCommand}" Height="30" Width="100">
    130133                <StackPanel Orientation="Horizontal" >
    131134                    <Image Source="../Images/ButtonIcons/check_16.png" Width="16" />
Note: See TracChangeset for help on using the changeset viewer.