dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 2370 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-10-14 14:52:32 +0200
message:
  (GIS) Translations reinserted.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== 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	2010-10-14 08:54:26 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties	2010-10-14 12:39:51 +0000
@@ -61,6 +61,7 @@
 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
 creating_choropleth					= Creating choropleth..
@@ -89,10 +90,14 @@
 error_while_saving_data				= Error while saving data
 is_saved_as_map_source				= is saved as map source
 is_already_selected					= is already selected
+delete								= Delete
+save								= Save
+new									= New
 overlays							= Overlays
 was_registered						= was registered
 is_already_in_use					= is already in use
 new_overlay							= New overlay
+name								= Name
 overlay_name_cannot_be_longer_than_25_characters = Overlay name cannot be longer than 25 characters
 overlay_form_is_not_complete		= Overlay form is not complete
 display_name						= Display name
@@ -110,6 +115,7 @@
 preview								= Preview
 queryable							= Queryable
 description							= Description
+edit								= Edit
 register_map						= Register map
 register_maps						= Register maps
 zoom								= Zoom
@@ -140,6 +146,7 @@
 map_view_name_cannot_be_longer_than_25_characters = Map view name cannot contain more than 25 characters
 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
 name_can_not_longer_than_25			= Name cannot contain more than 25 characters