diff --git a/dashboard/src/translation/en.json b/dashboard/src/translation/en.json
index fe8228b39..90ea3d395 100644
--- a/dashboard/src/translation/en.json
+++ b/dashboard/src/translation/en.json
@@ -980,7 +980,19 @@
             "graphTitle": "Percentage",
             "graphSubtext": "Only apps using more than {{ threshold }} of cpu are shown"
         },
-        "selectPeriodLabel": "Select Period"
+        "selectPeriodLabel": "Select Period",
+        "info": {
+            "platformVersion": "Platform Version",
+            "title": "Info",
+            "vendor": "Vendor",
+            "product": "Product",
+            "memory": "Memory",
+            "uptime": "Uptime",
+            "activationTime": "Cloudron Creation Time"
+        },
+        "graphs": {
+            "title": "Graphs"
+        }
     },
     "eventlog": {
         "title": "Event Log",
diff --git a/dashboard/src/views/system.html b/dashboard/src/views/system.html
index ff5526d14..2a8494598 100644
--- a/dashboard/src/views/system.html
+++ b/dashboard/src/views/system.html
@@ -14,20 +14,20 @@
     <div class="col-md-12">
 
       <h3 class="graphs-toolbar">
-        Server
+        {{ 'system.info.title' | tr }}
       </h3>
 
       <div class="card card-expand">
         <div class="row">
-          <div class="col-xs-4 text-muted">Platform Version</div>
+          <div class="col-xs-4 text-muted">{{ 'system.info.platformVersion' | tr }}</div>
           <div class="col-xs-8 text-right">v{{ config.version }} ({{ config.ubuntuVersion }})</div>
         </div>
         <div class="row">
-          <div class="col-xs-4 text-muted">Vendor</div>
+          <div class="col-xs-4 text-muted">{{ 'system.info.vendor' | tr }}</div>
           <div class="col-xs-8 text-right">{{ info.sysVendor }}</div>
         </div>
         <div class="row">
-          <div class="col-xs-4 text-muted">Product</div>
+          <div class="col-xs-4 text-muted">{{ 'system.info.product' | tr }}</div>
           <div class="col-xs-8 text-right">{{ info.productName }}</div>
         </div>
         <div class="row">
@@ -35,15 +35,15 @@
           <div class="col-xs-8 text-right">{{ cpus.length + ' Core "' + cpus[0].model + '"' }}</div>
         </div>
         <div class="row">
-          <div class="col-xs-4 text-muted">Memory</div>
-          <div class="col-xs-8 text-right">{{ memory.memory | prettyDiskSize }} RAM and {{ memory.swap | prettyDiskSize }} Swap</div>
+          <div class="col-xs-4 text-muted">{{ 'system.info.memory' | tr }}</div>
+          <div class="col-xs-8 text-right">{{ memory.memory | prettyDiskSize }} RAM <span ng-show="memory.swap">&amp; {{ memory.swap | prettyDiskSize }} Swap</span></div>
         </div>
         <div class="row">
-          <div class="col-xs-4 text-muted">Uptime</div>
+          <div class="col-xs-4 text-muted">{{ 'system.info.uptime' | tr }}</div>
           <div class="col-xs-8 text-right">{{ info.uptimeSecs }}</div>
         </div>
         <div class="row" ng-show="info.activationTime">
-          <div class="col-xs-4 text-muted">Cloudron Creation Time</div>
+          <div class="col-xs-4 text-muted">{{ 'system.info.activationTime' | tr }}</div>
           <div class="col-xs-8 text-right">{{ info.activationTime | prettyDate }}</div>
         </div>
       </div>
@@ -51,7 +51,7 @@
 
     <div class="col-md-6">
       <h3 class="graphs-toolbar">
-        Graphs
+        {{ 'system.graphs.title' | tr }}
         <div class="graphs-toolbar-actions">
           <button class="btn btn-sm btn-default" style="margin-right: 5px;" ng-click="graphs.refresh()" ng-disabled="graphs.busy"><i class="fas fa-sync-alt" ng-class="{ 'fa-spin': graphs.busy }"></i></button>
           <div class="dropdown">