=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2011-06-11 18:49:06 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2011-07-01 08:11:03 +0000
@@ -354,4 +354,6 @@
 data_element_group = Data element group
 grand_parent_organisation_unit = Grand parent organisation unit
 available_dataset_completeness_percentages = Available data set completeness percentages
-selected_dataset_completeness_percentages = Selected data set completeness percentages
\ No newline at end of file
+selected_dataset_completeness_percentages = Selected data set completeness percentages
+toggle_fixed_periods = Toggle fixed periods
+toggle_fixed_organisation_units = Toggle fixed organisation units
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartDataElementModeForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartDataElementModeForm.vm	2011-06-07 16:12:23 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartDataElementModeForm.vm	2011-07-01 08:11:03 +0000
@@ -11,7 +11,7 @@
 		<select id="periodType" name="periodType" style="min-width:478px" onchange="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '0' )">
 			<option value="">[ $i18n.getString( "select_period_type_all" ) ]</option>
 			#foreach ( $type in $periodTypes )
-				<option value="$type.name">$type.name</option>
+				<option value="$type.name">$i18n.getString( $type.name )</option>
 			#end
 		</select>
 	</td>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm	2011-03-28 20:09:32 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm	2011-07-01 08:11:03 +0000
@@ -11,7 +11,7 @@
 		<select id="periodType" name="periodType" style="min-width:478px" onchange="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '0' )">
 			<option value="">[ $i18n.getString( "select_period_type_all" ) ]</option>
 			#foreach ( $type in $periodTypes )
-				<option value="$type.name">$type.name</option>
+				<option value="$type.name">$i18n.getString( $type.name )</option>
 			#end
 		</select>
 	</td>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrganisationUnitModeForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrganisationUnitModeForm.vm	2011-06-23 14:27:06 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrganisationUnitModeForm.vm	2011-07-01 08:11:03 +0000
@@ -71,7 +71,7 @@
 		<select id="periodType" name="periodType" style="min-width:478px" onchange="getAvailablePeriods( 'periodType', 'selectedPeriods', 'selectedPeriods', '0' )">
 			<option value="">[ $i18n.getString( "select_period_type_all" ) ]</option>
 			#foreach ( $type in $periodTypes )
-				<option value="$type.name">$type.name</option>
+				<option value="$type.name">$i18n.getString( $type.name )</option>
 			#end
 		</select>
 	</td>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartPeriodModeForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartPeriodModeForm.vm	2011-03-28 20:09:32 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartPeriodModeForm.vm	2011-07-01 08:11:03 +0000
@@ -11,7 +11,7 @@
 		<select id="periodType" name="periodType" style="min-width:478px" onchange="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '0' )">
 			<option value="">[ $i18n.getString( "select_period_type_all" ) ]</option>
 			#foreach ( $type in $periodTypes )
-				<option value="$type.name">$type.name</option>
+				<option value="$type.name">$i18n.getString( $type.name )</option>
 			#end
 		</select>
 	</td>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm	2011-06-14 08:54:57 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm	2011-07-01 08:11:03 +0000
@@ -356,7 +356,7 @@
 			<select id="periodType" name="periodType" style="min-width:518px" onchange="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '0' )">
 				<option value="">[ $i18n.getString( "select_period_type" ) ]</option>
 				#foreach ( $type in $periodTypes )
-					<option value="$type.name">$type.name</option>
+					<option value="$type.name">$i18n.getString( $type.name)</option>
 				#end
 			</select>
 		</td>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2011-03-28 20:09:32 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2011-07-01 08:11:03 +0000
@@ -40,7 +40,7 @@
 			<select id="periodType" name="periodType" style="min-width:222px" onchange="getPeriods( 'periodType', 'periodId', 'periodId', '0' )">
 				<option value="">[ $i18n.getString( "select_period_type" ) ]</option>
 				#foreach ( $type in $periodTypes )
-					<option value="$type.name">$type.name</option>
+					<option value="$type.name">$i18n.getString( $type.name )</option>
 				#end
 			</select>
 

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm	2011-04-08 06:17:59 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm	2011-07-01 08:11:03 +0000
@@ -43,7 +43,7 @@
 			<select id="periodTypeId" style="min-width:223px" onchange="getPeriods( 'periodTypeId', 'periodId', 'periodId', '0' )">
 				<option value="0">[ $i18n.getString( "select_period_type" ) ]</option>
 				#foreach ( $type in $periodTypes )
-					<option value="$type.name">$type.name</option>
+					<option value="$type.name">$i18n.getString( $type.name )</option>
 				#end
 			</select>
 

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm	2011-06-22 08:04:33 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm	2011-07-01 08:11:03 +0000
@@ -139,7 +139,7 @@
 <label>$i18n.getString( "period_type" )</label>
 <select id="periodType" style="width:250px">
   #foreach( $type in $periodTypes )
-  <option value="${type.name}" #if( $type.name == "Monthly" )selected="selected"#end>$encoder.htmlEncode( $type.name )</option>
+  <option value="${type.name}" #if( $type.name == "Monthly" )selected="selected"#end>$i18n.getString(  $type.name )</option>
   #end
 </select>
 </div>