------------------------------------------------------------ revno: 8388 committer: Lars Helge Øverland <[email protected]> branch nick: dhis2 timestamp: Fri 2012-10-05 10:36:10 +0200 message: Translations modified: dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm
-- 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-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm 2011-03-14 09:46:14 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm 2012-10-05 08:36:10 +0000 @@ -11,10 +11,18 @@ <tr> <th colspan="2">$i18n.getString( "details" )</th> </tr> - <tr> - <td><label for="username">$i18n.getString( "user_name" )</label></td> - <td><input type="text" id="username" name="username" value="$encoder.htmlEncode( $userCredentials.username )" style="width:20em" disabled="disabled"></td> - </tr> + <tr> + <td><label for="username">$i18n.getString( "user_name" )</label></td> + <td><input type="text" id="username" name="username" value="$encoder.htmlEncode( $userCredentials.username )" style="width:20em" disabled="disabled"></td> + </tr> + <tr> + <td><label for="firstName">$i18n.getString( "first_name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td> + <td><input type="text" id="firstName" name="firstName" value="$encoder.htmlEncode( $userCredentials.user.firstName )" style="width:20em"></td> + </tr> + <tr> + <td><label for="surname">$i18n.getString( "last_name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td> + <td><input type="text" id="surname" name="surname" value="$encoder.htmlEncode( $userCredentials.user.surname )" style="width:20em"></td> + </tr> <tr> <td><label for="rawPassword">$i18n.getString( "old_password" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td> <td><input type="password" id="oldPassword" name="oldPassword" style="width:20em"></td> @@ -28,14 +36,6 @@ <td><input type="password" id="retypePassword" name="retypePassword" style="width:20em"></td> </tr> <tr> - <td><label for="surname">$i18n.getString( "surname" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td> - <td><input type="text" id="surname" name="surname" value="$encoder.htmlEncode( $userCredentials.user.surname )" style="width:20em"></td> - </tr> - <tr> - <td><label for="firstName">$i18n.getString( "first_name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td> - <td><input type="text" id="firstName" name="firstName" value="$encoder.htmlEncode( $userCredentials.user.firstName )" style="width:20em"></td> - </tr> - <tr> <td><label for="email">$i18n.getString( "email" )</label></td> <td><input type="text" id="email" name="email" value="$!encoder.htmlEncode( $userCredentials.user.email )" style="width:20em"/></td> </tr> === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2012-10-03 10:52:54 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2012-10-05 08:36:10 +0000 @@ -273,6 +273,7 @@ help_contents=Help Contents about_dhis2=About DHIS 2 user_account=User account +last_name=Last name unknown=Unknown java_opts=Java Opts java_version=Java version === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties 2012-09-26 08:56:09 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties 2012-10-05 08:36:10 +0000 @@ -58,4 +58,8 @@ load_favorite_click_share=load a favorite and click 'Share' on the top menu generate_report_table_click_share=generate a report table and click 'Share' on the top menu share_interpretation=Share interpretation -select_users_and_user_groups=Select users and user groups \ No newline at end of file +select_users_and_user_groups=Select users and user groups +generate_data_set_report_click_share=generate a data set report and click 'Share' on the top menu +data_visualizer=Data visualizer +report_table=Report table +data_set_report=Data set report \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm 2012-07-27 12:38:08 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm 2012-10-05 08:36:10 +0000 @@ -30,7 +30,8 @@ <div id="shareHelpForm"> <ul> - <li>$i18n.getString( "from" ) <a href="../dhis-web-visualizer/app/">Data visualizer</a>, $i18n.getString( "load_favorite_click_share" )</li> - <li>$i18n.getString( "from" ) <a href="../dhis-web-reporting/displayManageTableForm.action">Report table</a>, $i18n.getString( "generate_report_table_click_share" )</li> + <li>$i18n.getString( "from" ) <a href="../dhis-web-visualizer/app/">$i18n.getString( "data_visualizer" )</a>, $i18n.getString( "load_favorite_click_share" )</li> + <li>$i18n.getString( "from" ) <a href="../dhis-web-reporting/displayManageTableForm.action">$i18n.getString( "report_table" )</a>, $i18n.getString( "generate_report_table_click_share" )</li> + <li>$i18n.getString( "from" ) <a href="../dhis-web-reporting/showDataSetReportForm.action">$i18n.getString( "data_set_report" )</a>, $i18n.getString( "generate_data_set_report_click_share" )</li> </ul> </div> \ No newline at end of file
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
