diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 40f4af6fe9..183c1afaf8 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -527,7 +527,7 @@ $lang->error->date            = "『%s』should be valid date.";
 $lang->error->datetime        = "『%s』should be valid date.";
 $lang->error->code            = "『%s』should be letters or numbers.";
 $lang->error->account         = "『%s』should be valid account.";
-$lang->error->passwordsame    = "The password input is inconsistent.";
+$lang->error->passwordsame    = "The two passwords should be the same.";
 $lang->error->passwordrule    = "Password should follow rules. It must be at least 6 characters.";
 $lang->error->accessDenied    = 'Access is denied.';
 $lang->error->pasteImg        = 'Image is not allowed to be pasted in your browser!';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 81d53ed0df..f69f253ef3 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -527,7 +527,7 @@ $lang->error->date            = "『%s』should be valid date.";
 $lang->error->datetime        = "『%s』should be valid date.";
 $lang->error->code            = "『%s』should be letters or numbers.";
 $lang->error->account         = "『%s』should be >= 3 letters or numbers.";
-$lang->error->passwordsame    = "The password input is inconsistent.";
+$lang->error->passwordsame    = "The two passwords should be the same.";
 $lang->error->passwordrule    = "Password should conform to rules. It should be >= 6 characters.";
 $lang->error->accessDenied    = 'Access is denied.';
 $lang->error->pasteImg        = 'Images are not allowed to be pasted in your browser!';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 7dfdacd0e3..377464bc0d 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -527,7 +527,7 @@ $lang->error->date            = "『%s』should be valid date.";
 $lang->error->datetime        = "『 %s 』should be valid date.";
 $lang->error->code            = "『 %s 』should be letters or numbers.";
 $lang->error->account         = "『 %s 』should be >= 3 letters or numbers.";
-$lang->error->passwordsame    = "The password input is inconsistent.";
+$lang->error->passwordsame    = "The two passwords should be the same.";
 $lang->error->passwordrule    = "Password should conform to rules. It should be >= 6 characters.";
 $lang->error->accessDenied    = 'Access is denied.';
 $lang->error->pasteImg        = 'Images are not allowed to be pasted in your browser!';
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 60cf0134d8..72e34b7e2e 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -527,7 +527,7 @@ $lang->error->date            = "『%s』should be valid date.";
 $lang->error->datetime        = "『%s』should be valid date.";
 $lang->error->code            = "『%s』nên là chữ hoặc số.";
 $lang->error->account         = "『%s』should be >= 3 letters or numbers.";
-$lang->error->passwordsame    = "The password input is inconsistent.";
+$lang->error->passwordsame    = "The two passwords should be the same.";
 $lang->error->passwordrule    = "Password should conform to rules. It should be >= 6 characters.";
 $lang->error->accessDenied    = 'Truy cập bị từ chối.';
 $lang->error->pasteImg        = 'Images are not allowed to be pasted in your browser!';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 0e188fcdf1..de809e0d37 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -527,7 +527,7 @@ $lang->error->date            = "『%s』应当为合法的日期。";
 $lang->error->datetime        = "『%s』应当为合法的日期。";
 $lang->error->code            = "『%s』应当为字母或数字的组合。";
 $lang->error->account         = "『%s』只能是字母和数字的组合三位以上。";
-$lang->error->passwordsame    = "密码输入不一致。";
+$lang->error->passwordsame    = "两次密码应该相同。";
 $lang->error->passwordrule    = "密码应该符合规则，长度至少为六位。";
 $lang->error->accessDenied    = '您没有访问权限';
 $lang->error->pasteImg        = '您的浏览器不支持粘贴图片！';
diff --git a/module/todo/view/batchedit.html.php b/module/todo/view/batchedit.html.php
index 6dcdde697e..8f3ff55953 100644
--- a/module/todo/view/batchedit.html.php
+++ b/module/todo/view/batchedit.html.php
@@ -50,7 +50,17 @@
         <td><?php echo $todo->id . html::hidden("todoIDList[$todo->id]", $todo->id);?></td>
         <td><?php echo html::input("dates[$todo->id]", $todo->date, "class='form-control form-date'");?></td>
         <td class='text-center'>
-          <?php echo html::select("types[$todo->id]", $lang->todo->typeList, $todo->type, "onchange='loadList(this.value, " . $todo->id . ")' class='form-control'");?>
+          <?php
+          if($todo->type == 'cycle')
+          {
+              echo html::hidden("types[$todo->id]", $todo->type); 
+              echo $lang->todo->cycle;
+          }
+          else
+          {
+              echo html::select("types[$todo->id]", $lang->todo->typeList, $todo->type, "onchange='loadList(this.value, " . $todo->id . ")' class='form-control'");
+          }
+          ?>
         </td>
         <td style='overflow:visible' <?php echo zget($visibleFields, 'pri', "class='hidden'")?>><?php echo html::select("pris[$todo->id]", $lang->todo->priList, $todo->pri, "class='form-control chosen'");?></td>
         <td style='overflow:visible'>
diff --git a/module/todo/view/edit.html.php b/module/todo/view/edit.html.php
index 3ce31314f4..7a2305c23b 100644
--- a/module/todo/view/edit.html.php
+++ b/module/todo/view/edit.html.php
@@ -83,12 +83,14 @@
         </div>
       </div>
       <?php endif;?>
+      <?php if($todo->type != 'cycle'):?>
       <div class="row form-group">
         <label class="col-sm-1"><?php echo $lang->todo->type;?></label>
         <div class="col-sm-2">
           <?php echo html::select('type', $lang->todo->typeList, $todo->type, 'onchange="loadList(this.value);" class="form-control"');?>
         </div>
       </div>
+      <?php endif;?>
       <div class="row form-group">
         <label class="col-sm-1"><?php echo $lang->todo->pri;?></label>
         <div class="col-sm-2">