diff --git a/src/views/appstore.html b/src/views/appstore.html
index fa50fcb16..5d396f07a 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -4,23 +4,23 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <img ng-src="{{appInstall.app.iconUrl}}" onerror="this.onerror=null;this.src='img/appicon_fallback.png'" class="app-icon"/>
-        <h3 class="appstore-install-title" title="Version {{ appInstall.app.manifest.version }}">{{ appInstall.app.manifest.title }} <span class="badge badge-danger" ng-show="appInstall.app.publishState === 'testing'">Testing</span></h3>
+        <img ng-src="{{appInstall.app.iconUrl}}" onerror="this.onerror=null; this.src='img/appicon_fallback.png'" class="app-icon"/>
+        <h3 class="appstore-install-title">{{ appInstall.app.manifest.title }}</h3>
         <br/>
         <span class="appstore-install-meta"><a href="{{ appInstall.app.manifest.website }}" target="_blank">{{ appInstall.app.manifest.author }}</a></span>
         <br/>
-        <span class="appstore-install-meta">Last updated {{ appInstall.app.creationDate | prettyDate }}</span>
+        <span class="appstore-install-meta">{{ 'appstore.installDialog.lastUpdated' | tr:{ date: (appInstall.app.creationDate | prettyDate) } }}</span>
         <br/>
-        <span class="appstore-install-meta">Requires at least {{ appInstall.app.manifest.memoryLimit | prettyByteSize:'256 MB' }} memory</span>
+        <span class="appstore-install-meta">{{ 'appstore.installDialog.memoryRequirement' | tr:{ size: (appInstall.app.manifest.memoryLimit | prettyByteSize:'256 MB') } }}</span>
       </div>
       <div class="modal-body">
         <div class="collapse" id="collapseInstallForm" data-toggle="false">
           <form role="form" name="appInstallForm" ng-submit="appInstall.submit()" autocomplete="off">
             <div class="has-error text-center" ng-show="appInstall.error.other" ng-bind-html="appInstall.error.other"></div>
             <div class="form-group" ng-class="{ 'has-error': (appInstallForm.location.$dirty && appInstallForm.location.$invalid) || (!appInstallForm.location.$dirty && appInstall.error.location) }">
-              <label class="control-label" for="appInstallLocationInput">Location</label>
+              <label class="control-label" for="appInstallLocationInput">{{ 'appstore.installDialog.location' | tr }}</label>
               <div class="input-group form-inline">
-                <input type="text" class="form-control" ng-model="appInstall.location" id="appInstallLocationInput" name="location" placeholder="Leave empty to use bare domain" autofocus>
+                <input type="text" class="form-control" ng-model="appInstall.location" id="appInstallLocationInput" name="location" placeholder="{{ 'appstore.installDialog.locationPlaceholder' | tr }}" autofocus>
                 <div class="input-group-btn">
                   <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                     <span>{{ (appInstall.location ? '.' : '') + appInstall.domain.domain }}</span>
@@ -33,19 +33,11 @@
                   </ul>
                 </div>
               </div>
-              <div ng-show="appInstall.error.location"><small>{{ appInstall.error.location }}</small></div>
+              <div ng-show="appInstall.error.location" class="text-small">{{ appInstall.error.location }}</div>
             </div>
 
-            <p class="small text-center text-warning" ng-show="appInstall.domain.provider === 'linode'">
-              <b>Linode DNS average <a target="_blank" ng-href="https://docs.cloudron.io/domains/#linode-dns">propagation time</a> is 30 minutes.
-                Installing the app will take a while.</b>
-              <br>
-            </p>
-
-            <p class="text-center" ng-show="appInstall.location && appInstall.domain.provider === 'manual'">
-              <b>Add an A record manually for {{ appInstall.location }} to this Cloudron's public IP</b>
-              <br>
-            </p>
+            <p class="text-small text-warning" ng-show="appInstall.domain.provider === 'linode'" ng-bind-html="'appstore.installDialog.linodeWarning' | tr:{ linodeDocsLink: 'https://docs.cloudron.io/domains/#linode-dns' }"></p>
+            <p class="text-small text-warning" ng-show="appInstall.location && appInstall.domain.provider === 'manual'" ng-bind-html="'appstore.installDialog.manualWarning' | tr:{ location: (appInstall.location + '.' + appInstall.domain.domain) }"></p>
 
             <div class="has-error text-center" ng-show="appInstall.error.port">{{ appInstall.error.port }}</div>
             <div ng-repeat="(env, info) in appInstall.portBindingsInfo">
@@ -63,44 +55,42 @@
             </div>
 
             <div class="form-group" ng-show="appInstall.customAuth && !appInstall.app.manifest.addons.email">
-              <label class="control-label">User management</label>
-              <p>This app has it's own user management.</p>
+              <label class="control-label">{{ 'appstore.installDialog.userManagement' | tr }}</label>
+              <p>{{ 'appstore.installDialog.userManagementNone' | tr }}</p>
             </div>
 
             <div class="form-group" ng-show="appInstall.app.manifest.addons.email">
-              <label class="control-label">User management</label>
-              <p>All users with a mailbox on this Cloudron have access.</p>
+              <label class="control-label">{{ 'appstore.installDialog.userManagement' | tr }}</label>
+              <p>{{ 'appstore.installDialog.userManagementMailbox' | tr }}</p>
             </div>
 
             <div class="form-group" ng-show="!appInstall.customAuth && !appInstall.app.manifest.addons.email">
-              <label class="control-label">User management</label>
+              <label class="control-label">{{ 'appstore.installDialog.userManagement' | tr }}</label>
               <div class="radio" ng-show="appInstall.optionalSso">
                 <label>
-                  <input type="radio" ng-model="appInstall.accessRestrictionOption" value="nosso">
-                  Leave user management to the app
+                  <input type="radio" ng-model="appInstall.accessRestrictionOption" value="nosso"> {{ 'appstore.installDialog.userManagementLeaveToApp' | tr }}
                 </label>
               </div>
               <div class="radio">
                 <label>
-                  <input type="radio" ng-model="appInstall.accessRestrictionOption" value="any">
-                  Allow all users from this Cloudron
+                  <input type="radio" ng-model="appInstall.accessRestrictionOption" value="any"> {{ 'appstore.installDialog.userManagementAllUsers' | tr }}
                 </label>
               </div>
               <div class="radio">
                 <label>
-                  <input type="radio" ng-model="appInstall.accessRestrictionOption" value="groups">
-                  Only allow the following users and groups <span class="label label-danger" ng-show="appInstall.accessRestrictionOption === 'groups' && !appInstall.isAccessRestrictionValid()">Select at least one user or group</span>
+                  <input type="radio" ng-model="appInstall.accessRestrictionOption" value="groups"> {{ 'appstore.installDialog.userManagementSelectUsers' | tr }}
+                  <span class="label label-danger" ng-show="appInstall.accessRestrictionOption === 'groups' && !appInstall.isAccessRestrictionValid()">{{ 'appstore.installDialog.errorUserManagementSelectAtLeastOne' | tr }}</span>
                 </label>
               </div>
               <div>
                 <div style="margin-left: 20px;">
                   <div class="col-md-5">
-                    Users: &nbsp;
+                    {{ 'appstore.installDialog.users' | tr }}: &nbsp;
                     <multiselect ng-model="appInstall.accessRestriction.users" ng-disabled="appInstall.accessRestrictionOption !== 'groups'" options="user.username for user in users" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
                   </div>
 
                   <div class="col-md-5">
-                    Groups: &nbsp;
+                    {{ 'appstore.installDialog.groups' | tr }}: &nbsp;
                     <multiselect ng-model="appInstall.accessRestriction.groups" ng-disabled="appInstall.accessRestrictionOption !== 'groups'" options="group.name for group in groups" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
                   </div>
                 </div>
@@ -110,9 +100,7 @@
               <br/>
             </div>
 
-            <p ng-show="appInstall.app.manifest.addons.email" class="text-info">
-              This app is pre-configured for use with <a ng-href="https://docs.cloudron.io/email/" target="_blank">Cloudron Email</a>.
-            </p>
+            <p ng-show="appInstall.app.manifest.addons.email" class="text-info" ng-bind-html="'appstore.installDialog.configuredForCloudronEmail' | tr:{ emailDocsLink: 'https://docs.cloudron.io/email/' }"></p>
 
             <div class="hide">
               <label class="control-label" for="appInstallCertificateInput" ng-show="appInstall.domain.provider !== 'caas'">Certificate (optional)</label>
@@ -150,19 +138,19 @@
           </div>
         </div>
         <div class="collapse" id="collapseResourceConstraint" data-toggle="false">
-          <h4 class="text-danger">This Cloudron is running low on resources.</h4>
-          <p>Please upgrade to a server instance with more memory. Alternately, free up resources by uninstalling unused applications.</p>
+          <h4 class="text-danger">{{ 'appstore.installDialog.lowOnResources' | tr }}</h4>
+          <p>{{ 'appstore.installDialog.pleaseUpgradeServer' | tr }}</p>
         </div>
         <div class="collapse" id="collapseSubscriptionRequired" data-toggle="false">
-          <p>To install more apps, a paid subscription is required.</p>
+          <p>{{ 'appstore.installDialog.subscriptionRequired' | tr }}</p>
         </div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-success pull-left" ng-click="openSubscriptionSetup()" ng-show="appInstall.state === 'subscriptionRequired'">Setup Subscription</button>
-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-        <button type="button" class="btn btn-danger" ng-show="appInstall.state === 'resourceConstraint'" ng-click="appInstall.showForm(true)">Install anyway</button>
-        <button type="button" class="btn btn-success" ng-show="appInstall.state === 'appInfo'" ng-click="appInstall.showForm()">Install</button>
-        <button type="button" class="btn btn-success" ng-show="appInstall.state === 'installForm'" ng-click="appInstall.submit()" ng-disabled="(appInstall.accessRestrictionOption === 'groups' && !appInstall.isAccessRestrictionValid()) || appInstallForm.$invalid || appInstall.busy"><i class="fa fa-circle-notch fa-spin" ng-show="appInstall.busy"></i> Install {{ appInstall.needsOverwrite ? 'and overwrite DNS' : '' }}</button>
+        <button type="button" class="btn btn-success pull-left" ng-click="openSubscriptionSetup()" ng-show="appInstall.state === 'subscriptionRequired'">{{ 'appstore.installDialog.setupSubscriptionAction' | tr }}</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
+        <button type="button" class="btn btn-danger" ng-show="appInstall.state === 'resourceConstraint'" ng-click="appInstall.showForm(true)">{{ 'appstore.installDialog.installAnywayAction' | tr }}</button>
+        <button type="button" class="btn btn-success" ng-show="appInstall.state === 'appInfo'" ng-click="appInstall.showForm()">{{ 'appstore.installDialog.installAction' | tr }}</button>
+        <button type="button" class="btn btn-success" ng-show="appInstall.state === 'installForm'" ng-click="appInstall.submit()" ng-disabled="(appInstall.accessRestrictionOption === 'groups' && !appInstall.isAccessRestrictionValid()) || appInstallForm.$invalid || appInstall.busy"><i class="fa fa-circle-notch fa-spin" ng-show="appInstall.busy"></i> {{ 'appstore.installDialog.doInstallAction' | tr:{ dnsOverwrite: appInstall.needsOverwrite } }}</button>
       </div>
     </div>
   </div>
@@ -170,103 +158,101 @@
 
 <!-- Modal app not found -->
 <div class="modal fade" id="appNotFoundModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title">App not found</h4>
-            </div>
-            <div class="modal-body">
-                There is no such app <b>{{ appNotFound.appId }}</b><span ng-show="appNotFound.version"> with version <b>{{ appNotFound.version }}</b></span>.
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-dismiss="modal">OK</button>
-            </div>
-        </div>
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">{{ 'appstore.appNotFoundDialog.title' | tr }}</h4>
+      </div>
+      <div class="modal-body" ng-bind-html="'appstore.appNotFoundDialog.description' | tr:{ appId: appNotFound.appId, version: appNotFound.version }"></div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
+      </div>
     </div>
+  </div>
 </div>
 
 <div ng-show="!ready" class="loading-banner">
-    <h1><i class="fa fa-circle-notch fa-spin"></i></h1>
+  <h1><i class="fa fa-circle-notch fa-spin"></i></h1>
 </div>
 
 <!-- appstore login -->
 <div ng-show="ready && !validSubscription" class="container card card-small appstore-login ng-cloak">
-    <div class="col-md-12 text-center">
-        <h1 ng-show="appstoreLogin.register">Sign up with Cloudron.io</h1>
-        <h1 ng-hide="appstoreLogin.register">Login to Cloudron.io</h1>
-    </div>
-    <div class="col-md-12 text-center">
-        <p>This account is used to access the App Store and manage your subscription</p>
-    </div>
-    <div class="col-md-12" style="margin-bottom: 10px;">
-        <small class="text-danger" ng-show="appstoreLogin.error.generic">{{ appstoreLogin.error.generic }}</small>
-    </div>
-    <div class="col-md-12">
+  <div class="col-md-12 text-center">
+    <h1 ng-show="appstoreLogin.register">{{ 'appstore.accountDialog.titleSignUp' | tr }}</h1>
+    <h1 ng-hide="appstoreLogin.register">{{ 'appstore.accountDialog.titleLogin' | tr }}</h1>
+  </div>
+  <div class="col-md-12 text-center">
+    <p>{{ 'appstore.accountDialog.description' | tr }}</p>
+  </div>
+  <div class="col-md-12" style="margin-bottom: 10px;">
+    <small class="text-danger" ng-show="appstoreLogin.error.generic">{{ appstoreLogin.error.generic }}</small>
+  </div>
+  <div class="col-md-12">
+    <br/>
+
+    <form name="appstoreLoginForm" role="form" novalidate ng-submit="appstoreLogin.submit()" autocomplete="off">
+      <input type="password" style="display: none;">
+
+      <div class="form-group" ng-class="{ 'has-error': (appstoreLoginForm.email.$dirty && appstoreLoginForm.email.$invalid) || appstoreLogin.error.generic }">
+          <label class="control-label">{{ 'appstore.accountDialog.email' | tr }}</label>
+          <input type="email" class="form-control" ng-model="appstoreLogin.email" id="inputAppstoreLoginEmail" name="email" required autofocus>
+          <div class="control-label" ng-show="(!appstoreLoginForm.email.$dirty && appstoreLogin.error.email) || (appstoreLoginForm.email.$dirty && appstoreLoginForm.email.$invalid) || appstoreLogin.error.email">
+              <small class="text-danger" ng-show="appstoreLogin.error.email">{{ appstoreLogin.error.email }}</small>
+          </div>
+      </div>
+
+      <div class="form-group" ng-class="{ 'has-error': (!appstoreLoginForm.password.$dirty && appstoreLogin.error.password) || (appstoreLoginForm.password.$dirty && appstoreLoginForm.password.$invalid) || appstoreLogin.error.generic }">
+          <label class="control-label">{{ 'appstore.accountDialog.password' | tr }}</label>
+          <input type="password" class="form-control" ng-model="appstoreLogin.password" id="inputAppstoreLoginPassword" name="password" required>
+          <div class="control-label" ng-show="(!appstoreLoginForm.password.$dirty && appstoreLogin.error.password) || (appstoreLoginForm.password.$dirty && appstoreLoginForm.password.$invalid)">
+              <small ng-show="!appstoreLoginForm.password.$dirty && appstoreLogin.error.password">{{ 'appstore.accountDialog.errorWrongPassword' | tr }}</small>
+          </div>
+      </div>
+
+      <div class="form-group" ng-hide="appstoreLogin.register" ng-class="{ 'has-error': appstoreLogin.error.totpToken }">
+          <label class="control-label">{{ 'appstore.accountDialog.2faToken' | tr }}</label>
+          <input type="text" class="form-control" ng-model="appstoreLogin.totpToken" id="inputAppstoreLoginTotpToken" name="totpToken">
+          <div class="control-label" ng-show="appstoreLogin.error.totpToken">
+              <small ng-show="appstoreLogin.error.totpToken">{{ appstoreLogin.error.totpToken }}</small>
+          </div>
+      </div>
+
+      <div class="form-group">
+        <label class="control-label">{{ 'appstore.accountDialog.intendedUse' | tr }}</label>
+        <select class="purpose form-control" ng-model="appstoreLogin.purpose" required>
+          <option value="" disabled selected hidden>{{ 'appstore.accountDialog.chooseAnOption' | tr }}</option>
+          <option value="personal_cloud">Personal use</option>
+          <option value="business_cloud">Business use</option>
+          <option value="website_hosting">Website hosting</option>
+          <option value="msp">Managed Service Provider</option>
+          <option value="paas">PaaS - Develop &amp; deploy apps</option>
+          <option value="single_app">Host only one app</option>
+          <option value="exploring">Just exploring</option>
+        </select>
+      </div>
+
+      <div class="checkbox">
+        <label>
+          <input type="checkbox" ng-model="appstoreLogin.termsAccepted" ng-bind-html="'appstore.accountDialog.licenseCheckbox' | tr:{ licenseLink: 'https://cloudron.io/legal/license.html' }">
+        </label>
+      </div>
+
+      <br/>
+
+      <center>
+        <button type="submit" class="btn btn-lg btn-success" ng-disabled="appstoreLoginForm.$invalid || appstoreLogin.busy || !appstoreLogin.termsAccepted">
+          <i class="fa fa-circle-notch fa-spin" ng-show="appstoreLogin.busy"></i> <span ng-hide="appstoreLogin.register">{{ 'appstore.accountDialog.loginAction' | tr }}</span><span ng-show="appstoreLogin.register">{{ 'appstore.accountDialog.createAccountAction' | tr }}</span>
+        </button>
+
+        <br/>
         <br/>
 
-        <form name="appstoreLoginForm" role="form" novalidate ng-submit="appstoreLogin.submit()" autocomplete="off">
-            <input type="password" style="display: none;">
+        <a href="" ng-click="appstoreLogin.register = true" ng-hide="appstoreLogin.register">{{ 'appstore.accountDialog.switchToSignUpAction' | tr }}</a>
+        <a href="" ng-click="appstoreLogin.register = false" ng-show="appstoreLogin.register">{{ 'appstore.accountDialog.switchToLoginAction' | tr }}</a>
+      </center>
 
-            <div class="form-group" ng-class="{ 'has-error': (appstoreLoginForm.email.$dirty && appstoreLoginForm.email.$invalid) || appstoreLogin.error.generic }">
-                <label class="control-label">Email</label>
-                <input type="email" class="form-control" ng-model="appstoreLogin.email" id="inputAppstoreLoginEmail" name="email" required autofocus>
-                <div class="control-label" ng-show="(!appstoreLoginForm.email.$dirty && appstoreLogin.error.email) || (appstoreLoginForm.email.$dirty && appstoreLoginForm.email.$invalid) || appstoreLogin.error.email">
-                    <small class="text-danger" ng-show="appstoreLogin.error.email">{{ appstoreLogin.error.email }}</small>
-                </div>
-            </div>
-
-            <div class="form-group" ng-class="{ 'has-error': (!appstoreLoginForm.password.$dirty && appstoreLogin.error.password) || (appstoreLoginForm.password.$dirty && appstoreLoginForm.password.$invalid) || appstoreLogin.error.generic }">
-                <label class="control-label">Password</label>
-                <input type="password" class="form-control" ng-model="appstoreLogin.password" id="inputAppstoreLoginPassword" name="password" required>
-                <div class="control-label" ng-show="(!appstoreLoginForm.password.$dirty && appstoreLogin.error.password) || (appstoreLoginForm.password.$dirty && appstoreLoginForm.password.$invalid)">
-                    <small ng-show="!appstoreLoginForm.password.$dirty && appstoreLogin.error.password">Wrong password</small>
-                </div>
-            </div>
-
-            <div class="form-group" ng-hide="appstoreLogin.register" ng-class="{ 'has-error': appstoreLogin.error.totpToken }">
-                <label class="control-label">2FA Token (if enabled)</label>
-                <input type="text" class="form-control" ng-model="appstoreLogin.totpToken" id="inputAppstoreLoginTotpToken" name="totpToken">
-                <div class="control-label" ng-show="appstoreLogin.error.totpToken">
-                    <small ng-show="appstoreLogin.error.totpToken">{{ appstoreLogin.error.totpToken }}</small>
-                </div>
-            </div>
-
-            <div class="form-group">
-              <label class="control-label">Intended Use</label>
-              <select class="purpose form-control" ng-model="appstoreLogin.purpose" required>
-                <option value="" disabled selected hidden>Please choose an option...</option>
-                <option value="personal_cloud">Personal use</option>
-                <option value="business_cloud">Business use</option>
-                <option value="website_hosting">Website hosting</option>
-                <option value="msp">Managed Service Provider</option>
-                <option value="paas">PaaS - Develop &amp; deploy apps</option>
-                <option value="single_app">Host only one app</option>
-                <option value="exploring">Just exploring</option>
-              </select>
-            </div>
-
-            <div class="checkbox">
-                <label>
-                    <input type="checkbox" ng-model="appstoreLogin.termsAccepted">I accept the Cloudron <a href="https://cloudron.io/legal/license.html" target="_blank">license</a>
-                </label>
-            </div>
-
-            <br/>
-
-            <center>
-                <button type="submit" class="btn btn-lg btn-success" ng-disabled="appstoreLoginForm.$invalid || appstoreLogin.busy || !appstoreLogin.termsAccepted">
-                    <i class="fa fa-circle-notch fa-spin" ng-show="appstoreLogin.busy"></i> <span ng-hide="appstoreLogin.register">Login</span><span ng-show="appstoreLogin.register">Create Account</span>
-                </button>
-
-                <br/>
-                <br/>
-
-                <a href="" ng-click="appstoreLogin.register = true" ng-hide="appstoreLogin.register">Don't have an account yet? Sign up</a>
-                <a href="" ng-click="appstoreLogin.register = false" ng-show="appstoreLogin.register">Already have an account? Log in</a>
-            </center>
-
-        </form>
-    </div>
+    </form>
+  </div>
 </div>
 
 <!-- give more vertical spacing so the login form does not appear clipped -->
@@ -277,9 +263,9 @@
 
 <div ng-show="ready && validSubscription" class="ng-cloak appstore-toolbar">
   <div class="appstore-toolbar-content">
-    <button class="btn" type="button" ng-click="showCategory('');" ng-class="{ 'btn-primary': '' === category }">All</button>
-    <button class="btn" type="button" ng-click="showCategory('featured');" ng-class="{ 'btn-primary': 'featured' === category }">Popular</button>
-    <button class="btn" type="button" ng-click="showCategory('new');" ng-class="{ 'btn-primary': 'new' === category }">New Apps</button>
+    <button class="btn" type="button" ng-click="showCategory('');" ng-class="{ 'btn-primary': '' === category }">{{ 'appstore.category.all' | tr }}</button>
+    <button class="btn" type="button" ng-click="showCategory('featured');" ng-class="{ 'btn-primary': 'featured' === category }">{{ 'appstore.category.popular' | tr }}</button>
+    <button class="btn" type="button" ng-click="showCategory('new');" ng-class="{ 'btn-primary': 'new' === category }">{{ 'appstore.category.newApps' | tr }}</button>
     <div class="dropdown">
       <button class="btn dropdown-toggle" type="button" data-toggle="dropdown" ng-class="{ 'btn-primary': '' !== category && 'recent' !== category && 'featured' !== category && 'new' !== category }">
         {{ categoryButtonLabel(category) }}
@@ -289,7 +275,7 @@
         <li ng-repeat="category in categories"><a href="" ng-click="showCategory(category.id);"><i class="{{ category.icon }}"></i> {{ category.label }}</a></li>
       </ul>
     </div>
-    <input type="text" id="appstoreSearch" class="form-control" placeholder="Search for alternatives like Github, Dropbox, Slack, Trello, ..." ng-model="searchString" ng-change="search()" autofocus>
+    <input type="text" id="appstoreSearch" class="form-control" placeholder="{{ 'appstore.searchPlaceholder' | tr }}" ng-model="searchString" ng-change="search()" autofocus>
   </div>
 </div>
 
@@ -299,22 +285,21 @@
       <br/>
       <br/>
       <br/>
-      <h3 class="text-muted">No apps found.</h3>
+      <h3 class="text-muted">{{ 'appstore.noAppsFound' | tr }}</h3>
       <br/>
-      <a href="https://forum.cloudron.io/category/5/app-requests" target="_blank">Missing an app? Let us know.</a>
+      <a href="https://forum.cloudron.io/category/5/app-requests" target="_blank">{{ 'appstore.appMissing' | tr }}</a>
     </div>
     <div class="col-md-12" ng-show="apps.length">
       <div class="row-no-margin">
         <div class="col-sm-1 appstore-item" ng-repeat="app in apps">
           <div class="appstore-item-content highlight" ng-click="gotoApp(app)" ng-class="{ 'appstore-item-content-testing': app.releaseState === 'unstable' }">
-            <span class="badge badge-danger appstore-item-badge-testing" ng-show="app.releaseState === 'unstable'">Unstable</span>
+            <span class="badge badge-danger appstore-item-badge-testing" ng-show="app.releaseState === 'unstable'">{{ 'appstore.unstable' | tr }}</span>
             <div class="appstore-item-content-icon col-same-height">
               <img ng-src="{{app.iconUrl}}" onerror="this.onerror=null;this.src='img/appicon_fallback.png'" class="app-icon"/>
             </div>
             <div class="appstore-item-content-description col-same-height">
               <h4 class="appstore-item-content-title">{{ app.manifest.title }}</h4>
               <div class="appstore-item-content-tagline text-muted">{{ app.manifest.tagline }}</div>
-              <!-- <div class="appstore-item-rating"><i class="fa fa-star"></i><i class="fa fa-star"></i><i class="fa fa-star"></i><i class="fa fa-star-half-o"></i><i class="fa fa-star-o"></i></div> -->
             </div>
           </div>
         </div>
diff --git a/src/views/appstore.js b/src/views/appstore.js
index 2e2954460..b5cd9ca1f 100644
--- a/src/views/appstore.js
+++ b/src/views/appstore.js
@@ -512,7 +512,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
 
     $scope.showAppNotFound = function (appId, version) {
         $scope.appNotFound.appId = appId;
-        $scope.appNotFound.version = version;
+        $scope.appNotFound.version = version || 'latest';
 
         $('#appNotFoundModal').modal('show');
     };