diff options
| author | crupest <crupest@outlook.com> | 2020-01-29 18:38:41 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2020-01-29 18:38:41 +0800 |
| commit | 81c261b59016e15d320ad963882afe4d9c7b5f7d (patch) | |
| tree | dd1cd091ecc2c80943735af4b71b53ef26fc7eee /Timeline/Resources/Services/Exception.resx | |
| parent | 2750a3df1834c1c6623aa8c653504c7bc12cefd6 (diff) | |
| download | timeline-81c261b59016e15d320ad963882afe4d9c7b5f7d.tar.gz timeline-81c261b59016e15d320ad963882afe4d9c7b5f7d.tar.bz2 timeline-81c261b59016e15d320ad963882afe4d9c7b5f7d.zip | |
...
Diffstat (limited to 'Timeline/Resources/Services/Exception.resx')
| -rw-r--r-- | Timeline/Resources/Services/Exception.resx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Timeline/Resources/Services/Exception.resx b/Timeline/Resources/Services/Exception.resx index 3ae14d4e..2cb0f11a 100644 --- a/Timeline/Resources/Services/Exception.resx +++ b/Timeline/Resources/Services/Exception.resx @@ -135,6 +135,9 @@ <data name="BadPasswordException" xml:space="preserve">
<value>The password is wrong.</value>
</data>
+ <data name="ConfictException" xml:space="preserve">
+ <value>A present resource conflicts with the given resource.</value>
+ </data>
<data name="HashedPasswordBadFromatException" xml:space="preserve">
<value>The hashes password is of bad format. It might not be created by server.</value>
</data>
@@ -201,9 +204,6 @@ <data name="TimelineUserNotMemberException" xml:space="preserve">
<value>The use is not a member of the timeline.</value>
</data>
- <data name="UsernameConfictException" xml:space="preserve">
- <value>The username already exists.</value>
- </data>
<data name="UserNotExistException" xml:space="preserve">
<value>The user does not exist.</value>
</data>
|