Merge pull request #463 from 2DU/stable

일단 리퀘

language/en-UK.json

@@ -0,0 +1,42 @@
+{
+    "edit" : "Edit",
+    "history" : "History",
+    "delete" : "Delete",
+    "bulk_delete" : "Bulk delete",
+    "edit_filter" : "Edit filtering",
+    "move" : "Move",
+    "hide" : "Hide",
+    "list" : "List",
+    "revert" : "Undo",
+    "version" : "Version",
+    "document" : "Documents",
+    "all" : "Everything",
+    "ban" : "Ban",
+    "release" : "Pardon",
+    "save" : "Save",
+    "other" : "Others",
+    "tool" : "Tools",
+    "plus" : "Add",
+    "user" : "User",
+    "alarm" : "Alarm",
+    "watchlist" : "Watching list",
+    "my_info" : "About me",
+    "recent" : "Recently",
+    "recent_changes" : "Recently editted",
+    "discussion" : "Discussions",
+    "login" : "Sign in",
+    "logout" : "Sign out",
+    "register" : "Sign up",
+    "no_alarm" : "There is no available alarm",
+    "able" : "Able to",
+    "year" : "Year",
+    "month" : "Month",
+    "day" : "Day",
+    "normal" : "Common",
+    "subscriber" : "Member",
+    "admin" : "Administrator",
+    "owner" : "Owner",
+    "admin_group" : "Moderation group",
+    "user_css_warring" : "User's CSS will deleted if you close the browser or when you are editting as guest",
+    "http_warring" : "Warning : If you are not on HTTPS connection, your information can be leaked. We won't response to that."
+}

language/en-US.json

@@ -44,24 +44,17 @@
     "recent_changes" : "Recent Changes",
     
     "discussion" : "Discussions",
-    
-    "login" : "Sign in",
-    "logout" : "Sign out",
-    "register" : "Sign up",
-    "no_alarm" : "There Is No Available Alarm",
-    
-    "able" : "Able to",
-    
-    "year" : "Year",
-    "month" : "Month",
-    "day" : "Day",
 
-    "normal" : "Common",
-    "subscriber" : "Member",
-    "admin" : "Administrator",
-    "owner" : "Owner",
-    "admin_group" : "Moderation Group",
+    "login" : "Login",
+    "logout" : "Logout",
+    "register" : "Register",
+    "no_alarm" : "There is no alram available",
 
-    "user_css_warring" : "User's CSS Will Deleted If You Close The Browser Or When You Are Editting As Guest",
-    "http_warring" : "Warning : If You Are Not On HTTPS Connection, Your Information Can Be Leaked. We Won't Response To That."
+    "normal" : "Normal",
+    "subscriber" : "User",
+    "admin" : "Admin",
+    "owner" : "Owner",
+    "admin_group" : "MOD group",
+    "user_css_warring" : "User's CSS will deleted if you close the browser or when you are editting as guest",
+    "http_warring" : "Warning : If you are not on HTTPS connection, your information can be leaked. We won't response to that."
 }