Skip to content
This repository has been archived by the owner on May 9, 2019. It is now read-only.

Commit

Permalink
Merge localization updates pull request
Browse files Browse the repository at this point in the history
dubeaud committed Dec 15, 2012
2 parents 37639d6 + 48456e3 commit 1cde3ff
Showing 66 changed files with 13,946 additions and 13,508 deletions.
7 changes: 4 additions & 3 deletions src/BugNET.build
Original file line number Diff line number Diff line change
@@ -184,9 +184,10 @@
<include name="**\*" />
<exclude name="**\obj\**" />
<exclude name="**\bin\**" />
<exclude name="**\packages" />
<exclude name="**\Help"/>
<exclude name="**\build"/>
<exclude name="**\packages\**" />
<exclude name="**\Help\**"/>
<exclude name="**\build\**"/>
<exclude name="**\publish\**"/>
<exclude name="**\*.suo"/>
<exclude name="**\*.user"/>
<exclude name="**\tools"/>
12 changes: 12 additions & 0 deletions src/BugNET_WAP/Account/App_LocalResources/UserProfile.aspx.resx
Original file line number Diff line number Diff line change
@@ -177,4 +177,16 @@
<data name="AllowNotifications.Text" xml:space="preserve">
<value>Recieve email notifications:</value>
</data>
<data name="CurrentPassword.Text" xml:space="preserve">
<value>Enter your old password:</value>
</data>
<data name="PasswordStrength.PrefixText" xml:space="preserve">
<value>Strength:&amp;nbsp;</value>
</data>
<data name="PasswordStrength.TextStrengthDescriptions" xml:space="preserve">
<value>Very Poor;Weak;Average;Strong;Excellent</value>
</data>
<data name="SecurityQuestionChanged" xml:space="preserve">
<value>Security question was changed successfully.</value>
</data>
</root>
253 changes: 134 additions & 119 deletions src/BugNET_WAP/Account/App_LocalResources/UserProfile.aspx.ru-RU.resx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
<!--
Microsoft ResX Schema
Version 2.0
@@ -59,122 +59,137 @@
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="AllProjects.Text" xml:space="preserve">
<value>Все проекты</value>
</data>
<data name="lblItemPageSize.Text" xml:space="preserve">
<value>Размер страницы:</value>
</data>
<data name="Notifications.Text" xml:space="preserve">
<value>Уведомления</value>
</data>
<data name="Password.Text" xml:space="preserve">
<value>Пароль</value>
</data>
<data name="Preferences.Text" xml:space="preserve">
<value>Предпочтения</value>
</data>
<data name="PreferredLocale.Text" xml:space="preserve">
<value>Предпочитаемая локаль:</value>
</data>
<data name="ReceiveNotificationsBy.Text" xml:space="preserve">
<value>Получать уведомления:</value>
</data>
<data name="ReceiveProjectNotifications.Text" xml:space="preserve">
<value>Получать уведомления по проектам:</value>
</data>
<data name="SelectedProjects.Text" xml:space="preserve">
<value>Выбранные проекты</value>
</data>
<data name="UserDetails.Text" xml:space="preserve">
<value>Сведения о пользователе</value>
</data>
<data name="PasswordChanged" xml:space="preserve">
<value>Пароль успешно изменён</value>
</data>
<data name="PasswordChangeError" xml:space="preserve">
<value>Пароль не удалось изменить</value>
</data>
<data name="ProfileSaved" xml:space="preserve">
<value>Ваш профиль успешно изменён</value>
</data>
<data name="ProfileUpdateError" xml:space="preserve">
<value>Профиль не удалось изменить</value>
</data>
<data name="Page.Title" xml:space="preserve">
<value>Профиль пользователя</value>
</data>
<data name="Label111.Text" xml:space="preserve">
<value>Ваш новый пароль:</value>
</data>
<data name="UpdateProfileForOpenId" xml:space="preserve">
<value>Пожалуйста уделите время проверке Вашего профиля, для получения уведомлений проверьте адрес Email.</value>
</data>
<data name="AllowNotifications.Text" xml:space="preserve">
<value>Уведомления по EMail:</value>
</data>
<data name="CustomSettingsSaved" xml:space="preserve">
<value>Настройки успешно изменены.</value>
</data>
<data name="CustomSettingsUpdateError" xml:space="preserve">
<value>Настройки не удалось изменить.</value>
</data>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="AllProjects.Text" xml:space="preserve">
<value>Все проекты</value>
</data>
<data name="lblItemPageSize.Text" xml:space="preserve">
<value>Размер страницы:</value>
</data>
<data name="Notifications.Text" xml:space="preserve">
<value>Уведомления</value>
</data>
<data name="Password.Text" xml:space="preserve">
<value>Пароль</value>
</data>
<data name="Preferences.Text" xml:space="preserve">
<value>Предпочтения</value>
</data>
<data name="PreferredLocale.Text" xml:space="preserve">
<value>Предпочитаемая локаль:</value>
</data>
<data name="ReceiveNotificationsBy.Text" xml:space="preserve">
<value>Получать уведомления:</value>
</data>
<data name="ReceiveProjectNotifications.Text" xml:space="preserve">
<value>Получать уведомления по проектам:</value>
</data>
<data name="SelectedProjects.Text" xml:space="preserve">
<value>Выбранные проекты</value>
</data>
<data name="UserDetails.Text" xml:space="preserve">
<value>Сведения о пользователе</value>
</data>
<data name="PasswordChanged" xml:space="preserve">
<value>Пароль успешно изменён</value>
</data>
<data name="PasswordChangeError" xml:space="preserve">
<value>Пароль не удалось изменить</value>
</data>
<data name="ProfileSaved" xml:space="preserve">
<value>Ваш профиль успешно изменён</value>
</data>
<data name="ProfileUpdateError" xml:space="preserve">
<value>Профиль не удалось изменить</value>
</data>
<data name="Page.Title" xml:space="preserve">
<value>Профиль пользователя</value>
</data>
<data name="Label111.Text" xml:space="preserve">
<value>Ваш новый пароль:</value>
</data>
<data name="UpdateProfileForOpenId" xml:space="preserve">
<value>Пожалуйста уделите время проверке Вашего профиля, для получения уведомлений проверьте адрес Email.</value>
</data>
<data name="AllowNotifications.Text" xml:space="preserve">
<value>Уведомления по EMail:</value>
</data>
<data name="CustomSettingsSaved" xml:space="preserve">
<value>Настройки успешно изменены.</value>
</data>
<data name="CustomSettingsUpdateError" xml:space="preserve">
<value>Настройки не удалось изменить.</value>
</data>
<data name="CurrentPassword.Text" xml:space="preserve">
<value>Ваш текущий пароль:</value>
</data>
<data name="PasswordRequired" xml:space="preserve">
<value>Требуется указать пароль.</value>
</data>
<data name="PasswordStrength.PrefixText" xml:space="preserve">
<value>Сложность:&amp;nbsp;</value>
</data>
<data name="PasswordStrength.TextStrengthDescriptions" xml:space="preserve">
<value>Очень низкая;Низкая;Средняя;Высокая;Очень высокая</value>
</data>
<data name="SecurityQuestionChanged" xml:space="preserve">
<value>Ответ на секретный вопрос успешно изменён.</value>
</data>
</root>
10 changes: 5 additions & 5 deletions src/BugNET_WAP/Account/UserProfile.aspx
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@

<asp:Content ID="Content3" runat="server" ContentPlaceHolderID="PageTitle">
<h1 class="page-title">
User Profile -
<asp:Literal ID="litUserProfile" runat="server" /> -
<asp:Literal ID="litUserName" runat="Server" /></h1>
</asp:Content>
<asp:Content ID="Content1" runat="server" ContentPlaceHolderID="Content">
@@ -66,10 +66,10 @@
<asp:Label ID="Label12" runat="server" Text="<%$ Resources:SharedResources, ChangePassword %>"></asp:Label></h3>
<ol>
<li>
<asp:Label ID="Label7" runat="server" AssociatedControlID="CurrentPassword">Enter your old password:</asp:Label>
<asp:Label ID="Label7" runat="server" AssociatedControlID="CurrentPassword" Text="Enter your old password:" meta:resourceKey="CurrentPassword" />
<asp:TextBox ID="CurrentPassword" runat="server" TextMode="Password"></asp:TextBox>
<asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="CurrentPassword"
SetFocusOnError="True" ErrorMessage="Password is required." ToolTip="Password is required."
SetFocusOnError="True" ErrorMessage="<%$ Resources:SharedResources, PasswordRequired %>" ToolTip="<%$ Resources:SharedResources, PasswordRequired %>"
ValidationGroup="pwdReset">*</asp:RequiredFieldValidator>
</li>
<li>
@@ -109,7 +109,7 @@
<asp:TextBox ID="SecurityAnswer" runat="server"></asp:TextBox>
<asp:RequiredFieldValidator ID="AnswerRequired" runat="server" ControlToValidate="SecurityAnswer"
SetFocusOnError="True" ErrorMessage="<%$ Resources:SharedResources, SecurityAnswerRequiredErrorMessage %>"
ToolTip="Security answer is required." ValidationGroup="pwdReset">*</asp:RequiredFieldValidator>
ToolTip="<%$ Resources:SharedResources, SecurityAnswerRequiredErrorMessage %>" ValidationGroup="pwdReset">*</asp:RequiredFieldValidator>
</li>
</ol>
</div>
@@ -127,7 +127,7 @@
DisplayPosition="RightSide" StrengthIndicatorType="Text" PreferredPasswordLength="10"
PrefixText="Strength:" TextCssClass="TextIndicator_TextBox1" MinimumNumericCharacters="0"
MinimumSymbolCharacters="0" RequiresUpperAndLowerCaseCharacters="false" TextStrengthDescriptions="Very Poor;Weak;Average;Strong;Excellent"
CalculationWeightings="50;15;15;20" />
CalculationWeightings="50;15;15;20" meta:resourceKey="PasswordStrength" />
</asp:View>
<asp:View ID="Customize" runat="server">
<bn:Message ID="Message3" runat="server" Width="650px" Visible="False" />
6 changes: 4 additions & 2 deletions src/BugNET_WAP/Account/UserProfile.aspx.cs
Original file line number Diff line number Diff line change
@@ -28,6 +28,8 @@ protected void Page_Load(object sender, EventArgs e)
{
if (Page.IsPostBack) return;

litUserProfile.Text = Page.Title;

foreach (ListItem li in BulletedList4.Items)
li.Attributes.Add("class", "off");

@@ -159,12 +161,12 @@ protected void SavePasswordSettings_Click(object sender, EventArgs e)
}
if (securityQuestionChanged)
{
Message2.ShowSuccessMessage("Security question was changed successfully");
Message2.ShowSuccessMessage(GetLocalResourceObject("SecurityQuestionChanged").ToString()); // "Security question was changed successfully"
}
}
catch (Exception ex)
{
Message2.ShowSuccessMessage(ex.Message);
Message2.ShowErrorMessage(ex.Message);
}
}

9 changes: 9 additions & 0 deletions src/BugNET_WAP/Account/UserProfile.aspx.designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Oops, something went wrong.

0 comments on commit 1cde3ff

Please sign in to comment.