diff --git a/build/libifm.php b/build/libifm.php
index 8af65ab..5fc6855 100644
--- a/build/libifm.php
+++ b/build/libifm.php
@@ -331,13 +331,13 @@ f00bar;
 	<fieldset>
 		<label>URL</label><br>
 		<input class="form-control" type="text" id="ajaxurl" required><br>
-		<label>Data</label><br>
+		<label>{{i18n.data}}</label><br>
 		<textarea class="form-control" id="ajaxdata"></textarea><br>
-		<label>Method</label><br>
+		<label>{{i18n.method}}</label><br>
 		<input type="radio" name="arMethod" value="GET">GET</input><input type="radio" name="arMethod" value="POST" checked="checked">POST</input><br>
-		<button type="button" class="btn btn-success" id="buttonRequest">Request</button>
-		<button type="button" class="btn btn-default" id="buttonClose">Close</button><br>
-		<label>Response</label><br>
+		<button type="button" class="btn btn-success" id="buttonRequest">{{i18n.request}}</button>
+		<button type="button" class="btn btn-default" id="buttonClose">{{i18n.cancel}}</button><br>
+		<label>{{i18n.response}}</label><br>
 		<textarea class="form-control" id="ajaxresponse"></textarea>
 	</fieldset>
 </form>
@@ -348,13 +348,13 @@ f00bar;
 <form id="formCopyMove">
 <fieldset>
 	<div class="modal-body">
-		<label>Select destination:</label>
+		<label>{{i18n.select_destination}}:</label>
 		<div id="copyMoveTree"><div class="text-center"><span class="icon icon-spin5 animate-spin"></span></div></div>
 	</div>
 	<div class="modal-footer">
-		<button type="button" class="btn btn-default" id="copyButton">copy</button>
-		<button type="button" class="btn btn-default" id="moveButton">move</button>
-		<button type="button" class="btn btn-default" id="cancelButton">cancel</button>
+		<button type="button" class="btn btn-default" id="copyButton">{{i18n.copy}}</button>
+		<button type="button" class="btn btn-default" id="moveButton">{{i18n.move}}</button>
+		<button type="button" class="btn btn-default" id="cancelButton">{{i18n.cancel}}</button>
 	</div>
 </fieldset>
 </form>
@@ -364,13 +364,13 @@ f00bar;
 <form id="formCreateDir">
 <div class="modal-body">
 	<fieldset>
-		<label>Directoy name:</label>
+		<label>{{i18n.directoryname}}:</label>
 		<input class="form-control" type="text" name="dirname" value="" />
 	</fieldset>
 </div>
 <div class="modal-footer">
-	<button type="button" class="btn btn-default" id="buttonSave">Save</button>
-	<button type="button" class="btn btn-default" id="buttonCancel">Cancel</button>
+	<button type="button" class="btn btn-default" id="buttonSave">{{i18n.save}}</button>
+	<button type="button" class="btn btn-default" id="buttonCancel">{{i18n.cancel}}</button>
 </div>
 </form>
 
@@ -378,11 +378,11 @@ f00bar;
 		$templates['deletefile'] = <<<'f00bar'
 <form id="formDeleteFile">
 <div class="modal-body">
-	<label>Do you really want to delete the file {{filename}}?
+	<label>{{i18n.file_delete_confirm}} {{filename}}?
 </div>
 <div class="modal-footer">
-	<button type="button" class="btn btn-danger" id="buttonYes">Yes</button>
-	<button type="button" class="btn btn-default" id="buttonNo">No</button>
+	<button type="button" class="btn btn-danger" id="buttonYes">{{i18n.delete}}</button>
+	<button type="button" class="btn btn-default" id="buttonNo">{{i18n.cancel}}</button>
 </div>
 </form>
 
@@ -391,7 +391,7 @@ f00bar;
 <form id="formExtractFile">
 <fieldset>
 	<div class="modal-body">
-		<label>Extract {{filename}} to:</label>
+		<label>{{i18n.extract_filename}} {{filename}}:</label>
 		<div class="input-group">
 			<span class="input-group-addon"><input type="radio" name="extractTargetLocation" value="./" checked="checked"></span>
 			<span class="form-control">./</span>
@@ -406,8 +406,8 @@ f00bar;
 		</div>
 	</div>
 	<div class="modal-footer">
-		<button type="button" class="btn btn-default" id="buttonExtract">extract</button>
-		<button type="button" class="btn btn-default" id="buttonCancel">cancel</button>
+		<button type="button" class="btn btn-default" id="buttonExtract">{{i18n.extract}}</button>
+		<button type="button" class="btn btn-default" id="buttonCancel">{{i18n.cancel}}</button>
 	</div>
 </fieldset>
 </form>
@@ -417,22 +417,22 @@ f00bar;
 <form id="formFile">
 <div class="modal-body">
 	<fieldset>
-		<label>Filename:</label>
+		<label>{{i18n.filename}}:</label>
 		<input type="text" class="form-control" name="filename" value="{{filename}}"><br>
 		<div id="content" name="content"></div><br>
-		<button type="button" class="btn btn-default" id="editoroptions">editor options</button>
-		<div class="hide" id="editoroptions-head">options</div>
+		<button type="button" class="btn btn-default" id="editoroptions">{{i18n.editor_options}}</button>
+		<div class="hide" id="editoroptions-head">{{i18n.options}}</div>
 		<div class="hide" id="editoroptions-content">
-			<input type="checkbox" id="editor-wordwrap"> word wrap</input><br>
-			<input type="checkbox" id="editor-softtabs"> use soft tabs</input>
-			<div class="input-group"><span class="input-group-addon">tabsize</span><input class="form-control" type="text" size="2" id="editor-tabsize"title="tabsize"></div>
+			<input type="checkbox" id="editor-wordwrap"> {{i18n.word_wrap}}</input><br>
+			<input type="checkbox" id="editor-softtabs"> {{i18n.soft_tabs}}</input>
+			<div class="input-group"><span class="input-group-addon">{{i18n.tab_size}}</span><input class="form-control" type="text" size="2" id="editor-tabsize" title="{{i18n.tab_size}}"></div>
 		</div>
 	</fieldset>
 </div>
 <div class="modal-footer">
-	<button type="button" id="buttonSave" class="btn btn-default">Save</button>
-	<button type="button" id="buttonSaveNotClose" class="btn btn-default">Save without closing</button>
-	<button type="button" id="buttonClose" class="btn btn-default">Close</button>
+	<button type="button" id="buttonSave" class="btn btn-default">{{i18n.save}}</button>
+	<button type="button" id="buttonSaveNotClose" class="btn btn-default">{{i18n.save_wo_close}}</button>
+	<button type="button" id="buttonClose" class="btn btn-default">{{i18n.close}}</button>
 </div>
 </form>
 
@@ -440,11 +440,11 @@ f00bar;
 		$templates['multidelete'] = <<<'f00bar'
 <form id="formDeleteFiles">
 <div class="modal-body">
-	<label>Do you really want to delete these {{count}} files?</label>
+	<label>{{i18n.file_multi_delete_confirm}} {{count}}?</label>
 </div>
 <div class="modal-footer">
-	<button type="button" class="btn btn-danger" id="buttonYes">Yes</button>
-	<button type="button" class="btn btn-default" id="buttonNo">No</button>
+	<button type="button" class="btn btn-danger" id="buttonYes">{{i18n.yes}}</button>
+	<button type="button" class="btn btn-default" id="buttonNo">{{i18n.cancel}}</button>
 </div>
 </form>
 
@@ -453,17 +453,17 @@ f00bar;
 <form id="formRemoteUpload">
 <div class="modal-body">
 	<fieldset>
-		<label>Remote upload URL</label><br>
+		<label>{{i18n.upload_remote_url}}</label><br>
 		<input class="form-control" type="text" id="url" name="url" required><br>
-		<label>Filename (required)</label>
+		<label>{{i18n.filename}}</label>
 		<input class="form-control" type="text" id="filename" name="filename" required><br>
-		<label>Method</label>
+		<label>{{i18n.method}}</label>
 		<input type="radio" name="method" value="curl" checked="checked">cURL<input type="radio" name="method" value="file">file</input><br>
 	</fieldset>
 </div>
 <div class="modal-footer">
-	<button type="button" class="btn btn-default" id="buttonUpload">Upload</button>
-	<button type="button" class="btn btn-default" id="buttonCancel">Cancel</button>
+	<button type="button" class="btn btn-default" id="buttonUpload">{{i18n.upload}}</button>
+	<button type="button" class="btn btn-default" id="buttonCancel">{{i18n.cancel}}</button>
 </div>
 </form>
 
@@ -472,10 +472,10 @@ f00bar;
 <div class="modal-body">
 <form id="formRenameFile">
 	<fieldset>
-		<label>Rename {{filename}} to:</label>
+		<label>{{i18n.rename_filename}} {{filename}}:</label>
 		<input class="form-control" type="text" name="newname" /><br>
-		<button class="btn btn-default" id="buttonRename">Rename</button>
-		<button class="btn btn-default" id="buttonCancel">Cancel</button>
+		<button class="btn btn-default" id="buttonRename">{{i18n.rename_filename}}</button>
+		<button class="btn btn-default" id="buttonCancel">{{i18n.cancel}} </button>
 	</fieldset>
 </form>
 </div>
@@ -485,7 +485,7 @@ f00bar;
 <form id="searchForm">
 <div class="modal-body">
 	<fieldset>
-		<label>Pattern:</label>
+		<label>{{i18n.search_pattern}}:</label>
 		<input type="text" class="form-control" id="searchPattern" name="pattern" value="{{lastSearch}}"><br>
 		<table id="searchResults" class="table">
 		</table>
@@ -530,63 +530,115 @@ f00bar;
 		$i18n = array();
 		$i18n['en'] = <<<'f00bar'
 {
-	"refresh": "Refresh",
-	"upload": "Upload",
-	"file_edit_success": "File successfully edited / created.",
-	"toggle_nav": "Toggle navigation",
-	"path_content": "Content of",
-	"file_new": "New File",
-	"folder_new": "New Folder",
-	"upload_remote": "Remote Upload",
-	"ajax_request": "AJAX Request",
-	"logout": "Log Off",
-	"upload_drop": "Drop files to upload",
-	"filename": "Filename",
-	"size": "Size",
-	"last_modified": "Last Modified",
-	"permissions": "Permissions",
-	"owner": "Owner",
-	"group": "Group",
-	"footer": "IFM - improved file manager | ifm.php hidden |",
-	"github": "Visit the project on GitHub",
-	"tasks": "Tasks",
-	"login": "Login",
-	"username": "username",
-	"password": "Password",
-	"upload_file": "Upload File",
-	"filename_new": "New Filename",
-	"cancel": "Cancel"
+    "ajax_request": "AJAX Request",
+    "cancel": "Cancel",
+    "close": "Close",
+    "copy": "Copy",
+    "data": "Data",
+    "delete": "Delete",
+    "directoryname": "Directory Name",
+    "editor_options": "Editor Options",
+    "extract": "Extract",
+    "extract_filename": "Extract file - ",
+    "file_delete_confirm": "Do you really want to delete the following file -",
+    "file_edit_success": "File successfully edited / created.",
+    "file_multi_delete_confirm": "Do you really want to delete these files -",
+    "file_new": "New File",
+    "file_save_confirm": "Do you want to save the following file -",
+    "filename": "Filename",
+    "filename_new": "New Filename",
+    "folder_new": "New Folder",
+    "footer": "IFM - improved file manager | ifm.php hidden |",
+    "github": "Visit the project on GitHub",
+    "group": "Group",
+    "last_modified": "Last Modified",
+    "login": "Login",
+    "logout": "Log Off",
+    "method": "Method",
+    "move": "Move",
+    "options": "Options",
+    "owner": "Owner",
+    "password": "Password",
+    "path_content": "Content of",
+    "permissions": "Permissions",
+    "refresh": "Refresh",
+    "rename": "Rename",
+    "rename_filename": "Rename file -",
+    "request": "Request",
+    "response": "Response",
+    "save": "Save",
+    "save_wo_close": "Save w/o Close",
+    "search_pattern": "Pattern",
+    "select_destination": "Select Destination",
+    "size": "Size",
+    "soft_tabs": "Soft Tabs",
+    "tab_size": "Tab Size",
+    "tasks": "Tasks",
+    "toggle_nav": "Toggle navigation",
+    "upload": "Upload",
+    "upload_drop": "Drop files to upload",
+    "upload_file": "Upload File",
+    "upload_remote": "Remote Upload",
+    "upload_remote_url": "Remote Upload URL",
+    "username": "username",
+    "word_wrap": "Word Wrap"
 }
 f00bar;
 		$i18n['en'] = json_decode($i18n['en'], true);
 		$i18n['de'] = <<<'f00bar'
 {
-	"refresh": "Auffrischen",
-	"upload": "Hochladen",
-	"file_edit_success": "Datei erfolgreich geändert / angelegt.",
-	"toggle_nav": "Navigation umschalten",
-	"path_content": "Inhalt von",
-	"file_new": "Neue Datei",
-	"folder_new": "Neue Ordner",
-	"upload_remote": "Hochladen von draussen",
-	"ajax_request": "AJAX Request",
-	"logout": "Abmelden",
-	"upload_drop": "Dateien zum hochladen hier hinziehen",
-	"filename": "Dateiname",
-	"size": "Größe",
-	"last_modified": "Zuletzt geändert",
-	"permissions": "Berechtigungen",
-	"owner": "Besitzer",
-	"group": "Gruppe",
-	"footer": "IFM - verbesserter file manager | ifm.php versteckt |",
-	"github": "Besuche das Projekt auf GitHub",
-	"tasks": "Aufgaben",
-	"login": "Anmeldung",
-	"username": "Benutzername",
-	"password": "Passwort",
-	"upload_file": "Datei hochladen",
-	"filename_new": "Neuer Dateiname",
-	"cancel": "Abbrechen"
+    "ajax_request": "AJAX Request",
+    "cancel": "Abbrechen",
+    "close": "Schließen",
+    "copy": "Kopieren",
+    "data": "Daten",
+    "delete": "Löschen",
+    "directoryname": "Ordner Name",
+    "editor_options": "Editor Optionen",
+    "extract": "Auspacken",
+    "extract_filename": "Folgende Datei auspacken -",
+    "file_delete_confirm": "Soll die folgende Datei wirklich gelöscht werden -",
+    "file_edit_success": "Datei erfolgreich geändert / angelegt.",
+    "file_multi_delete_confirm": "Sollen diese Dateien wirklich gelöscht werden -",
+    "file_new": "Neue Datei",
+    "file_save_confirm": "Soll diese Datei wirklich gelöscht werden -",
+    "filename": "Dateiname",
+    "filename_new": "Neuer Dateiname",
+    "folder_new": "Neue Ordner",
+    "footer": "IFM - verbesserter file manager | ifm.php versteckt |",
+    "github": "Besuche das Projekt auf GitHub",
+    "group": "Gruppe",
+    "last_modified": "Zuletzt geändert",
+    "login": "Anmeldung",
+    "logout": "Abmelden",
+    "method": "Methode",
+    "move": "Verschieben",
+    "options": "Optionen",
+    "owner": "Besitzer",
+    "password": "Passwort",
+    "path_content": "Inhalt von",
+    "permissions": "Berechtigungen",
+    "refresh": "Auffrischen",
+    "rename": "Umbenennen",
+    "rename_filename": "Folgende Datei umbenennen -",
+    "request": "Anfrage",
+    "response": "Antwort",
+    "save": "Speichen",
+    "save_wo_close": "Speichen ohne Schließen",
+    "search_pattern": "Muster",
+    "select_destination": "Zielort auswählen",
+    "size": "Größe",
+    "soft_tabs": "Leichte Tabulatoren",
+    "tab_size": "Tabulatoren Größe",
+    "tasks": "Aufgaben",
+    "toggle_nav": "Navigation umschalten",
+    "upload": "Hochladen",
+    "upload_drop": "Dateien zum hochladen hier hinziehen",
+    "upload_file": "Datei hochladen",
+    "upload_remote": "Hochladen von ausserhalb",
+    "upload_remote_url": "Entfernte URL zum hochladen",
+    "username": "Benutzername",
+    "word_wrap": "Zeilenumbruch"
 }
 f00bar;
 		$i18n['de'] = json_decode($i18n['de'], true);
diff --git a/ifm.php b/ifm.php
index 0426fd3..060bc95 100644
--- a/ifm.php
+++ b/ifm.php
@@ -331,13 +331,13 @@ f00bar;
 	<fieldset>
 		<label>URL</label><br>
 		<input class="form-control" type="text" id="ajaxurl" required><br>
-		<label>Data</label><br>
+		<label>{{i18n.data}}</label><br>
 		<textarea class="form-control" id="ajaxdata"></textarea><br>
-		<label>Method</label><br>
+		<label>{{i18n.method}}</label><br>
 		<input type="radio" name="arMethod" value="GET">GET</input><input type="radio" name="arMethod" value="POST" checked="checked">POST</input><br>
-		<button type="button" class="btn btn-success" id="buttonRequest">Request</button>
-		<button type="button" class="btn btn-default" id="buttonClose">Close</button><br>
-		<label>Response</label><br>
+		<button type="button" class="btn btn-success" id="buttonRequest">{{i18n.request}}</button>
+		<button type="button" class="btn btn-default" id="buttonClose">{{i18n.cancel}}</button><br>
+		<label>{{i18n.response}}</label><br>
 		<textarea class="form-control" id="ajaxresponse"></textarea>
 	</fieldset>
 </form>
@@ -348,13 +348,13 @@ f00bar;
 <form id="formCopyMove">
 <fieldset>
 	<div class="modal-body">
-		<label>Select destination:</label>
+		<label>{{i18n.select_destination}}:</label>
 		<div id="copyMoveTree"><div class="text-center"><span class="icon icon-spin5 animate-spin"></span></div></div>
 	</div>
 	<div class="modal-footer">
-		<button type="button" class="btn btn-default" id="copyButton">copy</button>
-		<button type="button" class="btn btn-default" id="moveButton">move</button>
-		<button type="button" class="btn btn-default" id="cancelButton">cancel</button>
+		<button type="button" class="btn btn-default" id="copyButton">{{i18n.copy}}</button>
+		<button type="button" class="btn btn-default" id="moveButton">{{i18n.move}}</button>
+		<button type="button" class="btn btn-default" id="cancelButton">{{i18n.cancel}}</button>
 	</div>
 </fieldset>
 </form>
@@ -364,13 +364,13 @@ f00bar;
 <form id="formCreateDir">
 <div class="modal-body">
 	<fieldset>
-		<label>Directoy name:</label>
+		<label>{{i18n.directoryname}}:</label>
 		<input class="form-control" type="text" name="dirname" value="" />
 	</fieldset>
 </div>
 <div class="modal-footer">
-	<button type="button" class="btn btn-default" id="buttonSave">Save</button>
-	<button type="button" class="btn btn-default" id="buttonCancel">Cancel</button>
+	<button type="button" class="btn btn-default" id="buttonSave">{{i18n.save}}</button>
+	<button type="button" class="btn btn-default" id="buttonCancel">{{i18n.cancel}}</button>
 </div>
 </form>
 
@@ -378,11 +378,11 @@ f00bar;
 		$templates['deletefile'] = <<<'f00bar'
 <form id="formDeleteFile">
 <div class="modal-body">
-	<label>Do you really want to delete the file {{filename}}?
+	<label>{{i18n.file_delete_confirm}} {{filename}}?
 </div>
 <div class="modal-footer">
-	<button type="button" class="btn btn-danger" id="buttonYes">Yes</button>
-	<button type="button" class="btn btn-default" id="buttonNo">No</button>
+	<button type="button" class="btn btn-danger" id="buttonYes">{{i18n.delete}}</button>
+	<button type="button" class="btn btn-default" id="buttonNo">{{i18n.cancel}}</button>
 </div>
 </form>
 
@@ -391,7 +391,7 @@ f00bar;
 <form id="formExtractFile">
 <fieldset>
 	<div class="modal-body">
-		<label>Extract {{filename}} to:</label>
+		<label>{{i18n.extract_filename}} {{filename}}:</label>
 		<div class="input-group">
 			<span class="input-group-addon"><input type="radio" name="extractTargetLocation" value="./" checked="checked"></span>
 			<span class="form-control">./</span>
@@ -406,8 +406,8 @@ f00bar;
 		</div>
 	</div>
 	<div class="modal-footer">
-		<button type="button" class="btn btn-default" id="buttonExtract">extract</button>
-		<button type="button" class="btn btn-default" id="buttonCancel">cancel</button>
+		<button type="button" class="btn btn-default" id="buttonExtract">{{i18n.extract}}</button>
+		<button type="button" class="btn btn-default" id="buttonCancel">{{i18n.cancel}}</button>
 	</div>
 </fieldset>
 </form>
@@ -417,22 +417,22 @@ f00bar;
 <form id="formFile">
 <div class="modal-body">
 	<fieldset>
-		<label>Filename:</label>
+		<label>{{i18n.filename}}:</label>
 		<input type="text" class="form-control" name="filename" value="{{filename}}"><br>
 		<div id="content" name="content"></div><br>
-		<button type="button" class="btn btn-default" id="editoroptions">editor options</button>
-		<div class="hide" id="editoroptions-head">options</div>
+		<button type="button" class="btn btn-default" id="editoroptions">{{i18n.editor_options}}</button>
+		<div class="hide" id="editoroptions-head">{{i18n.options}}</div>
 		<div class="hide" id="editoroptions-content">
-			<input type="checkbox" id="editor-wordwrap"> word wrap</input><br>
-			<input type="checkbox" id="editor-softtabs"> use soft tabs</input>
-			<div class="input-group"><span class="input-group-addon">tabsize</span><input class="form-control" type="text" size="2" id="editor-tabsize"title="tabsize"></div>
+			<input type="checkbox" id="editor-wordwrap"> {{i18n.word_wrap}}</input><br>
+			<input type="checkbox" id="editor-softtabs"> {{i18n.soft_tabs}}</input>
+			<div class="input-group"><span class="input-group-addon">{{i18n.tab_size}}</span><input class="form-control" type="text" size="2" id="editor-tabsize" title="{{i18n.tab_size}}"></div>
 		</div>
 	</fieldset>
 </div>
 <div class="modal-footer">
-	<button type="button" id="buttonSave" class="btn btn-default">Save</button>
-	<button type="button" id="buttonSaveNotClose" class="btn btn-default">Save without closing</button>
-	<button type="button" id="buttonClose" class="btn btn-default">Close</button>
+	<button type="button" id="buttonSave" class="btn btn-default">{{i18n.save}}</button>
+	<button type="button" id="buttonSaveNotClose" class="btn btn-default">{{i18n.save_wo_close}}</button>
+	<button type="button" id="buttonClose" class="btn btn-default">{{i18n.close}}</button>
 </div>
 </form>
 
@@ -440,11 +440,11 @@ f00bar;
 		$templates['multidelete'] = <<<'f00bar'
 <form id="formDeleteFiles">
 <div class="modal-body">
-	<label>Do you really want to delete these {{count}} files?</label>
+	<label>{{i18n.file_multi_delete_confirm}} {{count}}?</label>
 </div>
 <div class="modal-footer">
-	<button type="button" class="btn btn-danger" id="buttonYes">Yes</button>
-	<button type="button" class="btn btn-default" id="buttonNo">No</button>
+	<button type="button" class="btn btn-danger" id="buttonYes">{{i18n.yes}}</button>
+	<button type="button" class="btn btn-default" id="buttonNo">{{i18n.cancel}}</button>
 </div>
 </form>
 
@@ -453,17 +453,17 @@ f00bar;
 <form id="formRemoteUpload">
 <div class="modal-body">
 	<fieldset>
-		<label>Remote upload URL</label><br>
+		<label>{{i18n.upload_remote_url}}</label><br>
 		<input class="form-control" type="text" id="url" name="url" required><br>
-		<label>Filename (required)</label>
+		<label>{{i18n.filename}}</label>
 		<input class="form-control" type="text" id="filename" name="filename" required><br>
-		<label>Method</label>
+		<label>{{i18n.method}}</label>
 		<input type="radio" name="method" value="curl" checked="checked">cURL<input type="radio" name="method" value="file">file</input><br>
 	</fieldset>
 </div>
 <div class="modal-footer">
-	<button type="button" class="btn btn-default" id="buttonUpload">Upload</button>
-	<button type="button" class="btn btn-default" id="buttonCancel">Cancel</button>
+	<button type="button" class="btn btn-default" id="buttonUpload">{{i18n.upload}}</button>
+	<button type="button" class="btn btn-default" id="buttonCancel">{{i18n.cancel}}</button>
 </div>
 </form>
 
@@ -472,10 +472,10 @@ f00bar;
 <div class="modal-body">
 <form id="formRenameFile">
 	<fieldset>
-		<label>Rename {{filename}} to:</label>
+		<label>{{i18n.rename_filename}} {{filename}}:</label>
 		<input class="form-control" type="text" name="newname" /><br>
-		<button class="btn btn-default" id="buttonRename">Rename</button>
-		<button class="btn btn-default" id="buttonCancel">Cancel</button>
+		<button class="btn btn-default" id="buttonRename">{{i18n.rename_filename}}</button>
+		<button class="btn btn-default" id="buttonCancel">{{i18n.cancel}} </button>
 	</fieldset>
 </form>
 </div>
@@ -485,7 +485,7 @@ f00bar;
 <form id="searchForm">
 <div class="modal-body">
 	<fieldset>
-		<label>Pattern:</label>
+		<label>{{i18n.search_pattern}}:</label>
 		<input type="text" class="form-control" id="searchPattern" name="pattern" value="{{lastSearch}}"><br>
 		<table id="searchResults" class="table">
 		</table>
@@ -530,63 +530,115 @@ f00bar;
 		$i18n = array();
 		$i18n['en'] = <<<'f00bar'
 {
-	"refresh": "Refresh",
-	"upload": "Upload",
-	"file_edit_success": "File successfully edited / created.",
-	"toggle_nav": "Toggle navigation",
-	"path_content": "Content of",
-	"file_new": "New File",
-	"folder_new": "New Folder",
-	"upload_remote": "Remote Upload",
-	"ajax_request": "AJAX Request",
-	"logout": "Log Off",
-	"upload_drop": "Drop files to upload",
-	"filename": "Filename",
-	"size": "Size",
-	"last_modified": "Last Modified",
-	"permissions": "Permissions",
-	"owner": "Owner",
-	"group": "Group",
-	"footer": "IFM - improved file manager | ifm.php hidden |",
-	"github": "Visit the project on GitHub",
-	"tasks": "Tasks",
-	"login": "Login",
-	"username": "username",
-	"password": "Password",
-	"upload_file": "Upload File",
-	"filename_new": "New Filename",
-	"cancel": "Cancel"
+    "ajax_request": "AJAX Request",
+    "cancel": "Cancel",
+    "close": "Close",
+    "copy": "Copy",
+    "data": "Data",
+    "delete": "Delete",
+    "directoryname": "Directory Name",
+    "editor_options": "Editor Options",
+    "extract": "Extract",
+    "extract_filename": "Extract file - ",
+    "file_delete_confirm": "Do you really want to delete the following file -",
+    "file_edit_success": "File successfully edited / created.",
+    "file_multi_delete_confirm": "Do you really want to delete these files -",
+    "file_new": "New File",
+    "file_save_confirm": "Do you want to save the following file -",
+    "filename": "Filename",
+    "filename_new": "New Filename",
+    "folder_new": "New Folder",
+    "footer": "IFM - improved file manager | ifm.php hidden |",
+    "github": "Visit the project on GitHub",
+    "group": "Group",
+    "last_modified": "Last Modified",
+    "login": "Login",
+    "logout": "Log Off",
+    "method": "Method",
+    "move": "Move",
+    "options": "Options",
+    "owner": "Owner",
+    "password": "Password",
+    "path_content": "Content of",
+    "permissions": "Permissions",
+    "refresh": "Refresh",
+    "rename": "Rename",
+    "rename_filename": "Rename file -",
+    "request": "Request",
+    "response": "Response",
+    "save": "Save",
+    "save_wo_close": "Save w/o Close",
+    "search_pattern": "Pattern",
+    "select_destination": "Select Destination",
+    "size": "Size",
+    "soft_tabs": "Soft Tabs",
+    "tab_size": "Tab Size",
+    "tasks": "Tasks",
+    "toggle_nav": "Toggle navigation",
+    "upload": "Upload",
+    "upload_drop": "Drop files to upload",
+    "upload_file": "Upload File",
+    "upload_remote": "Remote Upload",
+    "upload_remote_url": "Remote Upload URL",
+    "username": "username",
+    "word_wrap": "Word Wrap"
 }
 f00bar;
 		$i18n['en'] = json_decode($i18n['en'], true);
 		$i18n['de'] = <<<'f00bar'
 {
-	"refresh": "Auffrischen",
-	"upload": "Hochladen",
-	"file_edit_success": "Datei erfolgreich geändert / angelegt.",
-	"toggle_nav": "Navigation umschalten",
-	"path_content": "Inhalt von",
-	"file_new": "Neue Datei",
-	"folder_new": "Neue Ordner",
-	"upload_remote": "Hochladen von draussen",
-	"ajax_request": "AJAX Request",
-	"logout": "Abmelden",
-	"upload_drop": "Dateien zum hochladen hier hinziehen",
-	"filename": "Dateiname",
-	"size": "Größe",
-	"last_modified": "Zuletzt geändert",
-	"permissions": "Berechtigungen",
-	"owner": "Besitzer",
-	"group": "Gruppe",
-	"footer": "IFM - verbesserter file manager | ifm.php versteckt |",
-	"github": "Besuche das Projekt auf GitHub",
-	"tasks": "Aufgaben",
-	"login": "Anmeldung",
-	"username": "Benutzername",
-	"password": "Passwort",
-	"upload_file": "Datei hochladen",
-	"filename_new": "Neuer Dateiname",
-	"cancel": "Abbrechen"
+    "ajax_request": "AJAX Request",
+    "cancel": "Abbrechen",
+    "close": "Schließen",
+    "copy": "Kopieren",
+    "data": "Daten",
+    "delete": "Löschen",
+    "directoryname": "Ordner Name",
+    "editor_options": "Editor Optionen",
+    "extract": "Auspacken",
+    "extract_filename": "Folgende Datei auspacken -",
+    "file_delete_confirm": "Soll die folgende Datei wirklich gelöscht werden -",
+    "file_edit_success": "Datei erfolgreich geändert / angelegt.",
+    "file_multi_delete_confirm": "Sollen diese Dateien wirklich gelöscht werden -",
+    "file_new": "Neue Datei",
+    "file_save_confirm": "Soll diese Datei wirklich gelöscht werden -",
+    "filename": "Dateiname",
+    "filename_new": "Neuer Dateiname",
+    "folder_new": "Neue Ordner",
+    "footer": "IFM - verbesserter file manager | ifm.php versteckt |",
+    "github": "Besuche das Projekt auf GitHub",
+    "group": "Gruppe",
+    "last_modified": "Zuletzt geändert",
+    "login": "Anmeldung",
+    "logout": "Abmelden",
+    "method": "Methode",
+    "move": "Verschieben",
+    "options": "Optionen",
+    "owner": "Besitzer",
+    "password": "Passwort",
+    "path_content": "Inhalt von",
+    "permissions": "Berechtigungen",
+    "refresh": "Auffrischen",
+    "rename": "Umbenennen",
+    "rename_filename": "Folgende Datei umbenennen -",
+    "request": "Anfrage",
+    "response": "Antwort",
+    "save": "Speichen",
+    "save_wo_close": "Speichen ohne Schließen",
+    "search_pattern": "Muster",
+    "select_destination": "Zielort auswählen",
+    "size": "Größe",
+    "soft_tabs": "Leichte Tabulatoren",
+    "tab_size": "Tabulatoren Größe",
+    "tasks": "Aufgaben",
+    "toggle_nav": "Navigation umschalten",
+    "upload": "Hochladen",
+    "upload_drop": "Dateien zum hochladen hier hinziehen",
+    "upload_file": "Datei hochladen",
+    "upload_remote": "Hochladen von ausserhalb",
+    "upload_remote_url": "Entfernte URL zum hochladen",
+    "username": "Benutzername",
+    "word_wrap": "Zeilenumbruch"
 }
 f00bar;
 		$i18n['de'] = json_decode($i18n['de'], true);
diff --git a/src/i18n/de.json b/src/i18n/de.json
index 35ccb1c..db6f58c 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -1,28 +1,54 @@
 {
-	"refresh": "Auffrischen",
-	"upload": "Hochladen",
-	"file_edit_success": "Datei erfolgreich geändert / angelegt.",
-	"toggle_nav": "Navigation umschalten",
-	"path_content": "Inhalt von",
-	"file_new": "Neue Datei",
-	"folder_new": "Neue Ordner",
-	"upload_remote": "Hochladen von draussen",
-	"ajax_request": "AJAX Request",
-	"logout": "Abmelden",
-	"upload_drop": "Dateien zum hochladen hier hinziehen",
-	"filename": "Dateiname",
-	"size": "Größe",
-	"last_modified": "Zuletzt geändert",
-	"permissions": "Berechtigungen",
-	"owner": "Besitzer",
-	"group": "Gruppe",
-	"footer": "IFM - verbesserter file manager | ifm.php versteckt |",
-	"github": "Besuche das Projekt auf GitHub",
-	"tasks": "Aufgaben",
-	"login": "Anmeldung",
-	"username": "Benutzername",
-	"password": "Passwort",
-	"upload_file": "Datei hochladen",
-	"filename_new": "Neuer Dateiname",
-	"cancel": "Abbrechen"
+    "ajax_request": "AJAX Request",
+    "cancel": "Abbrechen",
+    "close": "Schließen",
+    "copy": "Kopieren",
+    "data": "Daten",
+    "delete": "Löschen",
+    "directoryname": "Ordner Name",
+    "editor_options": "Editor Optionen",
+    "extract": "Auspacken",
+    "extract_filename": "Folgende Datei auspacken -",
+    "file_delete_confirm": "Soll die folgende Datei wirklich gelöscht werden -",
+    "file_edit_success": "Datei erfolgreich geändert / angelegt.",
+    "file_multi_delete_confirm": "Sollen diese Dateien wirklich gelöscht werden -",
+    "file_new": "Neue Datei",
+    "file_save_confirm": "Soll diese Datei wirklich gelöscht werden -",
+    "filename": "Dateiname",
+    "filename_new": "Neuer Dateiname",
+    "folder_new": "Neue Ordner",
+    "footer": "IFM - verbesserter file manager | ifm.php versteckt |",
+    "github": "Besuche das Projekt auf GitHub",
+    "group": "Gruppe",
+    "last_modified": "Zuletzt geändert",
+    "login": "Anmeldung",
+    "logout": "Abmelden",
+    "method": "Methode",
+    "move": "Verschieben",
+    "options": "Optionen",
+    "owner": "Besitzer",
+    "password": "Passwort",
+    "path_content": "Inhalt von",
+    "permissions": "Berechtigungen",
+    "refresh": "Auffrischen",
+    "rename": "Umbenennen",
+    "rename_filename": "Folgende Datei umbenennen -",
+    "request": "Anfrage",
+    "response": "Antwort",
+    "save": "Speichen",
+    "save_wo_close": "Speichen ohne Schließen",
+    "search_pattern": "Muster",
+    "select_destination": "Zielort auswählen",
+    "size": "Größe",
+    "soft_tabs": "Leichte Tabulatoren",
+    "tab_size": "Tabulatoren Größe",
+    "tasks": "Aufgaben",
+    "toggle_nav": "Navigation umschalten",
+    "upload": "Hochladen",
+    "upload_drop": "Dateien zum hochladen hier hinziehen",
+    "upload_file": "Datei hochladen",
+    "upload_remote": "Hochladen von ausserhalb",
+    "upload_remote_url": "Entfernte URL zum hochladen",
+    "username": "Benutzername",
+    "word_wrap": "Zeilenumbruch"
 }
\ No newline at end of file
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 95e62c9..c564d46 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1,28 +1,54 @@
 {
-	"refresh": "Refresh",
-	"upload": "Upload",
-	"file_edit_success": "File successfully edited / created.",
-	"toggle_nav": "Toggle navigation",
-	"path_content": "Content of",
-	"file_new": "New File",
-	"folder_new": "New Folder",
-	"upload_remote": "Remote Upload",
-	"ajax_request": "AJAX Request",
-	"logout": "Log Off",
-	"upload_drop": "Drop files to upload",
-	"filename": "Filename",
-	"size": "Size",
-	"last_modified": "Last Modified",
-	"permissions": "Permissions",
-	"owner": "Owner",
-	"group": "Group",
-	"footer": "IFM - improved file manager | ifm.php hidden |",
-	"github": "Visit the project on GitHub",
-	"tasks": "Tasks",
-	"login": "Login",
-	"username": "username",
-	"password": "Password",
-	"upload_file": "Upload File",
-	"filename_new": "New Filename",
-	"cancel": "Cancel"
+    "ajax_request": "AJAX Request",
+    "cancel": "Cancel",
+    "close": "Close",
+    "copy": "Copy",
+    "data": "Data",
+    "delete": "Delete",
+    "directoryname": "Directory Name",
+    "editor_options": "Editor Options",
+    "extract": "Extract",
+    "extract_filename": "Extract file - ",
+    "file_delete_confirm": "Do you really want to delete the following file -",
+    "file_edit_success": "File successfully edited / created.",
+    "file_multi_delete_confirm": "Do you really want to delete these files -",
+    "file_new": "New File",
+    "file_save_confirm": "Do you want to save the following file -",
+    "filename": "Filename",
+    "filename_new": "New Filename",
+    "folder_new": "New Folder",
+    "footer": "IFM - improved file manager | ifm.php hidden |",
+    "github": "Visit the project on GitHub",
+    "group": "Group",
+    "last_modified": "Last Modified",
+    "login": "Login",
+    "logout": "Log Off",
+    "method": "Method",
+    "move": "Move",
+    "options": "Options",
+    "owner": "Owner",
+    "password": "Password",
+    "path_content": "Content of",
+    "permissions": "Permissions",
+    "refresh": "Refresh",
+    "rename": "Rename",
+    "rename_filename": "Rename file -",
+    "request": "Request",
+    "response": "Response",
+    "save": "Save",
+    "save_wo_close": "Save w/o Close",
+    "search_pattern": "Pattern",
+    "select_destination": "Select Destination",
+    "size": "Size",
+    "soft_tabs": "Soft Tabs",
+    "tab_size": "Tab Size",
+    "tasks": "Tasks",
+    "toggle_nav": "Toggle navigation",
+    "upload": "Upload",
+    "upload_drop": "Drop files to upload",
+    "upload_file": "Upload File",
+    "upload_remote": "Remote Upload",
+    "upload_remote_url": "Remote Upload URL",
+    "username": "username",
+    "word_wrap": "Word Wrap"
 }
\ No newline at end of file
diff --git a/src/main.php b/src/main.php
index 6acb9ee..02e58fb 100644
--- a/src/main.php
+++ b/src/main.php
@@ -153,11 +153,11 @@ f00bar;
 
 		$i18n = array();
 		$i18n['en'] = <<<'f00bar'
-@@@src/i18n/en.json@@@
+@@@file:src/i18n/en.json@@@
 f00bar;
 		$i18n['en'] = json_decode($i18n['en'], true);
 		$i18n['de'] = <<<'f00bar'
-@@@src/i18n/de.json@@@
+@@@file:src/i18n/de.json@@@
 f00bar;
 		$i18n['de'] = json_decode($i18n['de'], true);
 		$this->i18n = $i18n;
diff --git a/src/templates/misc.savequestion.html b/src/templates/misc.savequestion.html
index 11b977b..33de44c 100644
--- a/src/templates/misc.savequestion.html
+++ b/src/templates/misc.savequestion.html
@@ -1,5 +1,5 @@
 <div id="savequestion">
-	<label>Do you want to save this file?</label><br>
-	<button id="buttonSave">Save</button>
-	<button id="buttonDismiss">Dismiss</button>
+	<label>{{i18n.file_save_confirm}}?</label><br>
+	<button id="buttonSave">{{i18n.save}}</button>
+	<button id="buttonDismiss">{{i18n.cancel}}</button>
 </div>
diff --git a/src/templates/modal.ajaxrequest.html b/src/templates/modal.ajaxrequest.html
index 6ebe4b0..a41d504 100644
--- a/src/templates/modal.ajaxrequest.html
+++ b/src/templates/modal.ajaxrequest.html
@@ -3,13 +3,13 @@
 	<fieldset>
 		<label>URL</label><br>
 		<input class="form-control" type="text" id="ajaxurl" required><br>
-		<label>Data</label><br>
+		<label>{{i18n.data}}</label><br>
 		<textarea class="form-control" id="ajaxdata"></textarea><br>
-		<label>Method</label><br>
+		<label>{{i18n.method}}</label><br>
 		<input type="radio" name="arMethod" value="GET">GET</input><input type="radio" name="arMethod" value="POST" checked="checked">POST</input><br>
-		<button type="button" class="btn btn-success" id="buttonRequest">Request</button>
-		<button type="button" class="btn btn-default" id="buttonClose">Close</button><br>
-		<label>Response</label><br>
+		<button type="button" class="btn btn-success" id="buttonRequest">{{i18n.request}}</button>
+		<button type="button" class="btn btn-default" id="buttonClose">{{i18n.cancel}}</button><br>
+		<label>{{i18n.response}}</label><br>
 		<textarea class="form-control" id="ajaxresponse"></textarea>
 	</fieldset>
 </form>
diff --git a/src/templates/modal.copymove.html b/src/templates/modal.copymove.html
index f8451e6..c16dd77 100644
--- a/src/templates/modal.copymove.html
+++ b/src/templates/modal.copymove.html
@@ -1,13 +1,13 @@
 <form id="formCopyMove">
 <fieldset>
 	<div class="modal-body">
-		<label>Select destination:</label>
+		<label>{{i18n.select_destination}}:</label>
 		<div id="copyMoveTree"><div class="text-center"><span class="icon icon-spin5 animate-spin"></span></div></div>
 	</div>
 	<div class="modal-footer">
-		<button type="button" class="btn btn-default" id="copyButton">copy</button>
-		<button type="button" class="btn btn-default" id="moveButton">move</button>
-		<button type="button" class="btn btn-default" id="cancelButton">cancel</button>
+		<button type="button" class="btn btn-default" id="copyButton">{{i18n.copy}}</button>
+		<button type="button" class="btn btn-default" id="moveButton">{{i18n.move}}</button>
+		<button type="button" class="btn btn-default" id="cancelButton">{{i18n.cancel}}</button>
 	</div>
 </fieldset>
 </form>
diff --git a/src/templates/modal.createdir.html b/src/templates/modal.createdir.html
index 24967ff..5a5cd96 100644
--- a/src/templates/modal.createdir.html
+++ b/src/templates/modal.createdir.html
@@ -1,12 +1,12 @@
 <form id="formCreateDir">
 <div class="modal-body">
 	<fieldset>
-		<label>Directoy name:</label>
+		<label>{{i18n.directoryname}}:</label>
 		<input class="form-control" type="text" name="dirname" value="" />
 	</fieldset>
 </div>
 <div class="modal-footer">
-	<button type="button" class="btn btn-default" id="buttonSave">Save</button>
-	<button type="button" class="btn btn-default" id="buttonCancel">Cancel</button>
+	<button type="button" class="btn btn-default" id="buttonSave">{{i18n.save}}</button>
+	<button type="button" class="btn btn-default" id="buttonCancel">{{i18n.cancel}}</button>
 </div>
 </form>
diff --git a/src/templates/modal.deletefile.html b/src/templates/modal.deletefile.html
index 0546515..4e72bec 100644
--- a/src/templates/modal.deletefile.html
+++ b/src/templates/modal.deletefile.html
@@ -1,9 +1,9 @@
 <form id="formDeleteFile">
 <div class="modal-body">
-	<label>Do you really want to delete the file {{filename}}?
+	<label>{{i18n.file_delete_confirm}} {{filename}}?
 </div>
 <div class="modal-footer">
-	<button type="button" class="btn btn-danger" id="buttonYes">Yes</button>
-	<button type="button" class="btn btn-default" id="buttonNo">No</button>
+	<button type="button" class="btn btn-danger" id="buttonYes">{{i18n.delete}}</button>
+	<button type="button" class="btn btn-default" id="buttonNo">{{i18n.cancel}}</button>
 </div>
 </form>
diff --git a/src/templates/modal.extractfile.html b/src/templates/modal.extractfile.html
index 5f96373..9a6892b 100644
--- a/src/templates/modal.extractfile.html
+++ b/src/templates/modal.extractfile.html
@@ -1,7 +1,7 @@
 <form id="formExtractFile">
 <fieldset>
 	<div class="modal-body">
-		<label>Extract {{filename}} to:</label>
+		<label>{{i18n.extract_filename}} {{filename}}:</label>
 		<div class="input-group">
 			<span class="input-group-addon"><input type="radio" name="extractTargetLocation" value="./" checked="checked"></span>
 			<span class="form-control">./</span>
@@ -16,8 +16,8 @@
 		</div>
 	</div>
 	<div class="modal-footer">
-		<button type="button" class="btn btn-default" id="buttonExtract">extract</button>
-		<button type="button" class="btn btn-default" id="buttonCancel">cancel</button>
+		<button type="button" class="btn btn-default" id="buttonExtract">{{i18n.extract}}</button>
+		<button type="button" class="btn btn-default" id="buttonCancel">{{i18n.cancel}}</button>
 	</div>
 </fieldset>
 </form>
diff --git a/src/templates/modal.file.html b/src/templates/modal.file.html
index 23ee5c9..2f6945a 100644
--- a/src/templates/modal.file.html
+++ b/src/templates/modal.file.html
@@ -1,21 +1,21 @@
 <form id="formFile">
 <div class="modal-body">
 	<fieldset>
-		<label>Filename:</label>
+		<label>{{i18n.filename}}:</label>
 		<input type="text" class="form-control" name="filename" value="{{filename}}"><br>
 		<div id="content" name="content"></div><br>
-		<button type="button" class="btn btn-default" id="editoroptions">editor options</button>
-		<div class="hide" id="editoroptions-head">options</div>
+		<button type="button" class="btn btn-default" id="editoroptions">{{i18n.editor_options}}</button>
+		<div class="hide" id="editoroptions-head">{{i18n.options}}</div>
 		<div class="hide" id="editoroptions-content">
-			<input type="checkbox" id="editor-wordwrap"> word wrap</input><br>
-			<input type="checkbox" id="editor-softtabs"> use soft tabs</input>
-			<div class="input-group"><span class="input-group-addon">tabsize</span><input class="form-control" type="text" size="2" id="editor-tabsize"title="tabsize"></div>
+			<input type="checkbox" id="editor-wordwrap"> {{i18n.word_wrap}}</input><br>
+			<input type="checkbox" id="editor-softtabs"> {{i18n.soft_tabs}}</input>
+			<div class="input-group"><span class="input-group-addon">{{i18n.tab_size}}</span><input class="form-control" type="text" size="2" id="editor-tabsize" title="{{i18n.tab_size}}"></div>
 		</div>
 	</fieldset>
 </div>
 <div class="modal-footer">
-	<button type="button" id="buttonSave" class="btn btn-default">Save</button>
-	<button type="button" id="buttonSaveNotClose" class="btn btn-default">Save without closing</button>
-	<button type="button" id="buttonClose" class="btn btn-default">Close</button>
+	<button type="button" id="buttonSave" class="btn btn-default">{{i18n.save}}</button>
+	<button type="button" id="buttonSaveNotClose" class="btn btn-default">{{i18n.save_wo_close}}</button>
+	<button type="button" id="buttonClose" class="btn btn-default">{{i18n.close}}</button>
 </div>
 </form>
diff --git a/src/templates/modal.multidelete.html b/src/templates/modal.multidelete.html
index dddf4df..779f23b 100644
--- a/src/templates/modal.multidelete.html
+++ b/src/templates/modal.multidelete.html
@@ -1,9 +1,9 @@
 <form id="formDeleteFiles">
 <div class="modal-body">
-	<label>Do you really want to delete these {{count}} files?</label>
+	<label>{{i18n.file_multi_delete_confirm}} {{count}}?</label>
 </div>
 <div class="modal-footer">
-	<button type="button" class="btn btn-danger" id="buttonYes">Yes</button>
-	<button type="button" class="btn btn-default" id="buttonNo">No</button>
+	<button type="button" class="btn btn-danger" id="buttonYes">{{i18n.yes}}</button>
+	<button type="button" class="btn btn-default" id="buttonNo">{{i18n.cancel}}</button>
 </div>
 </form>
diff --git a/src/templates/modal.remoteupload.html b/src/templates/modal.remoteupload.html
index 3e322ab..edbda72 100644
--- a/src/templates/modal.remoteupload.html
+++ b/src/templates/modal.remoteupload.html
@@ -1,16 +1,16 @@
 <form id="formRemoteUpload">
 <div class="modal-body">
 	<fieldset>
-		<label>Remote upload URL</label><br>
+		<label>{{i18n.upload_remote_url}}</label><br>
 		<input class="form-control" type="text" id="url" name="url" required><br>
-		<label>Filename (required)</label>
+		<label>{{i18n.filename}}</label>
 		<input class="form-control" type="text" id="filename" name="filename" required><br>
-		<label>Method</label>
+		<label>{{i18n.method}}</label>
 		<input type="radio" name="method" value="curl" checked="checked">cURL<input type="radio" name="method" value="file">file</input><br>
 	</fieldset>
 </div>
 <div class="modal-footer">
-	<button type="button" class="btn btn-default" id="buttonUpload">Upload</button>
-	<button type="button" class="btn btn-default" id="buttonCancel">Cancel</button>
+	<button type="button" class="btn btn-default" id="buttonUpload">{{i18n.upload}}</button>
+	<button type="button" class="btn btn-default" id="buttonCancel">{{i18n.cancel}}</button>
 </div>
 </form>
diff --git a/src/templates/modal.renamefile.html b/src/templates/modal.renamefile.html
index 39fdf70..05f235c 100644
--- a/src/templates/modal.renamefile.html
+++ b/src/templates/modal.renamefile.html
@@ -1,10 +1,10 @@
 <div class="modal-body">
 <form id="formRenameFile">
 	<fieldset>
-		<label>Rename {{filename}} to:</label>
+		<label>{{i18n.rename_filename}} {{filename}}:</label>
 		<input class="form-control" type="text" name="newname" /><br>
-		<button class="btn btn-default" id="buttonRename">Rename</button>
-		<button class="btn btn-default" id="buttonCancel">Cancel</button>
+		<button class="btn btn-default" id="buttonRename">{{i18n.rename_filename}}</button>
+		<button class="btn btn-default" id="buttonCancel">{{i18n.cancel}} </button>
 	</fieldset>
 </form>
 </div>
diff --git a/src/templates/modal.search.html b/src/templates/modal.search.html
index 469ffda..9a2ae5f 100644
--- a/src/templates/modal.search.html
+++ b/src/templates/modal.search.html
@@ -1,7 +1,7 @@
 <form id="searchForm">
 <div class="modal-body">
 	<fieldset>
-		<label>Pattern:</label>
+		<label>{{i18n.search_pattern}}:</label>
 		<input type="text" class="form-control" id="searchPattern" name="pattern" value="{{lastSearch}}"><br>
 		<table id="searchResults" class="table">
 		</table>