=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties	2011-12-14 08:10:22 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties	2012-01-15 13:33:35 +0000
@@ -8,7 +8,6 @@
 registered=registered
 add=Add
 added=added
-assign=Assign
 assigned=assigned
 refresh=Refresh
 refreshed=refreshed
@@ -22,7 +21,6 @@
 hide=Hide
 showhide=Show / hide
 toggle=Toggle
-
 boundary=Boundary
 level=Level
 type=Type
@@ -38,13 +36,11 @@
 groups=Groups
 groupset=Group set
 groupsets=Group sets
-
 indicators=Indicators
 dataelements=Data elements
 thematic_map=Thematic map
 polygon_layer=Polygon layer
 point_layer=Point layer
-favorite=Favorite
 indicator_group=Indicator group
 indicator=Indicator
 period_type=Period type
@@ -101,7 +97,6 @@
 organisation_units_assigned=organisation units assigned
 applying_organisation_units_relations=Applying organisation units relations
 assigning=Assigning
-assigned=assigned
 no=no
 creating_map=Creating map..
 current_selection_no_data=The current selection returned no data
@@ -148,18 +143,15 @@
 overlay=overlay
 was_deleted=was deleted
 please_select_an_overlay=Please select an overlay
-select=Select
 title=Title
 preview=Preview
 queryable=Queryable
 description=Description
-
 register_map=Register map
 register_maps=Register maps
 zoom=Zoom
 name_column=Name column
 organisation_unit_level=Organisation unit level
-map_source_file=Map source file
 please_enter_map_title=Please enter a map title
 please_render_map_first=Please render the thematic map first
 include_legend=Include legend
@@ -180,12 +172,10 @@
 please_select_a_map_view=Please select a map view
 view=View
 delete_map_view=Delete map view
-was_deleted=was deleted
 new_map_view=New map view
 there_is_already_a_map_view_called=There is already a map view called
 thematic_map_form_is_not_complete=Thematic map form is not complete
 map_view_form_is_not_complete=Map view form is not complete
-save=Save
 saving_current_thematic_map_selection=Saving current thematic map selection.
 new_legend_set=New legend set
 already_exists=already exists
@@ -214,7 +204,6 @@
 there_is_already_a_map_called=There is already a map called
 the_source_file=The source file
 selected_relations_removed=Selected relations removed
-the_source_file=The source file
 delete_baselayer=Delete base layer
 please_select_a_baselayer=Please select a base layer
 baselayer=Base layer
@@ -226,7 +215,6 @@
 mapvaluetype=Map value type
 dataelement_group=Data el. group
 dataelement=Data element
-organisation_units_assigned=organisation units assigned
 parent_orgunit=Parent orgunit
 delete_map=Delete map
 aggregating_map_values=Aggregating map values..
@@ -259,10 +247,8 @@
 font_size=Font size
 bold_=Bold
 italic=Italic
-level=Level
 select_outer_boundary=Select outer boundary
 select_organisation_unit_level=Select organisation unit level
-type=Type
 code=Code
 address=Address
 contact_person=Contact person
@@ -285,13 +271,27 @@
 delete_legend_set=Delete legend set
 assign_indicators_to_legend_set=Assign indicators to legend set
 assign_dataelements_to_legend_set=Assign data elements to legend set
-export_image=Export image
 export_thematic_map_to_png=Export thematic map to PNG
 total_distance=Total distance
 symbol_layer=Symbol layer
 set_thematic_map_date_type=Set thematic map date type
-date=Date
-legend_symbolizer=Symbolizer
-image=Image
-register_new_wms_overlay=Register new WMS overlay
-register_new_vector_overlay=Register new vector overlay
\ No newline at end of file
+manage_favorites=Manage favorites
+tools=Tools
+layers=Layers
+edit_layer=Edit layer
+clear=Clear
+search=Search
+labels=Labels
+show_hide_feature_labels=Show / Hide feature labels
+opacity=Opacity
+data_options=Data options
+legend_options=Legend options
+parent_organisation_unit=Parent organisation unit
+resize=Resize
+facility_layer=Facility layer
+open_which_layer=Open in which layer?
+organisationunit_search=Organisation unit search
+no_features_rendered=No features rendered
+wms_overlays=WMS overlays
+file_overlays=File overlays
+centroid_layer=Symbol layer

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_fr_FR.properties'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_fr_FR.properties	2011-12-29 09:15:40 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_fr_FR.properties	2012-01-15 13:33:35 +0000
@@ -42,7 +42,6 @@
 thematic_map=Carte th\u00e9matique
 polygon_layer=Couche de polygones
 point_layer=Couche de points
-favorite=Favoris
 indicator_group=Groupe d'indicateurs
 indicator=Indicateur
 period_type=Type de p\u00e9riode
@@ -88,7 +87,6 @@
 remove_selected=Supprimer ce qui est s\u00e9lectionn\u00e9
 remove_relation=Supprimer la relation
 please_select_least_one_organisation_unit_in_the_list=Veuillez choisir au moins une unit\u00e9 d'organisation dans la liste
-assign=Assigner
 organisation_units=unit\u00e9s d'organisation
 assigned_to=assign\u00e9 \u00e0
 is_already_assigned=est d\u00e9j\u00e0 assign\u00e9
@@ -96,10 +94,8 @@
 min_size=Taille min
 max_size=Taille max
 select_a_value=Choisir une valeur ..
-organisation_units_assigned=Unit\u00e9s d'organisation assign\u00e9es
 applying_organisation_units_relations=Application des relations d'unit\u00e9s d'organisation
 assigning=Assignation
-assigned=assign\u00e9
 no=non
 creating_map=Cr\u00e9ation de carte
 current_selection_no_data=La s\u00e9lection courante n'a retourn\u00e9 aucune valeur
@@ -285,10 +281,24 @@
 export_image=Exporter image
 export_thematic_map_to_png=Exporter carte th\u00e9matique en PNG
 total_distance=Distance totale
-symbol_layer=Couche de symboles
+symbol_layer=Couche de facilité
 set_thematic_map_date_type=D\u00e9finir le type de date de la carte th\u00e9matique
 date=Date
 legend_symbolizer=Symboliseur
 image=Image
 register_new_wms_overlay=Enregistrer nouvelle superposition WMS
 register_new_vector_overlay=Enregistrer nouvelle superposition vectorielle
+manage_favorites=Gestion des favoris
+layers=Couches
+tools=Outils
+opacity=Opacité
+register_current_map_as_favorite=Enregistrez carte actuelle comme favorite
+edit_layer=Modifier couche
+clear=Effacer
+data_options=Options de données
+legend_options=Légende Options
+parent_organisation_unit=Unité d'organisation parent
+search=Rechercher
+facility_layer=Couche de facilité
+centroid_layer=Couche de symbole
+file_overlays=
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm	2011-12-09 15:26:08 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm	2012-01-15 13:33:35 +0000
@@ -25,7 +25,6 @@
     hide: '$encoder.jsEscape($i18n.getString( 'hide' ) , "'")',
     showhide: '$encoder.jsEscape($i18n.getString( 'showhide' ) , "'")',
     toggle: '$encoder.jsEscape($i18n.getString( 'toggle' ) , "'")',
-
     boundary: '$encoder.jsEscape($i18n.getString( 'boundary' ) , "'")',
     level: '$encoder.jsEscape($i18n.getString( 'level' ) , "'")',
     type: '$encoder.jsEscape($i18n.getString( 'type' ) , "'")',
@@ -41,7 +40,6 @@
     groups: '$encoder.jsEscape($i18n.getString( 'groups' ) , "'")',
     groupset: '$encoder.jsEscape($i18n.getString( 'groupset' ) , "'")',
     groupsets: '$encoder.jsEscape($i18n.getString( 'groupsets' ) , "'")',
-
     indicators: '$encoder.jsEscape($i18n.getString( 'indicators' ) , "'")',
     dataelements: '$encoder.jsEscape($i18n.getString( 'dataelements' ) , "'")',
     thematic_map: '$encoder.jsEscape($i18n.getString( 'thematic_map' ) , "'")',
@@ -245,7 +243,6 @@
     locate_features: '$encoder.jsEscape($i18n.getString( 'locate_features' ) , "'")',
     no_coordinates_found: '$encoder.jsEscape($i18n.getString( 'no_coordinates_found' ) , "'")',
     image_resolution: '$encoder.jsEscape($i18n.getString( 'image_resolution' ) , "'")',
-
     max: '$encoder.jsEscape($i18n.getString( 'max' ) , "'")',
     characters: '$encoder.jsEscape($i18n.getString( 'characters' ) , "'")',
     geojson_file: '$encoder.jsEscape($i18n.getString( 'geojson_file' ) , "'")',
@@ -305,5 +302,28 @@
     legend_symbolizer: '$encoder.jsEscape($i18n.getString( 'legend_symbolizer' ) , "'")',
     image: '$encoder.jsEscape($i18n.getString( 'image' ) , "'")',
     register_new_wms_overlay: '$encoder.jsEscape($i18n.getString( 'register_new_wms_overlay' ) , "'")',
-    register_new_vector_overlay: '$encoder.jsEscape($i18n.getString( 'register_new_vector_overlay' ) , "'")'    
+    register_new_vector_overlay: '$encoder.jsEscape($i18n.getString( 'register_new_vector_overlay' ) , "'")',
+    manage_favorites: '$encoder.jsEscape($i18n.getString( 'manage_favorites' ) , "'")',
+    layers: '$encoder.jsEscape($i18n.getString( 'layers' ) , "'")' ,
+    tools: '$encoder.jsEscape($i18n.getString( 'tools' ) , "'")',
+    edit_layer: '$encoder.jsEscape($i18n.getString( 'edit_layer' ) , "'")',
+    clear: '$encoder.jsEscape($i18n.getString( 'clear' ) , "'")',
+    search: '$encoder.jsEscape($i18n.getString( 'search' ) , "'")',
+    labels: '$encoder.jsEscape($i18n.getString( 'labels' ) , "'")',
+    show_hide_feature_labels:  '$encoder.jsEscape($i18n.getString( 'show_hide_feature_labels' ) , "'")' ,
+    opacity:  '$encoder.jsEscape($i18n.getString( 'opacity' ) , "'")',
+    history:  '$encoder.jsEscape($i18n.getString( 'history' ) , "'")',
+    data_options: '$encoder.jsEscape($i18n.getString( 'data_options' ) , "'")' ,
+    legend_options: '$encoder.jsEscape($i18n.getString( 'legend_options' ) , "'")',
+    parent_organisation_unit:  '$encoder.jsEscape($i18n.getString( 'parent_organisation_unit' ) , "'")',
+    resize:  '$encoder.jsEscape($i18n.getString( 'resize' ) , "'")',
+    facility_layer:    '$encoder.jsEscape($i18n.getString( 'facility_layer' ) , "'")',
+    open_which_layer:   '$encoder.jsEscape($i18n.getString( 'open_which_layer' ) , "'")',
+    organisationunit_search: '$encoder.jsEscape($i18n.getString( 'organisationunit_search' ) , "'")',
+    no_features_rendered:   '$encoder.jsEscape($i18n.getString( 'no_features_rendered' ) , "'")',
+    wms_overlays:  '$encoder.jsEscape($i18n.getString( 'wms_overlays' ) , "'")',
+    file_overlays:  '$encoder.jsEscape($i18n.getString( 'file_overlays' ) , "'")' ,
+    symbol_layer:    '$encoder.jsEscape($i18n.getString( 'symbol_layer' ) , "'")',
+    centroid_layer:    '$encoder.jsEscape($i18n.getString( 'centroid_layer' ) , "'")'
+
 };
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js	2011-12-09 14:32:33 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js	2012-01-15 13:33:35 +0000
@@ -8,10 +8,10 @@
     
 //  Layer names
 
-    thematic_layer_1: 'Thematic layer 1',
-    thematic_layer_2: 'Thematic layer 2',
-    symbol_layer: 'Facility layer',
-    centroid_layer: 'Symbol layer',
+    thematic_layer_1: G.i18n.thematic_layer  + ' 1',
+    thematic_layer_2: G.i18n.thematic_layer  + ' 2',
+    symbol_layer: G.i18n.symbol_layer,
+    centroid_layer: G.i18n.centroid_layer,
 	
 //	Help strings
     
@@ -624,7 +624,7 @@
         layer: function(id) {
             var w = new Ext.Window({
                 id: 'mapviewlayer_w',
-                title: '<span id="window-favorites-title">Favorite</span>',
+                title: '<span id="window-favorites-title">' + G.i18n.favorite + '</span>',
                 layout: 'fit',
                 modal: true,
                 width: 150,
@@ -634,7 +634,7 @@
                         xtype: 'panel',
                         bodyStyle: 'padding:14px;',
                         items: [
-                            { html: 'Open in which layer?' }
+                            { html: G.i18n.open_which_layer }
                         ]
                     }
                 ],
@@ -812,7 +812,7 @@
                         parent: b,
                         items: [
                             {
-                                text: 'Edit layer..',
+                                text:  G.i18n.edit_layer + '..',
                                 iconCls: 'menu-layeroptions-edit',
                                 scope: this,
                                 handler: function() {
@@ -821,7 +821,7 @@
                             },
                             '-',
                             {
-                                text: 'Refresh',
+                                text: G.i18n.refresh,
                                 iconCls: 'menu-layeroptions-refresh',
                                 scope: this,
                                 handler: function() {
@@ -830,7 +830,7 @@
                                 }
                             },
                             {
-                                text: 'Clear',
+                                text: G.i18n.clear ,
                                 iconCls: 'menu-layeroptions-clear',
                                 scope: this,
                                 handler: function() {
@@ -839,7 +839,7 @@
                             },
                             '-',
                             {
-                                text: 'Filter..',
+                                text: G.i18n.filter + '..',
                                 iconCls: 'menu-layeroptions-filter',
                                 scope: this,
                                 handler: function() {
@@ -847,7 +847,7 @@
                                 }
                             },
                             {
-                                text: 'Search..',
+                                text: G.i18n.search + '..',
                                 iconCls: 'menu-layeroptions-locate',
                                 showSearchWindow: function() {
                                     var layer = this.parentMenu.parent.widget.layer;
@@ -868,7 +868,7 @@
                                         });
                                         
                                         this.window = new Ext.Window({
-                                            title: '<span id="window-locate-title">Organisation unit search</span>',
+                                            title: '<span id="window-locate-title">' + G.i18n.organisationunit_search +'</span>',
                                             layout: 'fit',
                                             width: G.conf.window_width,
                                             height: G.util.getMultiSelectHeight() + 140,
@@ -878,7 +878,7 @@
                                                     bodyStyle:'padding:8px',
                                                     labelWidth: G.conf.label_width,
                                                     items: [
-                                                        { html: '<div class="window-info">Locate organisation units on the map</div>' },
+                                                        { html: '<div class="window-info">' + G.i18n.locate_organisationunit_on_map + '</div>' },
                                                         {
                                                             xtype: 'colorfield',
                                                             id: 'highlightcolor',
@@ -945,7 +945,7 @@
                                                                                 'fillColor': color
                                                                             });
                                                                         }
-                                                                        
+
                                                                         layer.drawFeature(feature,symbolizer);
                                                                     }
                                                                 }
@@ -964,7 +964,7 @@
                                         this.window.show(this.parentMenu.parent.id);
                                     }
                                     else {
-                                        Ext.message.msg(false, '<span class="x-msg-hl">' + layer.name + '</span>: No features rendered');
+                                        Ext.message.msg(false, '<span class="x-msg-hl">' + layer.name + '</span>: ' + G.i18n.no_features_rendered);
                                     }
                                 },
                                 handler: function() {
@@ -973,7 +973,7 @@
                             },
                             {
                                 name: 'labels',
-                                text: 'Labels..',
+                                text: G.i18n.labels + '..',
                                 iconCls: 'menu-layeroptions-labels',
                                 cmp: {
                                     fontSize: new Ext.form.NumberField({
@@ -1067,7 +1067,7 @@
                                         }
                                         else {
                                             this.cmp.labelWindow = new Ext.Window({
-                                                title: '<span id="window-labels-title">Labels</span>',
+                                                title: '<span id="window-labels-title">' + G.i18n.labels + '</span>',
                                                 layout: 'fit',
                                                 closeAction: 'hide',
                                                 width: G.conf.window_width,
@@ -1078,7 +1078,7 @@
                                                         bodyStyle: 'padding:8px',
                                                         labelWidth: G.conf.label_width,
                                                         items: [
-                                                            {html: '<div class="window-info">Show/hide feature labels</div>'},
+                                                            {html: '<div class="window-info">' + G.i18n.show_hide_feature_labels + '</div>'},
                                                             this.cmp.fontSize,
                                                             this.cmp.strong,
                                                             this.cmp.italic,
@@ -1100,7 +1100,7 @@
                                                                     this.cmp.strong.getValue(), this.cmp.italic.getValue(), this.cmp.color.getValue());
                                                             }
                                                             else {
-                                                                Ext.message.msg(false, '<span class="x-msg-hl">' + layer.name + '</span>: No features rendered');
+                                                                Ext.message.msg(false, '<span class="x-msg-hl">' + layer.name + '</span>: ' + Gi.i18n.no_features_rednered );
                                                             }
                                                         }
                                                     }
@@ -1111,7 +1111,7 @@
                                         }
                                     }
                                     else {
-                                        Ext.message.msg(false, '<span class="x-msg-hl">' + layer.name + '</span>: No features rendered');
+                                        Ext.message.msg(false, '<span class="x-msg-hl">' + layer.name + '</span>: ' + Gi.i18n.no_features_rednered );
                                     }
                                 },
                                 handler: function() {
@@ -1120,7 +1120,7 @@
                             },
                             '-',
                             {
-                                text: 'Opacity',
+                                text: G.i18n.opacity,
                                 iconCls: 'menu-layeroptions-opacity',
                                 menu: { 
                                     items: G.conf.opacityItems,
@@ -1137,7 +1137,7 @@
                             '-',
                             {
                                 name: 'history',
-                                text: 'History',
+                                text: G.i18n.history,
                                 iconCls: 'menu-history',
                                 disabled: true,
                                 menu: {},

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2011-12-25 17:15:00 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2012-01-15 13:33:35 +0000
@@ -473,7 +473,7 @@
                 xtype: 'form',
                 labelWidth: G.conf.label_width,
                 items: [
-                    {html: '<div class="window-info">Register current map as a favorite</div>'},
+                    {html: '<div class="window-info">' + G.i18n.register_map_favorite + '</div>'},
                     {
                         xtype: 'textfield',
                         id: 'favoritename_tf',
@@ -514,7 +514,7 @@
                     },
                     
                     {html: '<div class="window-p"></div>'},
-                    {html: '<div class="window-info">Delete favorite / Add to dashboard</div>'},
+                    {html: '<div class="window-info">' + G.i18n.delete_favorite + '/' + G.i18n.add_to_dashboard +'</div>'},
                     {
                         xtype: 'combo',
                         id: 'favorite_cb',
@@ -675,7 +675,7 @@
                 xtype: 'form',
                 labelWidth: G.conf.label_width,
                 items: [
-                    {html: '<div class="window-info">Export thematic layer 1 and 2 to PNG</div>'},
+                    {html: '<div class="window-info">' + G.i18n.export_thematic_map_to_png + '</div>'},
                     {
                         xtype: 'textfield',
                         id: 'exportimagetitle_tf',
@@ -821,7 +821,7 @@
                         xtype: 'form',
                         labelWidth: G.conf.label_width,
                         items: [
-                            {html: '<div class="window-info">Register new legend</div>'},
+                            {html: '<div class="window-info">' + G.i18n.register_new_legend +'</div>'},
                             {
                                 xtype: 'textfield',
                                 id: 'predefinedmaplegendname_tf',
@@ -907,7 +907,7 @@
                                 store: G.stores.mapLegendTypeIcon
                             },
                             {html: '<div class="window-p"></div>'},
-                            {html: '<div class="window-info">Delete legend</div>'},
+                            {html: '<div class="window-info">' + G.i18n.delete_legend + '</div>'},
                             {
                                 xtype: 'combo',
                                 id: 'predefinedmaplegend_cb',
@@ -1046,7 +1046,7 @@
                         xtype: 'form',
                         labelWidth: G.conf.label_width,
                         items: [
-                            {html: '<div class="window-info">Register new legend set</div>'},
+                            {html: '<div class="window-info">' + G.i18n.register_new_legend_set + '</div>'},
                             {
                                 xtype: 'textfield',
                                 id: 'predefinedmaplegendsetname_tf',
@@ -1100,7 +1100,7 @@
                                 store: G.stores.predefinedMapLegend
                             },
                             {html: '<div class="window-p"></div>'},
-                            {html: '<div class="window-info">Delete legend set</div>'},
+                            {html: '<div class="window-info">' + G.i18n.delete_legend_set + '</div>'},
                             {
                                 xtype: 'combo',
                                 id: 'predefinedmaplegendset_cb',
@@ -1285,7 +1285,7 @@
                         xtype: 'form',
                         labelWidth: G.conf.label_width,
                         items: [
-                            {html: '<div class="window-info">Assign indicators to legend set</div>'},
+                            {html: '<div class="window-info">' + G.i18n.assign_indicators_to_legend_set +'</div>'},
                             {
                                 xtype: 'combo',
                                 id: 'predefinedmaplegendsetindicator_cb',
@@ -1404,7 +1404,7 @@
                         xtype: 'form',
                         labelWidth: G.conf.label_width,
                         items: [
-                            {html: '<div class="window-info">Assign data elements to legend set</div>'},
+                            {html: '<div class="window-info">' + G.i18n. assign_dataelements_to_legend_set + '</div>'},
                             {
                                 xtype: 'combo',
                                 id: 'predefinedmaplegendsetdataelement_cb',
@@ -1976,7 +1976,7 @@
                 {
                     nodeType: 'gx_baselayercontainer',
                     expanded: true,
-                    text: 'Base layers'
+                    text: G.i18n.base_layers
                 },
                 {
                     nodeType: 'gx_overlaylayercontainer'
@@ -2117,16 +2117,16 @@
             ]
         }),
         clickEventFn: function(node, e) {
-            if (node.attributes.text !== 'Base layers' && node.attributes.text !== 'Overlays') {
+            if (node.attributes.text !== G.i18n.base_layers && node.attributes.text !== G.i18n.overlays ) {
                 node.select();
                 
-                if (node.parentNode.attributes.text === 'Base layers') {
+                if (node.parentNode.attributes.text === G.i18n.base_layers ) {
                     var cmb = node.getOwnerTree().contextMenuBaselayer;
                     cmb.contextNode = node;
                     cmb.showAt(e.getXY());
                 }
                 
-                else if (node.parentNode.attributes.text === 'Overlays') {
+                else if (node.parentNode.attributes.text === G.i18n.overlays ) {
                     var cmo = node.layer.overlayType === 'wms' ?
                         node.getOwnerTree().contextMenuOverlayWMS : node.getOwnerTree().contextMenuOverlayFile;
                     cmo.contextNode = node;
@@ -2146,7 +2146,7 @@
             {
                 xtype: 'button',
                 id: 'baselayers_b',
-                text: 'WMS overlays',
+                text: G.i18n.wms_overlays,
                 iconCls: 'icon-baselayer',
                 handler: function() {
                     Ext.getCmp('baselayers_w').setPagePosition(Ext.getCmp('east').x - (Ext.getCmp('overlays_w').width + 15), Ext.getCmp('center').y + 41);
@@ -2156,7 +2156,7 @@
             {
                 xtype: 'button',
                 id: 'overlays_b',
-                text: 'File overlays',
+                text: G.i18n.file_overlays,
                 iconCls: 'icon-overlay',
                 handler: function() {
                     Ext.getCmp('overlays_w').setPagePosition(Ext.getCmp('east').x - (Ext.getCmp('overlays_w').width + 15), Ext.getCmp('center').y + 41);
@@ -2184,7 +2184,7 @@
     });
     
     choropleth.window = new Ext.Window({
-        title: '<span id="window-thematic1-title">Thematic layer 1</span>',
+        title: '<span id="window-thematic1-title">' + G.conf.thematic_layer_1 + '</span>',
         layout: 'fit',
         bodyStyle: 'padding:8px; background-color:#fff',
         closeAction: 'hide',
@@ -2196,7 +2196,7 @@
         bbar: [
             {
                 xtype: 'button',
-                text: 'Resize',
+                text: G.i18n.resize,
                 iconCls: 'icon-resize',
                 scope: choropleth,
                 handler: function() {
@@ -2236,7 +2236,7 @@
             ' ',
             {
                 xtype: 'button',
-                text: 'Close',
+                text: G.i18n.close,
                 iconCls: 'icon-cancel',
                 scope: choropleth,
                 handler: function() {
@@ -2273,7 +2273,7 @@
     });
     
     point.window = new Ext.Window({
-        title: '<span id="window-thematic2-title">Thematic layer 2</span>',
+        title: '<span id="window-thematic2-title">' + G.conf.thematic_layer_2 + '</span>',
         layout: 'fit',
         bodyStyle: 'padding:8px; background-color:#fff',
         closeAction: 'hide',
@@ -2285,7 +2285,7 @@
         bbar: [
             {
                 xtype: 'button',
-                text: 'Resize',
+                text: G.i18n.resize,
                 iconCls: 'icon-resize',
                 scope: point,
                 handler: function() {
@@ -2373,7 +2373,7 @@
         bbar: [
             {
                 xtype: 'button',
-                text: 'Resize',
+                text: G.i18n.resize,
                 iconCls: 'icon-resize',
                 scope: symbol,
                 handler: function() {
@@ -2413,7 +2413,7 @@
             ' ',
             {
                 xtype: 'button',
-                text: 'Close',
+                text: G.i18n.close,
                 iconCls: 'icon-cancel',
                 scope: symbol,
                 handler: function() {
@@ -2452,7 +2452,7 @@
         bbar: [
             {
                 xtype: 'button',
-                text: 'Resize',
+                text: G.i18n.resize,
                 iconCls: 'icon-resize',
                 scope: centroid,
                 handler: function() {
@@ -2510,11 +2510,11 @@
 		style: 'font:bold 11px arial; color:#333;'
 	});
 	var layersLabel = new Ext.form.Label({
-		text: 'Layers',
+		text: G.i18n.layers,
 		style: 'font:bold 11px arial; color:#333;'
 	});
 	var toolsLabel = new Ext.form.Label({
-		text: 'Tools',
+		text: G.i18n.tools,
 		style: 'font:bold 11px arial; color:#333;'
 	});
 	
@@ -2580,7 +2580,7 @@
             this.menu = new Ext.menu.Menu({
                 items: [
                     {
-                        text: 'Manage favorites..',
+                        text:  G.i18n.manage_favorites,
                         iconCls: 'menu-layeroptions-edit',
                         scope: this,
                         handler: function() {
@@ -2670,7 +2670,7 @@
                                 layout: 'anchor',
                                 bodyStyle: 'padding:8px',
                                 items: [
-                                    {html: '<div class="window-info">Total distance</div>'},
+                                    {html: '<div class="window-info">' + G.i18n.total_distance + '</div>'},
                                     {html: '<div id="measureDistanceDiv"></div>'}
                                 ]
                             }

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js	2012-01-11 14:42:53 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Centroid.js	2012-01-15 13:33:35 +0000
@@ -660,7 +660,7 @@
                         xtype: 'form',
                         width: 270,
                         items: [
-                            { html: '<div class="window-info">Data options</div>' },
+                            { html: '<div class="window-info">' + G.i18n.data_options + '</div>' },
                             this.cmp.mapValueType,
                             this.cmp.indicatorGroup,
                             this.cmp.indicator,
@@ -669,7 +669,7 @@
                             this.cmp.periodType,
                             this.cmp.period,
                             { html: '<div class="thematic-br">' },
-                            { html: '<div class="window-info">Legend options</div>' },
+                            { html: '<div class="window-info">' +  G.i18n.legend_options+'</div>' },
                             this.cmp.mapLegendSet
                         ]
                     },
@@ -687,7 +687,7 @@
                                 ]
                             },                            
                             { html: '<div class="thematic-br"></div><div class="thematic-br"></div>' },                            
-                            { html: '<div class="window-info">Parent organisation unit</div>' },                            
+                            { html: '<div class="window-info">' + G.i18n.parent_organisation_unit + '</div>' },
                             this.cmp.parent
                         ]
                     }

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2012-01-11 14:42:53 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2012-01-15 13:33:35 +0000
@@ -960,7 +960,7 @@
                         xtype: 'form',
                         width: 270,
                         items: [
-                            { html: '<div class="window-info">Data options</div>' },
+                            { html: '<div class="window-info">' + G.i18n.data_options + '</div>' },
                             this.cmp.mapview,
                             { html: '<div class="thematic-br">' },
                             this.cmp.mapValueType,
@@ -971,7 +971,7 @@
                             this.cmp.periodType,
                             this.cmp.period,
                             { html: '<div class="thematic-br">' },
-                            { html: '<div class="window-info">Legend options</div>' },
+                            { html: '<div class="window-info">' + G.i18n.legend_options + '</div>' },
                             this.cmp.mapLegendType,
                             this.cmp.mapLegendSet,
                             this.cmp.method,
@@ -998,7 +998,7 @@
                                 ]
                             },                            
                             { html: '<div class="thematic-br"></div><div class="thematic-br"></div>' },                            
-                            { html: '<div class="window-info">Parent organisation unit</div>' },                            
+                            { html: '<div class="window-info">' + G.i18n.parent_organisation_unit + '</div>' },
                             this.cmp.parent
                         ]
                     }

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js	2012-01-11 14:42:53 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Point.js	2012-01-15 13:33:35 +0000
@@ -960,7 +960,7 @@
                         xtype: 'form',
                         width: 270,
                         items: [
-                            { html: '<div class="window-info">Data options</div>' },
+                            {  html: '<div class="window-info">' + G.i18n.data_options + '</div>' },
                             this.cmp.mapview,
                             { html: '<div class="thematic-br">' },
                             this.cmp.mapValueType,
@@ -971,7 +971,7 @@
                             this.cmp.periodType,
                             this.cmp.period,
                             { html: '<div class="thematic-br">' },
-                            { html: '<div class="window-info">Legend options</div>' },
+                            { html: '<div class="window-info">' + G.i18n.legend_options + '</div>' },
                             this.cmp.mapLegendType,
                             this.cmp.mapLegendSet,
                             this.cmp.method,
@@ -998,7 +998,7 @@
                                 ]
                             },                            
                             { html: '<div class="thematic-br"></div><div class="thematic-br"></div>' },                            
-                            { html: '<div class="window-info">Parent organisation unit</div>' },                            
+                            { html: '<div class="window-info">' + G.i18n.parent_organisation_unit + '</div>' },
                             this.cmp.parent
                         ]
                     }

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js	2012-01-11 14:42:53 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js	2012-01-15 13:33:35 +0000
@@ -488,7 +488,7 @@
                                 ]
                             },                            
                             { html: '<div class="thematic-br"></div><div class="thematic-br"></div>' },                            
-                            { html: '<div class="window-info">Parent organisation unit</div>' },                            
+                            { html: '<div class="window-info">' + G.i18n.parent_organisation_unit + '</div>' },
                             this.cmp.parent
                         ]
                     }