1 files changed, 26 insertions, 41 deletions
diff --git a/Timeline/Resources/Services/Exception.resx b/Timeline/Resources/Services/Exception.resx
index 1d9c0037..11ae5f27 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="ConflictException" 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>
@@ -156,47 +159,29 @@
   <data name="HashedPasswordBadFromatExceptionNotUnknownMarker" xml:space="preserve">
     <value>Unknown format marker.</value>
   </data>
-  <data name="JwtBadVersionException" xml:space="preserve">
-    <value>The version of the jwt token is old.</value>
-  </data>
-  <data name="JwtVerifyException" xml:space="preserve">
-    <value>The token didn't pass verification because {0}, see inner exception for information.</value>
+  <data name="JwtUserTokenBadFormatException" xml:space="preserve">
+    <value>The token didn't pass verification because {0}.</value>
   </data>
-  <data name="JwtVerifyExceptionExpired" xml:space="preserve">
-    <value>token is expired.</value>
+  <data name="JwtUserTokenBadFormatExceptionIdBadFormat" xml:space="preserve">
+    <value>id claim is not a number</value>
   </data>
-  <data name="JwtVerifyExceptionIdClaimBadFormat" xml:space="preserve">
-    <value>id claim is not a number.</value>
+  <data name="JwtUserTokenBadFormatExceptionIdMissing" xml:space="preserve">
+    <value>id claim does not exist</value>
   </data>
-  <data name="JwtVerifyExceptionNoIdClaim" xml:space="preserve">
-    <value>id claim does not exist.</value>
-  </data>
-  <data name="JwtVerifyExceptionNoVersionClaim" xml:space="preserve">
-    <value>version claim does not exist.</value>
+  <data name="JwtUserTokenBadFormatExceptionOthers" xml:space="preserve">
+    <value>other error, see inner exception for information</value>
   </data>
-  <data name="JwtVerifyExceptionOldVersion" xml:space="preserve">
-    <value>version of token is old.</value>
-  </data>
-  <data name="JwtVerifyExceptionOthers" xml:space="preserve">
-    <value>uncommon error.</value>
-  </data>
-  <data name="JwtVerifyExceptionUnknown" xml:space="preserve">
-    <value>unknown error code.</value>
+  <data name="JwtUserTokenBadFormatExceptionUnknown" xml:space="preserve">
+    <value>unknown error</value>
   </data>
-  <data name="JwtVerifyExceptionVersionClaimBadFormat" xml:space="preserve">
+  <data name="JwtUserTokenBadFormatExceptionVersionBadFormat" xml:space="preserve">
     <value>version claim is not a number.</value>
   </data>
-  <data name="TimelineAlreadyExistException" xml:space="preserve">
-    <value>The timeline with that name already exists.</value>
-  </data>
-  <data name="TimelineMemberOperationException" xml:space="preserve">
-    <value>An exception happened when add or remove member on timeline.</value>
-  </data>
-  <data name="TimelineMemberOperationExceptionDetail" xml:space="preserve">
-    <value>An exception happened when do operation {0} on the {1} member on timeline.</value>
+  <data name="JwtUserTokenBadFormatExceptionVersionMissing" xml:space="preserve">
+    <value>version claim does not exist.</value>
   </data>
-  <data name="TimelineNameBadFormatException" xml:space="preserve">
-    <value>Timeline name is of bad format. If this is a personal timeline, it means the username is of bad format and inner exception should be a UsernameBadFormatException.</value>
+  <data name="PasswordBadFormatException" xml:space="preserve">
+    <value>Password is of bad format.</value>
   </data>
   <data name="TimelineNotExistException" xml:space="preserve">
     <value>Timeline does not exist. If this is a personal timeline, it means the user does not exist and inner exception should be a UserNotExistException.</value>
@@ -204,16 +189,16 @@
   <data name="TimelinePostNotExistException" xml:space="preserve">
     <value>The timeline post does not exist. You can't do operation on it.</value>
   </data>
-  <data name="TimelineUserNotMemberException" xml:space="preserve">
-    <value>The use is not a member of the timeline.</value>
+  <data name="UserNotExistException" xml:space="preserve">
+    <value>The user does not exist.</value>
   </data>
-  <data name="UsernameBadFormatException" xml:space="preserve">
-    <value>The username is of bad format.</value>
+  <data name="UserTokenBadFormatException" xml:space="preserve">
+    <value>The token is of bad format, which means it may not be created by the server.</value>
   </data>
-  <data name="UsernameConfictException" xml:space="preserve">
-    <value>The username already exists.</value>
+  <data name="UserTokenBadVersionException" xml:space="preserve">
+    <value>The token is of bad version.</value>
   </data>
-  <data name="UserNotExistException" xml:space="preserve">
-    <value>The user does not exist.</value>
+  <data name="UserTokenTimeExpireException" xml:space="preserve">
+    <value>The token is expired because its expiration time has passed.</value>
   </data>
 </root>
 \ No newline at end of file