=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2015-06-25 09:01:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2015-08-18 13:53:47 +0000
@@ -6,6 +6,8 @@
 host_name=Host name
 username=Username
 password=Password
+refresh_token=Refresh token
+authorization_code=Authorization code
 application_title=Application title
 dhis-web-maintenance-settings=Settings
 flag=Flag

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/oAuth2Client.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/oAuth2Client.vm	2015-06-25 12:05:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/oAuth2Client.vm	2015-08-18 13:53:47 +0000
@@ -75,17 +75,17 @@
     <tr>
       <td><label for="name">$i18n.getString( "grant_types" )</label></td>
       <td>
-        <input type="checkbox" id="gtPassword" name="gtPassword">Password<br/>
-        <input type="checkbox" id="gtRefreshToken" name="gtRefreshToken">Refresh Token<br/>
-        <input type="checkbox" id="gtAuthorizationCode" name="gtAuthorizationCode">Authorization Code<br/>
+        <input type="checkbox" id="gtPassword" name="gtPassword"><label for="gtPassword">$i18n.getString( "password" )</label><br/>
+        <input type="checkbox" id="gtRefreshToken" name="gtRefreshToken"><label for="gtRefreshToken">$i18n.getString( "refresh_token" )</label><br/>
+        <input type="checkbox" id="gtAuthorizationCode" name="gtAuthorizationCode"><label for="gtAuthorizationCode">$i18n.getString( "authorization_code" )</label><br/>
       </td>
     </tr>
     <tr>
       <td><label for="name">$i18n.getString( "redirect_uris" )</label></td>
       <td>
         <input id="redirectUri" type="text" value="https://">
-        <button type="button" id="addRedirectUri" style="height: 22px;"><i class="fa fa-plus"></i> Add</button>
-        <button type="button" id="removeRedirectUri" style="height: 22px;"><i class="fa fa-minus"></i> Remove</button>
+        <button type="button" id="addRedirectUri" style="height: 22px;"><i class="fa fa-plus"></i> $i18n.getString( "add" )</button>
+        <button type="button" id="removeRedirectUri" style="height: 22px;"><i class="fa fa-minus"></i> $i18n.getString( "remove" )</button>
       </td>
     </tr>
     <tr>