diff --git a/templates/part.board.headerControls.php b/templates/part.board.headerControls.php
index 7230a6c7a..6386d4fa1 100644
--- a/templates/part.board.headerControls.php
+++ b/templates/part.board.headerControls.php
@@ -1,6 +1,6 @@
 <div id="stack-add" ng-if="boardservice.canEdit() && checkCanEdit()">
     <form class="ng-pristine ng-valid" ng-submit="createStack()">
-        <input type="text" class="no-close" placeholder="Add a new stack"
+        <input type="text" class="no-close" placeholder="<?php p($l->t('Add a new stack')); ?>"
             ng-focus="status.addStack=true"
             ng-blur="status.addStack=false"
             ng-model="newStack.title" required
diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php
index 20c011868..92875a26b 100644
--- a/templates/part.board.mainView.php
+++ b/templates/part.board.mainView.php
@@ -37,7 +37,7 @@
 			<h2 data-as-sortable-item-handle>
 				<span class="editable-inline" ng-show="!s.status.editStack" ng-click="s.status.editStack=true">{{ s.title }}</span>
 				<form ng-if="s.status.editStack" ng-submit="stackservice.update(s); s.status.editStack=false">
-					<input type="text" placeholder="Add a new stack"
+					<input type="text" placeholder="<?php p($l->t('Add a new stack')); ?>"
 						   ng-blur="stackservice.update(s); s.status.editStack=false" ng-model="s.title"
 						   autofocus-on-insert required maxlength="100" />
 				</form>
diff --git a/templates/part.board.sidebarView.php b/templates/part.board.sidebarView.php
index c170c2892..cb54dbfab 100644
--- a/templates/part.board.sidebarView.php
+++ b/templates/part.board.sidebarView.php
@@ -12,7 +12,7 @@
 
 <ul class="tabHeaders">
     <li class="tabHeader" ng-class="{'selected': (status.boardtab==0 || !status.boardtab)}" ng-click="status.boardtab=0"><a><?php p($l->t('Sharing')); ?></a></li>
-    <li class="tabHeader" ng-class="{'selected': (status.boardtab==1)}" ng-click="status.boardtab=1"><a><?php p($l->t('Labels')); ?></a></li>
+    <li class="tabHeader" ng-class="{'selected': (status.boardtab==1)}" ng-click="status.boardtab=1"><a><?php p($l->t('Tags')); ?></a></li>
 </ul>
 <div class="tabsContainer">
     <div id="commentsTabView" class="tab commentsTabView" ng-if="status.boardtab==0 || !status.boardtab">
@@ -98,7 +98,7 @@
                     </form>
                 </li>
                 <li ng-if="boardservice.canManage() && !status.createLabel" class="label-create">
-                    <a ng-click="status.createLabel=true"><span class="icon icon-add"> </span> <?php p($l->t('Create a new label')); ?></a>
+                    <a ng-click="status.createLabel=true"><span class="icon icon-add"> </span> <?php p($l->t('Create a new tag')); ?></a>
                 </li>
             </ul>
 
diff --git a/templates/part.boardlist.php b/templates/part.boardlist.php
index 8c222a575..1d6940f97 100644
--- a/templates/part.boardlist.php
+++ b/templates/part.boardlist.php
@@ -3,7 +3,7 @@
 		<thead>
 		<tr>
 			<td class="cell-board-bullet"></td>
-			<td class="cell-board-title" width="90%"><?php p($l->t('Board title')); ?></td>
+			<td class="cell-board-title" width="90%"><?php p($l->t('Title')); ?></td>
 			<td class="cell-board-members"><?php p($l->t('Members')); ?></td>
 		</tr>
 		</thead>
diff --git a/templates/part.navigation.php b/templates/part.navigation.php
index 04bacfb54..ca1cc5a0f 100644
--- a/templates/part.navigation.php
+++ b/templates/part.navigation.php
@@ -40,7 +40,7 @@
 		</a>
 		<div class="app-navigation-entry-edit" ng-if="status.addBoard">
 			<form ng-disabled="isAddingList" class="ng-pristine ng-valid"  ng-submit="boardCreate()">
-				<input id="newTitle" class="edit ng-valid ng-empty" type="text" placeholder="<?php p($l->t('Board title')); ?>" autofocus-on-insert ng-model="newBoard.title" maxlength="100">
+				<input id="newTitle" class="edit ng-valid ng-empty" type="text" placeholder="<?php p($l->t('New board title')); ?>" autofocus-on-insert ng-model="newBoard.title" maxlength="100">
 				<input type="submit" value="" class="action icon-checkmark svg">
 				<div class="colorselect">
 					<div class="color" ng-repeat="c in colors" style="background-color:#{{ c }};" ng-click="selectColor(c)" ng-class="{'selected': (c == newBoard.color) }"><br /></div>