=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties	2015-04-27 12:19:17 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties	2015-04-27 13:33:58 +0000
@@ -199,3 +199,8 @@
 this_sixmonth=This six-month
 this_bimonth=This bi-month
 about=About
+time_since_last_data_update=Time since last data update
+version=Version
+revision=Revision
+build_time=Build time
+username=Username

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js	2015-04-27 12:19:17 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js	2015-04-27 13:33:58 +0000
@@ -7,6 +7,7 @@
 		FavoriteWindow,
 		SharingWindow,
 		InterpretationWindow,
+        AboutWindow,
 
 		extendCore,
 		createViewport,
@@ -3764,10 +3765,11 @@
 								divStyle = 'padding:3px';
 
 							if (Ext.isObject(info)) {
-								html += '<div style="' + divStyle + '"><b>Data was updated: </b>' + info.intervalSinceLastAnalyticsTableSuccess + ' ago</div>';
-								html += '<div style="' + divStyle + '"><b>Version: </b>' + info.version + '</div>';
-								html += '<div style="' + divStyle + '"><b>Revision: </b>' + info.revision + '</div>';
-								html += '<div style="' + divStyle + '"><b>Build time: </b>' + info.buildTime.slice(0,19).replace('T', ' ') + '</div>';
+								html += '<div style="' + divStyle + '"><b>' + NS.i18n.time_since_last_data_update + ': </b>' + info.intervalSinceLastAnalyticsTableSuccess + '</div>';
+								html += '<div style="' + divStyle + '"><b>' + NS.i18n.version + ': </b>' + info.version + '</div>';
+								html += '<div style="' + divStyle + '"><b>' + NS.i18n.revision + ': </b>' + info.revision + '</div>';
+								html += '<div style="' + divStyle + '"><b>' + NS.i18n.build_time + ': </b>' + info.buildTime.slice(0,19).replace('T', ' ') + '</div>';
+                                html += '<div style="' + divStyle + '"><b>' + NS.i18n.username + ': </b>' + ns.core.init.userAccount.username + '</div>';
 							}
 							else {
 								html += 'No system info found';

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties	2015-04-27 12:21:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties	2015-04-27 13:33:58 +0000
@@ -224,3 +224,8 @@
 this_sixmonth=This six-month
 this_bimonth=This bi-month
 about=About
+time_since_last_data_update=Time since last data update
+version=Version
+revision=Revision
+build_time=Build time
+username=Username

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js	2015-04-27 12:21:07 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js	2015-04-27 13:33:58 +0000
@@ -6,6 +6,7 @@
 		FavoriteWindow,
 		SharingWindow,
 		InterpretationWindow,
+        AboutWindow,
 
 		extendCore,
 		createViewport,
@@ -3433,10 +3434,11 @@
 								divStyle = 'padding:3px';
 
 							if (Ext.isObject(info)) {
-								html += '<div style="' + divStyle + '"><b>Data was updated: </b>' + info.intervalSinceLastAnalyticsTableSuccess + ' ago</div>';
-								html += '<div style="' + divStyle + '"><b>Version: </b>' + info.version + '</div>';
-								html += '<div style="' + divStyle + '"><b>Revision: </b>' + info.revision + '</div>';
-								html += '<div style="' + divStyle + '"><b>Build time: </b>' + info.buildTime.slice(0,19).replace('T', ' ') + '</div>';
+								html += '<div style="' + divStyle + '"><b>' + NS.i18n.time_since_last_data_update + ': </b>' + info.intervalSinceLastAnalyticsTableSuccess + '</div>';
+								html += '<div style="' + divStyle + '"><b>' + NS.i18n.version + ': </b>' + info.version + '</div>';
+								html += '<div style="' + divStyle + '"><b>' + NS.i18n.revision + ': </b>' + info.revision + '</div>';
+								html += '<div style="' + divStyle + '"><b>' + NS.i18n.build_time + ': </b>' + info.buildTime.slice(0,19).replace('T', ' ') + '</div>';
+                                html += '<div style="' + divStyle + '"><b>' + NS.i18n.username + ': </b>' + ns.core.init.userAccount.username + '</div>';
 							}
 							else {
 								html += 'No system info found';

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties	2015-04-27 12:16:18 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties	2015-04-27 13:33:58 +0000
@@ -427,3 +427,9 @@
 this_sixmonth=This six-month
 this_bimonth=This bi-month
 about=About
+time_since_last_data_update=Time since last data update
+version=Version
+revision=Revision
+build_time=Build time
+username=Username
+

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js	2015-04-27 12:16:18 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js	2015-04-27 13:33:58 +0000
@@ -2583,56 +2583,6 @@
 		return window;
 	};
 
-	GIS.app.AboutWindow = function() {
-		var html = '',
-			window;
-
-		window = Ext.create('Ext.window.Window', {
-			title: GIS.i18n.about,
-			bodyStyle: 'background:#fff; padding:6px',
-			modal: true,
-            resizable: false,
-			hideOnBlur: true,
-			listeners: {
-				show: function(w) {
-					Ext.Ajax.request({
-						url: gis.init.contextPath + '/api/system/info.json',
-						success: function(r) {
-							var info = Ext.decode(r.responseText),
-								divStyle = 'padding:3px';
-
-							if (Ext.isObject(info)) {
-								html += '<div style="' + divStyle + '"><b>Data was updated: </b>' + info.intervalSinceLastAnalyticsTableSuccess + ' ago</div>';
-								html += '<div style="' + divStyle + '"><b>Version: </b>' + info.version + '</div>';
-								html += '<div style="' + divStyle + '"><b>Revision: </b>' + info.revision + '</div>';
-								html += '<div style="' + divStyle + '"><b>Build time: </b>' + info.buildTime.slice(0,19).replace('T', ' ') + '</div>';
-							}
-							else {
-								html += 'No system info found';
-							}
-
-							w.update(html);
-						},
-						failure: function(r) {
-							html += r.status + '\n' + r.statusText + '\n' + r.responseText;
-
-							w.update(html);
-						},
-                        callback: function() {
-                            gis.util.gui.window.setAnchorPosition(w, gis.viewport.aboutButton);
-
-                            //if (!w.hasHideOnBlurHandler) {
-                                //ns.core.web.window.addHideOnBlurHandler(w);
-                            //}
-                        }
-					});
-				}
-			}
-		});
-
-		return window;
-	};
-
     GIS.app.MapControlPanel = function(name, fn) {
 		var button,
 			panel;
@@ -4253,6 +4203,57 @@
 		return;
     };
 
+	GIS.app.AboutWindow = function() {
+		var html = '',
+			window;
+
+		window = Ext.create('Ext.window.Window', {
+			title: GIS.i18n.about,
+			bodyStyle: 'background:#fff; padding:6px',
+			modal: true,
+            resizable: false,
+			hideOnBlur: true,
+			listeners: {
+				show: function(w) {
+					Ext.Ajax.request({
+						url: gis.init.contextPath + '/api/system/info.json',
+						success: function(r) {
+							var info = Ext.decode(r.responseText),
+								divStyle = 'padding:3px';
+
+							if (Ext.isObject(info)) {
+								html += '<div style="' + divStyle + '"><b>' + GIS.i18n.time_since_last_data_update + ': </b>' + info.intervalSinceLastAnalyticsTableSuccess + '</div>';
+								html += '<div style="' + divStyle + '"><b>' + GIS.i18n.version + ': </b>' + info.version + '</div>';
+								html += '<div style="' + divStyle + '"><b>' + GIS.i18n.revision + ': </b>' + info.revision + '</div>';
+								html += '<div style="' + divStyle + '"><b>' + GIS.i18n.build_time + ': </b>' + info.buildTime.slice(0,19).replace('T', ' ') + '</div>';
+                                html += '<div style="' + divStyle + '"><b>' + GIS.i18n.username + ': </b>' + gis.init.userAccount.username + '</div>';
+							}
+							else {
+								html += 'No system info found';
+							}
+
+							w.update(html);
+						},
+						failure: function(r) {
+							html += r.status + '\n' + r.statusText + '\n' + r.responseText;
+
+							w.update(html);
+						},
+                        callback: function() {
+                            gis.util.gui.window.setAnchorPosition(w, gis.viewport.aboutButton);
+
+                            //if (!w.hasHideOnBlurHandler) {
+                                //ns.core.web.window.addHideOnBlurHandler(w);
+                            //}
+                        }
+					});
+				}
+			}
+		});
+
+		return window;
+	};
+
 	GIS.app.LayerWidgetEvent = function(layer) {
 
 		// stores

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties	2015-04-27 11:10:41 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties	2015-04-27 13:33:58 +0000
@@ -186,3 +186,8 @@
 row_dimensions=Row dimensions
 report_filter=Report filter
 about=About
+time_since_last_data_update=Time since last data update
+version=Version
+revision=Revision
+build_time=Build time
+username=Username

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js	2015-04-27 12:16:18 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js	2015-04-27 13:33:58 +0000
@@ -6,6 +6,7 @@
 		FavoriteWindow,
 		SharingWindow,
 		InterpretationWindow,
+        AboutWindow,
 
 		extendCore,
 		createViewport,
@@ -1933,10 +1934,11 @@
 								divStyle = 'padding:3px';
 
 							if (Ext.isObject(info)) {
-								html += '<div style="' + divStyle + '"><b>Data was updated: </b>' + info.intervalSinceLastAnalyticsTableSuccess + ' ago</div>';
-								html += '<div style="' + divStyle + '"><b>Version: </b>' + info.version + '</div>';
-								html += '<div style="' + divStyle + '"><b>Revision: </b>' + info.revision + '</div>';
-								html += '<div style="' + divStyle + '"><b>Build time: </b>' + info.buildTime.slice(0,19).replace('T', ' ') + '</div>';
+								html += '<div style="' + divStyle + '"><b>' + NS.i18n.time_since_last_data_update + ': </b>' + info.intervalSinceLastAnalyticsTableSuccess + '</div>';
+								html += '<div style="' + divStyle + '"><b>' + NS.i18n.version + ': </b>' + info.version + '</div>';
+								html += '<div style="' + divStyle + '"><b>' + NS.i18n.revision + ': </b>' + info.revision + '</div>';
+								html += '<div style="' + divStyle + '"><b>' + NS.i18n.build_time + ': </b>' + info.buildTime.slice(0,19).replace('T', ' ') + '</div>';
+                                html += '<div style="' + divStyle + '"><b>' + NS.i18n.username + ': </b>' + ns.core.init.userAccount.username + '</div>';
 							}
 							else {
 								html += 'No system info found';

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties	2015-04-27 12:16:18 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties	2015-04-27 13:33:58 +0000
@@ -268,3 +268,8 @@
 category_dimensions=Category dimensions
 report_filter=Report filter
 about=About
+time_since_last_data_update=Time since last data update
+version=Version
+revision=Revision
+build_time=Build time
+username=Username

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js	2015-04-27 12:16:18 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js	2015-04-27 13:33:58 +0000
@@ -2080,10 +2080,11 @@
 								divStyle = 'padding:3px';
 
 							if (Ext.isObject(info)) {
-								html += '<div style="' + divStyle + '"><b>Data was updated: </b>' + info.intervalSinceLastAnalyticsTableSuccess + ' ago</div>';
-								html += '<div style="' + divStyle + '"><b>Version: </b>' + info.version + '</div>';
-								html += '<div style="' + divStyle + '"><b>Revision: </b>' + info.revision + '</div>';
-								html += '<div style="' + divStyle + '"><b>Build time: </b>' + info.buildTime.slice(0,19).replace('T', ' ') + '</div>';
+								html += '<div style="' + divStyle + '"><b>' + NS.i18n.time_since_last_data_update + ': </b>' + info.intervalSinceLastAnalyticsTableSuccess + '</div>';
+								html += '<div style="' + divStyle + '"><b>' + NS.i18n.version + ': </b>' + info.version + '</div>';
+								html += '<div style="' + divStyle + '"><b>' + NS.i18n.revision + ': </b>' + info.revision + '</div>';
+								html += '<div style="' + divStyle + '"><b>' + NS.i18n.build_time + ': </b>' + info.buildTime.slice(0,19).replace('T', ' ') + '</div>';
+                                html += '<div style="' + divStyle + '"><b>' + NS.i18n.username + ': </b>' + ns.core.init.userAccount.username + '</div>';
 							}
 							else {
 								html += 'No system info found';