diff --git a/package/gluon-luci-admin/files/usr/lib/lua/luci/model/cbi/admin/remote.lua b/package/gluon-luci-admin/files/usr/lib/lua/luci/model/cbi/admin/remote.lua
index ebbba3a3..4513d59c 100644
--- a/package/gluon-luci-admin/files/usr/lib/lua/luci/model/cbi/admin/remote.lua
+++ b/package/gluon-luci-admin/files/usr/lib/lua/luci/model/cbi/admin/remote.lua
@@ -26,7 +26,7 @@ m.template = "admin/expertmode"
 
 if fs.access("/etc/config/dropbear") then
   s = m:section(TypedSection, "_keys", nil,
-    "Here you can paste public SSH-Keys (one per line) for SSH public-key authentication.")
+    "Hier hast du die Möglichkeit SSH-Keys (einen pro Zeile) zu hinterlegen:")
 
   s.addremove = false
   s.anonymous = true
@@ -54,15 +54,15 @@ if fs.access("/etc/config/dropbear") then
 end
 
 s = m:section(TypedSection, "_pass", nil,
-  "Changes the administrator password for accessing the device")
+  "Alternativ kannst du auch ein Passwort setzen. Wähle bitte ein sicheres Passwort, das du nirgendswo anders verwendest.")
 
 s.addremove = false
 s.anonymous = true
 
-pw1 = s:option(Value, "pw1", "Password")
+pw1 = s:option(Value, "pw1", "Passwort")
 pw1.password = true
 
-pw2 = s:option(Value, "pw2", "Confirmation")
+pw2 = s:option(Value, "pw2", "Wiederholung")
 pw2.password = true
 
 function s.cfgsections()
@@ -76,12 +76,12 @@ function m.on_commit(map)
   if v1 and v2 and #v1 > 0 and #v2 > 0 then
     if v1 == v2 then
       if luci.sys.user.setpasswd(luci.dispatcher.context.authuser, v1) == 0 then
-        m.message = "Password successfully changed!"
+        m.message = "Passwort geändert."
       else
-        m.errmessage = "Unknown Error, password not changed!"
+        m.errmessage = "Das Passwort konnte nicht geändert werden."
       end
     else
-      m.errmessage = "Given password confirmation did not match, password not changed!"
+      m.errmessage = "Die beiden Passwörter stimmen nicht überein."
     end
   end
 end
diff --git a/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/expertmode.htm b/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/expertmode.htm
index 5fe211b8..2907ecb3 100644
--- a/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/expertmode.htm
+++ b/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/expertmode.htm
@@ -15,7 +15,6 @@
 		<% if self.title and #self.title > 0 then %><h2><a id="content" name="content"><%=self.title%></a></h2><% end %>
 		<% if self.description and #self.description > 0 then %><div class="cbi-map-descr"><%=self.description%></div><% end %>
 		<% self:render_children() %>
-		<br />
 	</div>
 <% if not self.embedded then %>
 	<div class="cbi-page-actions">
diff --git a/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/upgrade.htm b/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/upgrade.htm
index d8827a03..ad0901f9 100644
--- a/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/upgrade.htm
+++ b/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/upgrade.htm
@@ -15,58 +15,50 @@ $Id$
 
 <%+header%>
 
-<h2><a id="content" name="content">Flash Firmware</a></h2>
+<h2>Firmware aktualisieren</h2>
 
 <% if step == 1 then %>
 	<% if supported then %>
 	<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
 	<p>
-		Upload an OpenWrt image file to reflash the device.
-		<% if bad_image then %>
-			<br /><br />
-			<div class="error">The uploaded image file does not
-				contain a supported format. Make sure that you choose the generic
-				image format for your platform.</div>
-		<% end %>
+		Hier kannst du ein manuelles Firmwareupdate durchführen.
 	</p>
+	<% if bad_image then %>
+	<p class="error">Die übermittelte Firmwaredatei kann nicht verwendet werden.</p>
+	<% end %>
 	<div>
-		Firmware image:<br />
+		<h3>Firmware image</h3>
 		<input type="hidden" name="step" value="2" />
 		<input type="file" size="30" name="image" />
-		<br />
-		<br />
 		<% if keepavail then -%>
+		<br/>
 		<input type="checkbox" name="keepcfg" value="1" checked="checked" />
-		<span class="bold">Keep configuration files</span>
+		<label for="keepcfg">Einstellungen beibehalten</label>
 		<% end -%>
 
-		<br />
-		<input class="cbi-button cbi-button-apply" type="submit" value="Upload image" />
+		<div class="cbi-page-actions right">
+			<input class="cbi-button cbi-button-apply" type="submit" value="Upload image" />
+		</div>
 	</div>
 	</form>
 	<% else %>
-		<div class="error">Sorry.
-			OpenWrt does not support a system upgrade on this platform.<br />
-			You need to manually flash your device.</div>
+		<p class="error">Auf diesem Gerät kann kein Upgrade durchgeführt werden.
+			Bitte führe das Upgrade manuell durch.</p>
 	<% end %>
 <% elseif step == 2 then %>
 	<p>
-		  The flash image was uploaded.
-			Below is the checksum and file size listed,
-			compare them with the original file to ensure data integrity.<br />
-			Click "Proceed" below to start the flash procedure.
+			Die Firmwaredatei wurde übermittelt. Bitte vergleiche MD5-Checksumme
+			und Dateigröße und klicke anschließend auf "Fortfahren".
+	</p>
 
-		<% if flashsize > 0 and filesize > flashsize then %>
-			<br /><br />
-			<div class="error">It appears that you try to
-				flash an image that does not fit into the flash memory, please verify
-				the image file!</div>
-		<% end %>
+	<% if flashsize > 0 and filesize > flashsize then %>
+	<p class="error">Die Firmware passt nicht in den Speicher des Gerätes.</p>
+	<% end %>
 
-		<br />
+	<p>
 		<ul>
-			<li>Checksum: <code><%=checksum%></code></li>
-			<li>Size: <%
+			<li>md5sum: <code><%=checksum%></code></li>
+			<li>Größe: <%
 				function byte_format(byte)
 					local suff = {"B", "KB", "MB", "GB", "TB"}
 					for i=1, 5 do
@@ -93,20 +85,21 @@ $Id$
 		<form style="display:inline">
 			<input type="hidden" name="step" value="3" />
 			<input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>" />
-			<input class="cbi-button cbi-button-apply" type="submit" value="Proceed" />	
+			<input class="cbi-button cbi-button-apply" type="submit" value="Fortfahren" />	
 		</form>
 		<form style="display:inline">
 			<input type="hidden" name="step" value="1" />
 			<input type="hidden" name="keepcfg" value="<%=keepconfig and "1" or "0"%>" />
-			<input class="cbi-button cbi-button-reset" type="submit" value="Cancel" />
+			<input class="cbi-button cbi-button-reset" type="submit" value="Abbrechen" />
 		</form>
 	</div>
 <% elseif step == 3 then %>
-	<p>The system is flashing now.<br />
-		DO NOT POWER OFF THE DEVICE!<br />
-		Wait a few minutes until you try to reconnect.
-		It might be necessary to renew the address of your computer to reach the device
-		again, depending on your settings.</p>
+	<p>
+		Die Firmware wird jetzt aktualisiert.
+		<strong>UNTERBRECHE AUF KEINEN FALL DIE STROMVERSORGUNG!</strong>
+		Dieser Vorgang wird einige Minuten dauern. Anschließend startet
+		das Gerät automatisch neu.
+	</p>
 <% end %>
 <%+footer%>