Move API setting to Authentication tab and add translations strings.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3222 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/helpers/settings_helper.rb

@@ -24,8 +24,7 @@ module SettingsHelper
             {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking},
             {:name => 'notifications', :partial => 'settings/notifications', :label => :field_mail_notification},
             {:name => 'mail_handler', :partial => 'settings/mail_handler', :label => :label_incoming_emails},
-            {:name => 'repositories', :partial => 'settings/repositories', :label => :label_repository_plural},
-            {:name => 'integration', :partial => 'settings/integration', :label => :label_integration}
+            {:name => 'repositories', :partial => 'settings/repositories', :label => :label_repository_plural}
             ]
   end
   

app/views/settings/_authentication.rhtml

@@ -15,6 +15,8 @@
 <p><%= setting_check_box :lost_password, :label => :label_password_lost %></p>
 
 <p><%= setting_check_box :openid, :disabled => !Object.const_defined?(:OpenID) %></p>
+
+<p><%= setting_check_box :rest_api_enabled %></p>
 </div>
 
 <div style="float:right;">

app/views/settings/_integration.html.erb

@@ -1,8 +0,0 @@
-<% form_tag({:action => 'edit', :tab => 'integration'}) do %>
-
-<div class="box tabular settings">
-<p><%= setting_check_box :rest_api_enabled %></p>
-</div>
-
-<%= submit_tag l(:button_save) %>
-<% end %>

config/locales/bg.yml

@@ -857,3 +857,11 @@ bg:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/bs.yml

@@ -881,3 +881,11 @@ bs:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/ca.yml

@@ -860,3 +860,11 @@ ca:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/cs.yml

@@ -863,3 +863,11 @@ cs:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/da.yml

@@ -883,3 +883,11 @@ da:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/de.yml

@@ -883,3 +883,11 @@ de:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/el.yml

@@ -863,3 +863,11 @@ el:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/en.yml

@@ -736,7 +736,6 @@ en:
   label_api_access_key: API access key
   label_missing_api_access_key: Missing an API access key
   label_api_access_key_created_on: "API access key created {{value}} ago"
-  label_integration: Integration
   
   button_login: Login
   button_submit: Submit

config/locales/es.yml

@@ -904,3 +904,11 @@ es:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/fi.yml

@@ -893,3 +893,11 @@ fi:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/fr.yml

@@ -343,6 +343,7 @@ fr:
   setting_issue_done_ratio: Calcul de l'avancement des demandes
   setting_issue_done_ratio_issue_status: Utiliser le statut
   setting_issue_done_ratio_issue_field: 'Utiliser le champ % effectué'
+  setting_rest_api_enabled: Activer l'API REST
   
   permission_add_project: Créer un projet
   permission_edit_project: Modifier le projet
@@ -886,3 +887,10 @@ fr:
   setting_gravatar_default: Default Gravatar image
   setting_start_of_week: Start calendars on
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/gl.yml

@@ -883,3 +883,11 @@ gl:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/he.yml

@@ -867,3 +867,11 @@ he:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/hu.yml

@@ -888,3 +888,11 @@
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/it.yml

@@ -870,3 +870,11 @@ it:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/ja.yml

@@ -892,3 +892,11 @@ ja:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/ko.yml

@@ -923,3 +923,11 @@ ko:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/lt.yml

@@ -931,3 +931,11 @@ lt:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/nl.yml

@@ -845,3 +845,11 @@ nl:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/no.yml

@@ -858,3 +858,11 @@
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/pl.yml

@@ -886,3 +886,11 @@ pl:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/pt-BR.yml

@@ -891,3 +891,11 @@ pt-BR:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/pt.yml

@@ -875,3 +875,11 @@ pt:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/ro.yml

@@ -860,3 +860,11 @@ ro:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/ru.yml

@@ -971,3 +971,11 @@ ru:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/sk.yml

@@ -862,3 +862,11 @@ sk:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/sl.yml

@@ -859,3 +859,11 @@ sl:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/sr.yml

@@ -878,3 +878,11 @@
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/sv.yml

@@ -912,3 +912,11 @@ sv:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/th.yml

@@ -860,3 +860,11 @@ th:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/tr.yml

@@ -890,3 +890,11 @@ tr:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/uk.yml

@@ -859,3 +859,11 @@ uk:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/vi.yml

@@ -922,3 +922,11 @@ vi:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/zh-TW.yml

@@ -956,3 +956,11 @@
   enumeration_activities: 活動 (時間追蹤)
   enumeration_system_activity: 系統活動
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key

config/locales/zh.yml

@@ -887,3 +887,11 @@ zh:
   permission_view_issues: View Issues
   label_display_used_statuses_only: Only display statuses that are used by this tracker
   label_revision_id: Revision {{value}}
+  label_api_access_key: API access key
+  text_show: Show
+  label_api_access_key_created_on: API access key created {{value}} ago
+  label_feeds_access_key: RSS access key
+  notice_api_access_key_reseted: Your API access key was reset.
+  setting_rest_api_enabled: Enable REST web service
+  label_missing_api_access_key: Missing an API access key
+  label_missing_feeds_access_key: Missing a RSS access key