=== modified file 'dhis-2/dhis-web/dhis-web-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module.properties 2013-05-29 21:29:34 +0000
+++ dhis-2/dhis-web/dhis-web-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module.properties 2013-06-10 15:15:17 +0000
@@ -1,11 +1,11 @@
appmanager_list_app=Installed Apps
appmanager_settings=Settings
-appmanager_go=Get New Apps
+appmanager_app_store=App Store
appmanager_saved_settings=Saved Settings
-appmanager_installation_folder=App Installation Folder:
-appmanager_baseurl=App Base URL:
-appmanager_store_url=AppStore URL:
-appmanager_upload_app_package=Upload App Package (zip)
+appmanager_installation_folder=App Installation Folder
+appmanager_baseurl=App Base URL
+appmanager_store_url=App Store URL
+appmanager_upload_app_package=Upload App package (ZIP)
appmanager_install_success=App Installed Successfully
appmanager_invalid_package=Invalid App Package
appmanager_not_zip=Incorrect App Package Format
=== modified file 'dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/appSettings.vm'
--- dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/appSettings.vm 2013-05-29 21:29:34 +0000
+++ dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/appSettings.vm 2013-06-10 15:15:17 +0000
@@ -26,13 +26,16 @@
$i18n.getString( "appmanager_store_url" ) |
|
+
+ |
+ |
+
-
$i18n.getString( "appmanager_management" )
-
+
@@ -42,7 +45,7 @@
$i18n.getString( "appmanager_appname" ) |
$i18n.getString( "version" ) |
- $i18n.getString( "operations" ) |
+ $i18n.getString( "operations" ) |
@@ -51,7 +54,7 @@
$encoder.htmlEncode( $app.name ) |
$encoder.htmlEncode( $app.version ) |
-
+ |
|
=== modified file 'dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/getApps.vm'
--- dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/getApps.vm 2013-05-28 08:27:16 +0000
+++ dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/getApps.vm 2013-06-10 15:15:17 +0000
@@ -5,14 +5,29 @@
autoUpload();
});
+
+
- $i18n.getString( "appmanager_go" ) #*openHelp( "appManager" )*#
-
+ $i18n.getString( "appmanager_app_store" ) #*openHelp( "appManager" )*#
+
+
#if( $!appStoreUrl )
=== modified file 'dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/menu.vm'
--- dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/menu.vm 2013-05-28 15:50:33 +0000
+++ dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/menu.vm 2013-06-10 15:15:17 +0000
@@ -2,7 +2,7 @@
|