Index: class.tx_templavoila_handlestaticdatastructures.php
===================================================================
--- class.tx_templavoila_handlestaticdatastructures.php	(revision 30569)
+++ class.tx_templavoila_handlestaticdatastructures.php	(working copy)
@@ -110,7 +110,7 @@
 				if ($row['previewicon'])	{
 					$icon='../'.$GLOBALS['TCA']['tx_templavoila_tmplobj']['columns']['previewicon']['config']['uploadfolder'].'/'.$row['previewicon'];
 				} else $icon='';
-				$params['items'][]=Array($row['title'],$row['uid'],$icon);
+				$params['items'][] = array($GLOBALS['LANG']->sL($row['title']), $row['uid'], $icon);
 			}
 		}
 	}
@@ -138,7 +138,7 @@
 				$icon = $this->iconPath . $dsRecord['previewicon'];
 			}
 			$params['items'][] = array(
-				$dsRecord['title'],
+				$GLOBALS['LANG']->sL($dsRecord['title']),
 				isset($dsRecord['path']) ? $dsRecord['path'] : $dsRecord['uid'],
 				$icon
 			);
@@ -194,7 +194,7 @@
 				$icon = $this->iconPath . $row['previewicon'];
 			}
 			$params['items'][] = array(
-				$row['title'],
+				$GLOBALS['LANG']->sL($row['title']),
 				$row['uid'],
 				$icon
 			);
@@ -245,7 +245,7 @@
 					$icon = $this->iconPath . $row['previewicon'];
 				}
 				$params['items'][] = array(
-					$row['title'],
+					$GLOBALS['LANG']->sL($row['title']),
 					$row['uid'],
 					$icon
 				);
@@ -353,10 +353,10 @@
 		$row1 = $this->toRows[$key1];
 		$row2 = $this->toRows[$key2];
 		if ($row1['datastructure'] == $row2['datastructure']) {
-			$result = strcmp($row1['title'], $row2['title']);
+			$result = strcmp($GLOBALS['LANG']->sL($row1['title']), $GLOBALS['LANG']->sL($row2['title']));
 		}
 		else {
-			$result = strcmp($this->dsList[$row1['datastructure']]['title'], $this->dsList[$row2['datastructure']]['title']);
+			$result = strcmp($GLOBALS['LANG']->sL($this->dsList[$row1['datastructure']]['title']), $GLOBALS['LANG']->sL($this->dsList[$row2['datastructure']]['title']));
 		}
 		return $result;
 	}
Index: cm1/index.php
===================================================================
--- cm1/index.php	(revision 30569)
+++ cm1/index.php	(working copy)
@@ -856,7 +856,7 @@
 				<tr>
 					<td class="bgColor5">&nbsp;</td>
 					<td class="bgColor5"><strong>' . $GLOBALS['LANG']->getLL('templateObject') . ':</strong></td>
-					<td class="bgColor4">' . ($toREC ? htmlspecialchars($toREC['title']) : $GLOBALS['LANG']->getLL('mappingNEW')) . '</td>
+					<td class="bgColor4">' . ($toREC ? htmlspecialchars($GLOBALS['LANG']->sL($toREC['title'])) : $GLOBALS['LANG']->getLL('mappingNEW')) . '</td>
 				</tr>';
 			if ($this->staticDS) {
 				$onClick = 'return top.openUrlInWindow(\'' . t3lib_div::getIndpEnv('TYPO3_SITE_URL') . $toREC['datastructure'] . '\',\'FileView\');';
@@ -871,7 +871,7 @@
 				<tr>
 					<td class="bgColor5">&nbsp;</td>
 					<td class="bgColor5"><strong>' . $GLOBALS['LANG']->getLL('renderTO_dsRecord') . ':</strong></td>
-					<td class="bgColor4">' . ($dsREC ? htmlspecialchars($dsREC['title']) : $GLOBALS['LANG']->getLL('mappingNEW')) . '</td>
+					<td class="bgColor4">' . ($dsREC ? htmlspecialchars($GLOBALS['LANG']->sL($dsREC['title'])) : $GLOBALS['LANG']->getLL('mappingNEW')) . '</td>
 				</tr>';
 			}
 
@@ -953,7 +953,7 @@
 				}
 				$opt[]= '<option value="' .htmlspecialchars($row['uid']).'" ' .
 					($row['scope'] == 1 ? 'class="pagetemplate"">' : 'class="fce">') .
-					 htmlspecialchars($row['title'] . ' (UID:' . $row['uid'] . ')').'</option>';
+					 htmlspecialchars($GLOBALS['LANG']->sL($row['title']) . ' (UID:' . $row['uid'] . ')').'</option>';
 			}
 			if ($optGroupOpen) {
 				$opt[] = '</optgroup>';
@@ -1243,11 +1243,12 @@
 
 					// Get title and icon:
 				$icon = t3lib_iconworks::getIconImage('tx_templavoila_tmplobj',$row,$GLOBALS['BACK_PATH'],' align="top" title="UID: '.$this->displayUid.'"');
-				$title = t3lib_BEfunc::getRecordTitle('tx_templavoila_tmplobj',$row,1);
+				$title = t3lib_BEfunc::getRecordTitle('tx_templavoila_tmplobj', $row);
+				$title = t3lib_BEFunc::getRecordTitlePrep($GLOBALS['LANG']->sL($title));
 				$tRows[]='
 					<tr class="bgColor4">
 						<td>'.$GLOBALS['LANG']->getLL('templateObject').':</td>
-						<td>'.$this->doc->wrapClickMenuOnIcon($icon,'tx_templavoila_tmplobj',$row['uid'],1).$title.'</td>
+						<td>' . $this->doc->wrapClickMenuOnIcon($icon, 'tx_templavoila_tmplobj', $row['uid'], 1) . $title . '</td>
 					</tr>';
 
 					// Find the file:
@@ -1280,11 +1281,13 @@
 						if (is_array($DS_row))	{
 								// Get title and icon:
 							$icon = t3lib_iconworks::getIconImage('tx_templavoila_datastructure',$DS_row,$GLOBALS['BACK_PATH'],' align="top" title="UID: '.$DS_row['uid'].'"');
-							$title = t3lib_BEfunc::getRecordTitle('tx_templavoila_datastructure',$DS_row,1);
+							$title = t3lib_BEfunc::getRecordTitle('tx_templavoila_datastructure', $DS_row);
+							$title = t3lib_BEFunc::getRecordTitlePrep($GLOBALS['LANG']->sL($title));
+
 							$tRows[]='
 								<tr class="bgColor4">
 									<td>' . $GLOBALS['LANG']->getLL('renderTO_dsRecord') . ':</td>
-									<td>'.$this->doc->wrapClickMenuOnIcon($icon,'tx_templavoila_datastructure',$DS_row['uid'],1).$title.'</td>
+									<td>' . $this->doc->wrapClickMenuOnIcon($icon, 'tx_templavoila_datastructure', $DS_row['uid'] , 1) . $title . '</td>
 								</tr>';
 
 								// Link to updating DS/TO:
Index: ext_tables.sql
===================================================================
--- ext_tables.sql	(revision 30569)
+++ ext_tables.sql	(working copy)
@@ -21,7 +21,7 @@
 	fileref_mtime int(11) unsigned DEFAULT '0' NOT NULL,
 	deleted tinyint(4) unsigned DEFAULT '0' NOT NULL,
 	sorting int(11) unsigned DEFAULT '0' NOT NULL,
-	title varchar(60) DEFAULT '' NOT NULL,
+	title varchar(100) DEFAULT '' NOT NULL,
 	datastructure varchar(100) DEFAULT '' NOT NULL,
 	fileref tinytext,
 	templatemapping mediumblob,
@@ -62,7 +62,7 @@
 	cruser_id int(11) unsigned DEFAULT '0' NOT NULL,
 	deleted tinyint(4) unsigned DEFAULT '0' NOT NULL,
 	sorting int(11) unsigned DEFAULT '0' NOT NULL,
-	title varchar(60) DEFAULT '' NOT NULL,
+	title varchar(100) DEFAULT '' NOT NULL,
 	dataprot mediumtext,
 	scope tinyint(4) unsigned DEFAULT '0' NOT NULL,
 	previewicon tinytext,
Index: mod1/class.tx_templavoila_mod1_wizards.php
===================================================================
--- mod1/class.tx_templavoila_mod1_wizards.php	(revision 30569)
+++ mod1/class.tx_templavoila_mod1_wizards.php	(working copy)
@@ -327,7 +327,7 @@
 				</tr><tr>
 					<td valign="top">' . $previewIcon . '</td>
 					<td width="120" valign="top">
-						<p><h4>' . htmlspecialchars($defaultTO['title']) . '</h4>' . $description . '</p>
+						<p><h4>' . htmlspecialchars($LANG->sL($defaultTO['title'])) . '</h4>' . $LANG->sL($description) . '</p>
 					</td>
 				</tr>
 				</table>';
@@ -343,8 +343,8 @@
 						// Note: we cannot use value of image input element because MSIE replaces this value with mouse coordinates! Thus on click we set value to a hidden field. See http://bugs.typo3.org/view.php?id=3376
 					$previewIcon = '<input type="image" class="c-inputButton" name="i' .$row['uid'] . '" onclick="document.getElementById(\'data_tx_templavoila_to\').value='.$row['uid'].'" src="'.$previewIconFilename.'" title="" />';
 					$description = $row['description'] ? htmlspecialchars($row['description']) : $LANG->getLL ('template_nodescriptionavailable');
-					$tmplHTML [] = '<table style="width: 100%;" valign="top"><tr><td colspan="2" nowrap="nowrap"><h3 class="bgColor3-20">'.htmlspecialchars($row['title']).'</h3></td></tr>'.
-						'<tr><td valign="top">'.$previewIcon.'</td><td width="120" valign="top"><p>'.$description.'</p></td></tr></table>';
+					$tmplHTML [] = '<table style="width: 100%;" valign="top"><tr><td colspan="2" nowrap="nowrap"><h3 class="bgColor3-20">' . htmlspecialchars($LANG->sL($row['title'])) . '</h3></td></tr>'.
+						'<tr><td valign="top">' . $previewIcon . '</td><td width="120" valign="top"><p>' . $LANG->sL($description) . '</p></td></tr></table>';
 				}
 				$tmplHTML[] = '<input type="hidden" id="data_tx_templavoila_to" name="data[tx_templavoila_to]" value="0" />';
 				break;
Index: mod2/index.php
===================================================================
--- mod2/index.php	(revision 30569)
+++ mod2/index.php	(working copy)
@@ -519,7 +519,7 @@
 							$indexTO.='
 								<tr class="bgColor4">
 									<td>&nbsp;&nbsp;&nbsp;</td>
-									<td><a href="#to-'.$toObj['uid'].'">'.htmlspecialchars($toObj['title']).'</a></td>
+									<td><a href="#to-' . $toObj['uid'] . '">' . htmlspecialchars($GLOBALS['LANG']->sL($toObj['title'])) . '</a></td>
 									<td>&nbsp;</td>
 									<td>&nbsp;</td>
 									<td align="center">'.$rTODres['mappingStatus'].'</td>
@@ -559,7 +559,7 @@
 				$content.= '<a name="ds-'.md5($dsID).'"></a>'.$rDSDres['HTML'];
 				$index.='
 					<tr class="bgColor4-20">
-						<td colspan="2"><a href="#ds-'.md5($dsID).'">'.htmlspecialchars($dsR['title']?$dsR['title']:$dsR['path']).'</a></td>
+						<td colspan="2"><a href="#ds-'.md5($dsID).'">'.htmlspecialchars($dsR['title'] ? $GLOBALS['LANG']->sL($dsR['title']) : $dsR['path']).'</a></td>
 						<td align="center">'.$rDSDres['languageMode'].'</td>
 						<td align="center">'.$rDSDres['container'].'</td>
 						<td>&nbsp;</td>
@@ -632,7 +632,7 @@
 
 				// Links:
 			$editLink = $lpXML.= '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick('&edit[tx_templavoila_datastructure]['.$dsR['uid'].']=edit',$this->doc->backPath)).'"><img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/edit2.gif','width="11" height="12"').' alt="" class="absmiddle" /></a>';
-			$dsTitle = '<a href="'.htmlspecialchars('../cm1/index.php?table=tx_templavoila_datastructure&uid=' . $dsR['uid'] . '&returnUrl=' . rawurlencode(tx_templavoila_div::sanitizeLocalUrl(t3lib_div::getIndpEnv('REQUEST_URI')))) . '">' . htmlspecialchars($dsR['title']) . '</a>';
+			$dsTitle = '<a href="'.htmlspecialchars('../cm1/index.php?table=tx_templavoila_datastructure&uid=' . $dsR['uid'] . '&returnUrl=' . rawurlencode(tx_templavoila_div::sanitizeLocalUrl(t3lib_div::getIndpEnv('REQUEST_URI')))) . '">' . htmlspecialchars($GLOBALS['LANG']->sL($dsR['title'])) . '</a>';
 
 			if ($this->MOD_SETTINGS['set_details'])	{
 				$XMLinfo = $this->DSdetails($dsR['dataprot']);
@@ -867,7 +867,7 @@
 
 			// Links:
 		$editLink = '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick('&edit[tx_templavoila_tmplobj]['.$toObj['uid'].']=edit',$this->doc->backPath)).'"><img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/edit2.gif','width="11" height="12"').' alt="" class="absmiddle" /></a>';
-		$toTitle = '<a href="'.htmlspecialchars($linkUrl).'">'.htmlspecialchars($toObj['title']).'</a>';
+		$toTitle = '<a href="' . htmlspecialchars($linkUrl) . '">' . htmlspecialchars($GLOBALS['LANG']->sL($toObj['title'])) . '</a>';
 
 		$fRWTOUres = array();
 
@@ -1119,7 +1119,7 @@
 				</table>';
 			} else {
 				$outputString = '<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/icon_warning2.gif','width="18" height="16"').' alt="" class="absmiddle" />No usage!';
-				$this->setErrorLog($scope, 'warning', sprintf($GLOBALS['LANG']->getLL('warning_mappingstatus', 1), $outputString ,$toObj['title']));
+				$this->setErrorLog($scope, 'warning', sprintf($GLOBALS['LANG']->getLL('warning_mappingstatus', 1), $outputString , $GLOBALS['LANG']->sL($toObj['title'])));
 			}
 		}