Merge branch 'master' into bugfix/sentry

l10n/et_EE.js

@@ -24,6 +24,7 @@ OC.L10N.register(
     "Created" : "Loodud",
     "Save" : "Salvesta",
     "Update" : "Uuenda",
-    "Settings" : "Seaded"
+    "Settings" : "Seaded",
+    "An error occurred" : "Tekkis tõrge"
 },
 "nplurals=2; plural=(n != 1);");

l10n/et_EE.json

@@ -22,6 +22,7 @@
     "Created" : "Loodud",
     "Save" : "Salvesta",
     "Update" : "Uuenda",
-    "Settings" : "Seaded"
+    "Settings" : "Seaded",
+    "An error occurred" : "Tekkis tõrge"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

l10n/zh_CN.js

@@ -153,6 +153,8 @@ OC.L10N.register(
     "Upload attachment" : "上传附件",
     "No comments yet. Begin the discussion!" : "还没有评论。 开始讨论吧！",
     "Save" : "保存",
+    "The comment cannot be empty." : "注释不能为空。",
+    "The comment cannot be longer than 1000 characters." : "注释不能超过 1000 个字符。",
     "Update" : "更新",
     "Assign to me" : "指派给我",
     "Delete card" : "删除卡片",

l10n/zh_CN.json

@@ -151,6 +151,8 @@
     "Upload attachment" : "上传附件",
     "No comments yet. Begin the discussion!" : "还没有评论。 开始讨论吧！",
     "Save" : "保存",
+    "The comment cannot be empty." : "注释不能为空。",
+    "The comment cannot be longer than 1000 characters." : "注释不能超过 1000 个字符。",
     "Update" : "更新",
     "Assign to me" : "指派给我",
     "Delete card" : "删除卡片",