+<%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @project) }')" %>
+<% end %>
<%= f.text_field :start_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_start_date') if @issue.leaf? %>
<%= f.text_field :due_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_due_date') if @issue.leaf? %>
<%= f.text_field :estimated_hours, :size => 3, :disabled => !@issue.leaf? %> <%= l(:field_hours) %>
diff -r adc8466df404 -r 753f1380d6bc app/views/issues/_changesets.rhtml
--- a/app/views/issues/_changesets.rhtml Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/issues/_changesets.rhtml Mon Jun 06 14:41:04 2011 +0100
@@ -3,7 +3,7 @@
<%= link_to_revision(changeset, changeset.project,
:text => "#{l(:label_revision)} #{changeset.format_identifier}") %><%= authoring(changeset.committed_on, changeset.author) %>
diff -r adc8466df404 -r 753f1380d6bc app/views/issues/_form.rhtml
--- a/app/views/issues/_form.rhtml Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/issues/_form.rhtml Mon Jun 06 14:41:04 2011 +0100
@@ -1,21 +1,17 @@
<%= call_hook(:view_issues_form_details_top, { :issue => @issue, :form => f }) %>
<%= call_hook(:view_issues_history_journal_bottom, { :journal => journal }) %>
<% end %>
+
+<% heads_for_wiki_formatter if User.current.allowed_to?(:edit_issue_notes, issue.project) || User.current.allowed_to?(:edit_own_issue_notes, issue.project) %>
diff -r adc8466df404 -r 753f1380d6bc app/views/issues/_list.rhtml
--- a/app/views/issues/_list.rhtml Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/issues/_list.rhtml Mon Jun 06 14:41:04 2011 +0100
@@ -20,6 +20,7 @@
<% previous_group = group %>
@@ -27,7 +28,7 @@
<% end -%>
diff -r adc8466df404 -r 753f1380d6bc app/views/issues/_relations.rhtml
--- a/app/views/issues/_relations.rhtml Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/issues/_relations.rhtml Mon Jun 06 14:41:04 2011 +0100
@@ -1,5 +1,5 @@
-<% if authorize_for('issue_relations', 'new') %>
+<% if User.current.allowed_to?(:manage_issue_relations, @project) %>
<%= toggle_link l(:button_add), 'new-relation-form', {:focus => 'relation_issue_to_id'} %>
<% end %>
+
<% end %>
<% remote_form_for(:relation, @relation,
diff -r adc8466df404 -r 753f1380d6bc app/views/issues/bulk_edit.rhtml
--- a/app/views/issues/bulk_edit.rhtml Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/issues/bulk_edit.rhtml Mon Jun 06 14:41:04 2011 +0100
@@ -48,13 +48,21 @@
<% end %>
<% @custom_fields.each do |custom_field| %>
- <%= h(custom_field.name) %> <%= custom_field_tag_for_bulk_edit('issue', custom_field) %>
+ <%= h(custom_field.name) %> <%= custom_field_tag_for_bulk_edit('issue', custom_field, @projects) %>
<% end %>
<%= call_hook(:view_issues_bulk_edit_details_bottom, { :issues => @issues }) %>
+<% if @project && User.current.allowed_to?(:manage_subtasks, @project) %>
+
+ <%= l(:field_parent_issue) %>
+ <%= text_field_tag 'issue[parent_issue_id]', '', :size => 10 %>
+
+
+<%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:project_id => @project) }')" %>
+<% end %>
<%= l(:field_start_date) %>
<%= text_field_tag 'issue[start_date]', '', :size => 10 %><%= calendar_for('issue_start_date') %>
diff -r adc8466df404 -r 753f1380d6bc app/views/issues/edit.rhtml
--- a/app/views/issues/edit.rhtml Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/issues/edit.rhtml Mon Jun 06 14:41:04 2011 +0100
@@ -1,3 +1,6 @@
<%=h "#{@issue.tracker.name} ##{@issue.id}" %>
<%= render :partial => 'edit' %>
+<% content_for :header_tags do %>
+ <%= robot_exclusion_tag %>
+<% end %>
diff -r adc8466df404 -r 753f1380d6bc app/views/issues/index.rhtml
--- a/app/views/issues/index.rhtml Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/issues/index.rhtml Mon Jun 06 14:41:04 2011 +0100
@@ -8,8 +8,8 @@
<%= @query.new_record? ? l(:label_issue_plural) : h(@query.name) %>
<% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
-<% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %>
- <%= hidden_field_tag('project_id', @project.to_param) if @project %>
+<% form_tag({ :controller => 'issues', :action => 'index', :project_id => @project }, :method => :get, :id => 'query_form') do %>
+ <%= hidden_field_tag 'set_filter', '1' %>
">
<%= l(:label_filter_plural) %>
@@ -35,22 +35,10 @@
- <%= link_to_remote l(:button_apply),
- { :url => { :set_filter => 1 },
- :before => 'selectAllOptions("selected_columns");',
- :update => "content",
- :complete => "apply_filters_observer()",
- :with => "Form.serialize('query_form')"
- }, :class => 'icon icon-checked' %>
-
- <%= link_to_remote l(:button_clear),
- { :url => { :set_filter => 1, :project_id => @project },
- :method => :get,
- :update => "content",
- }, :class => 'icon icon-reload' %>
-
+ <%= link_to_function l(:button_apply), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
+ <%= link_to l(:button_clear), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload' %>
<% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
- <%= link_to l(:button_save), {}, :onclick => "selectAllOptions('selected_columns'); $('query_form').submit(); return false;", :class => 'icon icon-save' %>
+ <%= link_to_function l(:button_save), "$('query_form').action='#{ url_for :controller => 'queries', :action => 'new', :project_id => @project }'; submit_query_form('query_form')", :class => 'icon icon-save' %>
<% end %>
<% end %>
@@ -65,9 +53,9 @@
<% end %>
<% other_formats_links do |f| %>
- <%= f.link_to 'Atom', :url => { :project_id => @project, :query_id => (@query.new_record? ? nil : @query), :key => User.current.rss_key } %>
- <%= f.link_to 'CSV', :url => { :project_id => @project } %>
- <%= f.link_to 'PDF', :url => { :project_id => @project } %>
+ <%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
+ <%= f.link_to 'CSV', :url => params %>
+ <%= f.link_to 'PDF', :url => params %>
<% end %>
<% end %>
diff -r adc8466df404 -r 753f1380d6bc app/views/issues/new.rhtml
--- a/app/views/issues/new.rhtml Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/issues/new.rhtml Mon Jun 06 14:41:04 2011 +0100
@@ -23,4 +23,5 @@
<% content_for :header_tags do %>
<%= stylesheet_link_tag 'scm' %>
+ <%= robot_exclusion_tag %>
<% end %>
diff -r adc8466df404 -r 753f1380d6bc app/views/issues/show.rhtml
--- a/app/views/issues/show.rhtml Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/issues/show.rhtml Mon Jun 06 14:41:04 2011 +0100
@@ -1,6 +1,6 @@
<%= render :partial => 'action_menu' %>
-
<%= @issue.tracker.name %> #<%= @issue.id %>
+
<%= issue_heading(@issue) %>
<%= avatar(@issue.author, :size => "50") %>
@@ -73,7 +73,7 @@
<% end %>
-<% if authorize_for('issue_relations', 'new') || @issue.relations.present? %>
+<% if @relations.present? || User.current.allowed_to?(:manage_issue_relations, @project) %>
<%= render :partial => 'relations' %>
@@ -98,7 +98,7 @@
-<%= render :partial => 'action_menu', :locals => {:replace_watcher => 'watcher2' } %>
+<%= render :partial => 'action_menu' %>
<% if authorize_for('issues', 'edit') %>
diff -r adc8466df404 -r 753f1380d6bc app/views/journals/.svn/all-wcprops
--- a/app/views/journals/.svn/all-wcprops Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/journals/.svn/all-wcprops Mon Jun 06 14:41:04 2011 +0100
@@ -1,35 +1,5 @@
-K 25
-svn:wc:ra_dav:version-url
-V 43
-/svn/!svn/ver/4954/trunk/app/views/journals
-END
-_notes_form.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 61
-/svn/!svn/ver/2924/trunk/app/views/journals/_notes_form.rhtml
-END
-update.rjs
-K 25
-svn:wc:ra_dav:version-url
-V 54
-/svn/!svn/ver/3596/trunk/app/views/journals/update.rjs
-END
-edit.rjs
-K 25
-svn:wc:ra_dav:version-url
-V 52
-/svn/!svn/ver/1105/trunk/app/views/journals/edit.rjs
-END
-diff.html.erb
K 25
svn:wc:ra_dav:version-url
V 57
-/svn/!svn/ver/4954/trunk/app/views/journals/diff.html.erb
+/svn/!svn/ver/5878/branches/1.2-stable/app/views/journals
END
-index.rxml
-K 25
-svn:wc:ra_dav:version-url
-V 54
-/svn/!svn/ver/4034/trunk/app/views/journals/index.rxml
-END
diff -r adc8466df404 -r 753f1380d6bc app/views/journals/.svn/entries
--- a/app/views/journals/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/journals/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,14 +1,14 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/app/views/journals
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/app/views/journals
http://redmine.rubyforge.org/svn
-2011-02-27T13:34:41.060565Z
-4954
+2011-03-28T21:45:30.892324Z
+5246
jplang
@@ -32,10 +32,10 @@
-2011-03-03T11:05:10.000000Z
-fb8a5b1bfdbadbbaaa17ce7fc1dfcf3c
-2009-10-11T10:36:11.599175Z
-2924
+2011-06-06T13:18:33.000000Z
+6f96a31cd9e465b7b9324190b604aac1
+2011-03-28T21:45:30.892324Z
+5246
jplang
has-props
@@ -58,7 +58,7 @@
-656
+1304
update.rjs
file
@@ -66,7 +66,7 @@
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
269ec86216a5d0340e02940f1b190d51
2010-03-17T04:13:05.342620Z
3596
@@ -100,7 +100,7 @@
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
ce552c52f7c423630412d0593cc1ee61
2008-02-02T10:50:31.694950Z
1105
@@ -134,7 +134,7 @@
-2011-03-03T11:40:18.000000Z
+2011-06-06T13:14:59.000000Z
073352211ae7cecb9e1ff5ea1ce17150
2011-02-27T13:34:41.060565Z
4954
@@ -168,7 +168,7 @@
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
ef7f777c9318cee52e909377c4f96e8b
2010-08-23T15:04:36.844654Z
4034
diff -r adc8466df404 -r 753f1380d6bc app/views/journals/.svn/text-base/_notes_form.rhtml.svn-base
--- a/app/views/journals/.svn/text-base/_notes_form.rhtml.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/journals/.svn/text-base/_notes_form.rhtml.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -1,8 +1,21 @@
<% form_remote_tag(:url => {}, :html => { :id => "journal-#{@journal.id}-form" }) do %>
- <%= text_area_tag :notes, @journal.notes, :class => 'wiki-edit',
- :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %>
+ <%= text_area_tag :notes, @journal.notes,
+ :id => "journal_#{@journal.id}_notes",
+ :class => 'wiki-edit',
+ :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %>
<%= call_hook(:view_journals_notes_form_after_notes, { :journal => @journal}) %>
<%= submit_tag l(:button_save) %>
+ <%= link_to_remote l(:label_preview),
+ { :url => preview_issue_path(:project_id => @project, :id => @journal.issue),
+ :method => 'post',
+ :update => "journal_#{@journal.id}_preview",
+ :with => "Form.serialize('journal-#{@journal.id}-form')",
+ :complete => "Element.scrollTo('journal_#{@journal.id}_preview')"
+ }, :accesskey => accesskey(:preview) %>
+ |
<%= link_to l(:button_cancel), '#', :onclick => "Element.remove('journal-#{@journal.id}-form'); " +
"Element.show('journal-#{@journal.id}-notes'); return false;" %>
+
+
<% end %>
+<%= wikitoolbar_for "journal_#{@journal.id}_notes" %>
diff -r adc8466df404 -r 753f1380d6bc app/views/journals/_notes_form.rhtml
--- a/app/views/journals/_notes_form.rhtml Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/journals/_notes_form.rhtml Mon Jun 06 14:41:04 2011 +0100
@@ -1,8 +1,21 @@
<% form_remote_tag(:url => {}, :html => { :id => "journal-#{@journal.id}-form" }) do %>
- <%= text_area_tag :notes, @journal.notes, :class => 'wiki-edit',
- :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %>
+ <%= text_area_tag :notes, @journal.notes,
+ :id => "journal_#{@journal.id}_notes",
+ :class => 'wiki-edit',
+ :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %>
<%= call_hook(:view_journals_notes_form_after_notes, { :journal => @journal}) %>
<%= submit_tag l(:button_save) %>
+ <%= link_to_remote l(:label_preview),
+ { :url => preview_issue_path(:project_id => @project, :id => @journal.issue),
+ :method => 'post',
+ :update => "journal_#{@journal.id}_preview",
+ :with => "Form.serialize('journal-#{@journal.id}-form')",
+ :complete => "Element.scrollTo('journal_#{@journal.id}_preview')"
+ }, :accesskey => accesskey(:preview) %>
+ |
<%= link_to l(:button_cancel), '#', :onclick => "Element.remove('journal-#{@journal.id}-form'); " +
"Element.show('journal-#{@journal.id}-notes'); return false;" %>
+
+
<% end %>
+<%= wikitoolbar_for "journal_#{@journal.id}_notes" %>
diff -r adc8466df404 -r 753f1380d6bc app/views/layouts/.svn/all-wcprops
--- a/app/views/layouts/.svn/all-wcprops Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/layouts/.svn/all-wcprops Mon Jun 06 14:41:04 2011 +0100
@@ -1,29 +1,5 @@
K 25
svn:wc:ra_dav:version-url
-V 42
-/svn/!svn/ver/4965/trunk/app/views/layouts
+V 56
+/svn/!svn/ver/5878/branches/1.2-stable/app/views/layouts
END
-base.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 53
-/svn/!svn/ver/4965/trunk/app/views/layouts/base.rhtml
-END
-mailer.text.plain.erb
-K 25
-svn:wc:ra_dav:version-url
-V 64
-/svn/!svn/ver/4362/trunk/app/views/layouts/mailer.text.plain.erb
-END
-mailer.text.html.erb
-K 25
-svn:wc:ra_dav:version-url
-V 63
-/svn/!svn/ver/4362/trunk/app/views/layouts/mailer.text.html.erb
-END
-admin.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 54
-/svn/!svn/ver/3176/trunk/app/views/layouts/admin.rhtml
-END
diff -r adc8466df404 -r 753f1380d6bc app/views/layouts/.svn/entries
--- a/app/views/layouts/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/layouts/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,14 +1,14 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/app/views/layouts
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/app/views/layouts
http://redmine.rubyforge.org/svn
-2011-02-28T16:44:02.921792Z
-4965
+2011-03-28T19:59:35.933790Z
+5239
jplang
@@ -32,10 +32,10 @@
-2011-03-03T11:40:18.000000Z
-be984c02903b5fdba04df41a14c73242
-2011-02-28T16:44:02.921792Z
-4965
+2011-06-06T13:18:33.000000Z
+b4bb84ecaf9a28dd92d63bc219ca26e0
+2011-03-28T19:59:35.933790Z
+5239
jplang
has-props
@@ -58,7 +58,7 @@
-2912
+3029
mailer.text.plain.erb
file
@@ -66,7 +66,7 @@
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
490231bbc42932a0f9e1735a94d06260
2010-11-02T19:00:36.834304Z
4362
@@ -100,7 +100,7 @@
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
5073a425d4e7896c725996f9cf35f74b
2010-11-02T19:00:36.834304Z
4362
@@ -134,7 +134,7 @@
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
cc6ca08e56314fb510561e8eeb4ede46
2009-12-17T18:21:02.630202Z
3176
diff -r adc8466df404 -r 753f1380d6bc app/views/layouts/.svn/text-base/base.rhtml.svn-base
--- a/app/views/layouts/.svn/text-base/base.rhtml.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/layouts/.svn/text-base/base.rhtml.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -5,12 +5,12 @@
<%=h html_title %>
+<%= csrf_meta_tag %>
<%= favicon %>
<%= stylesheet_link_tag 'application', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= heads_for_theme %>
-<%= heads_for_wiki_formatter %>
+
+
<%=l(:label_information_plural)%>
<%= f.text_field :login, :required => true, :size => 25 %>
<%= f.text_field :firstname, :required => true %>
@@ -19,8 +22,8 @@
<%= call_hook(:view_users_form, :user => @user, :form => f) %>
+
<%=l(:label_authentication)%>
-
<%=l(:label_authentication)%>
<% unless @auth_sources.empty? %>
<%= f.select :auth_source_id, ([[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] }), {}, :onchange => "if (this.value=='') {Element.show('password_fields');} else {Element.hide('password_fields');}" %>
<% end %>
@@ -30,14 +33,19 @@
<%= f.password_field :password_confirmation, :required => true, :size => 25 %>
+
+
+
<%=l(:field_mail_notification)%>
-
<%=l(:field_mail_notification)%>
<%= render :partial => 'users/mail_notifications' %>
+
<%=l(:label_preferences)%>
-
<%=l(:label_preferences)%>
<%= render :partial => 'users/preferences' %>
+
+
diff -r adc8466df404 -r 753f1380d6bc app/views/users/.svn/text-base/index.rhtml.svn-base
--- a/app/views/users/.svn/text-base/index.rhtml.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/users/.svn/text-base/index.rhtml.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -8,9 +8,16 @@
<%= l(:label_filter_plural) %>
<%= l(:field_status) %>:
<%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;" %>
+
+<% if @groups.present? %>
+<%= l(:label_group) %>:
+<%= select_tag 'group_id', '<%= l(:label_user) %>:
<%= text_field_tag 'name', params[:name], :size => 30 %>
<%= submit_tag l(:button_apply), :class => "small", :name => nil %>
+<%= link_to l(:button_clear), users_path, :class => 'icon icon-reload' %>
diff -r adc8466df404 -r 753f1380d6bc app/views/users/index.rhtml
--- a/app/views/users/index.rhtml Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/users/index.rhtml Mon Jun 06 14:41:04 2011 +0100
@@ -8,9 +8,16 @@
<%= l(:label_filter_plural) %>
<%= l(:field_status) %>:
<%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;" %>
+
+<% if @groups.present? %>
+<%= l(:label_group) %>:
+<%= select_tag 'group_id', '<%= l(:label_user) %>:
<%= text_field_tag 'name', params[:name], :size => 30 %>
<%= submit_tag l(:button_apply), :class => "small", :name => nil %>
+<%= link_to l(:button_clear), users_path, :class => 'icon icon-reload' %>
<%= progress_bar((count[:closed].to_f / count[:total])*100,
diff -r adc8466df404 -r 753f1380d6bc app/views/versions/.svn/text-base/show.rhtml.svn-base
--- a/app/views/versions/.svn/text-base/show.rhtml.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/versions/.svn/text-base/show.rhtml.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -6,6 +6,10 @@
<%= h(@version.name) %>
+
+<%= render :partial => 'versions/overview', :locals => {:version => @version} %>
+<%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
+
<% if @version.estimated_hours > 0 || User.current.allowed_to?(:view_time_entries, @project) %>
<%= l(:label_time_tracking) %>
@@ -29,18 +33,19 @@
-<%= render :partial => 'versions/overview', :locals => {:version => @version} %>
-<%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
-
<% if @issues.present? %>
-
<%= l(:label_related_issues) %>
-
-<% @issues.each do |issue| -%>
- <%= link_to_issue(issue) %>
-<% end -%>
-
-
+<% form_tag({}) do -%>
+
+<% end %>
+<%= context_menu issues_context_menu_path %>
<% end %>
<%= progress_bar((count[:closed].to_f / count[:total])*100,
diff -r adc8466df404 -r 753f1380d6bc app/views/versions/show.rhtml
--- a/app/views/versions/show.rhtml Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/versions/show.rhtml Mon Jun 06 14:41:04 2011 +0100
@@ -6,6 +6,10 @@
<%= h(@version.name) %>
+
+<%= render :partial => 'versions/overview', :locals => {:version => @version} %>
+<%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
+
<% if @version.estimated_hours > 0 || User.current.allowed_to?(:view_time_entries, @project) %>
<%= l(:label_time_tracking) %>
@@ -29,18 +33,19 @@
-<%= render :partial => 'versions/overview', :locals => {:version => @version} %>
-<%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
-
<% if @issues.present? %>
-
<%= l(:label_related_issues) %>
-
-<% @issues.each do |issue| -%>
- <%= link_to_issue(issue) %>
-<% end -%>
-
-
+<% form_tag({}) do -%>
+
+<% end %>
+<%= context_menu issues_context_menu_path %>
<% end %>
<%= l(:label_no_data) %>
<% end %>
-<%= render_page_hierarchy(@pages_by_parent_id) %>
+<%= render_page_hierarchy(@pages_by_parent_id, nil, :timestamp => true) %>
<% content_for :sidebar do %>
<%= render :partial => 'sidebar' %>
@@ -16,11 +16,11 @@
<% unless @pages.empty? %>
<% other_formats_links do |f| %>
- <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'show', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
+ <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
<%= f.link_to('HTML', :url => {:action => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
<% end %>
<% end %>
<% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'show', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
+<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
<% end %>
diff -r adc8466df404 -r 753f1380d6bc app/views/wiki/date_index.html.erb
--- a/app/views/wiki/date_index.html.erb Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/wiki/date_index.html.erb Mon Jun 06 14:41:04 2011 +0100
@@ -23,11 +23,11 @@
<% unless @pages.empty? %>
<% other_formats_links do |f| %>
- <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'show', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
+ <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
<%= f.link_to('HTML', :url => {:action => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
<% end %>
<% end %>
<% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'show', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
+<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
<% end %>
diff -r adc8466df404 -r 753f1380d6bc app/views/wiki/edit.rhtml
--- a/app/views/wiki/edit.rhtml Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/wiki/edit.rhtml Mon Jun 06 14:41:04 2011 +0100
@@ -23,6 +23,7 @@
<% content_for :header_tags do %>
<%= stylesheet_link_tag 'scm' %>
+ <%= robot_exclusion_tag %>
<% end %>
<% html_title @page.pretty_title %>
diff -r adc8466df404 -r 753f1380d6bc app/views/wiki/index.html.erb
--- a/app/views/wiki/index.html.erb Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/wiki/index.html.erb Mon Jun 06 14:41:04 2011 +0100
@@ -8,7 +8,7 @@
<%= l(:label_no_data) %>
<% end %>
-<%= render_page_hierarchy(@pages_by_parent_id) %>
+<%= render_page_hierarchy(@pages_by_parent_id, nil, :timestamp => true) %>
<% content_for :sidebar do %>
<%= render :partial => 'sidebar' %>
@@ -16,11 +16,11 @@
<% unless @pages.empty? %>
<% other_formats_links do |f| %>
- <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'show', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
+ <%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :key => User.current.rss_key} %>
<%= f.link_to('HTML', :url => {:action => 'export'}) if User.current.allowed_to?(:export_wiki_pages, @project) %>
<% end %>
<% end %>
<% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'show', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
+<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
<% end %>
diff -r adc8466df404 -r 753f1380d6bc app/views/wikis/.svn/entries
--- a/app/views/wikis/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/wikis/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,8 +1,8 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/app/views/wikis
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/app/views/wikis
http://redmine.rubyforge.org/svn
@@ -32,7 +32,7 @@
-2011-03-03T11:05:11.000000Z
+2011-06-06T13:14:59.000000Z
6edeee3130b12027d4d8dbfeca809abb
2007-09-14T11:34:08.234701Z
725
diff -r adc8466df404 -r 753f1380d6bc app/views/workflows/.svn/all-wcprops
--- a/app/views/workflows/.svn/all-wcprops Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/workflows/.svn/all-wcprops Mon Jun 06 14:41:04 2011 +0100
@@ -1,35 +1,5 @@
K 25
svn:wc:ra_dav:version-url
-V 44
-/svn/!svn/ver/4895/trunk/app/views/workflows
+V 58
+/svn/!svn/ver/5878/branches/1.2-stable/app/views/workflows
END
-copy.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 55
-/svn/!svn/ver/3154/trunk/app/views/workflows/copy.rhtml
-END
-_action_menu.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 63
-/svn/!svn/ver/3154/trunk/app/views/workflows/_action_menu.rhtml
-END
-edit.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 55
-/svn/!svn/ver/4895/trunk/app/views/workflows/edit.rhtml
-END
-index.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 56
-/svn/!svn/ver/4890/trunk/app/views/workflows/index.rhtml
-END
-_form.html.erb
-K 25
-svn:wc:ra_dav:version-url
-V 59
-/svn/!svn/ver/4895/trunk/app/views/workflows/_form.html.erb
-END
diff -r adc8466df404 -r 753f1380d6bc app/views/workflows/.svn/entries
--- a/app/views/workflows/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/workflows/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,14 +1,14 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/app/views/workflows
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/app/views/workflows
http://redmine.rubyforge.org/svn
-2011-02-20T15:38:07.840581Z
-4895
+2011-03-30T16:56:52.761894Z
+5264
jplang
@@ -32,7 +32,7 @@
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
d7c2b6481788394f541fe6af5dadd598
2009-12-12T10:06:07.860865Z
3154
@@ -66,7 +66,7 @@
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
2457a85600aa051fcf9edf06010e6fcc
2009-12-12T10:06:07.860865Z
3154
@@ -100,10 +100,10 @@
-2011-03-03T11:40:18.000000Z
-f52bc187d855a23aea0bc36061a8d179
-2011-02-20T15:38:07.840581Z
-4895
+2011-06-06T13:18:33.000000Z
+3d867dc08990e317641df2e09eb711b8
+2011-03-30T16:56:52.761894Z
+5264
jplang
has-props
@@ -126,7 +126,7 @@
-2211
+2179
index.rhtml
file
@@ -134,7 +134,7 @@
-2011-03-03T11:40:18.000000Z
+2011-06-06T13:14:59.000000Z
0943677a780ac0d9c0ba1a7000148f13
2011-02-20T13:13:10.623157Z
4890
@@ -168,7 +168,7 @@
-2011-03-03T11:40:18.000000Z
+2011-06-06T13:14:59.000000Z
a2442c53d709a008d9026746d5f3cfd3
2011-02-20T15:38:07.840581Z
4895
diff -r adc8466df404 -r 753f1380d6bc app/views/workflows/.svn/text-base/edit.rhtml.svn-base
--- a/app/views/workflows/.svn/text-base/edit.rhtml.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/workflows/.svn/text-base/edit.rhtml.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -28,7 +28,7 @@
<%= render :partial => 'form', :locals => {:name => 'always', :workflows => @workflows['always']} %>
- Autorisations supplémentaires lorsque l'utilisateur a créé la demande
+ <%= l(:label_additional_workflow_transitions_for_author) %>
<%= render :partial => 'form', :locals => {:name => 'author', :workflows => @workflows['author']} %>
@@ -36,7 +36,7 @@
<%= javascript_tag "hideFieldset($('author_workflows'))" unless @workflows['author'].present? %>
- Autorisations supplémentaires lorsque la demande est assignée à l'utilisateur
+ <%= l(:label_additional_workflow_transitions_for_assignee) %>
<%= render :partial => 'form', :locals => {:name => 'assignee', :workflows => @workflows['assignee']} %>
diff -r adc8466df404 -r 753f1380d6bc app/views/workflows/edit.rhtml
--- a/app/views/workflows/edit.rhtml Thu Mar 03 15:08:45 2011 +0000
+++ b/app/views/workflows/edit.rhtml Mon Jun 06 14:41:04 2011 +0100
@@ -28,7 +28,7 @@
<%= render :partial => 'form', :locals => {:name => 'always', :workflows => @workflows['always']} %>
- Autorisations supplémentaires lorsque l'utilisateur a créé la demande
+ <%= l(:label_additional_workflow_transitions_for_author) %>
<%= render :partial => 'form', :locals => {:name => 'author', :workflows => @workflows['author']} %>
@@ -36,7 +36,7 @@
<%= javascript_tag "hideFieldset($('author_workflows'))" unless @workflows['author'].present? %>
- Autorisations supplémentaires lorsque la demande est assignée à l'utilisateur
+ <%= l(:label_additional_workflow_transitions_for_assignee) %>
<%= render :partial => 'form', :locals => {:name => 'assignee', :workflows => @workflows['assignee']} %>
diff -r adc8466df404 -r 753f1380d6bc config/.svn/all-wcprops
--- a/config/.svn/all-wcprops Thu Mar 03 15:08:45 2011 +0000
+++ b/config/.svn/all-wcprops Mon Jun 06 14:41:04 2011 +0100
@@ -1,47 +1,17 @@
K 25
svn:wc:ra_dav:version-url
-V 31
-/svn/!svn/ver/4955/trunk/config
-END
-settings.yml
-K 25
-svn:wc:ra_dav:version-url
-V 44
-/svn/!svn/ver/4513/trunk/config/settings.yml
-END
-configuration.yml.example
-K 25
-svn:wc:ra_dav:version-url
-V 57
-/svn/!svn/ver/4950/trunk/config/configuration.yml.example
+V 45
+/svn/!svn/ver/5998/branches/1.2-stable/config
END
routes.rb
K 25
svn:wc:ra_dav:version-url
-V 41
-/svn/!svn/ver/4729/trunk/config/routes.rb
-END
-boot.rb
-K 25
-svn:wc:ra_dav:version-url
-V 39
-/svn/!svn/ver/4516/trunk/config/boot.rb
+V 55
+/svn/!svn/ver/5878/branches/1.2-stable/config/routes.rb
END
environment.rb
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4904/trunk/config/environment.rb
+V 60
+/svn/!svn/ver/5878/branches/1.2-stable/config/environment.rb
END
-additional_environment.rb.example
-K 25
-svn:wc:ra_dav:version-url
-V 65
-/svn/!svn/ver/3018/trunk/config/additional_environment.rb.example
-END
-database.yml.example
-K 25
-svn:wc:ra_dav:version-url
-V 52
-/svn/!svn/ver/4753/trunk/config/database.yml.example
-END
diff -r adc8466df404 -r 753f1380d6bc config/.svn/entries
--- a/config/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/config/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,15 +1,15 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/config
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/config
http://redmine.rubyforge.org/svn
-2011-02-27T13:43:18.863191Z
-4955
-jplang
+2011-06-02T08:26:02.080563Z
+5998
+tmaruyama
has-props
@@ -32,7 +32,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:14:59.000000Z
0f6fe2db3317d8b40af42a6d534da87e
2010-12-15T21:18:06.237327Z
4513
@@ -66,7 +66,7 @@
-2011-03-03T11:40:18.000000Z
+2011-06-06T13:14:59.000000Z
69243d1b5b9b111da631c7034d51ba71
2011-02-26T13:09:25.657748Z
4950
@@ -103,11 +103,11 @@
-2011-03-03T11:05:14.000000Z
-b03599e0dc8d0a6b03c3173864eb57bd
-2011-01-16T15:23:11.666065Z
-4729
-jplang
+2011-06-06T13:20:53.000000Z
+f1eebe0f75a51707ede6d40175e2f15c
+2011-04-04T11:53:29.801553Z
+5313
+tmaruyama
has-props
@@ -129,7 +129,7 @@
-14402
+15093
boot.rb
file
@@ -137,7 +137,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:14:59.000000Z
2969e2a7b5ab1b2a014b5f0c94bac872
2010-12-17T08:34:29.830642Z
4516
@@ -174,10 +174,10 @@
-2011-03-03T11:40:18.000000Z
-cc9c7d7f9a4bd800d2c4a8737147e4c3
-2011-02-21T11:02:18.659691Z
-4904
+2011-06-06T13:20:53.000000Z
+e67b4e0a2d4ca847d47fa960eeb2a55d
+2011-03-04T14:32:58.878627Z
+5003
jplang
has-props
@@ -200,7 +200,7 @@
-2553
+2572
environments
dir
@@ -211,7 +211,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:14:59.000000Z
6b63489cdd262e653712af1aa96cd390
2009-11-08T02:16:42.659918Z
3018
@@ -245,7 +245,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:14:59.000000Z
f33e1e1bf73ba5d10ef3a6f170da3088
2011-01-23T10:25:48.265995Z
4753
diff -r adc8466df404 -r 753f1380d6bc config/.svn/text-base/environment.rb.svn-base
--- a/config/.svn/text-base/environment.rb.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/config/.svn/text-base/environment.rb.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -36,7 +36,7 @@
# Activate observers that should always be running
# config.active_record.observers = :cacher, :garbage_collector
- config.active_record.observers = :message_observer, :issue_observer, :journal_observer, :news_observer, :document_observer, :wiki_content_observer
+ config.active_record.observers = :message_observer, :issue_observer, :journal_observer, :news_observer, :document_observer, :wiki_content_observer, :comment_observer
# Make Active Record use UTC-base instead of local time
# config.active_record.default_timezone = :utc
diff -r adc8466df404 -r 753f1380d6bc config/.svn/text-base/routes.rb.svn-base
--- a/config/.svn/text-base/routes.rb.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/config/.svn/text-base/routes.rb.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -14,13 +14,21 @@
map.connect 'roles/workflow/:id/:role_id/:tracker_id', :controller => 'roles', :action => 'workflow'
map.connect 'help/:ctrl/:page', :controller => 'help'
- map.connect 'projects/:project_id/time_entries/report', :controller => 'time_entry_reports', :action => 'report'
map.with_options :controller => 'time_entry_reports', :action => 'report',:conditions => {:method => :get} do |time_report|
+ time_report.connect 'projects/:project_id/issues/:issue_id/time_entries/report'
+ time_report.connect 'projects/:project_id/issues/:issue_id/time_entries/report.:format'
+ time_report.connect 'projects/:project_id/time_entries/report'
+ time_report.connect 'projects/:project_id/time_entries/report.:format'
time_report.connect 'time_entries/report'
time_report.connect 'time_entries/report.:format'
- time_report.connect 'projects/:project_id/time_entries/report.:format'
end
+ map.bulk_edit_time_entry 'time_entries/bulk_edit',
+ :controller => 'timelog', :action => 'bulk_edit', :conditions => { :method => :get }
+ map.bulk_update_time_entry 'time_entries/bulk_edit',
+ :controller => 'timelog', :action => 'bulk_update', :conditions => { :method => :post }
+ map.time_entries_context_menu '/time_entries/context_menu',
+ :controller => 'context_menus', :action => 'time_entries'
# TODO: wasteful since this is also nested under issues, projects, and projects/issues
map.resources :time_entries, :controller => 'timelog'
@@ -80,10 +88,16 @@
map.quoted_issue '/issues/:id/quoted', :controller => 'journals', :action => 'new', :id => /\d+/, :conditions => { :method => :post }
map.connect '/issues/:id/destroy', :controller => 'issues', :action => 'destroy', :conditions => { :method => :post } # legacy
- map.resource :gantt, :path_prefix => '/issues', :controller => 'gantts', :only => [:show, :update]
- map.resource :gantt, :path_prefix => '/projects/:project_id/issues', :controller => 'gantts', :only => [:show, :update]
- map.resource :calendar, :path_prefix => '/issues', :controller => 'calendars', :only => [:show, :update]
- map.resource :calendar, :path_prefix => '/projects/:project_id/issues', :controller => 'calendars', :only => [:show, :update]
+ map.with_options :controller => 'gantts', :action => 'show' do |gantts_routes|
+ gantts_routes.connect '/projects/:project_id/issues/gantt'
+ gantts_routes.connect '/projects/:project_id/issues/gantt.:format'
+ gantts_routes.connect '/issues/gantt.:format'
+ end
+
+ map.with_options :controller => 'calendars', :action => 'show' do |calendars_routes|
+ calendars_routes.connect '/projects/:project_id/issues/calendar'
+ calendars_routes.connect '/issues/calendar'
+ end
map.with_options :controller => 'reports', :conditions => {:method => :get} do |reports|
reports.connect 'projects/:id/issues/report', :action => 'issue_report'
@@ -215,6 +229,7 @@
map.resources :groups
#left old routes at the bottom for backwards compat
+ map.connect 'projects/:project_id/queries/:action', :controller => 'queries'
map.connect 'projects/:project_id/issues/:action', :controller => 'issues'
map.connect 'projects/:project_id/documents/:action', :controller => 'documents'
map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards'
diff -r adc8466df404 -r 753f1380d6bc config/environment.rb
--- a/config/environment.rb Thu Mar 03 15:08:45 2011 +0000
+++ b/config/environment.rb Mon Jun 06 14:41:04 2011 +0100
@@ -36,7 +36,7 @@
# Activate observers that should always be running
# config.active_record.observers = :cacher, :garbage_collector
- config.active_record.observers = :message_observer, :issue_observer, :journal_observer, :news_observer, :document_observer, :wiki_content_observer
+ config.active_record.observers = :message_observer, :issue_observer, :journal_observer, :news_observer, :document_observer, :wiki_content_observer, :comment_observer
# Make Active Record use UTC-base instead of local time
# config.active_record.default_timezone = :utc
diff -r adc8466df404 -r 753f1380d6bc config/environments/.svn/entries
--- a/config/environments/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/config/environments/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,8 +1,8 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/config/environments
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/config/environments
http://redmine.rubyforge.org/svn
@@ -32,7 +32,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:14:59.000000Z
08b25fdea5e3e041116340c3c3090b18
2010-11-14T15:14:19.280754Z
4405
@@ -66,7 +66,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:14:59.000000Z
02eadf22aa59353271c702e4865138b1
2007-12-10T17:58:07.273873Z
975
@@ -100,7 +100,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:14:59.000000Z
213279c73e8c922d0a9d43f3c1cc6943
2010-02-08T18:53:07.634937Z
3397
@@ -134,7 +134,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:14:59.000000Z
d08152d4dda4608f254785b23840140a
2007-09-27T22:30:57.196220Z
772
@@ -168,7 +168,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:14:59.000000Z
213279c73e8c922d0a9d43f3c1cc6943
2010-02-08T18:53:07.634937Z
3397
@@ -202,7 +202,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:14:59.000000Z
17a6fbb168f3951191541f0f5a554454
2010-09-26T16:54:38.112012Z
4182
diff -r adc8466df404 -r 753f1380d6bc config/initializers/.svn/entries
--- a/config/initializers/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/config/initializers/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,8 +1,8 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/config/initializers
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/config/initializers
http://redmine.rubyforge.org/svn
@@ -32,7 +32,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:14:59.000000Z
acc71445fc1c65ebe6fdeba695fea714
2009-09-20T14:06:57.257282Z
2895
@@ -66,7 +66,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:14:59.000000Z
45627c8ad9bafcee93e6ce01b92b57d1
2011-01-10T18:25:12.105765Z
4679
@@ -100,7 +100,7 @@
-2011-03-03T11:40:18.000000Z
+2011-06-06T13:14:59.000000Z
17f5c9eadec957cb8fb2b6d1f07b61ae
2011-02-21T11:02:18.659691Z
4904
@@ -134,7 +134,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:14:59.000000Z
ca8db2f40b067cb8615263fa5a238517
2009-09-20T14:06:57.257282Z
2895
@@ -168,7 +168,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:14:59.000000Z
0005ed7b233f71646e0f75b9994cf219
2008-09-10T18:26:13.133776Z
1797
@@ -202,7 +202,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:14:59.000000Z
a7948d8e86bcd799c74945fe91b4a8b1
2009-09-20T14:06:57.257282Z
2895
diff -r adc8466df404 -r 753f1380d6bc config/locales/.svn/all-wcprops
--- a/config/locales/.svn/all-wcprops Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/.svn/all-wcprops Mon Jun 06 14:41:04 2011 +0100
@@ -1,269 +1,269 @@
K 25
svn:wc:ra_dav:version-url
-V 39
-/svn/!svn/ver/4955/trunk/config/locales
+V 53
+/svn/!svn/ver/5998/branches/1.2-stable/config/locales
END
lt.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/lt.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/lt.yml
END
sr-YU.yml
K 25
svn:wc:ra_dav:version-url
-V 49
-/svn/!svn/ver/4955/trunk/config/locales/sr-YU.yml
+V 63
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/sr-YU.yml
END
ro.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/ro.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/ro.yml
END
lv.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/lv.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/lv.yml
END
zh.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/zh.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/zh.yml
END
pt.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/pt.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/pt.yml
END
ca.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/ca.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/ca.yml
END
pt-BR.yml
K 25
svn:wc:ra_dav:version-url
-V 49
-/svn/!svn/ver/4955/trunk/config/locales/pt-BR.yml
+V 63
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/pt-BR.yml
END
tr.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/tr.yml
+V 60
+/svn/!svn/ver/5998/branches/1.2-stable/config/locales/tr.yml
END
ru.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/ru.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/ru.yml
END
en-GB.yml
K 25
svn:wc:ra_dav:version-url
-V 49
-/svn/!svn/ver/4955/trunk/config/locales/en-GB.yml
+V 63
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/en-GB.yml
END
id.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/id.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/id.yml
END
el.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/el.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/el.yml
END
en.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4954/trunk/config/locales/en.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/en.yml
END
gl.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/gl.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/gl.yml
END
cs.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/cs.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/cs.yml
+END
+es.yml
+K 25
+svn:wc:ra_dav:version-url
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/es.yml
END
mk.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/mk.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/mk.yml
END
-es.yml
+zh-TW.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/es.yml
+V 63
+/svn/!svn/ver/5971/branches/1.2-stable/config/locales/zh-TW.yml
+END
+eu.yml
+K 25
+svn:wc:ra_dav:version-url
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/eu.yml
END
ko.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/ko.yml
-END
-eu.yml
-K 25
-svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/eu.yml
-END
-zh-TW.yml
-K 25
-svn:wc:ra_dav:version-url
-V 49
-/svn/!svn/ver/4955/trunk/config/locales/zh-TW.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/ko.yml
END
mn.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/mn.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/mn.yml
END
it.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/it.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/it.yml
END
sk.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/sk.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/sk.yml
END
sl.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/sl.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/sl.yml
END
uk.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/uk.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/uk.yml
+END
+sr.yml
+K 25
+svn:wc:ra_dav:version-url
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/sr.yml
END
da.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/da.yml
-END
-sr.yml
-K 25
-svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/sr.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/da.yml
END
fa.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/fa.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/fa.yml
+END
+de.yml
+K 25
+svn:wc:ra_dav:version-url
+V 60
+/svn/!svn/ver/5987/branches/1.2-stable/config/locales/de.yml
+END
+bg.yml
+K 25
+svn:wc:ra_dav:version-url
+V 60
+/svn/!svn/ver/5963/branches/1.2-stable/config/locales/bg.yml
END
sv.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/sv.yml
-END
-bg.yml
-K 25
-svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/bg.yml
-END
-de.yml
-K 25
-svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/de.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/sv.yml
END
ja.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/ja.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/ja.yml
END
he.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/he.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/he.yml
END
fi.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/fi.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/fi.yml
END
bs.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/bs.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/bs.yml
END
fr.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4954/trunk/config/locales/fr.yml
+V 60
+/svn/!svn/ver/5966/branches/1.2-stable/config/locales/fr.yml
END
nl.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/nl.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/nl.yml
END
hr.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/hr.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/hr.yml
END
pl.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/pl.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/pl.yml
END
th.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/th.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/th.yml
END
no.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/no.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/no.yml
END
hu.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/hu.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/hu.yml
END
vi.yml
K 25
svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/4955/trunk/config/locales/vi.yml
+V 60
+/svn/!svn/ver/5961/branches/1.2-stable/config/locales/vi.yml
END
diff -r adc8466df404 -r 753f1380d6bc config/locales/.svn/entries
--- a/config/locales/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,15 +1,15 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/config/locales
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/config/locales
http://redmine.rubyforge.org/svn
-2011-02-27T13:43:18.863191Z
-4955
-jplang
+2011-06-02T08:26:02.080563Z
+5998
+tmaruyama
@@ -32,10 +32,10 @@
-2011-03-03T11:40:18.000000Z
-3542e97eeeee34df7a3d6d64a4ce0407
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+5e7b7f486912e5d0f86ef826213fdba6
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -58,7 +58,7 @@
-44029
+46015
sr-YU.yml
file
@@ -66,33 +66,33 @@
-2011-03-03T11:40:18.000000Z
-b05d928becf91c52a78271c93715bb1b
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+48ebc431f92eb9909461b86595623d53
+2011-05-29T12:06:05.086159Z
+5961
jplang
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-42299
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+43343
ro.yml
file
@@ -100,10 +100,10 @@
-2011-03-03T11:40:18.000000Z
-dd9fb4aae0fa69165e4f4e1100c3fa26
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+c89831e13c892860c203da66ef7cde39
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -126,7 +126,7 @@
-40417
+42401
lv.yml
file
@@ -134,33 +134,33 @@
-2011-03-03T11:40:18.000000Z
-12f9b4e9c849923a86334f56fbb65f1a
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+dd21f6353eda45c24f513402301a86ae
+2011-05-29T12:06:05.086159Z
+5961
jplang
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-42305
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+43354
zh.yml
file
@@ -168,10 +168,10 @@
-2011-03-03T11:40:18.000000Z
-dde46f425abed5caa3d8d3afe9049fb7
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+7a72ffc7de1ff3a52e782463729ddbc7
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -194,7 +194,7 @@
-38303
+40191
pt.yml
file
@@ -202,10 +202,10 @@
-2011-03-03T11:40:18.000000Z
-017dbb90319bfa26bab5a45296b337b3
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+ec11cbc0584c8ac119cfc6c29081f56f
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -228,7 +228,7 @@
-41777
+43934
ca.yml
file
@@ -236,10 +236,10 @@
-2011-03-03T11:40:18.000000Z
-55d3137cb8850d53bce7337a8a0cf720
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+a3707360ad2b2de97d4ed95701a94356
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -262,7 +262,7 @@
-42226
+44212
pt-BR.yml
file
@@ -270,10 +270,10 @@
-2011-03-03T11:40:18.000000Z
-0714d61f3439e9e8058f26487eae91b2
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+b49afa84dd5f8734f8002419fe90d051
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -296,7 +296,7 @@
-41661
+43759
tr.yml
file
@@ -304,11 +304,11 @@
-2011-03-03T11:40:18.000000Z
-5bc442cb54c4373e1aeea7dd56e30bd0
-2011-02-27T13:43:18.863191Z
-4955
-jplang
+2011-06-06T13:20:53.000000Z
+7bb800f58917300c44761e96f4d5032f
+2011-06-02T08:26:02.080563Z
+5998
+tmaruyama
has-props
@@ -330,7 +330,7 @@
-40295
+43367
ru.yml
file
@@ -338,10 +338,10 @@
-2011-03-03T11:40:18.000000Z
-6a3741281160ebb7f27f6d2bb03499c8
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+4ea5a627a00e7c1a8eda2636477032c0
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -364,7 +364,7 @@
-62124
+65360
en-GB.yml
file
@@ -372,33 +372,33 @@
-2011-03-03T11:40:18.000000Z
-831604fd1ce5d6f72e64688ce6f62581
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+f78e8de5b513009213f9c69fc66247c0
+2011-05-29T12:06:05.086159Z
+5961
jplang
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-39685
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+40744
id.yml
file
@@ -406,10 +406,10 @@
-2011-03-03T11:40:18.000000Z
-eb45d7f2bc3d3e7fd8ab01db1a3041a4
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+9d2d1e06b1b49d66819cc25def6eaa12
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -432,7 +432,7 @@
-40037
+42018
el.yml
file
@@ -440,10 +440,10 @@
-2011-03-03T11:40:18.000000Z
-98b4f21cce1a0242221eecb23f5fc727
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+a3900a53db9dd482bca160bc630f12d3
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -466,7 +466,7 @@
-55145
+57131
en.yml
file
@@ -474,10 +474,10 @@
-2011-03-03T11:40:18.000000Z
-4265d626f893cc08f2142d0a254e2ac7
-2011-02-27T13:34:41.060565Z
-4954
+2011-06-06T13:20:53.000000Z
+2c7af38389b9234860de6bb7fe1f1803
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -500,7 +500,7 @@
-38787
+40720
gl.yml
file
@@ -508,10 +508,10 @@
-2011-03-03T11:40:18.000000Z
-03aa773b8d01d5bc421b8896fc9c861b
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+1246246f8c76fcfd296387509aa5b2cd
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -534,7 +534,7 @@
-40895
+42875
cs.yml
file
@@ -542,10 +542,10 @@
-2011-03-03T11:40:18.000000Z
-85ac61a4067ad6dda83d43acbf874cf6
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+ecf7a07f4da1d9b7941892d52f8636e8
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -568,7 +568,7 @@
-41752
+43747
mk.yml
file
@@ -576,33 +576,33 @@
-2011-03-03T11:40:18.000000Z
-626a66d6d98190418f4a4fd43077734f
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+3b5cb975840d7ff4a5f669be5607b37d
+2011-05-29T12:06:05.086159Z
+5961
jplang
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-49418
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+50462
es.yml
file
@@ -610,10 +610,10 @@
-2011-03-03T11:40:18.000000Z
-6ef7d2fb0af3cce0f6afbdea3ff9ab17
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+702907e64c5219e59b0343b0f9be2532
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -636,7 +636,7 @@
-43670
+45659
ko.yml
file
@@ -644,10 +644,10 @@
-2011-03-03T11:40:18.000000Z
-1ff250f0b17ecb9465add49dfcf9bb91
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+905023ea1e51638dc8be8ae0649a48ca
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -670,7 +670,7 @@
-44501
+46485
eu.yml
file
@@ -678,33 +678,33 @@
-2011-03-03T11:40:18.000000Z
-b3ba93d14600b4b992e65fbd243759ae
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+c03eeee6ca05c7f7301960370e6f0e7c
+2011-05-29T12:06:05.086159Z
+5961
jplang
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-42568
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+43750
zh-TW.yml
file
@@ -712,11 +712,11 @@
-2011-03-03T11:40:18.000000Z
-f4c6a612b84e5087ed4d023414dab628
-2011-02-27T13:43:18.863191Z
-4955
-jplang
+2011-06-06T13:20:53.000000Z
+6e15c0de02a38cd855ec6ec008799a2e
+2011-05-31T03:48:27.658498Z
+5971
+tmaruyama
has-props
@@ -738,7 +738,7 @@
-42608
+44611
mn.yml
file
@@ -746,33 +746,33 @@
-2011-03-03T11:40:18.000000Z
-b9e2987cb3cbaab826c7388d09b74f75
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+d125d8a5d37d483faa77d2dab780d4b9
+2011-05-29T12:06:05.086159Z
+5961
jplang
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-54082
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+55125
it.yml
file
@@ -780,10 +780,10 @@
-2011-03-03T11:40:18.000000Z
-f80f107e4d9318b8a8cea65b2e13d579
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+85dcefefac13070b7aa284c6bf6c8787
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -806,7 +806,7 @@
-41436
+43417
sk.yml
file
@@ -814,10 +814,10 @@
-2011-03-03T11:40:18.000000Z
-e7901c1e26424f863f96dd86164419c2
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+5d12e8694bbdc394e64f118e56e6ee2d
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -840,7 +840,7 @@
-41687
+43673
sl.yml
file
@@ -848,10 +848,10 @@
-2011-03-03T11:40:18.000000Z
-808c04baadb112b6be492be9dc78ef89
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+e2c9983529b81f1cb0f75f921f5ed40a
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -874,7 +874,7 @@
-39863
+41849
uk.yml
file
@@ -882,10 +882,10 @@
-2011-03-03T11:40:18.000000Z
-430d26c543f2d9d31ffe77c9ef3eb4f8
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+f55dca5aa01e0404de280fbdafe0e79c
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -908,7 +908,7 @@
-47441
+49427
da.yml
file
@@ -916,10 +916,10 @@
-2011-03-03T11:40:18.000000Z
-a7ae693463d0d34fb5fd212ccbda0aff
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+5e1975c634cd0435fac3d988ae0c56ec
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -942,7 +942,7 @@
-39983
+41978
sr.yml
file
@@ -950,10 +950,10 @@
-2011-03-03T11:40:18.000000Z
-adf2619297b8e142957c327c6a76c786
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+fab2e1c089f2d129ba1ef8ac29de2930
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -976,7 +976,7 @@
-54555
+56541
fa.yml
file
@@ -984,10 +984,10 @@
-2011-03-03T11:40:18.000000Z
-6f585dcad4e6b03d987ea0f5e7d7e91f
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+dc9aa9dc1c76e148671ab6d121ff3b89
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -1010,7 +1010,7 @@
-51085
+53601
bg.yml
file
@@ -1018,11 +1018,11 @@
-2011-03-03T11:40:18.000000Z
-e0df426fe104bb05be553a362f46610b
-2011-02-27T13:43:18.863191Z
-4955
-jplang
+2011-06-06T13:20:53.000000Z
+9a059cba7f432b990cef9cfd84a6c2c2
+2011-05-29T14:54:06.800463Z
+5963
+tmaruyama
has-props
@@ -1044,7 +1044,7 @@
-54718
+57818
de.yml
file
@@ -1052,11 +1052,11 @@
-2011-03-03T11:40:18.000000Z
-80e835963312388a9077a8f27452d429
-2011-02-27T13:43:18.863191Z
-4955
-jplang
+2011-06-06T13:20:53.000000Z
+69079d50061a1719565236cdf639960e
+2011-06-01T08:09:23.285027Z
+5987
+tmaruyama
has-props
@@ -1078,7 +1078,7 @@
-42574
+44841
sv.yml
file
@@ -1086,10 +1086,10 @@
-2011-03-03T11:40:18.000000Z
-59f72f202281205f1ed729183db2a402
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+5466cb2f059c427e478b892659b04824
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -1112,7 +1112,7 @@
-42180
+44295
ja.yml
file
@@ -1120,10 +1120,10 @@
-2011-03-03T11:40:18.000000Z
-03fac78c16fdf9c77069f24fec7b2796
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+d6e75928ee638a76ad5120697fee360b
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -1146,7 +1146,7 @@
-46191
+48520
he.yml
file
@@ -1154,10 +1154,10 @@
-2011-03-03T11:40:18.000000Z
-03045c9539de31b255a14c9207fb8eaa
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+87a07cb160ea8fcd984e5ef254454861
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -1180,7 +1180,7 @@
-45433
+47411
fi.yml
file
@@ -1188,10 +1188,10 @@
-2011-03-03T11:40:18.000000Z
-18dd7ae78913bad4b75e0d5f16068290
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+6f7134b22b56cdb1713c7a3dbf38b742
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -1214,7 +1214,7 @@
-40941
+42923
bs.yml
file
@@ -1222,10 +1222,10 @@
-2011-03-03T11:40:18.000000Z
-0fdc9e453941e547e3b40fee917fcf02
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+46ab17e98f32862b0526430b9337c764
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -1248,7 +1248,7 @@
-40878
+42866
fr.yml
file
@@ -1256,10 +1256,10 @@
-2011-03-03T11:40:18.000000Z
-95995431647aa0e13c850df4250a57d0
-2011-02-27T13:34:41.060565Z
-4954
+2011-06-06T13:20:53.000000Z
+89004e3fd348f579a5119c4f19054774
+2011-05-30T16:40:17.424028Z
+5966
jplang
has-props
@@ -1282,7 +1282,7 @@
-43081
+45156
nl.yml
file
@@ -1290,10 +1290,10 @@
-2011-03-03T11:40:18.000000Z
-06358d3f035a3fcc20cde865e7295023
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+1ca85bc2a1fabda051687f7bbb97db90
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -1316,7 +1316,7 @@
-40433
+42618
hr.yml
file
@@ -1324,10 +1324,10 @@
-2011-03-03T11:40:18.000000Z
-3fbb52f4fa0ba97dfd179ad0c8e020c3
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+89ef8a359d83eaeebfc88f637be23163
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -1350,7 +1350,7 @@
-40541
+42529
pl.yml
file
@@ -1358,10 +1358,10 @@
-2011-03-03T11:40:18.000000Z
-afca79760eefe54e70833751f3d9b0bb
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+d44215277c85a0010b522b5d87f1ef9a
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -1384,7 +1384,7 @@
-42836
+44826
th.yml
file
@@ -1392,10 +1392,10 @@
-2011-03-03T11:40:18.000000Z
-e9737687144c1c4fd63eacb68f2682f1
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+54b9b765101bb126998397790b5d189a
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -1418,7 +1418,7 @@
-53301
+55287
no.yml
file
@@ -1426,10 +1426,10 @@
-2011-03-03T11:40:18.000000Z
-8fff009aa1fe3602b8b4dff6210f8497
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+56c04554c393102c0d5d7142609a52eb
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -1452,7 +1452,7 @@
-38744
+40727
hu.yml
file
@@ -1460,10 +1460,10 @@
-2011-03-03T11:40:18.000000Z
-5c2041121ebd0cd3bcf252d54e21786b
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+91dbf51d0aebef5b2518ef387d0bd131
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -1486,7 +1486,7 @@
-43268
+45718
vi.yml
file
@@ -1494,10 +1494,10 @@
-2011-03-03T11:40:18.000000Z
-37a28f575513649d20833ce31e5fce23
-2011-02-27T13:43:18.863191Z
-4955
+2011-06-06T13:20:53.000000Z
+287ab5f3b5571371f14ad0ee81fc534a
+2011-05-29T12:06:05.086159Z
+5961
jplang
has-props
@@ -1520,5 +1520,5 @@
-43836
+45820
diff -r adc8466df404 -r 753f1380d6bc config/locales/.svn/text-base/bg.yml.svn-base
--- a/config/locales/.svn/text-base/bg.yml.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/.svn/text-base/bg.yml.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -17,7 +17,10 @@
month_names: [~, Януари, Февруари, Март, Април, Май, Юни, Юли, Август, Септември, Октомври, Ноември, Декември]
abbr_month_names: [~, Яну, Фев, Мар, Апр, Май, Юни, Юли, Авг, Сеп, Окт, Ное, Дек]
# Used in date_select and datime_select.
- order: [ :year, :month, :day ]
+ order:
+ - :year
+ - :month
+ - :day
time:
formats:
@@ -268,7 +271,7 @@
field_attr_mail: Атрибут Email
field_onthefly: Динамично създаване на потребител
field_start_date: Начална дата
- field_done_ratio: % Прогрес
+ field_done_ratio: "% Прогрес"
field_auth_source: Начин на оторизация
field_hide_mail: Скрий e-mail адреса ми
field_comments: Коментар
@@ -304,7 +307,15 @@
field_text: Текстово поле
field_visible: Видим
field_warn_on_leaving_unsaved: Предупреди ме, когато напускам страница с незаписано съдържание
-
+ field_issues_visibility: Видимост на задачите
+ field_is_private: Лична
+ field_commit_logs_encoding: Кодова таблица на съобщенията при поверяване
+ field_scm_path_encoding: Кодова таблица на пътищата (path)
+ field_path_to_repository: Път до хранилището
+ field_root_directory: Коренна директория (папка)
+ field_cvsroot: CVSROOT
+ field_cvs_module: Модул
+
setting_app_title: Заглавие
setting_app_subtitle: Описание
setting_welcome_text: Допълнителен текст
@@ -331,7 +342,6 @@
setting_cross_project_issue_relations: Релации на задачи между проекти
setting_issue_list_default_columns: Показвани колони по подразбиране
setting_repositories_encodings: Кодови таблици
- setting_commit_logs_encoding: Кодова таблица на съобщенията при поверяване
setting_emails_header: Emails header
setting_emails_footer: Подтекст за e-mail
setting_protocol: Протокол
@@ -376,7 +386,9 @@
permission_add_issues: Добавяне на задачи
permission_edit_issues: Редактиране на задачи
permission_manage_issue_relations: Управление на връзките между задачите
- permission_add_issue_notes: Добаване на бележки
+ permission_set_own_issues_private: Установяване на собствените задачи публични или лични
+ permission_set_issues_private: Установяване на задачите публични или лични
+ permission_add_issue_notes: Добавяне на бележки
permission_edit_issue_notes: Редактиране на бележки
permission_edit_own_issue_notes: Редактиране на собствени бележки
permission_move_issues: Преместване на задачи
@@ -451,6 +463,9 @@
label_issues_by: "Задачи по %{value}"
label_issue_added: Добавена задача
label_issue_updated: Обновена задача
+ label_issue_note_added: Добавена бележка
+ label_issue_status_updated: Обновено състояние
+ label_issue_priority_updated: Обновен приоритет
label_document: Документ
label_document_new: Нов документ
label_document_plural: Документи
@@ -459,6 +474,8 @@
label_role_plural: Роли
label_role_new: Нова роля
label_role_and_permissions: Роли и права
+ label_role_anonymous: Анонимен
+ label_role_non_member: Не член
label_member: Член
label_member_new: Нов член
label_member_plural: Членове
@@ -537,6 +554,7 @@
label_news_latest: Последни новини
label_news_view_all: Виж всички
label_news_added: Добавена новина
+ label_news_comment_added: Добавен коментар към новина
label_settings: Настройки
label_overview: Общ изглед
label_version: Версия
@@ -733,7 +751,8 @@
label_changeset_plural: Ревизии
label_default_columns: По подразбиране
label_no_change_option: (Без промяна)
- label_bulk_edit_selected_issues: Редактиране на задачи
+ label_bulk_edit_selected_issues: Групово редактиране на задачи
+ label_bulk_edit_selected_time_entries: Групово редактиране на записи за използвано време
label_theme: Тема
label_default: По подразбиране
label_search_titles_only: Само в заглавията
@@ -795,12 +814,20 @@
label_project_copy_notifications: Изпращане на Send e-mail известия по време на копирането на проекта
label_principal_search: "Търсене на потребител или група:"
label_user_search: "Търсене на потребител:"
+ label_additional_workflow_transitions_for_author: Позволени са допълнителни преходи, когато потребителят е авторът
+ label_additional_workflow_transitions_for_assignee: Позволени са допълнителни преходи, когато потребителят е назначеният към задачата
+ label_issues_visibility_all: Всички задачи
+ label_issues_visibility_public: Всички не-лични задачи
+ label_issues_visibility_own: Задачи, създадени от или назначени на потребителя
+ label_git_report_last_commit: Извеждане на последното поверяване за файлове и папки
button_login: Вход
button_submit: Прикачване
button_save: Запис
button_check_all: Избор на всички
button_uncheck_all: Изчистване на всички
+ button_collapse_all: Скриване всички
+ button_expand_all: Разгъване всички
button_delete: Изтриване
button_create: Създаване
button_create_and_continue: Създаване и продължаване
@@ -860,6 +887,7 @@
text_are_you_sure: Сигурни ли сте?
text_are_you_sure_with_children: Изтриване на задачата и нейните подзадачи?
text_journal_changed: "%{label} променен от %{old} на %{new}"
+ text_journal_changed_no_detail: "%{label} променен"
text_journal_set_to: "%{label} установен на %{value}"
text_journal_deleted: "%{label} изтрит (%{old})"
text_journal_added: "Добавено %{label} %{value}"
@@ -887,6 +915,8 @@
text_status_changed_by_changeset: "Приложено с ревизия %{value}."
text_time_logged_by_changeset: Приложено в ревизия %{value}.
text_issues_destroy_confirmation: 'Сигурни ли сте, че искате да изтриете избраните задачи?'
+ text_issues_destroy_descendants_confirmation: Тази операция ще премахне и %{count} подзадача(и).
+ text_time_entries_destroy_confirmation: Сигурен ли сте, че изтриете избраните записи за изразходвано време?
text_select_project_modules: 'Изберете активните модули за този проект:'
text_default_administrator_account_changed: Сменен фабричния администраторски профил
text_file_repository_writable: Възможност за писане в хранилището с файлове
@@ -911,6 +941,13 @@
text_zoom_in: Увеличаване
text_zoom_out: Намаляване
text_warn_on_leaving_unsaved: Страницата съдържа незаписано съдържание, което може да бъде загубено, ако я напуснете.
+ text_scm_path_encoding_note: "По подразбиране: UTF-8"
+ text_git_repository_note: Празно и локално хранилище (например /gitrepo, c:\gitrepo)
+ text_mercurial_repository_note: Локално хранилище (например /hgrepo, c:\hgrepo)
+ text_scm_command: SCM команда
+ text_scm_command_version: Версия
+ text_scm_config: Можете да конфигурирате SCM командите в config/configuration.yml. За да активирате промените, рестартирайте Redmine.
+ text_scm_command_not_available: SCM командата не е налична или достъпна. Проверете конфигурацията в административния панел.
default_role_manager: Мениджър
default_role_developer: Разработчик
@@ -938,5 +975,3 @@
enumeration_doc_categories: Категории документи
enumeration_activities: Дейности (time tracking)
enumeration_system_activity: Системна активност
-
- text_journal_changed_no_detail: "%{label} updated"
diff -r adc8466df404 -r 753f1380d6bc config/locales/.svn/text-base/bs.yml.svn-base
--- a/config/locales/.svn/text-base/bs.yml.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/.svn/text-base/bs.yml.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -15,7 +15,10 @@
month_names: [~, Januar, Februar, Mart, April, Maj, Jun, Jul, Avgust, Septembar, Oktobar, Novembar, Decembar]
abbr_month_names: [~, Jan, Feb, Mar, Apr, Maj, Jun, Jul, Avg, Sep, Okt, Nov, Dec]
- order: [ :day, :month, :year ]
+ order:
+ - :day
+ - :month
+ - :year
time:
formats:
@@ -145,8 +148,8 @@
general_lang_name: 'Bosanski'
general_csv_separator: ','
general_csv_decimal_separator: '.'
- general_csv_encoding: utf8
- general_pdf_encoding: utf8
+ general_csv_encoding: UTF-8
+ general_pdf_encoding: UTF-8
general_first_day_of_week: '7'
notice_account_activated: Vaš nalog je aktiviran. Možete se prijaviti.
@@ -257,7 +260,7 @@
field_attr_mail: Atribut za email
field_onthefly: 'Kreiranje korisnika "On-the-fly"'
field_start_date: Početak
- field_done_ratio: % Realizovano
+ field_done_ratio: "% Realizovano"
field_auth_source: Mod za authentifikaciju
field_hide_mail: Sakrij moju email adresu
field_comments: Komentar
@@ -312,7 +315,6 @@
setting_cross_project_issue_relations: Omogući relacije između aktivnosti na različitim projektima
setting_issue_list_default_columns: Podrazumjevane koleone za prikaz na listi aktivnosti
setting_repositories_encodings: Enkodiranje repozitorija
- setting_commit_logs_encoding: 'Enkodiranje "commit" poruka'
setting_emails_footer: Potpis na email-ovima
setting_protocol: Protokol
setting_per_page_options: Broj objekata po stranici
@@ -954,3 +956,37 @@
text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
label_my_queries: My custom queries
text_journal_changed_no_detail: "%{label} updated"
+ label_news_comment_added: Comment added to a news
+ button_expand_all: Expand all
+ button_collapse_all: Collapse all
+ label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
+ label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
+ label_bulk_edit_selected_time_entries: Bulk edit selected time entries
+ text_time_entries_destroy_confirmation: Are you sure you want to delete the selected time entr(y/ies)?
+ label_role_anonymous: Anonymous
+ label_role_non_member: Non member
+ label_issue_note_added: Note added
+ label_issue_status_updated: Status updated
+ label_issue_priority_updated: Priority updated
+ label_issues_visibility_own: Issues created by or assigned to the user
+ field_issues_visibility: Issues visibility
+ label_issues_visibility_all: All issues
+ permission_set_own_issues_private: Set own issues public or private
+ field_is_private: Private
+ permission_set_issues_private: Set issues public or private
+ label_issues_visibility_public: All non private issues
+ text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
+ field_commit_logs_encoding: 'Enkodiranje "commit" poruka'
+ field_scm_path_encoding: Path encoding
+ text_scm_path_encoding_note: "Default: UTF-8"
+ field_path_to_repository: Path to repository
+ field_root_directory: Root directory
+ field_cvs_module: Module
+ field_cvsroot: CVSROOT
+ text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
+ text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
+ text_scm_command: Command
+ text_scm_command_version: Version
+ label_git_report_last_commit: Report last commit for files and directories
+ text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+ text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
diff -r adc8466df404 -r 753f1380d6bc config/locales/.svn/text-base/ca.yml.svn-base
--- a/config/locales/.svn/text-base/ca.yml.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/.svn/text-base/ca.yml.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -20,7 +20,10 @@
month_names: [~, Gener, Febrer, Març, Abril, Maig, Juny, Juliol, Agost, Setembre, Octubre, Novembre, Desembre]
abbr_month_names: [~, Gen, Feb, Mar, Abr, Mai, Jun, Jul, Ago, Set, Oct, Nov, Des]
# Used in date_select and datime_select.
- order: [ :year, :month, :day ]
+ order:
+ - :year
+ - :month
+ - :day
time:
formats:
@@ -138,7 +141,7 @@
general_csv_separator: ';'
general_csv_decimal_separator: ','
general_csv_encoding: ISO-8859-15
- general_pdf_encoding: ISO-8859-15
+ general_pdf_encoding: UTF-8
general_first_day_of_week: '1'
notice_account_updated: "El compte s'ha actualitzat correctament."
@@ -161,7 +164,7 @@
notice_email_error: "S'ha produït un error en enviar el correu (%{value})"
notice_feeds_access_key_reseted: "S'ha reiniciat la clau d'accés del RSS."
notice_api_access_key_reseted: "S'ha reiniciat la clau d'accés a l'API."
- notice_failed_to_save_issues: "No s'han pogut desar %s assumptes de %{count} seleccionats: %{ids}."
+ notice_failed_to_save_issues: "No s'han pogut desar %{count} assumptes de %{total} seleccionats: %{ids}."
notice_failed_to_save_members: "No s'han pogut desar els membres: %{errors}."
notice_no_issue_selected: "No s'ha seleccionat cap assumpte. Activeu els assumptes que voleu editar."
notice_account_pending: "S'ha creat el compte i ara està pendent de l'aprovació de l'administrador."
@@ -269,7 +272,7 @@
field_attr_mail: Atribut del correu electrònic
field_onthefly: "Creació de l'usuari «al vol»"
field_start_date: Inici
- field_done_ratio: % realitzat
+ field_done_ratio: "% realitzat"
field_auth_source: "Mode d'autenticació"
field_hide_mail: "Oculta l'adreça de correu electrònic"
field_comments: Comentari
@@ -327,7 +330,6 @@
setting_cross_project_issue_relations: "Permet les relacions d'assumptes entre projectes"
setting_issue_list_default_columns: "Columnes mostrades per defecte en la llista d'assumptes"
setting_repositories_encodings: Codificacions del dipòsit
- setting_commit_logs_encoding: Codificació dels missatges publicats
setting_emails_footer: Peu dels correus electrònics
setting_protocol: Protocol
setting_per_page_options: Opcions dels objectes per pàgina
@@ -943,3 +945,37 @@
text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
label_my_queries: My custom queries
text_journal_changed_no_detail: "%{label} updated"
+ label_news_comment_added: Comment added to a news
+ button_expand_all: Expand all
+ button_collapse_all: Collapse all
+ label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
+ label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
+ label_bulk_edit_selected_time_entries: Bulk edit selected time entries
+ text_time_entries_destroy_confirmation: Are you sure you want to delete the selected time entr(y/ies)?
+ label_role_anonymous: Anonymous
+ label_role_non_member: Non member
+ label_issue_note_added: Note added
+ label_issue_status_updated: Status updated
+ label_issue_priority_updated: Priority updated
+ label_issues_visibility_own: Issues created by or assigned to the user
+ field_issues_visibility: Issues visibility
+ label_issues_visibility_all: All issues
+ permission_set_own_issues_private: Set own issues public or private
+ field_is_private: Private
+ permission_set_issues_private: Set issues public or private
+ label_issues_visibility_public: All non private issues
+ text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
+ field_commit_logs_encoding: Codificació dels missatges publicats
+ field_scm_path_encoding: Path encoding
+ text_scm_path_encoding_note: "Default: UTF-8"
+ field_path_to_repository: Path to repository
+ field_root_directory: Root directory
+ field_cvs_module: Module
+ field_cvsroot: CVSROOT
+ text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
+ text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
+ text_scm_command: Command
+ text_scm_command_version: Version
+ label_git_report_last_commit: Report last commit for files and directories
+ text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+ text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
diff -r adc8466df404 -r 753f1380d6bc config/locales/.svn/text-base/cs.yml.svn-base
--- a/config/locales/.svn/text-base/cs.yml.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/.svn/text-base/cs.yml.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -21,7 +21,10 @@
month_names: [~, Leden, Únor, Březen, Duben, Květen, Červen, Červenec, Srpen, Září, Říjen, Listopad, Prosinec]
abbr_month_names: [~, Led, Úno, Bře, Dub, Kvě, Čer, Čec, Srp, Zář, Říj, Lis, Pro]
# Used in date_select and datime_select.
- order: [ :year, :month, :day ]
+ order:
+ - :year
+ - :month
+ - :day
time:
formats:
@@ -272,7 +275,7 @@
field_attr_mail: Email (atribut)
field_onthefly: Automatické vytváření uživatelů
field_start_date: Začátek
- field_done_ratio: % Hotovo
+ field_done_ratio: "% Hotovo"
field_auth_source: Autentifikační mód
field_hide_mail: Nezobrazovat můj email
field_comments: Komentář
@@ -334,7 +337,6 @@
setting_cross_project_issue_relations: Povolit vazby úkolů napříč projekty
setting_issue_list_default_columns: Výchozí sloupce zobrazené v seznamu úkolů
setting_repositories_encodings: Kódování
- setting_commit_logs_encoding: Kódování zpráv při commitu
setting_emails_header: Hlavička emailů
setting_emails_footer: Patička emailů
setting_protocol: Protokol
@@ -349,7 +351,7 @@
setting_sequential_project_identifiers: Generovat sekvenční identifikátory projektů
setting_gravatar_enabled: Použít uživatelské ikony Gravatar
setting_gravatar_default: Výchozí Gravatar
- setting_diff_max_lines_displayed: Maximální počet zobrazenách řádků rozdílů
+ setting_diff_max_lines_displayed: Maximální počet zobrazených řádků rozdílů
setting_file_max_size_displayed: Maximální velikost textových souborů zobrazených přímo na stránce
setting_repository_log_display_limit: Maximální počet revizí zobrazených v logu souboru
setting_openid: Umožnit přihlašování a registrace s OpenID
@@ -840,7 +842,7 @@
button_update: Aktualizovat
button_configure: Konfigurovat
button_quote: Citovat
- button_duplicate: Duplikát
+ button_duplicate: Duplikovat
button_show: Zobrazit
status_active: aktivní
@@ -901,7 +903,7 @@
text_user_wrote: "%{value} napsal:"
text_enumeration_destroy_question: "Několik (%{count}) objektů je přiřazeno k této hodnotě."
text_enumeration_category_reassign_to: 'Přeřadit je do této:'
- text_email_delivery_not_configured: "Doručování e-mailů není nastaveno a odesílání notifikací je zakázáno.\nNastavte Váš SMTP server v souboru config/email.yml a restartujte aplikaci."
+ text_email_delivery_not_configured: "Doručování e-mailů není nastaveno a odesílání notifikací je zakázáno.\nNastavte Váš SMTP server v souboru config/configuration.yml a restartujte aplikaci."
text_repository_usernames_mapping: "Vybrat nebo upravit mapování mezi Redmine uživateli a uživatelskými jmény nalezenými v logu repozitáře.\nUživatelé se shodným Redmine uživatelským jménem a uživatelským jménem v repozitáři jsou mapovaní automaticky."
text_diff_truncated: '... Rozdílový soubor je zkrácen, protože jeho délka přesahuje max. limit.'
text_custom_field_possible_values_info: 'Každá hodnota na novém řádku'
@@ -944,3 +946,37 @@
text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
label_my_queries: My custom queries
text_journal_changed_no_detail: "%{label} updated"
+ label_news_comment_added: Comment added to a news
+ button_expand_all: Expand all
+ button_collapse_all: Collapse all
+ label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
+ label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
+ label_bulk_edit_selected_time_entries: Bulk edit selected time entries
+ text_time_entries_destroy_confirmation: Are you sure you want to delete the selected time entr(y/ies)?
+ label_role_anonymous: Anonymous
+ label_role_non_member: Non member
+ label_issue_note_added: Note added
+ label_issue_status_updated: Status updated
+ label_issue_priority_updated: Priority updated
+ label_issues_visibility_own: Issues created by or assigned to the user
+ field_issues_visibility: Issues visibility
+ label_issues_visibility_all: All issues
+ permission_set_own_issues_private: Set own issues public or private
+ field_is_private: Private
+ permission_set_issues_private: Set issues public or private
+ label_issues_visibility_public: All non private issues
+ text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
+ field_commit_logs_encoding: Kódování zpráv při commitu
+ field_scm_path_encoding: Path encoding
+ text_scm_path_encoding_note: "Default: UTF-8"
+ field_path_to_repository: Path to repository
+ field_root_directory: Root directory
+ field_cvs_module: Module
+ field_cvsroot: CVSROOT
+ text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
+ text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
+ text_scm_command: Command
+ text_scm_command_version: Version
+ label_git_report_last_commit: Report last commit for files and directories
+ text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+ text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
diff -r adc8466df404 -r 753f1380d6bc config/locales/.svn/text-base/da.yml.svn-base
--- a/config/locales/.svn/text-base/da.yml.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/.svn/text-base/da.yml.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -14,7 +14,10 @@
abbr_day_names: [sø, ma, ti, 'on', to, fr, lø]
month_names: [~, januar, februar, marts, april, maj, juni, juli, august, september, oktober, november, december]
abbr_month_names: [~, jan, feb, mar, apr, maj, jun, jul, aug, sep, okt, nov, dec]
- order: [ :day, :month, :year ]
+ order:
+ - :day
+ - :month
+ - :year
time:
formats:
@@ -134,7 +137,7 @@
greater_than_start_date: "skal være senere end startdatoen"
not_same_project: "hører ikke til samme projekt"
circular_dependency: "Denne relation vil skabe et afhængighedsforhold"
- cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
+ cant_link_an_issue_with_a_descendant: "En sag kan ikke relateres til en af dens underopgaver"
template:
header:
@@ -151,7 +154,7 @@
general_lang_name: 'Danish (Dansk)'
general_csv_separator: ','
general_csv_encoding: ISO-8859-1
- general_pdf_encoding: ISO-8859-1
+ general_pdf_encoding: UTF-8
general_first_day_of_week: '1'
notice_account_updated: Kontoen er opdateret.
@@ -183,7 +186,7 @@
error_scm_command_failed: "En fejl opstod under forbindelsen til det valgte repository: %{value}"
mail_subject_lost_password: "Dit %{value} kodeord"
- mail_body_lost_password: 'For at ændre dit kodeord, klik på dette link:'
+ mail_body_lost_password: 'Klik på dette link for at ændre dit kodeord:'
mail_subject_register: "%{value} kontoaktivering"
mail_body_register: 'Klik på dette link for at aktivere din konto:'
mail_body_account_information_external: "Du kan bruge din %{value} konto til at logge ind."
@@ -227,7 +230,7 @@
field_due_date: Deadline
field_assigned_to: Tildelt til
field_priority: Prioritet
- field_fixed_version: Target version
+ field_fixed_version: Udgave
field_user: Bruger
field_role: Rolle
field_homepage: Hjemmeside
@@ -254,8 +257,8 @@
field_attr_lastname: Efternavn attribut
field_attr_mail: Email attribut
field_onthefly: løbende brugeroprettelse
- field_start_date: Start date
- field_done_ratio: % Færdig
+ field_start_date: Start dato
+ field_done_ratio: "% færdig"
field_auth_source: Sikkerhedsmetode
field_hide_mail: Skjul min email
field_comments: Kommentar
@@ -349,7 +352,7 @@
label_tracker_new: Ny type
label_workflow: Arbejdsgang
label_issue_status: Sagsstatus
- label_issue_status_plural: Sagsstatuser
+ label_issue_status_plural: Sagsstatusser
label_issue_status_new: Ny status
label_issue_category: Sagskategori
label_issue_category_plural: Sagskategorier
@@ -373,8 +376,8 @@
label_logout: Log ud
label_help: Hjælp
label_reported_issues: Rapporterede sager
- label_assigned_to_me_issues: Sager tildelt mig
- label_last_login: Sidste login tidspunkt
+ label_assigned_to_me_issues: Sager tildelt til mig
+ label_last_login: Sidste logintidspunkt
label_registered_on: Registreret den
label_activity: Aktivitet
label_new: Ny
@@ -489,7 +492,7 @@
label_date_range: Dato interval
label_less_than_ago: mindre end dage siden
label_more_than_ago: mere end dage siden
- label_ago: days siden
+ label_ago: dage siden
label_contains: indeholder
label_not_contains: ikke indeholder
label_day_plural: dage
@@ -500,7 +503,7 @@
label_modification_plural: "%{count} ændringer"
label_revision: Revision
label_revision_plural: Revisioner
- label_associated_revisions: Tilnyttede revisioner
+ label_associated_revisions: Tilknyttede revisioner
label_added: tilføjet
label_modified: ændret
label_deleted: slettet
@@ -530,7 +533,7 @@
label_preview: Forhåndsvisning
label_feed_plural: Feeds
label_changes_details: Detaljer for alle ændringer
- label_issue_tracking: Sags søgning
+ label_issue_tracking: Sagssøgning
label_spent_time: Anvendt tid
label_f_hour: "%{value} time"
label_f_hour_plural: "%{value} timer"
@@ -547,7 +550,7 @@
label_permissions_report: Godkendelsesrapport
label_watched_issues: Overvågede sager
label_related_issues: Relaterede sager
- label_applied_status: Anvendte statuser
+ label_applied_status: Anvendte statusser
label_loading: Indlæser...
label_relation_new: Ny relation
label_relation_delete: Slet relation
@@ -590,7 +593,7 @@
label_jump_to_a_project: Skift til projekt...
label_file_plural: Filer
label_changeset_plural: Ændringer
- label_default_columns: Standard kolonner
+ label_default_columns: Standardkolonner
label_no_change_option: (Ingen ændringer)
label_bulk_edit_selected_issues: Masse-ret de valgte sager
label_theme: Tema
@@ -678,20 +681,20 @@
text_issue_category_destroy_assignments: Slet tildelinger af kategori
text_issue_category_reassign_to: Tildel sager til denne kategori
text_user_mail_option: "For ikke-valgte projekter vil du kun modtage beskeder omhandlende ting du er involveret i eller overvåger (f.eks. sager du har indberettet eller ejer)."
- text_no_configuration_data: "Roller, typer, sagsstatuser og arbejdsgange er endnu ikke konfigureret.\nDet er anbefalet at indlæse standardopsætningen. Du vil kunne ændre denne når den er indlæst."
+ text_no_configuration_data: "Roller, typer, sagsstatusser og arbejdsgange er endnu ikke konfigureret.\nDet er anbefalet at indlæse standardopsætningen. Du vil kunne ændre denne når den er indlæst."
text_load_default_configuration: Indlæs standardopsætningen
text_status_changed_by_changeset: "Anvendt i ændring %{value}."
text_issues_destroy_confirmation: 'Er du sikker på du ønsker at slette den/de valgte sag(er)?'
text_select_project_modules: 'Vælg moduler er skal være aktiveret for dette projekt:'
- text_default_administrator_account_changed: Standard administratorkonto ændret
+ text_default_administrator_account_changed: Standardadministratorkonto ændret
text_file_repository_writable: Filarkiv er skrivbar
text_rmagick_available: RMagick tilgængelig (valgfri)
default_role_manager: Leder
default_role_developer: Udvikler
default_role_reporter: Rapportør
- default_tracker_bug: Bug
- default_tracker_feature: Feature
+ default_tracker_bug: Fejl
+ default_tracker_feature: Funktion
default_tracker_support: Support
default_issue_status_new: Ny
default_issue_status_in_progress: Igangværende
@@ -720,12 +723,12 @@
error_issue_not_found_in_project: 'Sagen blev ikke fundet eller tilhører ikke dette projekt'
text_assign_time_entries_to_project: Tildel raporterede timer til projektet
setting_display_subprojects_issues: Vis sager for underprojekter på hovedprojektet som standard
- label_optional_description: Optionel beskrivelse
+ label_optional_description: Valgfri beskrivelse
text_destroy_time_entries: Slet registrerede timer
field_comments_sorting: Vis kommentar
text_reassign_time_entries: 'Tildel registrerede timer til denne sag igen'
label_reverse_chronological_order: I omvendt kronologisk rækkefølge
- label_preferences: Preferences
+ label_preferences: Præferencer
label_overall_activity: Overordnet aktivitet
setting_default_projects_public: Nye projekter er offentlige som standard
error_scm_annotate: "Filen findes ikke, eller kunne ikke annoteres."
@@ -759,7 +762,7 @@
permission_add_issue_watchers: Tilføj overvågere
warning_attachments_not_saved: "der var %{count} fil(er), som ikke kunne gemmes."
permission_comment_news: Kommentér nyheder
- text_enumeration_category_reassign_to: 'FLyt dem til denne værdi:'
+ text_enumeration_category_reassign_to: 'Flyt dem til denne værdi:'
permission_select_project_modules: Vælg projektmoduler
permission_view_gantt: Se Gantt diagram
permission_delete_messages: Slet beskeder
@@ -786,9 +789,9 @@
label_and_its_subprojects: "%{value} og dets underprojekter"
permission_view_calendar: Se kalender
button_create_and_continue: Opret og fortsæt
- setting_gravatar_enabled: Anvend Gravatar bruger ikoner
+ setting_gravatar_enabled: Anvend Gravatar brugerikoner
label_updated_time_by: "Opdateret af %{author} for %{age} siden"
- text_diff_truncated: '... Listen over forskelle er bleve afkortet da den overstiger den maksimale størrelse der kan vises.'
+ text_diff_truncated: '... Listen over forskelle er blevet afkortet da den overstiger den maksimale størrelse der kan vises.'
text_user_wrote: "%{value} skrev:"
setting_mail_handler_api_enabled: Aktiver webservice for indkomne emails
permission_delete_issues: Slet sager
@@ -809,7 +812,6 @@
permission_edit_project: Redigér projekt
permission_save_queries: Gem forespørgsler
label_copied: kopieret
- setting_commit_logs_encoding: Kodning af Commit beskeder
text_repository_usernames_mapping: "Vælg eller opdatér de Redmine brugere der svarer til de enkelte brugere fundet i repository loggen.\nBrugere med samme brugernavn eller email adresse i både Redmine og det valgte repository bliver automatisk koblet sammen."
permission_edit_time_entries: Redigér tidsregistreringer
general_csv_decimal_separator: ','
@@ -847,7 +849,7 @@
label_tag: Tag
label_branch: Branch
error_no_tracker_in_project: Der er ingen sagshåndtering for dette projekt. Kontrollér venligst projektindstillingerne.
- error_no_default_issue_status: Der er ikek defineret en standardstatus. Kontrollér venligst indstillingernen (Gå til "Administration -> Sagsstatuser").
+ error_no_default_issue_status: Der er ikke defineret en standardstatus. Kontrollér venligst indstillingerne (gå til "Administration -> Sagsstatusser").
text_journal_changed: "%{label} ændret fra %{old} til %{new}"
text_journal_set_to: "%{label} sat til %{value}"
text_journal_deleted: "%{label} slettet (%{old})"
@@ -862,34 +864,34 @@
version_status_closed: lukket
version_status_locked: låst
version_status_open: åben
- error_can_not_reopen_issue_on_closed_version: En sag tildelt en lukket version, kan ikke genåbnes
+ error_can_not_reopen_issue_on_closed_version: En sag tildelt en lukket version kan ikke genåbnes
label_user_anonymous: Anonym
button_move_and_follow: Flyt og overvåg
setting_default_projects_modules: Standard moduler, aktiveret for nye projekter
setting_gravatar_default: Standard Gravatar billede
field_sharing: Delning
- label_version_sharing_hierarchy: Med projekt hierarki
+ label_version_sharing_hierarchy: Med projekthierarki
label_version_sharing_system: Med alle projekter
- label_version_sharing_descendants: Med under projekter
- label_version_sharing_tree: Med projekt træ
+ label_version_sharing_descendants: Med underprojekter
+ label_version_sharing_tree: Med projekttræ
label_version_sharing_none: Ikke delt
error_can_not_archive_project: Dette projekt kan ikke arkiveres
button_duplicate: Duplikér
button_copy_and_follow: Kopiér og overvåg
label_copy_source: Kilde
setting_issue_done_ratio: Beregn sagsløsning ratio
- setting_issue_done_ratio_issue_status: Benyt sags status
+ setting_issue_done_ratio_issue_status: Benyt sagsstatus
error_issue_done_ratios_not_updated: Sagsløsnings ratio, ikke opdateret.
- error_workflow_copy_target: Vælg venligst mål tracker og rolle(r)
- setting_issue_done_ratio_issue_field: Benyt sags felt
+ error_workflow_copy_target: Vælg venligst måltracker og rolle(r)
+ setting_issue_done_ratio_issue_field: Benyt sagsfelt
label_copy_same_as_target: Samme som mål
label_copy_target: Mål
- notice_issue_done_ratios_updated: Sagsløsnings ratio opdateret.
- error_workflow_copy_source: Vælg venligst en kilde tracker eller rolle
- label_update_issue_done_ratios: Opdater sagsløsnings ratio
+ notice_issue_done_ratios_updated: Sagsløsningsratio opdateret.
+ error_workflow_copy_source: Vælg venligst en kildetracker eller rolle
+ label_update_issue_done_ratios: Opdater sagsløsningsratio
setting_start_of_week: Start kalendre på
permission_view_issues: Vis sager
- label_display_used_statuses_only: Vis kun statuser der er benyttet af denne tracker
+ label_display_used_statuses_only: Vis kun statusser der er benyttet af denne tracker
label_revision_id: Revision %{value}
label_api_access_key: API nøgle
label_api_access_key_created_on: API nøgle genereret %{value} siden
@@ -911,12 +913,12 @@
label_board_locked: Låst
permission_export_wiki_pages: Eksporter wiki sider
setting_cache_formatted_text: Cache formatteret tekst
- permission_manage_project_activities: Administrer projekt aktiviteter
- error_unable_delete_issue_status: Det var ikke muligt at slette sags status
+ permission_manage_project_activities: Administrer projektaktiviteter
+ error_unable_delete_issue_status: Det var ikke muligt at slette sagsstatus
label_profile: Profil
- permission_manage_subtasks: Administrer under opgaver
- field_parent_issue: Hoved opgave
- label_subtask_plural: Under opgaver
+ permission_manage_subtasks: Administrer underopgaver
+ field_parent_issue: Hovedopgave
+ label_subtask_plural: Underopgaver
label_project_copy_notifications: Send email notifikationer, mens projektet kopieres
error_can_not_delete_custom_field: Kan ikke slette brugerdefineret felt
error_unable_to_connect: Kan ikke forbinde (%{value})
@@ -926,7 +928,7 @@
label_my_page_block: blok
notice_failed_to_save_members: "Fejl under lagring af medlem(mer): %{errors}."
text_zoom_out: Zoom ud
- text_zoom_in: Zoom in
+ text_zoom_in: Zoom ind
notice_unable_delete_time_entry: Kan ikke slette tidsregistrering.
label_overall_spent_time: Overordnet forbrug af tid
field_time_entries: Log tid
@@ -935,24 +937,59 @@
button_edit_associated_wikipage: "Redigér tilknyttet Wiki side: %{page_title}"
text_are_you_sure_with_children: Slet sag og alle undersager?
field_text: Tekstfelt
- label_user_mail_option_only_owner: Only for things I am the owner of
- setting_default_notification_option: Default notification option
- label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
- label_user_mail_option_only_assigned: Only for things I am assigned to
- label_user_mail_option_none: No events
- field_member_of_group: Medlem af Gruppe
- field_assigned_to_role: Medlem af Rolle
- notice_not_authorized_archived_project: The project you're trying to access has been archived.
- label_principal_search: "Search for user or group:"
- label_user_search: "Search for user:"
- field_visible: Visible
+ label_user_mail_option_only_owner: Kun for ting jeg er ejer af
+ setting_default_notification_option: Standardpåmindelsesmulighed
+ label_user_mail_option_only_my_events: Kun for ting jeg overvåger eller er involveret i
+ label_user_mail_option_only_assigned: Kun for ting jeg er tildelt
+ label_user_mail_option_none: Ingen hændelser
+ field_member_of_group: Medlem af gruppe
+ field_assigned_to_role: Medlem af rolle
+ notice_not_authorized_archived_project: Projektet du prøver at tilgå, er blevet arkiveret.
+ label_principal_search: "Søg efter bruger eller gruppe:"
+ label_user_search: "Søg efter bruger:"
+ field_visible: Synlig
setting_emails_header: Emails header
- setting_commit_logtime_activity_id: Activity for logged time
- text_time_logged_by_changeset: Applied in changeset %{value}.
- setting_commit_logtime_enabled: Enable time logging
- notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
- setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
+ setting_commit_logtime_activity_id: Aktivitet for registreret tid
+ text_time_logged_by_changeset: Anvendt i changeset %{value}.
+ setting_commit_logtime_enabled: Aktiver tidsregistrering
+ notice_gantt_chart_truncated: Kortet er blevet afkortet, fordi det overstiger det maksimale antal elementer, der kan vises (%{max})
+ setting_gantt_items_limit: Maksimalt antal af elementer der kan vises på gantt kortet
+
field_warn_on_leaving_unsaved: Warn me when leaving a page with unsaved text
text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
label_my_queries: My custom queries
text_journal_changed_no_detail: "%{label} updated"
+ label_news_comment_added: Comment added to a news
+ button_expand_all: Expand all
+ button_collapse_all: Collapse all
+ label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
+ label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
+ label_bulk_edit_selected_time_entries: Bulk edit selected time entries
+ text_time_entries_destroy_confirmation: Are you sure you want to delete the selected time entr(y/ies)?
+ label_role_anonymous: Anonymous
+ label_role_non_member: Non member
+ label_issue_note_added: Note added
+ label_issue_status_updated: Status updated
+ label_issue_priority_updated: Priority updated
+ label_issues_visibility_own: Issues created by or assigned to the user
+ field_issues_visibility: Issues visibility
+ label_issues_visibility_all: All issues
+ permission_set_own_issues_private: Set own issues public or private
+ field_is_private: Private
+ permission_set_issues_private: Set issues public or private
+ label_issues_visibility_public: All non private issues
+ text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
+ field_commit_logs_encoding: Kodning af Commit beskeder
+ field_scm_path_encoding: Path encoding
+ text_scm_path_encoding_note: "Default: UTF-8"
+ field_path_to_repository: Path to repository
+ field_root_directory: Root directory
+ field_cvs_module: Module
+ field_cvsroot: CVSROOT
+ text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
+ text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
+ text_scm_command: Command
+ text_scm_command_version: Version
+ label_git_report_last_commit: Report last commit for files and directories
+ text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+ text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
diff -r adc8466df404 -r 753f1380d6bc config/locales/.svn/text-base/de.yml.svn-base
--- a/config/locales/.svn/text-base/de.yml.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/.svn/text-base/de.yml.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -1,5 +1,6 @@
# German translations for Ruby on Rails
# by Clemens Kofler (clemens@railway.at)
+# additions for Redmine 1.2 by Jens Martsch (jmartsch@gmail.com)
de:
direction: ltr
@@ -19,7 +20,10 @@
month_names: [~, Januar, Februar, März, April, Mai, Juni, Juli, August, September, Oktober, November, Dezember]
abbr_month_names: [~, Jan, Feb, Mär, Apr, Mai, Jun, Jul, Aug, Sep, Okt, Nov, Dez]
# Used in date_select and datime_select.
- order: [:day, :month, :year]
+ order:
+ - :day
+ - :month
+ - :year
time:
formats:
@@ -152,7 +156,7 @@
general_csv_separator: ';'
general_csv_decimal_separator: ','
general_csv_encoding: ISO-8859-1
- general_pdf_encoding: ISO-8859-1
+ general_pdf_encoding: UTF-8
general_first_day_of_week: '1'
notice_account_updated: Konto wurde erfolgreich aktualisiert.
@@ -283,7 +287,7 @@
field_attr_mail: E-Mail-Attribut
field_onthefly: On-the-fly-Benutzererstellung
field_start_date: Beginn
- field_done_ratio: % erledigt
+ field_done_ratio: "% erledigt"
field_auth_source: Authentifizierungs-Modus
field_hide_mail: E-Mail-Adresse nicht anzeigen
field_comments: Kommentar
@@ -341,7 +345,6 @@
setting_cross_project_issue_relations: Ticket-Beziehungen zwischen Projekten erlauben
setting_issue_list_default_columns: Default-Spalten in der Ticket-Auflistung
setting_repositories_encodings: Kodierungen der Projektarchive
- setting_commit_logs_encoding: Kodierung der Commit-Log-Meldungen
setting_emails_footer: E-Mail-Fußzeile
setting_protocol: Protokoll
setting_per_page_options: Objekte pro Seite
@@ -947,13 +950,48 @@
field_member_of_group: Zuständigkeitsgruppe
field_assigned_to_role: Zuständigkeitsrolle
field_visible: Sichtbar
- setting_emails_header: Emailkopf
+ setting_emails_header: E-Mail Betreffzeile
setting_commit_logtime_activity_id: Aktivität für die Zeiterfassung
text_time_logged_by_changeset: Angewendet in Changeset %{value}.
setting_commit_logtime_enabled: Aktiviere Zeitlogging
notice_gantt_chart_truncated: Die Grafik ist unvollständig, da das Maximum der anzeigbaren Aufgaben überschritten wurde (%{max})
setting_gantt_items_limit: Maximale Anzahl von Aufgaben die im Gantt-Chart angezeigt werden.
- field_warn_on_leaving_unsaved: Warn me when leaving a page with unsaved text
- text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
- label_my_queries: My custom queries
- text_journal_changed_no_detail: "%{label} updated"
+ field_warn_on_leaving_unsaved: vor dem Verlassen einer Seite mit ungesichertem Text im Editor warnen
+ text_warn_on_leaving_unsaved: Die aktuellen Änderungen gehen verloren, wenn Sie diese Seite verlassen.
+ label_my_queries: Meine eigenen Abfragen
+ text_journal_changed_no_detail: "%{label} aktualisiert"
+ label_news_comment_added: Kommentar zu einer News hinzugefügt
+ button_expand_all: Alle ausklappen
+ button_collapse_all: Alle einklappen
+ label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
+ label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
+ label_bulk_edit_selected_time_entries: Ausgewählte Zeitaufwände bearbeiten
+ text_time_entries_destroy_confirmation: Sind Sie sicher, dass Sie die ausgewählten Zeitaufwände löschen möchten?
+ label_role_anonymous: Anonymous
+ label_role_non_member: Nichtmitglied
+ label_issue_note_added: Notiz hinzugefügt
+ label_issue_status_updated: Status aktualisiert
+ label_issue_priority_updated: Priorität aktualisiert
+ label_issues_visibility_own: Tickets die folgender User erstellt hat oder die ihm zugewiesen sind
+ field_issues_visibility: Ticket Sichtbarkeit
+ label_issues_visibility_all: Alle Tickets
+ permission_set_own_issues_private: Eigene Tickets privat oder öffentlich markieren
+ field_is_private: Privat
+ permission_set_issues_private: Tickets privat oder öffentlich markieren
+ label_issues_visibility_public: Alle nicht privaten Tickets
+ text_issues_destroy_descendants_confirmation: Dies wird auch %{count} Unteraufgabe/n löschen.
+ field_commit_logs_encoding: Kodierung der Commit-Log-Meldungen
+ field_scm_path_encoding: Pfad Kodierung
+ text_scm_path_encoding_note: "Standard: UTF-8"
+ field_path_to_repository: Pfad zum repository
+ field_root_directory: Wurzelverzeichnis
+ field_cvs_module: Modul
+ field_cvsroot: CVSROOT
+ text_git_repository_note: Bare und lokales repository (e.g. /gitrepo, c:\gitrepo)
+ text_mercurial_repository_note: Lokales repository (e.g. /hgrepo, c:\hgrepo)
+ text_scm_command: Kommando
+ text_scm_command_version: Version
+ label_git_report_last_commit: Bericht des letzten Commits für Dateien und Verzeichnisse
+ text_scm_config: Sie können Ihre scm Kommandos in config/configuration.yml ändern. Bitte starten Sie die Anwendung nach dem ändern neu.
+ text_scm_command_not_available: Scm Kommando ist nicht verfügbar. Bitte prüfen Sie die Einstellungen im Administrationspanel.
+
diff -r adc8466df404 -r 753f1380d6bc config/locales/.svn/text-base/el.yml.svn-base
--- a/config/locales/.svn/text-base/el.yml.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/.svn/text-base/el.yml.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -19,7 +19,10 @@
month_names: [~, Ιανουάριος, Φεβρουάριος, Μάρτιος, Απρίλιος, Μάϊος, Ιούνιος, Ιούλιος, Αύγουστος, Σεπτέμβριος, Οκτώβριος, Νοέμβριος, Δεκέμβριος]
abbr_month_names: [~, Ιαν, Φεβ, Μαρ, Απρ, Μαϊ, Ιον, Ιολ, Αυγ, Σεπ, Οκτ, Νοε, Δεκ]
# Used in date_select and datime_select.
- order: [ :year, :month, :day ]
+ order:
+ - :year
+ - :month
+ - :day
time:
formats:
@@ -252,7 +255,7 @@
field_attr_mail: Ιδιότητα email
field_onthefly: Άμεση δημιουργία χρήστη
field_start_date: Εκκίνηση
- field_done_ratio: % επιτεύχθη
+ field_done_ratio: "% επιτεύχθη"
field_auth_source: Τρόπος πιστοποίησης
field_hide_mail: Απόκρυψη διεύθυνσης email
field_comments: Σχόλιο
@@ -307,7 +310,6 @@
setting_cross_project_issue_relations: Επιτρέψτε συσχετισμό θεμάτων σε διασταύρωση-έργων
setting_issue_list_default_columns: Προκαθορισμένες εμφανιζόμενες στήλες στη λίστα θεμάτων
setting_repositories_encodings: Κωδικοποίηση χαρακτήρων αποθετηρίου
- setting_commit_logs_encoding: Κωδικοποίηση μηνυμάτων commit
setting_emails_footer: Υποσέλιδο στα email
setting_protocol: Πρωτόκολο
setting_per_page_options: Αντικείμενα ανά σελίδα επιλογών
@@ -940,3 +942,37 @@
text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
label_my_queries: My custom queries
text_journal_changed_no_detail: "%{label} updated"
+ label_news_comment_added: Comment added to a news
+ button_expand_all: Expand all
+ button_collapse_all: Collapse all
+ label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
+ label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
+ label_bulk_edit_selected_time_entries: Bulk edit selected time entries
+ text_time_entries_destroy_confirmation: Are you sure you want to delete the selected time entr(y/ies)?
+ label_role_anonymous: Anonymous
+ label_role_non_member: Non member
+ label_issue_note_added: Note added
+ label_issue_status_updated: Status updated
+ label_issue_priority_updated: Priority updated
+ label_issues_visibility_own: Issues created by or assigned to the user
+ field_issues_visibility: Issues visibility
+ label_issues_visibility_all: All issues
+ permission_set_own_issues_private: Set own issues public or private
+ field_is_private: Private
+ permission_set_issues_private: Set issues public or private
+ label_issues_visibility_public: All non private issues
+ text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
+ field_commit_logs_encoding: Κωδικοποίηση μηνυμάτων commit
+ field_scm_path_encoding: Path encoding
+ text_scm_path_encoding_note: "Default: UTF-8"
+ field_path_to_repository: Path to repository
+ field_root_directory: Root directory
+ field_cvs_module: Module
+ field_cvsroot: CVSROOT
+ text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
+ text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
+ text_scm_command: Command
+ text_scm_command_version: Version
+ label_git_report_last_commit: Report last commit for files and directories
+ text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+ text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
diff -r adc8466df404 -r 753f1380d6bc config/locales/.svn/text-base/en-GB.yml.svn-base
--- a/config/locales/.svn/text-base/en-GB.yml.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/.svn/text-base/en-GB.yml.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -1,946 +1,981 @@
-en-GB:
- direction: ltr
- date:
- formats:
- # Use the strftime parameters for formats.
- # When no format has been given, it uses default.
- # You can provide other formats here if you like!
- default: "%d/%m/%Y"
- short: "%d %b"
- long: "%d %B, %Y"
-
- day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
- abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
-
- # Don't forget the nil at the beginning; there's no such thing as a 0th month
- month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
- abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
- # Used in date_select and datime_select.
- order: [ :year, :month, :day ]
-
- time:
- formats:
- default: "%d/%m/%Y %I:%M %p"
- time: "%I:%M %p"
- short: "%d %b %H:%M"
- long: "%d %B, %Y %H:%M"
- am: "am"
- pm: "pm"
-
- datetime:
- distance_in_words:
- half_a_minute: "half a minute"
- less_than_x_seconds:
- one: "less than 1 second"
- other: "less than %{count} seconds"
- x_seconds:
- one: "1 second"
- other: "%{count} seconds"
- less_than_x_minutes:
- one: "less than a minute"
- other: "less than %{count} minutes"
- x_minutes:
- one: "1 minute"
- other: "%{count} minutes"
- about_x_hours:
- one: "about 1 hour"
- other: "about %{count} hours"
- x_days:
- one: "1 day"
- other: "%{count} days"
- about_x_months:
- one: "about 1 month"
- other: "about %{count} months"
- x_months:
- one: "1 month"
- other: "%{count} months"
- about_x_years:
- one: "about 1 year"
- other: "about %{count} years"
- over_x_years:
- one: "over 1 year"
- other: "over %{count} years"
- almost_x_years:
- one: "almost 1 year"
- other: "almost %{count} years"
-
- number:
- format:
- separator: "."
- delimiter: " "
- precision: 3
-
- currency:
- format:
- format: "%u%n"
- unit: "£"
- human:
- format:
- delimiter: ""
- precision: 1
- storage_units:
- format: "%n %u"
- units:
- byte:
- one: "Byte"
- other: "Bytes"
- kb: "kB"
- mb: "MB"
- gb: "GB"
- tb: "TB"
-
-
-# Used in array.to_sentence.
- support:
- array:
- sentence_connector: "and"
- skip_last_comma: false
-
- activerecord:
- errors:
- template:
- header:
- one: "1 error prohibited this %{model} from being saved"
- other: "%{count} errors prohibited this %{model} from being saved"
- messages:
- inclusion: "is not included in the list"
- exclusion: "is reserved"
- invalid: "is invalid"
- confirmation: "doesn't match confirmation"
- accepted: "must be accepted"
- empty: "can't be empty"
- blank: "can't be blank"
- too_long: "is too long (maximum is %{count} characters)"
- too_short: "is too short (minimum is %{count} characters)"
- wrong_length: "is the wrong length (should be %{count} characters)"
- taken: "has already been taken"
- not_a_number: "is not a number"
- not_a_date: "is not a valid date"
- greater_than: "must be greater than %{count}"
- greater_than_or_equal_to: "must be greater than or equal to %{count}"
- equal_to: "must be equal to %{count}"
- less_than: "must be less than %{count}"
- less_than_or_equal_to: "must be less than or equal to %{count}"
- odd: "must be odd"
- even: "must be even"
- greater_than_start_date: "must be greater than start date"
- not_same_project: "doesn't belong to the same project"
- circular_dependency: "This relation would create a circular dependency"
- cant_link_an_issue_with_a_descendant: "An issue can not be linked to one of its subtasks"
-
- actionview_instancetag_blank_option: Please select
-
- general_text_No: 'No'
- general_text_Yes: 'Yes'
- general_text_no: 'no'
- general_text_yes: 'yes'
- general_lang_name: 'English (British)'
- general_csv_separator: ','
- general_csv_decimal_separator: '.'
- general_csv_encoding: ISO-8859-1
- general_pdf_encoding: ISO-8859-1
- general_first_day_of_week: '1'
-
- notice_account_updated: Account was successfully updated.
- notice_account_invalid_creditentials: Invalid user or password
- notice_account_password_updated: Password was successfully updated.
- notice_account_wrong_password: Wrong password
- notice_account_register_done: Account was successfully created. To activate your account, click on the link that was emailed to you.
- notice_account_unknown_email: Unknown user.
- notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
- notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
- notice_account_activated: Your account has been activated. You can now log in.
- notice_successful_create: Successful creation.
- notice_successful_update: Successful update.
- notice_successful_delete: Successful deletion.
- notice_successful_connection: Successful connection.
- notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
- notice_locking_conflict: Data has been updated by another user.
- notice_not_authorized: You are not authorised to access this page.
- notice_email_sent: "An email was sent to %{value}"
- notice_email_error: "An error occurred while sending mail (%{value})"
- notice_feeds_access_key_reseted: Your RSS access key was reset.
- notice_api_access_key_reseted: Your API access key was reset.
- notice_failed_to_save_issues: "Failed to save %{count} issue(s) on %{total} selected: %{ids}."
- notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
- notice_account_pending: "Your account was created and is now pending administrator approval."
- notice_default_data_loaded: Default configuration successfully loaded.
- notice_unable_delete_version: Unable to delete version.
- notice_issue_done_ratios_updated: Issue done ratios updated.
-
- error_can_t_load_default_data: "Default configuration could not be loaded: %{value}"
- error_scm_not_found: "The entry or revision was not found in the repository."
- error_scm_command_failed: "An error occurred when trying to access the repository: %{value}"
- error_scm_annotate: "The entry does not exist or can not be annotated."
- error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
- error_no_tracker_in_project: 'No tracker is associated to this project. Please check the Project settings.'
- error_no_default_issue_status: 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
- error_can_not_reopen_issue_on_closed_version: 'An issue assigned to a closed version can not be reopened'
- error_can_not_archive_project: This project can not be archived
- error_issue_done_ratios_not_updated: "Issue done ratios not updated."
- error_workflow_copy_source: 'Please select a source tracker or role'
- error_workflow_copy_target: 'Please select target tracker(s) and role(s)'
-
- warning_attachments_not_saved: "%{count} file(s) could not be saved."
-
- mail_subject_lost_password: "Your %{value} password"
- mail_body_lost_password: 'To change your password, click on the following link:'
- mail_subject_register: "Your %{value} account activation"
- mail_body_register: 'To activate your account, click on the following link:'
- mail_body_account_information_external: "You can use your %{value} account to log in."
- mail_body_account_information: Your account information
- mail_subject_account_activation_request: "%{value} account activation request"
- mail_body_account_activation_request: "A new user (%{value}) has registered. The account is pending your approval:"
- mail_subject_reminder: "%{count} issue(s) due in the next %{days} days"
- mail_body_reminder: "%{count} issue(s) that are assigned to you are due in the next %{days} days:"
- mail_subject_wiki_content_added: "'%{id}' wiki page has been added"
- mail_body_wiki_content_added: "The '%{id}' wiki page has been added by %{author}."
- mail_subject_wiki_content_updated: "'%{id}' wiki page has been updated"
- mail_body_wiki_content_updated: "The '%{id}' wiki page has been updated by %{author}."
-
- gui_validation_error: 1 error
- gui_validation_error_plural: "%{count} errors"
-
- field_name: Name
- field_description: Description
- field_summary: Summary
- field_is_required: Required
- field_firstname: Firstname
- field_lastname: Lastname
- field_mail: Email
- field_filename: File
- field_filesize: Size
- field_downloads: Downloads
- field_author: Author
- field_created_on: Created
- field_updated_on: Updated
- field_field_format: Format
- field_is_for_all: For all projects
- field_possible_values: Possible values
- field_regexp: Regular expression
- field_min_length: Minimum length
- field_max_length: Maximum length
- field_value: Value
- field_category: Category
- field_title: Title
- field_project: Project
- field_issue: Issue
- field_status: Status
- field_notes: Notes
- field_is_closed: Issue closed
- field_is_default: Default value
- field_tracker: Tracker
- field_subject: Subject
- field_due_date: Due date
- field_assigned_to: Assignee
- field_priority: Priority
- field_fixed_version: Target version
- field_user: User
- field_role: Role
- field_homepage: Homepage
- field_is_public: Public
- field_parent: Subproject of
- field_is_in_roadmap: Issues displayed in roadmap
- field_login: Login
- field_mail_notification: Email notifications
- field_admin: Administrator
- field_last_login_on: Last connection
- field_language: Language
- field_effective_date: Date
- field_password: Password
- field_new_password: New password
- field_password_confirmation: Confirmation
- field_version: Version
- field_type: Type
- field_host: Host
- field_port: Port
- field_account: Account
- field_base_dn: Base DN
- field_attr_login: Login attribute
- field_attr_firstname: Firstname attribute
- field_attr_lastname: Lastname attribute
- field_attr_mail: Email attribute
- field_onthefly: On-the-fly user creation
- field_start_date: Start date
- field_done_ratio: % Done
- field_auth_source: Authentication mode
- field_hide_mail: Hide my email address
- field_comments: Comment
- field_url: URL
- field_start_page: Start page
- field_subproject: Subproject
- field_hours: Hours
- field_activity: Activity
- field_spent_on: Date
- field_identifier: Identifier
- field_is_filter: Used as a filter
- field_issue_to: Related issue
- field_delay: Delay
- field_assignable: Issues can be assigned to this role
- field_redirect_existing_links: Redirect existing links
- field_estimated_hours: Estimated time
- field_column_names: Columns
- field_time_zone: Time zone
- field_searchable: Searchable
- field_default_value: Default value
- field_comments_sorting: Display comments
- field_parent_title: Parent page
- field_editable: Editable
- field_watcher: Watcher
- field_identity_url: OpenID URL
- field_content: Content
- field_group_by: Group results by
- field_sharing: Sharing
-
- setting_app_title: Application title
- setting_app_subtitle: Application subtitle
- setting_welcome_text: Welcome text
- setting_default_language: Default language
- setting_login_required: Authentication required
- setting_self_registration: Self-registration
- setting_attachment_max_size: Attachment max. size
- setting_issues_export_limit: Issues export limit
- setting_mail_from: Emission email address
- setting_bcc_recipients: Blind carbon copy recipients (bcc)
- setting_plain_text_mail: Plain text mail (no HTML)
- setting_host_name: Host name and path
- setting_text_formatting: Text formatting
- setting_wiki_compression: Wiki history compression
- setting_feeds_limit: Feed content limit
- setting_default_projects_public: New projects are public by default
- setting_autofetch_changesets: Autofetch commits
- setting_sys_api_enabled: Enable WS for repository management
- setting_commit_ref_keywords: Referencing keywords
- setting_commit_fix_keywords: Fixing keywords
- setting_autologin: Autologin
- setting_date_format: Date format
- setting_time_format: Time format
- setting_cross_project_issue_relations: Allow cross-project issue relations
- setting_issue_list_default_columns: Default columns displayed on the issue list
- setting_repositories_encodings: Repositories encodings
- setting_commit_logs_encoding: Commit messages encoding
- setting_emails_footer: Emails footer
- setting_protocol: Protocol
- setting_per_page_options: Objects per page options
- setting_user_format: Users display format
- setting_activity_days_default: Days displayed on project activity
- setting_display_subprojects_issues: Display subprojects issues on main projects by default
- setting_enabled_scm: Enabled SCM
- setting_mail_handler_body_delimiters: "Truncate emails after one of these lines"
- setting_mail_handler_api_enabled: Enable WS for incoming emails
- setting_mail_handler_api_key: API key
- setting_sequential_project_identifiers: Generate sequential project identifiers
- setting_gravatar_enabled: Use Gravatar user icons
- setting_gravatar_default: Default Gravatar image
- setting_diff_max_lines_displayed: Max number of diff lines displayed
- setting_file_max_size_displayed: Max size of text files displayed inline
- setting_repository_log_display_limit: Maximum number of revisions displayed on file log
- setting_openid: Allow OpenID login and registration
- setting_password_min_length: Minimum password length
- setting_new_project_user_role_id: Role given to a non-admin user who creates a project
- setting_default_projects_modules: Default enabled modules for new projects
- setting_issue_done_ratio: Calculate the issue done ratio with
- setting_issue_done_ratio_issue_field: Use the issue field
- setting_issue_done_ratio_issue_status: Use the issue status
- setting_start_of_week: Start calendars on
- setting_rest_api_enabled: Enable REST web service
- setting_cache_formatted_text: Cache formatted text
-
- permission_add_project: Create project
- permission_add_subprojects: Create subprojects
- permission_edit_project: Edit project
- permission_select_project_modules: Select project modules
- permission_manage_members: Manage members
- permission_manage_project_activities: Manage project activities
- permission_manage_versions: Manage versions
- permission_manage_categories: Manage issue categories
- permission_view_issues: View Issues
- permission_add_issues: Add issues
- permission_edit_issues: Edit issues
- permission_manage_issue_relations: Manage issue relations
- permission_add_issue_notes: Add notes
- permission_edit_issue_notes: Edit notes
- permission_edit_own_issue_notes: Edit own notes
- permission_move_issues: Move issues
- permission_delete_issues: Delete issues
- permission_manage_public_queries: Manage public queries
- permission_save_queries: Save queries
- permission_view_gantt: View gantt chart
- permission_view_calendar: View calendar
- permission_view_issue_watchers: View watchers list
- permission_add_issue_watchers: Add watchers
- permission_delete_issue_watchers: Delete watchers
- permission_log_time: Log spent time
- permission_view_time_entries: View spent time
- permission_edit_time_entries: Edit time logs
- permission_edit_own_time_entries: Edit own time logs
- permission_manage_news: Manage news
- permission_comment_news: Comment news
- permission_manage_documents: Manage documents
- permission_view_documents: View documents
- permission_manage_files: Manage files
- permission_view_files: View files
- permission_manage_wiki: Manage wiki
- permission_rename_wiki_pages: Rename wiki pages
- permission_delete_wiki_pages: Delete wiki pages
- permission_view_wiki_pages: View wiki
- permission_view_wiki_edits: View wiki history
- permission_edit_wiki_pages: Edit wiki pages
- permission_delete_wiki_pages_attachments: Delete attachments
- permission_protect_wiki_pages: Protect wiki pages
- permission_manage_repository: Manage repository
- permission_browse_repository: Browse repository
- permission_view_changesets: View changesets
- permission_commit_access: Commit access
- permission_manage_boards: Manage boards
- permission_view_messages: View messages
- permission_add_messages: Post messages
- permission_edit_messages: Edit messages
- permission_edit_own_messages: Edit own messages
- permission_delete_messages: Delete messages
- permission_delete_own_messages: Delete own messages
- permission_export_wiki_pages: Export wiki pages
-
- project_module_issue_tracking: Issue tracking
- project_module_time_tracking: Time tracking
- project_module_news: News
- project_module_documents: Documents
- project_module_files: Files
- project_module_wiki: Wiki
- project_module_repository: Repository
- project_module_boards: Boards
-
- label_user: User
- label_user_plural: Users
- label_user_new: New user
- label_user_anonymous: Anonymous
- label_project: Project
- label_project_new: New project
- label_project_plural: Projects
- label_x_projects:
- zero: no projects
- one: 1 project
- other: "%{count} projects"
- label_project_all: All Projects
- label_project_latest: Latest projects
- label_issue: Issue
- label_issue_new: New issue
- label_issue_plural: Issues
- label_issue_view_all: View all issues
- label_issues_by: "Issues by %{value}"
- label_issue_added: Issue added
- label_issue_updated: Issue updated
- label_document: Document
- label_document_new: New document
- label_document_plural: Documents
- label_document_added: Document added
- label_role: Role
- label_role_plural: Roles
- label_role_new: New role
- label_role_and_permissions: Roles and permissions
- label_member: Member
- label_member_new: New member
- label_member_plural: Members
- label_tracker: Tracker
- label_tracker_plural: Trackers
- label_tracker_new: New tracker
- label_workflow: Workflow
- label_issue_status: Issue status
- label_issue_status_plural: Issue statuses
- label_issue_status_new: New status
- label_issue_category: Issue category
- label_issue_category_plural: Issue categories
- label_issue_category_new: New category
- label_custom_field: Custom field
- label_custom_field_plural: Custom fields
- label_custom_field_new: New custom field
- label_enumerations: Enumerations
- label_enumeration_new: New value
- label_information: Information
- label_information_plural: Information
- label_please_login: Please log in
- label_register: Register
- label_login_with_open_id_option: or login with OpenID
- label_password_lost: Lost password
- label_home: Home
- label_my_page: My page
- label_my_account: My account
- label_my_projects: My projects
- label_administration: Administration
- label_login: Sign in
- label_logout: Sign out
- label_help: Help
- label_reported_issues: Reported issues
- label_assigned_to_me_issues: Issues assigned to me
- label_last_login: Last connection
- label_registered_on: Registered on
- label_activity: Activity
- label_overall_activity: Overall activity
- label_user_activity: "%{value}'s activity"
- label_new: New
- label_logged_as: Logged in as
- label_environment: Environment
- label_authentication: Authentication
- label_auth_source: Authentication mode
- label_auth_source_new: New authentication mode
- label_auth_source_plural: Authentication modes
- label_subproject_plural: Subprojects
- label_subproject_new: New subproject
- label_and_its_subprojects: "%{value} and its subprojects"
- label_min_max_length: Min - Max length
- label_list: List
- label_date: Date
- label_integer: Integer
- label_float: Float
- label_boolean: Boolean
- label_string: Text
- label_text: Long text
- label_attribute: Attribute
- label_attribute_plural: Attributes
- label_download: "%{count} Download"
- label_download_plural: "%{count} Downloads"
- label_no_data: No data to display
- label_change_status: Change status
- label_history: History
- label_attachment: File
- label_attachment_new: New file
- label_attachment_delete: Delete file
- label_attachment_plural: Files
- label_file_added: File added
- label_report: Report
- label_report_plural: Reports
- label_news: News
- label_news_new: Add news
- label_news_plural: News
- label_news_latest: Latest news
- label_news_view_all: View all news
- label_news_added: News added
- label_settings: Settings
- label_overview: Overview
- label_version: Version
- label_version_new: New version
- label_version_plural: Versions
- label_close_versions: Close completed versions
- label_confirmation: Confirmation
- label_export_to: 'Also available in:'
- label_read: Read...
- label_public_projects: Public projects
- label_open_issues: open
- label_open_issues_plural: open
- label_closed_issues: closed
- label_closed_issues_plural: closed
- label_x_open_issues_abbr_on_total:
- zero: 0 open / %{total}
- one: 1 open / %{total}
- other: "%{count} open / %{total}"
- label_x_open_issues_abbr:
- zero: 0 open
- one: 1 open
- other: "%{count} open"
- label_x_closed_issues_abbr:
- zero: 0 closed
- one: 1 closed
- other: "%{count} closed"
- label_total: Total
- label_permissions: Permissions
- label_current_status: Current status
- label_new_statuses_allowed: New statuses allowed
- label_all: all
- label_none: none
- label_nobody: nobody
- label_next: Next
- label_previous: Previous
- label_used_by: Used by
- label_details: Details
- label_add_note: Add a note
- label_per_page: Per page
- label_calendar: Calendar
- label_months_from: months from
- label_gantt: Gantt
- label_internal: Internal
- label_last_changes: "last %{count} changes"
- label_change_view_all: View all changes
- label_personalize_page: Personalise this page
- label_comment: Comment
- label_comment_plural: Comments
- label_x_comments:
- zero: no comments
- one: 1 comment
- other: "%{count} comments"
- label_comment_add: Add a comment
- label_comment_added: Comment added
- label_comment_delete: Delete comments
- label_query: Custom query
- label_query_plural: Custom queries
- label_query_new: New query
- label_filter_add: Add filter
- label_filter_plural: Filters
- label_equals: is
- label_not_equals: is not
- label_in_less_than: in less than
- label_in_more_than: in more than
- label_greater_or_equal: '>='
- label_less_or_equal: '<='
- label_in: in
- label_today: today
- label_all_time: all time
- label_yesterday: yesterday
- label_this_week: this week
- label_last_week: last week
- label_last_n_days: "last %{count} days"
- label_this_month: this month
- label_last_month: last month
- label_this_year: this year
- label_date_range: Date range
- label_less_than_ago: less than days ago
- label_more_than_ago: more than days ago
- label_ago: days ago
- label_contains: contains
- label_not_contains: doesn't contain
- label_day_plural: days
- label_repository: Repository
- label_repository_plural: Repositories
- label_browse: Browse
- label_modification: "%{count} change"
- label_modification_plural: "%{count} changes"
- label_branch: Branch
- label_tag: Tag
- label_revision: Revision
- label_revision_plural: Revisions
- label_revision_id: "Revision %{value}"
- label_associated_revisions: Associated revisions
- label_added: added
- label_modified: modified
- label_copied: copied
- label_renamed: renamed
- label_deleted: deleted
- label_latest_revision: Latest revision
- label_latest_revision_plural: Latest revisions
- label_view_revisions: View revisions
- label_view_all_revisions: View all revisions
- label_max_size: Maximum size
- label_sort_highest: Move to top
- label_sort_higher: Move up
- label_sort_lower: Move down
- label_sort_lowest: Move to bottom
- label_roadmap: Roadmap
- label_roadmap_due_in: "Due in %{value}"
- label_roadmap_overdue: "%{value} late"
- label_roadmap_no_issues: No issues for this version
- label_search: Search
- label_result_plural: Results
- label_all_words: All words
- label_wiki: Wiki
- label_wiki_edit: Wiki edit
- label_wiki_edit_plural: Wiki edits
- label_wiki_page: Wiki page
- label_wiki_page_plural: Wiki pages
- label_index_by_title: Index by title
- label_index_by_date: Index by date
- label_current_version: Current version
- label_preview: Preview
- label_feed_plural: Feeds
- label_changes_details: Details of all changes
- label_issue_tracking: Issue tracking
- label_spent_time: Spent time
- label_f_hour: "%{value} hour"
- label_f_hour_plural: "%{value} hours"
- label_time_tracking: Time tracking
- label_change_plural: Changes
- label_statistics: Statistics
- label_commits_per_month: Commits per month
- label_commits_per_author: Commits per author
- label_view_diff: View differences
- label_diff_inline: inline
- label_diff_side_by_side: side by side
- label_options: Options
- label_copy_workflow_from: Copy workflow from
- label_permissions_report: Permissions report
- label_watched_issues: Watched issues
- label_related_issues: Related issues
- label_applied_status: Applied status
- label_loading: Loading...
- label_relation_new: New relation
- label_relation_delete: Delete relation
- label_relates_to: related to
- label_duplicates: duplicates
- label_duplicated_by: duplicated by
- label_blocks: blocks
- label_blocked_by: blocked by
- label_precedes: precedes
- label_follows: follows
- label_end_to_start: end to start
- label_end_to_end: end to end
- label_start_to_start: start to start
- label_start_to_end: start to end
- label_stay_logged_in: Stay logged in
- label_disabled: disabled
- label_show_completed_versions: Show completed versions
- label_me: me
- label_board: Forum
- label_board_new: New forum
- label_board_plural: Forums
- label_board_locked: Locked
- label_board_sticky: Sticky
- label_topic_plural: Topics
- label_message_plural: Messages
- label_message_last: Last message
- label_message_new: New message
- label_message_posted: Message added
- label_reply_plural: Replies
- label_send_information: Send account information to the user
- label_year: Year
- label_month: Month
- label_week: Week
- label_date_from: From
- label_date_to: To
- label_language_based: Based on user's language
- label_sort_by: "Sort by %{value}"
- label_send_test_email: Send a test email
- label_feeds_access_key: RSS access key
- label_missing_feeds_access_key: Missing a RSS access key
- label_feeds_access_key_created_on: "RSS access key created %{value} ago"
- label_module_plural: Modules
- label_added_time_by: "Added by %{author} %{age} ago"
- label_updated_time_by: "Updated by %{author} %{age} ago"
- label_updated_time: "Updated %{value} ago"
- label_jump_to_a_project: Jump to a project...
- label_file_plural: Files
- label_changeset_plural: Changesets
- label_default_columns: Default columns
- label_no_change_option: (No change)
- label_bulk_edit_selected_issues: Bulk edit selected issues
- label_theme: Theme
- label_default: Default
- label_search_titles_only: Search titles only
- label_user_mail_option_all: "For any event on all my projects"
- label_user_mail_option_selected: "For any event on the selected projects only..."
- label_user_mail_option_none: "No events"
- label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
- label_registration_activation_by_email: account activation by email
- label_registration_manual_activation: manual account activation
- label_registration_automatic_activation: automatic account activation
- label_display_per_page: "Per page: %{value}"
- label_age: Age
- label_change_properties: Change properties
- label_general: General
- label_more: More
- label_scm: SCM
- label_plugins: Plugins
- label_ldap_authentication: LDAP authentication
- label_downloads_abbr: D/L
- label_optional_description: Optional description
- label_add_another_file: Add another file
- label_preferences: Preferences
- label_chronological_order: In chronological order
- label_reverse_chronological_order: In reverse chronological order
- label_planning: Planning
- label_incoming_emails: Incoming emails
- label_generate_key: Generate a key
- label_issue_watchers: Watchers
- label_example: Example
- label_display: Display
- label_sort: Sort
- label_ascending: Ascending
- label_descending: Descending
- label_date_from_to: From %{start} to %{end}
- label_wiki_content_added: Wiki page added
- label_wiki_content_updated: Wiki page updated
- label_group: Group
- label_group_plural: Groups
- label_group_new: New group
- label_time_entry_plural: Spent time
- label_version_sharing_none: Not shared
- label_version_sharing_descendants: With subprojects
- label_version_sharing_hierarchy: With project hierarchy
- label_version_sharing_tree: With project tree
- label_version_sharing_system: With all projects
- label_update_issue_done_ratios: Update issue done ratios
- label_copy_source: Source
- label_copy_target: Target
- label_copy_same_as_target: Same as target
- label_display_used_statuses_only: Only display statuses that are used by this tracker
- 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"
-
- button_login: Login
- button_submit: Submit
- button_save: Save
- button_check_all: Check all
- button_uncheck_all: Uncheck all
- button_delete: Delete
- button_create: Create
- button_create_and_continue: Create and continue
- button_test: Test
- button_edit: Edit
- button_add: Add
- button_change: Change
- button_apply: Apply
- button_clear: Clear
- button_lock: Lock
- button_unlock: Unlock
- button_download: Download
- button_list: List
- button_view: View
- button_move: Move
- button_move_and_follow: Move and follow
- button_back: Back
- button_cancel: Cancel
- button_activate: Activate
- button_sort: Sort
- button_log_time: Log time
- button_rollback: Rollback to this version
- button_watch: Watch
- button_unwatch: Unwatch
- button_reply: Reply
- button_archive: Archive
- button_unarchive: Unarchive
- button_reset: Reset
- button_rename: Rename
- button_change_password: Change password
- button_copy: Copy
- button_copy_and_follow: Copy and follow
- button_annotate: Annotate
- button_update: Update
- button_configure: Configure
- button_quote: Quote
- button_duplicate: Duplicate
- button_show: Show
-
- status_active: active
- status_registered: registered
- status_locked: locked
-
- version_status_open: open
- version_status_locked: locked
- version_status_closed: closed
-
- field_active: Active
-
- text_select_mail_notifications: Select actions for which email notifications should be sent.
- text_regexp_info: eg. ^[A-Z0-9]+$
- text_min_max_length_info: 0 means no restriction
- text_project_destroy_confirmation: Are you sure you want to delete this project and related data?
- text_subprojects_destroy_warning: "Its subproject(s): %{value} will be also deleted."
- text_workflow_edit: Select a role and a tracker to edit the workflow
- text_are_you_sure: Are you sure?
- text_journal_changed: "%{label} changed from %{old} to %{new}"
- text_journal_set_to: "%{label} set to %{value}"
- text_journal_deleted: "%{label} deleted (%{old})"
- text_journal_added: "%{label} %{value} added"
- text_tip_issue_begin_day: task beginning this day
- text_tip_issue_end_day: task ending this day
- text_tip_issue_begin_end_day: task beginning and ending this day
- text_project_identifier_info: 'Only lower case letters (a-z), numbers and dashes are allowed.
-# 2010-01-25
-# Distributed under the same terms as the Redmine itself.
-eu:
- direction: ltr
- date:
- formats:
- # Use the strftime parameters for formats.
- # When no format has been given, it uses default.
- # You can provide other formats here if you like!
- default: "%Y/%m/%d"
- short: "%b %d"
- long: "%Y %B %d"
-
- day_names: [Igandea, Astelehena, Asteartea, Asteazkena, Osteguna, Ostirala, Larunbata]
- abbr_day_names: [Ig., Al., Ar., Az., Og., Or., La.]
-
- # Don't forget the nil at the beginning; there's no such thing as a 0th month
- month_names: [~, Urtarrila, Otsaila, Martxoa, Apirila, Maiatza, Ekaina, Uztaila, Abuztua, Iraila, Urria, Azaroa, Abendua]
- abbr_month_names: [~, Urt, Ots, Mar, Api, Mai, Eka, Uzt, Abu, Ira, Urr, Aza, Abe]
- # Used in date_select and datime_select.
- order: [ :year, :month, :day ]
-
- time:
- formats:
- default: "%Y/%m/%d %H:%M"
- time: "%H:%M"
- short: "%b %d %H:%M"
- long: "%Y %B %d %H:%M"
- am: "am"
- pm: "pm"
-
- datetime:
- distance_in_words:
- half_a_minute: "minutu erdi"
- less_than_x_seconds:
- one: "segundu bat baino gutxiago"
- other: "%{count} segundu baino gutxiago"
- x_seconds:
- one: "segundu 1"
- other: "%{count} segundu"
- less_than_x_minutes:
- one: "minutu bat baino gutxiago"
- other: "%{count} minutu baino gutxiago"
- x_minutes:
- one: "minutu 1"
- other: "%{count} minutu"
- about_x_hours:
- one: "ordu 1 inguru"
- other: "%{count} ordu inguru"
- x_days:
- one: "egun 1"
- other: "%{count} egun"
- about_x_months:
- one: "hilabete 1 inguru"
- other: "%{count} hilabete inguru"
- x_months:
- one: "hilabete 1"
- other: "%{count} hilabete"
- about_x_years:
- one: "urte 1 inguru"
- other: "%{count} urte inguru"
- over_x_years:
- one: "urte 1 baino gehiago"
- other: "%{count} urte baino gehiago"
- almost_x_years:
- one: "ia urte 1"
- other: "ia %{count} urte"
-
- number:
- format:
- separator: "."
- delimiter: ""
- precision: 3
- human:
- format:
- delimiter: ""
- precision: 1
- storage_units:
- format: "%n %u"
- units:
- byte:
- one: "Byte"
- other: "Byte"
- kb: "KB"
- mb: "MB"
- gb: "GB"
- tb: "TB"
-
-
-# Used in array.to_sentence.
- support:
- array:
- sentence_connector: "eta"
- skip_last_comma: false
-
- activerecord:
- errors:
- template:
- header:
- one: "Errore batek %{model} hau godetzea galarazi du."
- other: "%{count} errorek %{model} hau gordetzea galarazi dute."
- messages:
- inclusion: "ez dago zerrendan"
- exclusion: "erreserbatuta dago"
- invalid: "baliogabea da"
- confirmation: "ez du berrespenarekin bat egiten"
- accepted: "onartu behar da"
- empty: "ezin da hutsik egon"
- blank: "ezin da hutsik egon"
- too_long: "luzeegia da (maximoa %{count} karaktere dira)"
- too_short: "laburregia da (minimoa %{count} karaktere dira)"
- wrong_length: "luzera ezegokia da (%{count} karakter izan beharko litzake)"
- taken: "dagoeneko hartuta dago"
- not_a_number: "ez da zenbaki bat"
- not_a_date: "ez da baliozko data"
- greater_than: "%{count} baino handiagoa izan behar du"
- greater_than_or_equal_to: "%{count} edo handiagoa izan behar du"
- equal_to: "%{count} izan behar du"
- less_than: "%{count} baino gutxiago izan behar du"
- less_than_or_equal_to: "%{count} edo gutxiago izan behar du"
- odd: "bakoitia izan behar du"
- even: "bikoitia izan behar du"
- greater_than_start_date: "hasiera data baino handiagoa izan behar du"
- not_same_project: "ez dago proiektu berdinean"
- circular_dependency: "Erlazio honek mendekotasun zirkular bat sortuko luke"
- cant_link_an_issue_with_a_descendant: "Zeregin bat ezin da bere azpiataza batekin estekatu."
-
- actionview_instancetag_blank_option: Hautatu mesedez
-
- general_text_No: 'Ez'
- general_text_Yes: 'Bai'
- general_text_no: 'ez'
- general_text_yes: 'bai'
- general_lang_name: 'Euskara'
- general_csv_separator: ','
- general_csv_decimal_separator: '.'
- general_csv_encoding: UTF-8
- general_pdf_encoding: UTF-8
- general_first_day_of_week: '1'
-
- notice_account_updated: Kontua ongi eguneratu da.
- notice_account_invalid_creditentials: Erabiltzaile edo pasahitz ezegokia
- notice_account_password_updated: Pasahitza ongi eguneratu da.
- notice_account_wrong_password: Pasahitz ezegokia.
- notice_account_register_done: Kontua ongi sortu da. Kontua gaitzeko klikatu epostan adierazi zaizun estekan.
- notice_account_unknown_email: Erabiltzaile ezezaguna.
- notice_can_t_change_password: Kontu honek kanpoko autentikazio bat erabiltzen du. Ezinezkoa da pasahitza aldatzea.
- notice_account_lost_email_sent: Pasahitz berria aukeratzeko jarraibideak dituen eposta bat bidali zaizu.
- notice_account_activated: Zure kontua gaituta dago. Orain saioa has dezakezu
- notice_successful_create: Sortze arrakastatsua.
- notice_successful_update: Eguneratze arrakastatsua.
- notice_successful_delete: Ezabaketa arrakastatsua.
- notice_successful_connection: Konexio arrakastatsua.
- notice_file_not_found: Atzitu nahi duzun orria ez da exisitzen edo ezabatua izan da.
- notice_locking_conflict: Beste erabiltzaile batek datuak eguneratu ditu.
- notice_not_authorized: Ez duzu orri hau atzitzeko baimenik.
- notice_email_sent: "%{value} helbidera eposta bat bidali da"
- notice_email_error: "Errorea eposta bidaltzean (%{value})"
- notice_feeds_access_key_reseted: Zure RSS atzipen giltza berrezarri da.
- notice_api_access_key_reseted: Zure API atzipen giltza berrezarri da.
- notice_failed_to_save_issues: "Hautatutako %{total} zereginetatik %{count} ezin izan dira konpondu: %{ids}."
- notice_no_issue_selected: "Ez da zereginik hautatu! Mesedez, editatu nahi dituzun arazoak markatu."
- notice_account_pending: "Zure kontua sortu da, orain kudeatzailearen onarpenaren zain dago."
- notice_default_data_loaded: Lehenetsitako konfigurazioa ongi kargatu da.
- notice_unable_delete_version: Ezin da bertsioa ezabatu.
- notice_issue_done_ratios_updated: Burututako zereginen erlazioa eguneratu da.
-
- error_can_t_load_default_data: "Ezin izan da lehenetsitako konfigurazioa kargatu: %{value}"
- error_scm_not_found: "Sarrera edo berrikuspena ez da biltegian topatu."
- error_scm_command_failed: "Errorea gertatu da biltegia atzitzean: %{value}"
- error_scm_annotate: "Sarrera ez da existitzen edo ezin da anotatu."
- error_issue_not_found_in_project: 'Zeregina ez da topatu edo ez da proiektu honetakoa'
- error_no_tracker_in_project: 'Proiektu honek ez du aztarnaririk esleituta. Mesedez egiaztatu Proiektuaren ezarpenak.'
- error_no_default_issue_status: 'Zereginek ez dute lehenetsitako egoerarik. Mesedez egiaztatu zure konfigurazioa ("Kudeaketa -> Arazoen egoerak" atalera joan).'
- error_can_not_reopen_issue_on_closed_version: 'Itxitako bertsio batera esleitutako zereginak ezin dira berrireki'
- error_can_not_archive_project: Proiektu hau ezin da artxibatu
- error_issue_done_ratios_not_updated: "Burututako zereginen erlazioa ez da eguneratu."
- error_workflow_copy_source: 'Mesedez hautatu iturburuko aztarnari edo rola'
- error_workflow_copy_target: 'Mesedez hautatu helburuko aztarnari(ak) edo rola(k)'
-
- warning_attachments_not_saved: "%{count} fitxategi ezin izan d(ir)a gorde."
-
- mail_subject_lost_password: "Zure %{value} pasahitza"
- mail_body_lost_password: 'Zure pasahitza aldatzeko hurrengo estekan klikatu:'
- mail_subject_register: "Zure %{value} kontuaren gaitzea"
- mail_body_register: 'Zure kontua gaitzeko hurrengo estekan klikatu:'
- mail_body_account_information_external: "Zure %{value} kontua erabil dezakezu saioa hasteko."
- mail_body_account_information: Zure kontuaren informazioa
- mail_subject_account_activation_request: "%{value} kontu gaitzeko eskaera"
- mail_body_account_activation_request: "Erabiltzaile berri bat (%{value}) erregistratu da. Kontua zure onarpenaren zain dago:"
- mail_subject_reminder: "%{count} arazo hurrengo %{days} egunetan amaitzen d(ir)a"
- mail_body_reminder: "Zuri esleituta dauden %{count} arazo hurrengo %{days} egunetan amaitzen d(ir)a:"
- mail_subject_wiki_content_added: "'%{id}' wiki orria gehitu da"
- mail_body_wiki_content_added: "%{author}-(e)k '%{id}' wiki orria gehitu du."
- mail_subject_wiki_content_updated: "'%{id}' wiki orria eguneratu da"
- mail_body_wiki_content_updated: "%{author}-(e)k '%{id}' wiki orria eguneratu du."
-
- gui_validation_error: akats 1
- gui_validation_error_plural: "%{count} akats"
-
- field_name: Izena
- field_description: Deskribapena
- field_summary: Laburpena
- field_is_required: Beharrezkoa
- field_firstname: Izena
- field_lastname: Abizenak
- field_mail: Eposta
- field_filename: Fitxategia
- field_filesize: Tamaina
- field_downloads: Deskargak
- field_author: Egilea
- field_created_on: Sortuta
- field_updated_on: Eguneratuta
- field_field_format: Formatua
- field_is_for_all: Proiektu guztietarako
- field_possible_values: Balio posibleak
- field_regexp: Expresio erregularra
- field_min_length: Luzera minimoa
- field_max_length: Luzera maxioma
- field_value: Balioa
- field_category: Kategoria
- field_title: Izenburua
- field_project: Proiektua
- field_issue: Zeregina
- field_status: Egoera
- field_notes: Oharrak
- field_is_closed: Itxitako arazoa
- field_is_default: Lehenetsitako balioa
- field_tracker: Aztarnaria
- field_subject: Gaia
- field_due_date: Amaiera data
- field_assigned_to: Esleituta
- field_priority: Lehentasuna
- field_fixed_version: Helburuko bertsioa
- field_user: Erabiltzilea
- field_role: Rola
- field_homepage: Orri nagusia
- field_is_public: Publikoa
- field_parent: "Honen azpiproiektua:"
- field_is_in_chlog: Zereginak aldaketa egunkarian ikusten dira
- field_is_in_roadmap: Arazoak ibilbide-mapan erakutsi
- field_login: Erabiltzaile izena
- field_mail_notification: Eposta jakinarazpenak
- field_admin: Kudeatzailea
- field_last_login_on: Azken konexioa
- field_language: Hizkuntza
- field_effective_date: Data
- field_password: Pasahitza
- field_new_password: Pasahitz berria
- field_password_confirmation: Berrespena
- field_version: Bertsioa
- field_type: Mota
- field_host: Ostalaria
- field_port: Portua
- field_account: Kontua
- field_base_dn: Base DN
- field_attr_login: Erabiltzaile atributua
- field_attr_firstname: Izena atributua
- field_attr_lastname: Abizenak atributua
- field_attr_mail: Eposta atributua
- field_onthefly: Zuzeneko erabiltzaile sorrera
- field_start_date: Hasiera
- field_done_ratio: Egindako %
- field_auth_source: Autentikazio modua
- field_hide_mail: Nire eposta helbidea ezkutatu
- field_comments: Iruzkina
- field_url: URL
- field_start_page: Hasierako orria
- field_subproject: Azpiproiektua
- field_hours: Ordu
- field_activity: Jarduera
- field_spent_on: Data
- field_identifier: Identifikatzailea
- field_is_filter: Iragazki moduan erabilita
- field_issue_to: Erlazionatutako zereginak
- field_delay: Atzerapena
- field_assignable: Arazoak rol honetara esleitu daitezke
- field_redirect_existing_links: Existitzen diren estekak berbideratu
- field_estimated_hours: Estimatutako denbora
- field_column_names: Zutabeak
- field_time_zone: Ordu zonaldea
- field_searchable: Bilagarria
- field_default_value: Lehenetsitako balioa
- field_comments_sorting: Iruzkinak erakutsi
- field_parent_title: Orri gurasoa
- field_editable: Editagarria
- field_watcher: Behatzailea
- field_identity_url: OpenID URLa
- field_content: Edukia
- field_group_by: Emaitzak honegatik taldekatu
- field_sharing: Partekatzea
-
- setting_app_title: Aplikazioaren izenburua
- setting_app_subtitle: Aplikazioaren azpizenburua
- setting_welcome_text: Ongietorriko testua
- setting_default_language: Lehenetsitako hizkuntza
- setting_login_required: Autentikazioa derrigorrezkoa
- setting_self_registration: Norberak erregistratu
- setting_attachment_max_size: Eranskinen tamaina max.
- setting_issues_export_limit: Zereginen esportatze limitea
- setting_mail_from: Igorlearen eposta helbidea
- setting_bcc_recipients: Hartzaileak ezkutuko kopian (bcc)
- setting_plain_text_mail: Testu soileko epostak (HTML-rik ez)
- setting_host_name: Ostalari izena eta bidea
- setting_text_formatting: Testu formatua
- setting_wiki_compression: Wikiaren historia konprimitu
- setting_feeds_limit: Jarioaren edukiera limitea
- setting_default_projects_public: Proiektu berriak defektuz publikoak dira
- setting_autofetch_changesets: Commit-ak automatikoki hartu
- setting_sys_api_enabled: Biltegien kudeaketarako WS gaitu
- setting_commit_ref_keywords: Erreferentzien gako-hitzak
- setting_commit_fix_keywords: Konpontze gako-hitzak
- setting_autologin: Saioa automatikoki hasi
- setting_date_format: Data formatua
- setting_time_format: Ordu formatua
- setting_cross_project_issue_relations: Zereginak proiektuen artean erlazionatzea baimendu
- setting_issue_list_default_columns: Zereginen zerrendan defektuz ikusten diren zutabeak
- setting_repositories_encodings: Biltegien kodeketak
- setting_commit_logs_encoding: Commit-en egunkarien kodetzea
- setting_emails_footer: Eposten oina
- setting_protocol: Protokoloa
- setting_per_page_options: Orriko objektuen aukerak
- setting_user_format: Erabiltzaileak erakusteko formatua
- setting_activity_days_default: Proiektuen jardueran erakusteko egunak
- setting_display_subprojects_issues: Azpiproiektuen zereginak proiektu nagusian erakutsi defektuz
- setting_enabled_scm: Gaitutako IKKak
- setting_mail_handler_body_delimiters: "Lerro hauteko baten ondoren epostak moztu"
- setting_mail_handler_api_enabled: Sarrerako epostentzako WS gaitu
- setting_mail_handler_api_key: API giltza
- setting_sequential_project_identifiers: Proiektuen identifikadore sekuentzialak sortu
- setting_gravatar_enabled: Erabili Gravatar erabiltzaile ikonoak
- setting_gravatar_default: Lehenetsitako Gravatar irudia
- setting_diff_max_lines_displayed: Erakutsiko diren diff lerro kopuru maximoa
- setting_file_max_size_displayed: Barnean erakuzten diren testu fitxategien tamaina maximoa
- setting_repository_log_display_limit: Egunkari fitxategian erakutsiko diren berrikuspen kopuru maximoa.
- setting_openid: Baimendu OpenID saio hasiera eta erregistatzea
- setting_password_min_length: Pasahitzen luzera minimoa
- setting_new_project_user_role_id: Proiektu berriak sortzerakoan kudeatzaile ez diren erabiltzaileei esleitutako rola
- setting_default_projects_modules: Proiektu berrientzako defektuz gaitutako moduluak
- setting_issue_done_ratio: "Zereginen burututako tasa kalkulatzean erabili:"
- setting_issue_done_ratio_issue_field: Zeregin eremua erabili
- setting_issue_done_ratio_issue_status: Zeregin egoera erabili
- setting_start_of_week: "Egutegiak noiz hasi:"
- setting_rest_api_enabled: Gaitu REST web zerbitzua
-
- permission_add_project: Proiektua sortu
- permission_add_subprojects: Azpiproiektuak sortu
- permission_edit_project: Proiektua editatu
- permission_select_project_modules: Proiektuaren moduluak hautatu
- permission_manage_members: Kideak kudeatu
- permission_manage_versions: Bertsioak kudeatu
- permission_manage_categories: Arazoen kategoriak kudeatu
- permission_view_issues: Zereginak ikusi
- permission_add_issues: Zereginak gehitu
- permission_edit_issues: Zereginak aldatu
- permission_manage_issue_relations: Zereginen erlazioak kudeatu
- permission_add_issue_notes: Oharrak gehitu
- permission_edit_issue_notes: Oharrak aldatu
- permission_edit_own_issue_notes: Nork bere oharrak aldatu
- permission_move_issues: Zereginak mugitu
- permission_delete_issues: Zereginak ezabatu
- permission_manage_public_queries: Galdera publikoak kudeatu
- permission_save_queries: Galderak gorde
- permission_view_gantt: Gantt grafikoa ikusi
- permission_view_calendar: Egutegia ikusi
- permission_view_issue_watchers: Behatzaileen zerrenda ikusi
- permission_add_issue_watchers: Behatzaileak gehitu
- permission_delete_issue_watchers: Behatzaileak ezabatu
- permission_log_time: Igarotako denbora erregistratu
- permission_view_time_entries: Igarotako denbora ikusi
- permission_edit_time_entries: Denbora egunkariak editatu
- permission_edit_own_time_entries: Nork bere denbora egunkariak editatu
- permission_manage_news: Berriak kudeatu
- permission_comment_news: Berrien iruzkinak egin
- permission_manage_documents: Dokumentuak kudeatu
- permission_view_documents: Dokumentuak ikusi
- permission_manage_files: Fitxategiak kudeatu
- permission_view_files: Fitxategiak ikusi
- permission_manage_wiki: Wikia kudeatu
- permission_rename_wiki_pages: Wiki orriak berrizendatu
- permission_delete_wiki_pages: Wiki orriak ezabatu
- permission_view_wiki_pages: Wikia ikusi
- permission_view_wiki_edits: Wikiaren historia ikusi
- permission_edit_wiki_pages: Wiki orriak editatu
- permission_delete_wiki_pages_attachments: Eranskinak ezabatu
- permission_protect_wiki_pages: Wiki orriak babestu
- permission_manage_repository: Biltegiak kudeatu
- permission_browse_repository: Biltegia arakatu
- permission_view_changesets: Aldaketak ikusi
- permission_commit_access: Commit atzipena
- permission_manage_boards: Foroak kudeatu
- permission_view_messages: Mezuak ikusi
- permission_add_messages: Mezuak bidali
- permission_edit_messages: Mezuak aldatu
- permission_edit_own_messages: Nork bere mezuak aldatu
- permission_delete_messages: Mezuak ezabatu
- permission_delete_own_messages: Nork bere mezuak ezabatu
-
- project_module_issue_tracking: Zereginen jarraipena
- project_module_time_tracking: Denbora jarraipena
- project_module_news: Berriak
- project_module_documents: Dokumentuak
- project_module_files: Fitxategiak
- project_module_wiki: Wiki
- project_module_repository: Biltegia
- project_module_boards: Foroak
-
- label_user: Erabiltzailea
- label_user_plural: Erabiltzaileak
- label_user_new: Erabiltzaile berria
- label_user_anonymous: Ezezaguna
- label_project: Proiektua
- label_project_new: Proiektu berria
- label_project_plural: Proiektuak
- label_x_projects:
- zero: proiekturik ez
- one: proiektu bat
- other: "%{count} proiektu"
- label_project_all: Proiektu guztiak
- label_project_latest: Azken proiektuak
- label_issue: Zeregina
- label_issue_new: Zeregin berria
- label_issue_plural: Zereginak
- label_issue_view_all: Zeregin guztiak ikusi
- label_issues_by: "Zereginak honengatik: %{value}"
- label_issue_added: Zeregina gehituta
- label_issue_updated: Zeregina eguneratuta
- label_document: Dokumentua
- label_document_new: Dokumentu berria
- label_document_plural: Dokumentuak
- label_document_added: Dokumentua gehituta
- label_role: Rola
- label_role_plural: Rolak
- label_role_new: Rol berria
- label_role_and_permissions: Rolak eta baimenak
- label_member: Kidea
- label_member_new: Kide berria
- label_member_plural: Kideak
- label_tracker: Aztarnaria
- label_tracker_plural: Aztarnariak
- label_tracker_new: Aztarnari berria
- label_workflow: Lan-fluxua
- label_issue_status: Zeregin egoera
- label_issue_status_plural: Zeregin egoerak
- label_issue_status_new: Egoera berria
- label_issue_category: Zeregin kategoria
- label_issue_category_plural: Zeregin kategoriak
- label_issue_category_new: Kategoria berria
- label_custom_field: Eremu pertsonalizatua
- label_custom_field_plural: Eremu pertsonalizatuak
- label_custom_field_new: Eremu pertsonalizatu berria
- label_enumerations: Enumerazioak
- label_enumeration_new: Balio berria
- label_information: Informazioa
- label_information_plural: Informazioa
- label_please_login: Saioa hasi mesedez
- label_register: Erregistratu
- label_login_with_open_id_option: edo OpenID-rekin saioa hasi
- label_password_lost: Pasahitza galduta
- label_home: Hasiera
- label_my_page: Nire orria
- label_my_account: Nire kontua
- label_my_projects: Nire proiektuak
- label_administration: Kudeaketa
- label_login: Saioa hasi
- label_logout: Saioa bukatu
- label_help: Laguntza
- label_reported_issues: Berri emandako zereginak
- label_assigned_to_me_issues: Niri esleitutako arazoak
- label_last_login: Azken konexioa
- label_registered_on: Noiz erregistratuta
- label_activity: Jarduerak
- label_overall_activity: Jarduera guztiak
- label_user_activity: "%{value}-(r)en jarduerak"
- label_new: Berria
- label_logged_as: "Sartutako erabiltzailea:"
- label_environment: Ingurune
- label_authentication: Autentikazioa
- label_auth_source: Autentikazio modua
- label_auth_source_new: Autentikazio modu berria
- label_auth_source_plural: Autentikazio moduak
- label_subproject_plural: Azpiproiektuak
- label_subproject_new: Azpiproiektu berria
- label_and_its_subprojects: "%{value} eta bere azpiproiektuak"
- label_min_max_length: Luzera min - max
- label_list: Zerrenda
- label_date: Data
- label_integer: Osokoa
- label_float: Koma higikorrekoa
- label_boolean: Boolearra
- label_string: Testua
- label_text: Testu luzea
- label_attribute: Atributua
- label_attribute_plural: Atributuak
- label_download: "Deskarga %{count}"
- label_download_plural: "%{count} Deskarga"
- label_no_data: Ez dago erakusteko daturik
- label_change_status: Egoera aldatu
- label_history: Historikoa
- label_attachment: Fitxategia
- label_attachment_new: Fitxategi berria
- label_attachment_delete: Fitxategia ezabatu
- label_attachment_plural: Fitxategiak
- label_file_added: Fitxategia gehituta
- label_report: Berri ematea
- label_report_plural: Berri emateak
- label_news: Berria
- label_news_new: Berria gehitu
- label_news_plural: Berriak
- label_news_latest: Azken berriak
- label_news_view_all: Berri guztiak ikusi
- label_news_added: Berria gehituta
- label_change_log: Aldaketa egunkaria
- label_settings: Ezarpenak
- label_overview: Gainbegirada
- label_version: Bertsioa
- label_version_new: Bertsio berria
- label_version_plural: Bertsioak
- label_close_versions: Burututako bertsioak itxi
- label_confirmation: Baieztapena
- label_export_to: 'Eskuragarri baita:'
- label_read: Irakurri...
- label_public_projects: Proiektu publikoak
- label_open_issues: irekita
- label_open_issues_plural: irekiak
- label_closed_issues: itxita
- label_closed_issues_plural: itxiak
- label_x_open_issues_abbr_on_total:
- zero: 0 irekita / %{total}
- one: 1 irekita / %{total}
- other: "%{count} irekiak / %{total}"
- label_x_open_issues_abbr:
- zero: 0 irekita
- one: 1 irekita
- other: "%{count} irekiak"
- label_x_closed_issues_abbr:
- zero: 0 itxita
- one: 1 itxita
- other: "%{count} itxiak"
- label_total: Guztira
- label_permissions: Baimenak
- label_current_status: Uneko egoera
- label_new_statuses_allowed: Baimendutako egoera berriak
- label_all: guztiak
- label_none: ezer
- label_nobody: inor
- label_next: Hurrengoa
- label_previous: Aurrekoak
- label_used_by: Erabilita
- label_details: Xehetasunak
- label_add_note: Oharra gehitu
- label_per_page: Orriko
- label_calendar: Egutegia
- label_months_from: hilabete noiztik
- label_gantt: Gantt
- label_internal: Barnekoa
- label_last_changes: "azken %{count} aldaketak"
- label_change_view_all: Aldaketa guztiak ikusi
- label_personalize_page: Orri hau pertsonalizatu
- label_comment: Iruzkin
- label_comment_plural: Iruzkinak
- label_x_comments:
- zero: iruzkinik ez
- one: iruzkin 1
- other: "%{count} iruzkin"
- label_comment_add: Iruzkina gehitu
- label_comment_added: Iruzkina gehituta
- label_comment_delete: Iruzkinak ezabatu
- label_query: Galdera pertsonalizatua
- label_query_plural: Pertsonalizatutako galderak
- label_query_new: Galdera berria
- label_filter_add: Iragazkia gehitu
- label_filter_plural: Iragazkiak
- label_equals: da
- label_not_equals: ez da
- label_in_less_than: baino gutxiagotan
- label_in_more_than: baino gehiagotan
- label_greater_or_equal: '>='
- label_less_or_equal: '<='
- label_in: hauetan
- label_today: gaur
- label_all_time: denbora guztia
- label_yesterday: atzo
- label_this_week: aste honetan
- label_last_week: pasadan astean
- label_last_n_days: "azken %{count} egunetan"
- label_this_month: hilabete hau
- label_last_month: pasadan hilabetea
- label_this_year: urte hau
- label_date_range: Data tartea
- label_less_than_ago: egun hauek baino gutxiago
- label_more_than_ago: egun hauek baino gehiago
- label_ago: orain dela
- label_contains: dauka
- label_not_contains: ez dauka
- label_day_plural: egun
- label_repository: Biltegia
- label_repository_plural: Biltegiak
- label_browse: Arakatu
- label_modification: "aldaketa %{count}"
- label_modification_plural: "%{count} aldaketa"
- label_branch: Adarra
- label_tag: Etiketa
- label_revision: Berrikuspena
- label_revision_plural: Berrikuspenak
- label_revision_id: "%{value} berrikuspen"
- label_associated_revisions: Elkartutako berrikuspenak
- label_added: gehituta
- label_modified: aldatuta
- label_copied: kopiatuta
- label_renamed: berrizendatuta
- label_deleted: ezabatuta
- label_latest_revision: Azken berrikuspena
- label_latest_revision_plural: Azken berrikuspenak
- label_view_revisions: Berrikuspenak ikusi
- label_view_all_revisions: Berrikuspen guztiak ikusi
- label_max_size: Tamaina maximoa
- label_sort_highest: Goraino mugitu
- label_sort_higher: Gora mugitu
- label_sort_lower: Behera mugitu
- label_sort_lowest: Beheraino mugitu
- label_roadmap: Ibilbide-mapa
- label_roadmap_due_in: "Epea: %{value}"
- label_roadmap_overdue: "%{value} berandu"
- label_roadmap_no_issues: Ez dago zereginik bertsio honetan
- label_search: Bilatu
- label_result_plural: Emaitzak
- label_all_words: hitz guztiak
- label_wiki: Wikia
- label_wiki_edit: Wiki edizioa
- label_wiki_edit_plural: Wiki edizioak
- label_wiki_page: Wiki orria
- label_wiki_page_plural: Wiki orriak
- label_index_by_title: Izenburuaren araberako indizea
- label_index_by_date: Dataren araberako indizea
- label_current_version: Uneko bertsioa
- label_preview: Aurreikusi
- label_feed_plural: Jarioak
- label_changes_details: Aldaketa guztien xehetasunak
- label_issue_tracking: Zeregin jarraipena
- label_spent_time: Igarotako denbora
- label_f_hour: "ordu %{value}"
- label_f_hour_plural: "%{value} ordu"
- label_time_tracking: Denbora jarraipena
- label_change_plural: Aldaketak
- label_statistics: Estatistikak
- label_commits_per_month: Commit-ak hilabeteka
- label_commits_per_author: Commit-ak egileka
- label_view_diff: Ezberdintasunak ikusi
- label_diff_inline: barnean
- label_diff_side_by_side: aldez alde
- label_options: Aukerak
- label_copy_workflow_from: Kopiatu workflow-a hemendik
- label_permissions_report: Baimenen txostena
- label_watched_issues: Behatutako zereginak
- label_related_issues: Erlazionatutako zereginak
- label_applied_status: Aplikatutako egoera
- label_loading: Kargatzen...
- label_relation_new: Erlazio berria
- label_relation_delete: Erlazioa ezabatu
- label_relates_to: erlazionatuta dago
- label_duplicates: bikoizten du
- label_duplicated_by: honek bikoiztuta
- label_blocks: blokeatzen du
- label_blocked_by: honek blokeatuta
- label_precedes: aurretik doa
- label_follows: jarraitzen du
- label_end_to_start: bukaeratik hasierara
- label_end_to_end: bukaeratik bukaerara
- label_start_to_start: hasieratik hasierhasieratik bukaerara
- label_start_to_end: hasieratik bukaerara
- label_stay_logged_in: Saioa mantendu
- label_disabled: ezgaituta
- label_show_completed_versions: Bukatutako bertsioak ikusi
- label_me: ni
- label_board: Foroa
- label_board_new: Foro berria
- label_board_plural: Foroak
- label_topic_plural: Gaiak
- label_message_plural: Mezuak
- label_message_last: Azken mezua
- label_message_new: Mezu berria
- label_message_posted: Mesua gehituta
- label_reply_plural: Erantzunak
- label_send_information: Erabiltzaileai kontuaren informazioa bidali
- label_year: Urtea
- label_month: Hilabetea
- label_week: Astea
- label_date_from: Nork
- label_date_to: Nori
- label_language_based: Erabiltzailearen hizkuntzaren arabera
- label_sort_by: "Ordenazioa: %{value}"
- label_send_test_email: Frogako mezua bidali
- label_feeds_access_key: RSS atzipen giltza
- label_missing_feeds_access_key: RSS atzipen giltza falta da
- label_feeds_access_key_created_on: "RSS atzipen giltza orain dela %{value} sortuta"
- label_module_plural: Moduluak
- label_added_time_by: "%{author}, orain dela %{age} gehituta"
- label_updated_time_by: "%{author}, orain dela %{age} eguneratuta"
- label_updated_time: "Orain dela %{value} eguneratuta"
- label_jump_to_a_project: Joan proiektura...
- label_file_plural: Fitxategiak
- label_changeset_plural: Aldaketak
- label_default_columns: Lehenetsitako zutabeak
- label_no_change_option: (Aldaketarik ez)
- label_bulk_edit_selected_issues: Hautatutako zereginak batera editatu
- label_theme: Itxura
- label_default: Lehenetsia
- label_search_titles_only: Izenburuetan bakarrik bilatu
- label_user_mail_option_all: "Nire proiektu guztietako gertakari guztientzat"
- label_user_mail_option_selected: "Hautatutako proiektuetako edozein gertakarientzat..."
- label_user_mail_no_self_notified: "Ez dut nik egiten ditudan aldeketen jakinarazpenik jaso nahi"
- label_registration_activation_by_email: kontuak epostaz gaitu
- label_registration_manual_activation: kontuak eskuz gaitu
- label_registration_automatic_activation: kontuak automatikoki gaitu
- label_display_per_page: "Orriko: %{value}"
- label_age: Adina
- label_change_properties: Propietateak aldatu
- label_general: Orokorra
- label_more: Gehiago
- label_scm: IKK
- label_plugins: Pluginak
- label_ldap_authentication: LDAP autentikazioa
- label_downloads_abbr: Desk.
- label_optional_description: Aukerako deskribapena
- label_add_another_file: Beste fitxategia gehitu
- label_preferences: Hobespenak
- label_chronological_order: Orden kronologikoan
- label_reverse_chronological_order: Alderantzizko orden kronologikoan
- label_planning: Planifikazioa
- label_incoming_emails: Sarrerako epostak
- label_generate_key: Giltza sortu
- label_issue_watchers: Behatzaileak
- label_example: Adibidea
- label_display: Bistaratzea
- label_sort: Ordenatu
- label_ascending: Gorantz
- label_descending: Beherantz
- label_date_from_to: "%{start}-tik %{end}-ra"
- label_wiki_content_added: Wiki orria gehituta
- label_wiki_content_updated: Wiki orria eguneratuta
- label_group: Taldea
- label_group_plural: Taldeak
- label_group_new: Talde berria
- label_time_entry_plural: Igarotako denbora
- label_version_sharing_none: Ez partekatuta
- label_version_sharing_descendants: Azpiproiektuekin
- label_version_sharing_hierarchy: Proiektu Hierarkiarekin
- label_version_sharing_tree: Proiektu zuhaitzarekin
- label_version_sharing_system: Proiektu guztiekin
- label_update_issue_done_ratios: Zereginen burututako erlazioa eguneratu
- label_copy_source: Iturburua
- label_copy_target: Helburua
- label_copy_same_as_target: Helburuaren berdina
- label_display_used_statuses_only: Aztarnari honetan erabiltzen diren egoerak bakarrik erakutsi
- label_api_access_key: API atzipen giltza
- label_missing_api_access_key: API atzipen giltza falta da
- label_api_access_key_created_on: "API atzipen giltza sortuta orain dela %{value}"
-
- button_login: Saioa hasi
- button_submit: Bidali
- button_save: Gorde
- button_check_all: Guztiak markatu
- button_uncheck_all: Guztiak desmarkatu
- button_delete: Ezabatu
- button_create: Sortu
- button_create_and_continue: Sortu eta jarraitu
- button_test: Frogatu
- button_edit: Editatu
- button_add: Gehitu
- button_change: Aldatu
- button_apply: Aplikatu
- button_clear: Garbitu
- button_lock: Blokeatu
- button_unlock: Desblokeatu
- button_download: Deskargatu
- button_list: Zerrenda
- button_view: Ikusi
- button_move: Mugitu
- button_move_and_follow: Mugitu eta jarraitu
- button_back: Atzera
- button_cancel: Ezeztatu
- button_activate: Gahitu
- button_sort: Ordenatu
- button_log_time: Denbora erregistratu
- button_rollback: Itzuli bertsio honetara
- button_watch: Behatu
- button_unwatch: Behatzen utzi
- button_reply: Erantzun
- button_archive: Artxibatu
- button_unarchive: Desartxibatu
- button_reset: Berrezarri
- button_rename: Berrizendatu
- button_change_password: Pasahitza aldatu
- button_copy: Kopiatu
- button_copy_and_follow: Kopiatu eta jarraitu
- button_annotate: Anotatu
- button_update: Eguneratu
- button_configure: Konfiguratu
- button_quote: Aipatu
- button_duplicate: Bikoiztu
- button_show: Ikusi
-
- status_active: gaituta
- status_registered: izena emanda
- status_locked: blokeatuta
-
- version_status_open: irekita
- version_status_locked: blokeatuta
- version_status_closed: itxita
-
- field_active: Gaituta
-
- text_select_mail_notifications: Jakinarazpenak zein ekintzetarako bidaliko diren hautatu.
- text_regexp_info: adib. ^[A-Z0-9]+$
- text_min_max_length_info: 0k mugarik gabe esan nahi du
- text_project_destroy_confirmation: Ziur zaude proiektu hau eta erlazionatutako datu guztiak ezabatu nahi dituzula?
- text_subprojects_destroy_warning: "%{value} azpiproiektuak ere ezabatuko dira."
- text_workflow_edit: Hautatu rola eta aztarnaria workflow-a editatzeko
- text_are_you_sure: Ziur zaude?
- text_journal_changed: "%{label} %{old}-(e)tik %{new}-(e)ra aldatuta"
- text_journal_set_to: "%{label}-k %{value} balioa hartu du"
- text_journal_deleted: "%{label} ezabatuta (%{old})"
- text_journal_added: "%{label} %{value} gehituta"
- text_tip_issue_begin_day: gaur hasten diren zereginak
- text_tip_issue_end_day: gaur bukatzen diren zereginak
- text_tip_issue_begin_end_day: gaur hasi eta bukatzen diren zereginak
- text_project_identifier_info: 'Letra xeheak (a-z), zenbakiak eta marrak erabil daitezke bakarrik.
+# 2010-01-25
+# Distributed under the same terms as the Redmine itself.
+eu:
+ direction: ltr
+ date:
+ formats:
+ # Use the strftime parameters for formats.
+ # When no format has been given, it uses default.
+ # You can provide other formats here if you like!
+ default: "%Y/%m/%d"
+ short: "%b %d"
+ long: "%Y %B %d"
+
+ day_names: [Igandea, Astelehena, Asteartea, Asteazkena, Osteguna, Ostirala, Larunbata]
+ abbr_day_names: [Ig., Al., Ar., Az., Og., Or., La.]
+
+ # Don't forget the nil at the beginning; there's no such thing as a 0th month
+ month_names: [~, Urtarrila, Otsaila, Martxoa, Apirila, Maiatza, Ekaina, Uztaila, Abuztua, Iraila, Urria, Azaroa, Abendua]
+ abbr_month_names: [~, Urt, Ots, Mar, Api, Mai, Eka, Uzt, Abu, Ira, Urr, Aza, Abe]
+ # Used in date_select and datime_select.
+ order:
+ - :year
+ - :month
+ - :day
+
+ time:
+ formats:
+ default: "%Y/%m/%d %H:%M"
+ time: "%H:%M"
+ short: "%b %d %H:%M"
+ long: "%Y %B %d %H:%M"
+ am: "am"
+ pm: "pm"
+
+ datetime:
+ distance_in_words:
+ half_a_minute: "minutu erdi"
+ less_than_x_seconds:
+ one: "segundu bat baino gutxiago"
+ other: "%{count} segundu baino gutxiago"
+ x_seconds:
+ one: "segundu 1"
+ other: "%{count} segundu"
+ less_than_x_minutes:
+ one: "minutu bat baino gutxiago"
+ other: "%{count} minutu baino gutxiago"
+ x_minutes:
+ one: "minutu 1"
+ other: "%{count} minutu"
+ about_x_hours:
+ one: "ordu 1 inguru"
+ other: "%{count} ordu inguru"
+ x_days:
+ one: "egun 1"
+ other: "%{count} egun"
+ about_x_months:
+ one: "hilabete 1 inguru"
+ other: "%{count} hilabete inguru"
+ x_months:
+ one: "hilabete 1"
+ other: "%{count} hilabete"
+ about_x_years:
+ one: "urte 1 inguru"
+ other: "%{count} urte inguru"
+ over_x_years:
+ one: "urte 1 baino gehiago"
+ other: "%{count} urte baino gehiago"
+ almost_x_years:
+ one: "ia urte 1"
+ other: "ia %{count} urte"
+
+ number:
+ format:
+ separator: "."
+ delimiter: ""
+ precision: 3
+ human:
+ format:
+ delimiter: ""
+ precision: 1
+ storage_units:
+ format: "%n %u"
+ units:
+ byte:
+ one: "Byte"
+ other: "Byte"
+ kb: "KB"
+ mb: "MB"
+ gb: "GB"
+ tb: "TB"
+
+
+# Used in array.to_sentence.
+ support:
+ array:
+ sentence_connector: "eta"
+ skip_last_comma: false
+
+ activerecord:
+ errors:
+ template:
+ header:
+ one: "Errore batek %{model} hau godetzea galarazi du."
+ other: "%{count} errorek %{model} hau gordetzea galarazi dute."
+ messages:
+ inclusion: "ez dago zerrendan"
+ exclusion: "erreserbatuta dago"
+ invalid: "baliogabea da"
+ confirmation: "ez du berrespenarekin bat egiten"
+ accepted: "onartu behar da"
+ empty: "ezin da hutsik egon"
+ blank: "ezin da hutsik egon"
+ too_long: "luzeegia da (maximoa %{count} karaktere dira)"
+ too_short: "laburregia da (minimoa %{count} karaktere dira)"
+ wrong_length: "luzera ezegokia da (%{count} karakter izan beharko litzake)"
+ taken: "dagoeneko hartuta dago"
+ not_a_number: "ez da zenbaki bat"
+ not_a_date: "ez da baliozko data"
+ greater_than: "%{count} baino handiagoa izan behar du"
+ greater_than_or_equal_to: "%{count} edo handiagoa izan behar du"
+ equal_to: "%{count} izan behar du"
+ less_than: "%{count} baino gutxiago izan behar du"
+ less_than_or_equal_to: "%{count} edo gutxiago izan behar du"
+ odd: "bakoitia izan behar du"
+ even: "bikoitia izan behar du"
+ greater_than_start_date: "hasiera data baino handiagoa izan behar du"
+ not_same_project: "ez dago proiektu berdinean"
+ circular_dependency: "Erlazio honek mendekotasun zirkular bat sortuko luke"
+ cant_link_an_issue_with_a_descendant: "Zeregin bat ezin da bere azpiataza batekin estekatu."
+
+ actionview_instancetag_blank_option: Hautatu mesedez
+
+ general_text_No: 'Ez'
+ general_text_Yes: 'Bai'
+ general_text_no: 'ez'
+ general_text_yes: 'bai'
+ general_lang_name: 'Euskara'
+ general_csv_separator: ','
+ general_csv_decimal_separator: '.'
+ general_csv_encoding: UTF-8
+ general_pdf_encoding: UTF-8
+ general_first_day_of_week: '1'
+
+ notice_account_updated: Kontua ongi eguneratu da.
+ notice_account_invalid_creditentials: Erabiltzaile edo pasahitz ezegokia
+ notice_account_password_updated: Pasahitza ongi eguneratu da.
+ notice_account_wrong_password: Pasahitz ezegokia.
+ notice_account_register_done: Kontua ongi sortu da. Kontua gaitzeko klikatu epostan adierazi zaizun estekan.
+ notice_account_unknown_email: Erabiltzaile ezezaguna.
+ notice_can_t_change_password: Kontu honek kanpoko autentikazio bat erabiltzen du. Ezinezkoa da pasahitza aldatzea.
+ notice_account_lost_email_sent: Pasahitz berria aukeratzeko jarraibideak dituen eposta bat bidali zaizu.
+ notice_account_activated: Zure kontua gaituta dago. Orain saioa has dezakezu
+ notice_successful_create: Sortze arrakastatsua.
+ notice_successful_update: Eguneratze arrakastatsua.
+ notice_successful_delete: Ezabaketa arrakastatsua.
+ notice_successful_connection: Konexio arrakastatsua.
+ notice_file_not_found: Atzitu nahi duzun orria ez da exisitzen edo ezabatua izan da.
+ notice_locking_conflict: Beste erabiltzaile batek datuak eguneratu ditu.
+ notice_not_authorized: Ez duzu orri hau atzitzeko baimenik.
+ notice_email_sent: "%{value} helbidera eposta bat bidali da"
+ notice_email_error: "Errorea eposta bidaltzean (%{value})"
+ notice_feeds_access_key_reseted: Zure RSS atzipen giltza berrezarri da.
+ notice_api_access_key_reseted: Zure API atzipen giltza berrezarri da.
+ notice_failed_to_save_issues: "Hautatutako %{total} zereginetatik %{count} ezin izan dira konpondu: %{ids}."
+ notice_no_issue_selected: "Ez da zereginik hautatu! Mesedez, editatu nahi dituzun arazoak markatu."
+ notice_account_pending: "Zure kontua sortu da, orain kudeatzailearen onarpenaren zain dago."
+ notice_default_data_loaded: Lehenetsitako konfigurazioa ongi kargatu da.
+ notice_unable_delete_version: Ezin da bertsioa ezabatu.
+ notice_issue_done_ratios_updated: Burututako zereginen erlazioa eguneratu da.
+
+ error_can_t_load_default_data: "Ezin izan da lehenetsitako konfigurazioa kargatu: %{value}"
+ error_scm_not_found: "Sarrera edo berrikuspena ez da biltegian topatu."
+ error_scm_command_failed: "Errorea gertatu da biltegia atzitzean: %{value}"
+ error_scm_annotate: "Sarrera ez da existitzen edo ezin da anotatu."
+ error_issue_not_found_in_project: 'Zeregina ez da topatu edo ez da proiektu honetakoa'
+ error_no_tracker_in_project: 'Proiektu honek ez du aztarnaririk esleituta. Mesedez egiaztatu Proiektuaren ezarpenak.'
+ error_no_default_issue_status: 'Zereginek ez dute lehenetsitako egoerarik. Mesedez egiaztatu zure konfigurazioa ("Kudeaketa -> Arazoen egoerak" atalera joan).'
+ error_can_not_reopen_issue_on_closed_version: 'Itxitako bertsio batera esleitutako zereginak ezin dira berrireki'
+ error_can_not_archive_project: Proiektu hau ezin da artxibatu
+ error_issue_done_ratios_not_updated: "Burututako zereginen erlazioa ez da eguneratu."
+ error_workflow_copy_source: 'Mesedez hautatu iturburuko aztarnari edo rola'
+ error_workflow_copy_target: 'Mesedez hautatu helburuko aztarnari(ak) edo rola(k)'
+
+ warning_attachments_not_saved: "%{count} fitxategi ezin izan d(ir)a gorde."
+
+ mail_subject_lost_password: "Zure %{value} pasahitza"
+ mail_body_lost_password: 'Zure pasahitza aldatzeko hurrengo estekan klikatu:'
+ mail_subject_register: "Zure %{value} kontuaren gaitzea"
+ mail_body_register: 'Zure kontua gaitzeko hurrengo estekan klikatu:'
+ mail_body_account_information_external: "Zure %{value} kontua erabil dezakezu saioa hasteko."
+ mail_body_account_information: Zure kontuaren informazioa
+ mail_subject_account_activation_request: "%{value} kontu gaitzeko eskaera"
+ mail_body_account_activation_request: "Erabiltzaile berri bat (%{value}) erregistratu da. Kontua zure onarpenaren zain dago:"
+ mail_subject_reminder: "%{count} arazo hurrengo %{days} egunetan amaitzen d(ir)a"
+ mail_body_reminder: "Zuri esleituta dauden %{count} arazo hurrengo %{days} egunetan amaitzen d(ir)a:"
+ mail_subject_wiki_content_added: "'%{id}' wiki orria gehitu da"
+ mail_body_wiki_content_added: "%{author}-(e)k '%{id}' wiki orria gehitu du."
+ mail_subject_wiki_content_updated: "'%{id}' wiki orria eguneratu da"
+ mail_body_wiki_content_updated: "%{author}-(e)k '%{id}' wiki orria eguneratu du."
+
+ gui_validation_error: akats 1
+ gui_validation_error_plural: "%{count} akats"
+
+ field_name: Izena
+ field_description: Deskribapena
+ field_summary: Laburpena
+ field_is_required: Beharrezkoa
+ field_firstname: Izena
+ field_lastname: Abizenak
+ field_mail: Eposta
+ field_filename: Fitxategia
+ field_filesize: Tamaina
+ field_downloads: Deskargak
+ field_author: Egilea
+ field_created_on: Sortuta
+ field_updated_on: Eguneratuta
+ field_field_format: Formatua
+ field_is_for_all: Proiektu guztietarako
+ field_possible_values: Balio posibleak
+ field_regexp: Expresio erregularra
+ field_min_length: Luzera minimoa
+ field_max_length: Luzera maxioma
+ field_value: Balioa
+ field_category: Kategoria
+ field_title: Izenburua
+ field_project: Proiektua
+ field_issue: Zeregina
+ field_status: Egoera
+ field_notes: Oharrak
+ field_is_closed: Itxitako arazoa
+ field_is_default: Lehenetsitako balioa
+ field_tracker: Aztarnaria
+ field_subject: Gaia
+ field_due_date: Amaiera data
+ field_assigned_to: Esleituta
+ field_priority: Lehentasuna
+ field_fixed_version: Helburuko bertsioa
+ field_user: Erabiltzilea
+ field_role: Rola
+ field_homepage: Orri nagusia
+ field_is_public: Publikoa
+ field_parent: "Honen azpiproiektua:"
+ field_is_in_chlog: Zereginak aldaketa egunkarian ikusten dira
+ field_is_in_roadmap: Arazoak ibilbide-mapan erakutsi
+ field_login: Erabiltzaile izena
+ field_mail_notification: Eposta jakinarazpenak
+ field_admin: Kudeatzailea
+ field_last_login_on: Azken konexioa
+ field_language: Hizkuntza
+ field_effective_date: Data
+ field_password: Pasahitza
+ field_new_password: Pasahitz berria
+ field_password_confirmation: Berrespena
+ field_version: Bertsioa
+ field_type: Mota
+ field_host: Ostalaria
+ field_port: Portua
+ field_account: Kontua
+ field_base_dn: Base DN
+ field_attr_login: Erabiltzaile atributua
+ field_attr_firstname: Izena atributua
+ field_attr_lastname: Abizenak atributua
+ field_attr_mail: Eposta atributua
+ field_onthefly: Zuzeneko erabiltzaile sorrera
+ field_start_date: Hasiera
+ field_done_ratio: Egindako %
+ field_auth_source: Autentikazio modua
+ field_hide_mail: Nire eposta helbidea ezkutatu
+ field_comments: Iruzkina
+ field_url: URL
+ field_start_page: Hasierako orria
+ field_subproject: Azpiproiektua
+ field_hours: Ordu
+ field_activity: Jarduera
+ field_spent_on: Data
+ field_identifier: Identifikatzailea
+ field_is_filter: Iragazki moduan erabilita
+ field_issue_to: Erlazionatutako zereginak
+ field_delay: Atzerapena
+ field_assignable: Arazoak rol honetara esleitu daitezke
+ field_redirect_existing_links: Existitzen diren estekak berbideratu
+ field_estimated_hours: Estimatutako denbora
+ field_column_names: Zutabeak
+ field_time_zone: Ordu zonaldea
+ field_searchable: Bilagarria
+ field_default_value: Lehenetsitako balioa
+ field_comments_sorting: Iruzkinak erakutsi
+ field_parent_title: Orri gurasoa
+ field_editable: Editagarria
+ field_watcher: Behatzailea
+ field_identity_url: OpenID URLa
+ field_content: Edukia
+ field_group_by: Emaitzak honegatik taldekatu
+ field_sharing: Partekatzea
+
+ setting_app_title: Aplikazioaren izenburua
+ setting_app_subtitle: Aplikazioaren azpizenburua
+ setting_welcome_text: Ongietorriko testua
+ setting_default_language: Lehenetsitako hizkuntza
+ setting_login_required: Autentikazioa derrigorrezkoa
+ setting_self_registration: Norberak erregistratu
+ setting_attachment_max_size: Eranskinen tamaina max.
+ setting_issues_export_limit: Zereginen esportatze limitea
+ setting_mail_from: Igorlearen eposta helbidea
+ setting_bcc_recipients: Hartzaileak ezkutuko kopian (bcc)
+ setting_plain_text_mail: Testu soileko epostak (HTML-rik ez)
+ setting_host_name: Ostalari izena eta bidea
+ setting_text_formatting: Testu formatua
+ setting_wiki_compression: Wikiaren historia konprimitu
+ setting_feeds_limit: Jarioaren edukiera limitea
+ setting_default_projects_public: Proiektu berriak defektuz publikoak dira
+ setting_autofetch_changesets: Commit-ak automatikoki hartu
+ setting_sys_api_enabled: Biltegien kudeaketarako WS gaitu
+ setting_commit_ref_keywords: Erreferentzien gako-hitzak
+ setting_commit_fix_keywords: Konpontze gako-hitzak
+ setting_autologin: Saioa automatikoki hasi
+ setting_date_format: Data formatua
+ setting_time_format: Ordu formatua
+ setting_cross_project_issue_relations: Zereginak proiektuen artean erlazionatzea baimendu
+ setting_issue_list_default_columns: Zereginen zerrendan defektuz ikusten diren zutabeak
+ setting_repositories_encodings: Biltegien kodeketak
+ setting_emails_footer: Eposten oina
+ setting_protocol: Protokoloa
+ setting_per_page_options: Orriko objektuen aukerak
+ setting_user_format: Erabiltzaileak erakusteko formatua
+ setting_activity_days_default: Proiektuen jardueran erakusteko egunak
+ setting_display_subprojects_issues: Azpiproiektuen zereginak proiektu nagusian erakutsi defektuz
+ setting_enabled_scm: Gaitutako IKKak
+ setting_mail_handler_body_delimiters: "Lerro hauteko baten ondoren epostak moztu"
+ setting_mail_handler_api_enabled: Sarrerako epostentzako WS gaitu
+ setting_mail_handler_api_key: API giltza
+ setting_sequential_project_identifiers: Proiektuen identifikadore sekuentzialak sortu
+ setting_gravatar_enabled: Erabili Gravatar erabiltzaile ikonoak
+ setting_gravatar_default: Lehenetsitako Gravatar irudia
+ setting_diff_max_lines_displayed: Erakutsiko diren diff lerro kopuru maximoa
+ setting_file_max_size_displayed: Barnean erakuzten diren testu fitxategien tamaina maximoa
+ setting_repository_log_display_limit: Egunkari fitxategian erakutsiko diren berrikuspen kopuru maximoa.
+ setting_openid: Baimendu OpenID saio hasiera eta erregistatzea
+ setting_password_min_length: Pasahitzen luzera minimoa
+ setting_new_project_user_role_id: Proiektu berriak sortzerakoan kudeatzaile ez diren erabiltzaileei esleitutako rola
+ setting_default_projects_modules: Proiektu berrientzako defektuz gaitutako moduluak
+ setting_issue_done_ratio: "Zereginen burututako tasa kalkulatzean erabili:"
+ setting_issue_done_ratio_issue_field: Zeregin eremua erabili
+ setting_issue_done_ratio_issue_status: Zeregin egoera erabili
+ setting_start_of_week: "Egutegiak noiz hasi:"
+ setting_rest_api_enabled: Gaitu REST web zerbitzua
+
+ permission_add_project: Proiektua sortu
+ permission_add_subprojects: Azpiproiektuak sortu
+ permission_edit_project: Proiektua editatu
+ permission_select_project_modules: Proiektuaren moduluak hautatu
+ permission_manage_members: Kideak kudeatu
+ permission_manage_versions: Bertsioak kudeatu
+ permission_manage_categories: Arazoen kategoriak kudeatu
+ permission_view_issues: Zereginak ikusi
+ permission_add_issues: Zereginak gehitu
+ permission_edit_issues: Zereginak aldatu
+ permission_manage_issue_relations: Zereginen erlazioak kudeatu
+ permission_add_issue_notes: Oharrak gehitu
+ permission_edit_issue_notes: Oharrak aldatu
+ permission_edit_own_issue_notes: Nork bere oharrak aldatu
+ permission_move_issues: Zereginak mugitu
+ permission_delete_issues: Zereginak ezabatu
+ permission_manage_public_queries: Galdera publikoak kudeatu
+ permission_save_queries: Galderak gorde
+ permission_view_gantt: Gantt grafikoa ikusi
+ permission_view_calendar: Egutegia ikusi
+ permission_view_issue_watchers: Behatzaileen zerrenda ikusi
+ permission_add_issue_watchers: Behatzaileak gehitu
+ permission_delete_issue_watchers: Behatzaileak ezabatu
+ permission_log_time: Igarotako denbora erregistratu
+ permission_view_time_entries: Igarotako denbora ikusi
+ permission_edit_time_entries: Denbora egunkariak editatu
+ permission_edit_own_time_entries: Nork bere denbora egunkariak editatu
+ permission_manage_news: Berriak kudeatu
+ permission_comment_news: Berrien iruzkinak egin
+ permission_manage_documents: Dokumentuak kudeatu
+ permission_view_documents: Dokumentuak ikusi
+ permission_manage_files: Fitxategiak kudeatu
+ permission_view_files: Fitxategiak ikusi
+ permission_manage_wiki: Wikia kudeatu
+ permission_rename_wiki_pages: Wiki orriak berrizendatu
+ permission_delete_wiki_pages: Wiki orriak ezabatu
+ permission_view_wiki_pages: Wikia ikusi
+ permission_view_wiki_edits: Wikiaren historia ikusi
+ permission_edit_wiki_pages: Wiki orriak editatu
+ permission_delete_wiki_pages_attachments: Eranskinak ezabatu
+ permission_protect_wiki_pages: Wiki orriak babestu
+ permission_manage_repository: Biltegiak kudeatu
+ permission_browse_repository: Biltegia arakatu
+ permission_view_changesets: Aldaketak ikusi
+ permission_commit_access: Commit atzipena
+ permission_manage_boards: Foroak kudeatu
+ permission_view_messages: Mezuak ikusi
+ permission_add_messages: Mezuak bidali
+ permission_edit_messages: Mezuak aldatu
+ permission_edit_own_messages: Nork bere mezuak aldatu
+ permission_delete_messages: Mezuak ezabatu
+ permission_delete_own_messages: Nork bere mezuak ezabatu
+
+ project_module_issue_tracking: Zereginen jarraipena
+ project_module_time_tracking: Denbora jarraipena
+ project_module_news: Berriak
+ project_module_documents: Dokumentuak
+ project_module_files: Fitxategiak
+ project_module_wiki: Wiki
+ project_module_repository: Biltegia
+ project_module_boards: Foroak
+
+ label_user: Erabiltzailea
+ label_user_plural: Erabiltzaileak
+ label_user_new: Erabiltzaile berria
+ label_user_anonymous: Ezezaguna
+ label_project: Proiektua
+ label_project_new: Proiektu berria
+ label_project_plural: Proiektuak
+ label_x_projects:
+ zero: proiekturik ez
+ one: proiektu bat
+ other: "%{count} proiektu"
+ label_project_all: Proiektu guztiak
+ label_project_latest: Azken proiektuak
+ label_issue: Zeregina
+ label_issue_new: Zeregin berria
+ label_issue_plural: Zereginak
+ label_issue_view_all: Zeregin guztiak ikusi
+ label_issues_by: "Zereginak honengatik: %{value}"
+ label_issue_added: Zeregina gehituta
+ label_issue_updated: Zeregina eguneratuta
+ label_document: Dokumentua
+ label_document_new: Dokumentu berria
+ label_document_plural: Dokumentuak
+ label_document_added: Dokumentua gehituta
+ label_role: Rola
+ label_role_plural: Rolak
+ label_role_new: Rol berria
+ label_role_and_permissions: Rolak eta baimenak
+ label_member: Kidea
+ label_member_new: Kide berria
+ label_member_plural: Kideak
+ label_tracker: Aztarnaria
+ label_tracker_plural: Aztarnariak
+ label_tracker_new: Aztarnari berria
+ label_workflow: Lan-fluxua
+ label_issue_status: Zeregin egoera
+ label_issue_status_plural: Zeregin egoerak
+ label_issue_status_new: Egoera berria
+ label_issue_category: Zeregin kategoria
+ label_issue_category_plural: Zeregin kategoriak
+ label_issue_category_new: Kategoria berria
+ label_custom_field: Eremu pertsonalizatua
+ label_custom_field_plural: Eremu pertsonalizatuak
+ label_custom_field_new: Eremu pertsonalizatu berria
+ label_enumerations: Enumerazioak
+ label_enumeration_new: Balio berria
+ label_information: Informazioa
+ label_information_plural: Informazioa
+ label_please_login: Saioa hasi mesedez
+ label_register: Erregistratu
+ label_login_with_open_id_option: edo OpenID-rekin saioa hasi
+ label_password_lost: Pasahitza galduta
+ label_home: Hasiera
+ label_my_page: Nire orria
+ label_my_account: Nire kontua
+ label_my_projects: Nire proiektuak
+ label_administration: Kudeaketa
+ label_login: Saioa hasi
+ label_logout: Saioa bukatu
+ label_help: Laguntza
+ label_reported_issues: Berri emandako zereginak
+ label_assigned_to_me_issues: Niri esleitutako arazoak
+ label_last_login: Azken konexioa
+ label_registered_on: Noiz erregistratuta
+ label_activity: Jarduerak
+ label_overall_activity: Jarduera guztiak
+ label_user_activity: "%{value}-(r)en jarduerak"
+ label_new: Berria
+ label_logged_as: "Sartutako erabiltzailea:"
+ label_environment: Ingurune
+ label_authentication: Autentikazioa
+ label_auth_source: Autentikazio modua
+ label_auth_source_new: Autentikazio modu berria
+ label_auth_source_plural: Autentikazio moduak
+ label_subproject_plural: Azpiproiektuak
+ label_subproject_new: Azpiproiektu berria
+ label_and_its_subprojects: "%{value} eta bere azpiproiektuak"
+ label_min_max_length: Luzera min - max
+ label_list: Zerrenda
+ label_date: Data
+ label_integer: Osokoa
+ label_float: Koma higikorrekoa
+ label_boolean: Boolearra
+ label_string: Testua
+ label_text: Testu luzea
+ label_attribute: Atributua
+ label_attribute_plural: Atributuak
+ label_download: "Deskarga %{count}"
+ label_download_plural: "%{count} Deskarga"
+ label_no_data: Ez dago erakusteko daturik
+ label_change_status: Egoera aldatu
+ label_history: Historikoa
+ label_attachment: Fitxategia
+ label_attachment_new: Fitxategi berria
+ label_attachment_delete: Fitxategia ezabatu
+ label_attachment_plural: Fitxategiak
+ label_file_added: Fitxategia gehituta
+ label_report: Berri ematea
+ label_report_plural: Berri emateak
+ label_news: Berria
+ label_news_new: Berria gehitu
+ label_news_plural: Berriak
+ label_news_latest: Azken berriak
+ label_news_view_all: Berri guztiak ikusi
+ label_news_added: Berria gehituta
+ label_change_log: Aldaketa egunkaria
+ label_settings: Ezarpenak
+ label_overview: Gainbegirada
+ label_version: Bertsioa
+ label_version_new: Bertsio berria
+ label_version_plural: Bertsioak
+ label_close_versions: Burututako bertsioak itxi
+ label_confirmation: Baieztapena
+ label_export_to: 'Eskuragarri baita:'
+ label_read: Irakurri...
+ label_public_projects: Proiektu publikoak
+ label_open_issues: irekita
+ label_open_issues_plural: irekiak
+ label_closed_issues: itxita
+ label_closed_issues_plural: itxiak
+ label_x_open_issues_abbr_on_total:
+ zero: 0 irekita / %{total}
+ one: 1 irekita / %{total}
+ other: "%{count} irekiak / %{total}"
+ label_x_open_issues_abbr:
+ zero: 0 irekita
+ one: 1 irekita
+ other: "%{count} irekiak"
+ label_x_closed_issues_abbr:
+ zero: 0 itxita
+ one: 1 itxita
+ other: "%{count} itxiak"
+ label_total: Guztira
+ label_permissions: Baimenak
+ label_current_status: Uneko egoera
+ label_new_statuses_allowed: Baimendutako egoera berriak
+ label_all: guztiak
+ label_none: ezer
+ label_nobody: inor
+ label_next: Hurrengoa
+ label_previous: Aurrekoak
+ label_used_by: Erabilita
+ label_details: Xehetasunak
+ label_add_note: Oharra gehitu
+ label_per_page: Orriko
+ label_calendar: Egutegia
+ label_months_from: hilabete noiztik
+ label_gantt: Gantt
+ label_internal: Barnekoa
+ label_last_changes: "azken %{count} aldaketak"
+ label_change_view_all: Aldaketa guztiak ikusi
+ label_personalize_page: Orri hau pertsonalizatu
+ label_comment: Iruzkin
+ label_comment_plural: Iruzkinak
+ label_x_comments:
+ zero: iruzkinik ez
+ one: iruzkin 1
+ other: "%{count} iruzkin"
+ label_comment_add: Iruzkina gehitu
+ label_comment_added: Iruzkina gehituta
+ label_comment_delete: Iruzkinak ezabatu
+ label_query: Galdera pertsonalizatua
+ label_query_plural: Pertsonalizatutako galderak
+ label_query_new: Galdera berria
+ label_filter_add: Iragazkia gehitu
+ label_filter_plural: Iragazkiak
+ label_equals: da
+ label_not_equals: ez da
+ label_in_less_than: baino gutxiagotan
+ label_in_more_than: baino gehiagotan
+ label_greater_or_equal: '>='
+ label_less_or_equal: '<='
+ label_in: hauetan
+ label_today: gaur
+ label_all_time: denbora guztia
+ label_yesterday: atzo
+ label_this_week: aste honetan
+ label_last_week: pasadan astean
+ label_last_n_days: "azken %{count} egunetan"
+ label_this_month: hilabete hau
+ label_last_month: pasadan hilabetea
+ label_this_year: urte hau
+ label_date_range: Data tartea
+ label_less_than_ago: egun hauek baino gutxiago
+ label_more_than_ago: egun hauek baino gehiago
+ label_ago: orain dela
+ label_contains: dauka
+ label_not_contains: ez dauka
+ label_day_plural: egun
+ label_repository: Biltegia
+ label_repository_plural: Biltegiak
+ label_browse: Arakatu
+ label_modification: "aldaketa %{count}"
+ label_modification_plural: "%{count} aldaketa"
+ label_branch: Adarra
+ label_tag: Etiketa
+ label_revision: Berrikuspena
+ label_revision_plural: Berrikuspenak
+ label_revision_id: "%{value} berrikuspen"
+ label_associated_revisions: Elkartutako berrikuspenak
+ label_added: gehituta
+ label_modified: aldatuta
+ label_copied: kopiatuta
+ label_renamed: berrizendatuta
+ label_deleted: ezabatuta
+ label_latest_revision: Azken berrikuspena
+ label_latest_revision_plural: Azken berrikuspenak
+ label_view_revisions: Berrikuspenak ikusi
+ label_view_all_revisions: Berrikuspen guztiak ikusi
+ label_max_size: Tamaina maximoa
+ label_sort_highest: Goraino mugitu
+ label_sort_higher: Gora mugitu
+ label_sort_lower: Behera mugitu
+ label_sort_lowest: Beheraino mugitu
+ label_roadmap: Ibilbide-mapa
+ label_roadmap_due_in: "Epea: %{value}"
+ label_roadmap_overdue: "%{value} berandu"
+ label_roadmap_no_issues: Ez dago zereginik bertsio honetan
+ label_search: Bilatu
+ label_result_plural: Emaitzak
+ label_all_words: hitz guztiak
+ label_wiki: Wikia
+ label_wiki_edit: Wiki edizioa
+ label_wiki_edit_plural: Wiki edizioak
+ label_wiki_page: Wiki orria
+ label_wiki_page_plural: Wiki orriak
+ label_index_by_title: Izenburuaren araberako indizea
+ label_index_by_date: Dataren araberako indizea
+ label_current_version: Uneko bertsioa
+ label_preview: Aurreikusi
+ label_feed_plural: Jarioak
+ label_changes_details: Aldaketa guztien xehetasunak
+ label_issue_tracking: Zeregin jarraipena
+ label_spent_time: Igarotako denbora
+ label_f_hour: "ordu %{value}"
+ label_f_hour_plural: "%{value} ordu"
+ label_time_tracking: Denbora jarraipena
+ label_change_plural: Aldaketak
+ label_statistics: Estatistikak
+ label_commits_per_month: Commit-ak hilabeteka
+ label_commits_per_author: Commit-ak egileka
+ label_view_diff: Ezberdintasunak ikusi
+ label_diff_inline: barnean
+ label_diff_side_by_side: aldez alde
+ label_options: Aukerak
+ label_copy_workflow_from: Kopiatu workflow-a hemendik
+ label_permissions_report: Baimenen txostena
+ label_watched_issues: Behatutako zereginak
+ label_related_issues: Erlazionatutako zereginak
+ label_applied_status: Aplikatutako egoera
+ label_loading: Kargatzen...
+ label_relation_new: Erlazio berria
+ label_relation_delete: Erlazioa ezabatu
+ label_relates_to: erlazionatuta dago
+ label_duplicates: bikoizten du
+ label_duplicated_by: honek bikoiztuta
+ label_blocks: blokeatzen du
+ label_blocked_by: honek blokeatuta
+ label_precedes: aurretik doa
+ label_follows: jarraitzen du
+ label_end_to_start: bukaeratik hasierara
+ label_end_to_end: bukaeratik bukaerara
+ label_start_to_start: hasieratik hasierhasieratik bukaerara
+ label_start_to_end: hasieratik bukaerara
+ label_stay_logged_in: Saioa mantendu
+ label_disabled: ezgaituta
+ label_show_completed_versions: Bukatutako bertsioak ikusi
+ label_me: ni
+ label_board: Foroa
+ label_board_new: Foro berria
+ label_board_plural: Foroak
+ label_topic_plural: Gaiak
+ label_message_plural: Mezuak
+ label_message_last: Azken mezua
+ label_message_new: Mezu berria
+ label_message_posted: Mezua gehituta
+ label_reply_plural: Erantzunak
+ label_send_information: Erabiltzaileai kontuaren informazioa bidali
+ label_year: Urtea
+ label_month: Hilabetea
+ label_week: Astea
+ label_date_from: Nork
+ label_date_to: Nori
+ label_language_based: Erabiltzailearen hizkuntzaren arabera
+ label_sort_by: "Ordenazioa: %{value}"
+ label_send_test_email: Frogako mezua bidali
+ label_feeds_access_key: RSS atzipen giltza
+ label_missing_feeds_access_key: RSS atzipen giltza falta da
+ label_feeds_access_key_created_on: "RSS atzipen giltza orain dela %{value} sortuta"
+ label_module_plural: Moduluak
+ label_added_time_by: "%{author}, orain dela %{age} gehituta"
+ label_updated_time_by: "%{author}, orain dela %{age} eguneratuta"
+ label_updated_time: "Orain dela %{value} eguneratuta"
+ label_jump_to_a_project: Joan proiektura...
+ label_file_plural: Fitxategiak
+ label_changeset_plural: Aldaketak
+ label_default_columns: Lehenetsitako zutabeak
+ label_no_change_option: (Aldaketarik ez)
+ label_bulk_edit_selected_issues: Hautatutako zereginak batera editatu
+ label_theme: Itxura
+ label_default: Lehenetsia
+ label_search_titles_only: Izenburuetan bakarrik bilatu
+ label_user_mail_option_all: "Nire proiektu guztietako gertakari guztientzat"
+ label_user_mail_option_selected: "Hautatutako proiektuetako edozein gertakarientzat..."
+ label_user_mail_no_self_notified: "Ez dut nik egiten ditudan aldeketen jakinarazpenik jaso nahi"
+ label_registration_activation_by_email: kontuak epostaz gaitu
+ label_registration_manual_activation: kontuak eskuz gaitu
+ label_registration_automatic_activation: kontuak automatikoki gaitu
+ label_display_per_page: "Orriko: %{value}"
+ label_age: Adina
+ label_change_properties: Propietateak aldatu
+ label_general: Orokorra
+ label_more: Gehiago
+ label_scm: IKK
+ label_plugins: Pluginak
+ label_ldap_authentication: LDAP autentikazioa
+ label_downloads_abbr: Desk.
+ label_optional_description: Aukerako deskribapena
+ label_add_another_file: Beste fitxategia gehitu
+ label_preferences: Hobespenak
+ label_chronological_order: Orden kronologikoan
+ label_reverse_chronological_order: Alderantzizko orden kronologikoan
+ label_planning: Planifikazioa
+ label_incoming_emails: Sarrerako epostak
+ label_generate_key: Giltza sortu
+ label_issue_watchers: Behatzaileak
+ label_example: Adibidea
+ label_display: Bistaratzea
+ label_sort: Ordenatu
+ label_ascending: Gorantz
+ label_descending: Beherantz
+ label_date_from_to: "%{start}-tik %{end}-ra"
+ label_wiki_content_added: Wiki orria gehituta
+ label_wiki_content_updated: Wiki orria eguneratuta
+ label_group: Taldea
+ label_group_plural: Taldeak
+ label_group_new: Talde berria
+ label_time_entry_plural: Igarotako denbora
+ label_version_sharing_none: Ez partekatuta
+ label_version_sharing_descendants: Azpiproiektuekin
+ label_version_sharing_hierarchy: Proiektu Hierarkiarekin
+ label_version_sharing_tree: Proiektu zuhaitzarekin
+ label_version_sharing_system: Proiektu guztiekin
+ label_update_issue_done_ratios: Zereginen burututako erlazioa eguneratu
+ label_copy_source: Iturburua
+ label_copy_target: Helburua
+ label_copy_same_as_target: Helburuaren berdina
+ label_display_used_statuses_only: Aztarnari honetan erabiltzen diren egoerak bakarrik erakutsi
+ label_api_access_key: API atzipen giltza
+ label_missing_api_access_key: API atzipen giltza falta da
+ label_api_access_key_created_on: "API atzipen giltza sortuta orain dela %{value}"
+
+ button_login: Saioa hasi
+ button_submit: Bidali
+ button_save: Gorde
+ button_check_all: Guztiak markatu
+ button_uncheck_all: Guztiak desmarkatu
+ button_delete: Ezabatu
+ button_create: Sortu
+ button_create_and_continue: Sortu eta jarraitu
+ button_test: Frogatu
+ button_edit: Editatu
+ button_add: Gehitu
+ button_change: Aldatu
+ button_apply: Aplikatu
+ button_clear: Garbitu
+ button_lock: Blokeatu
+ button_unlock: Desblokeatu
+ button_download: Deskargatu
+ button_list: Zerrenda
+ button_view: Ikusi
+ button_move: Mugitu
+ button_move_and_follow: Mugitu eta jarraitu
+ button_back: Atzera
+ button_cancel: Ezeztatu
+ button_activate: Gahitu
+ button_sort: Ordenatu
+ button_log_time: Denbora erregistratu
+ button_rollback: Itzuli bertsio honetara
+ button_watch: Behatu
+ button_unwatch: Behatzen utzi
+ button_reply: Erantzun
+ button_archive: Artxibatu
+ button_unarchive: Desartxibatu
+ button_reset: Berrezarri
+ button_rename: Berrizendatu
+ button_change_password: Pasahitza aldatu
+ button_copy: Kopiatu
+ button_copy_and_follow: Kopiatu eta jarraitu
+ button_annotate: Anotatu
+ button_update: Eguneratu
+ button_configure: Konfiguratu
+ button_quote: Aipatu
+ button_duplicate: Bikoiztu
+ button_show: Ikusi
+
+ status_active: gaituta
+ status_registered: izena emanda
+ status_locked: blokeatuta
+
+ version_status_open: irekita
+ version_status_locked: blokeatuta
+ version_status_closed: itxita
+
+ field_active: Gaituta
+
+ text_select_mail_notifications: Jakinarazpenak zein ekintzetarako bidaliko diren hautatu.
+ text_regexp_info: adib. ^[A-Z0-9]+$
+ text_min_max_length_info: 0k mugarik gabe esan nahi du
+ text_project_destroy_confirmation: Ziur zaude proiektu hau eta erlazionatutako datu guztiak ezabatu nahi dituzula?
+ text_subprojects_destroy_warning: "%{value} azpiproiektuak ere ezabatuko dira."
+ text_workflow_edit: Hautatu rola eta aztarnaria workflow-a editatzeko
+ text_are_you_sure: Ziur zaude?
+ text_journal_changed: "%{label} %{old}-(e)tik %{new}-(e)ra aldatuta"
+ text_journal_set_to: "%{label}-k %{value} balioa hartu du"
+ text_journal_deleted: "%{label} ezabatuta (%{old})"
+ text_journal_added: "%{label} %{value} gehituta"
+ text_tip_issue_begin_day: gaur hasten diren zereginak
+ text_tip_issue_end_day: gaur bukatzen diren zereginak
+ text_tip_issue_begin_end_day: gaur hasi eta bukatzen diren zereginak
+ text_project_identifier_info: 'Letra xeheak (a-z), zenbakiak eta marrak erabil daitezke bakarrik.
+# by Alberto Ferreira
pt:
support:
array:
@@ -17,7 +18,10 @@
abbr_day_names: [Dom, Seg, Ter, Qua, Qui, Sex, Sáb]
month_names: [~, Janeiro, Fevereiro, Março, Abril, Maio, Junho, Julho, Agosto, Setembro, Outubro, Novembro, Dezembro]
abbr_month_names: [~, Jan, Fev, Mar, Abr, Mai, Jun, Jul, Ago, Set, Out, Nov, Dez]
- order: [:day, :month, :year]
+ order:
+ - :day
+ - :month
+ - :year
time:
formats:
@@ -141,7 +145,7 @@
general_csv_separator: ';'
general_csv_decimal_separator: ','
general_csv_encoding: ISO-8859-15
- general_pdf_encoding: ISO-8859-15
+ general_pdf_encoding: UTF-8
general_first_day_of_week: '1'
notice_account_updated: A conta foi actualizada com sucesso.
@@ -228,7 +232,7 @@
field_homepage: Página
field_is_public: Público
field_parent: Sub-projecto de
- field_is_in_roadmap: Tarefas mostradas no roadmap
+ field_is_in_roadmap: Tarefas mostradas no mapa de planificação
field_login: Nome de utilizador
field_mail_notification: Notificações por e-mail
field_admin: Administrador
@@ -248,9 +252,9 @@
field_attr_firstname: Atributo nome próprio
field_attr_lastname: Atributo último nome
field_attr_mail: Atributo e-mail
- field_onthefly: Criação de utilizadores na hora
+ field_onthefly: Criação imediata de utilizadores
field_start_date: Início
- field_done_ratio: % Completo
+ field_done_ratio: "% Completo"
field_auth_source: Modo de autenticação
field_hide_mail: Esconder endereço de e-mail
field_comments: Comentário
@@ -264,7 +268,7 @@
field_is_filter: Usado como filtro
field_issue_to: Tarefa relacionada
field_delay: Atraso
- field_assignable: As tarefas podem ser associados a esta função
+ field_assignable: As tarefas podem ser associadas a esta função
field_redirect_existing_links: Redireccionar ligações existentes
field_estimated_hours: Tempo estimado
field_column_names: Colunas
@@ -299,7 +303,6 @@
setting_cross_project_issue_relations: Permitir relações entre tarefas de projectos diferentes
setting_issue_list_default_columns: Colunas na lista de tarefas por omissão
setting_repositories_encodings: Encodings dos repositórios
- setting_commit_logs_encoding: Encoding das mensagens de commit
setting_emails_footer: Rodapé do e-mails
setting_protocol: Protocolo
setting_per_page_options: Opções de objectos por página
@@ -522,7 +525,7 @@
label_sort_higher: Mover para cima
label_sort_lower: Mover para baixo
label_sort_lowest: Mover para o fim
- label_roadmap: Roadmap
+ label_roadmap: Planificação
label_roadmap_due_in: "Termina em %{value}"
label_roadmap_overdue: "Atrasado %{value}"
label_roadmap_no_issues: Sem tarefas para esta versão
@@ -922,25 +925,59 @@
project_module_calendar: Calendário
button_edit_associated_wikipage: "Editar página Wiki associada: %{page_title}"
text_are_you_sure_with_children: Apagar tarefa e todas as sub-tarefas?
- field_text: Text field
- label_user_mail_option_only_owner: Only for things I am the owner of
- setting_default_notification_option: Default notification option
- label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
- label_user_mail_option_only_assigned: Only for things I am assigned to
- label_user_mail_option_none: No events
- field_member_of_group: Assignee's group
- field_assigned_to_role: Assignee's role
- notice_not_authorized_archived_project: The project you're trying to access has been archived.
- label_principal_search: "Search for user or group:"
- label_user_search: "Search for user:"
- field_visible: Visible
- setting_emails_header: Emails header
- setting_commit_logtime_activity_id: Activity for logged time
- text_time_logged_by_changeset: Applied in changeset %{value}.
- setting_commit_logtime_enabled: Enable time logging
- notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
- setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
+ field_text: Campo de texto
+ label_user_mail_option_only_owner: Apenas para tarefas das quais sou proprietário
+ setting_default_notification_option: Opção predefinida de notificação
+ label_user_mail_option_only_my_events: Apenas para tarefas que observo ou em que estou envolvido
+ label_user_mail_option_only_assigned: Apenas para tarefas que me foram atribuídas
+ label_user_mail_option_none: Sem eventos
+ field_member_of_group: Grupo do detentor de atribuição
+ field_assigned_to_role: Papel do detentor de atribuição
+ notice_not_authorized_archived_project: O projecto a que tentou aceder foi arquivado.
+ label_principal_search: "Procurar utilizador ou grupo:"
+ label_user_search: "Procurar utilizador:"
+ field_visible: Visível
+ setting_emails_header: Cabeçalho dos e-mails
+ setting_commit_logtime_activity_id: Actividade para tempo registado
+ text_time_logged_by_changeset: Aplicado no conjunto de alterações %{value}.
+ setting_commit_logtime_enabled: Activar registo de tempo
+ notice_gantt_chart_truncated: O gráfico foi truncado porque excede o número máximo de itens visível (%{máx.})
+ setting_gantt_items_limit: Número máximo de itens exibidos no gráfico Gantt
field_warn_on_leaving_unsaved: Warn me when leaving a page with unsaved text
text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
label_my_queries: My custom queries
text_journal_changed_no_detail: "%{label} updated"
+ label_news_comment_added: Comment added to a news
+ button_expand_all: Expand all
+ button_collapse_all: Collapse all
+ label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
+ label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
+ label_bulk_edit_selected_time_entries: Bulk edit selected time entries
+ text_time_entries_destroy_confirmation: Are you sure you want to delete the selected time entr(y/ies)?
+ label_role_anonymous: Anonymous
+ label_role_non_member: Non member
+ label_issue_note_added: Note added
+ label_issue_status_updated: Status updated
+ label_issue_priority_updated: Priority updated
+ label_issues_visibility_own: Issues created by or assigned to the user
+ field_issues_visibility: Issues visibility
+ label_issues_visibility_all: All issues
+ permission_set_own_issues_private: Set own issues public or private
+ field_is_private: Private
+ permission_set_issues_private: Set issues public or private
+ label_issues_visibility_public: All non private issues
+ text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
+ field_commit_logs_encoding: Encoding das mensagens de commit
+ field_scm_path_encoding: Path encoding
+ text_scm_path_encoding_note: "Default: UTF-8"
+ field_path_to_repository: Path to repository
+ field_root_directory: Root directory
+ field_cvs_module: Module
+ field_cvsroot: CVSROOT
+ text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
+ text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
+ text_scm_command: Command
+ text_scm_command_version: Version
+ label_git_report_last_commit: Report last commit for files and directories
+ text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+ text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
diff -r adc8466df404 -r 753f1380d6bc config/locales/.svn/text-base/ro.yml.svn-base
--- a/config/locales/.svn/text-base/ro.yml.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/.svn/text-base/ro.yml.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -14,7 +14,10 @@
month_names: [~, Ianuarie, Februarie, Martie, Aprilie, Mai, Iunie, Iulie, August, Septembrie, Octombrie, Noiembrie, Decembrie]
abbr_month_names: [~, Ian, Feb, Mar, Apr, Mai, Iun, Iul, Aug, Sep, Oct, Noi, Dec]
# Used in date_select and datime_select.
- order: [ :day, :month, :year ]
+ order:
+ - :day
+ - :month
+ - :year
time:
formats:
@@ -291,7 +294,6 @@
setting_cross_project_issue_relations: Permite legături de tichete între proiecte
setting_issue_list_default_columns: Coloane implicite afișate în lista de tichete
setting_repositories_encodings: Codare pentru depozit
- setting_commit_logs_encoding: Codare pentru mesaje
setting_emails_footer: Subsol email
setting_protocol: Protocol
setting_per_page_options: Număr de obiecte pe pagină
@@ -933,3 +935,37 @@
text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
label_my_queries: My custom queries
text_journal_changed_no_detail: "%{label} updated"
+ label_news_comment_added: Comment added to a news
+ button_expand_all: Expand all
+ button_collapse_all: Collapse all
+ label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
+ label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
+ label_bulk_edit_selected_time_entries: Bulk edit selected time entries
+ text_time_entries_destroy_confirmation: Are you sure you want to delete the selected time entr(y/ies)?
+ label_role_anonymous: Anonymous
+ label_role_non_member: Non member
+ label_issue_note_added: Note added
+ label_issue_status_updated: Status updated
+ label_issue_priority_updated: Priority updated
+ label_issues_visibility_own: Issues created by or assigned to the user
+ field_issues_visibility: Issues visibility
+ label_issues_visibility_all: All issues
+ permission_set_own_issues_private: Set own issues public or private
+ field_is_private: Private
+ permission_set_issues_private: Set issues public or private
+ label_issues_visibility_public: All non private issues
+ text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
+ field_commit_logs_encoding: Codare pentru mesaje
+ field_scm_path_encoding: Path encoding
+ text_scm_path_encoding_note: "Default: UTF-8"
+ field_path_to_repository: Path to repository
+ field_root_directory: Root directory
+ field_cvs_module: Module
+ field_cvsroot: CVSROOT
+ text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
+ text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
+ text_scm_command: Command
+ text_scm_command_version: Version
+ label_git_report_last_commit: Report last commit for files and directories
+ text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+ text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
diff -r adc8466df404 -r 753f1380d6bc config/locales/.svn/text-base/ru.yml.svn-base
--- a/config/locales/.svn/text-base/ru.yml.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/.svn/text-base/ru.yml.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -28,7 +28,10 @@
abbr_month_names: [~, янв., февр., марта, апр., мая, июня, июля, авг., сент., окт., нояб., дек.]
standalone_abbr_month_names: [~, янв., февр., март, апр., май, июнь, июль, авг., сент., окт., нояб., дек.]
- order: [ :day, :month, :year ]
+ order:
+ - :day
+ - :month
+ - :year
time:
formats:
@@ -261,7 +264,7 @@
default_issue_status_closed: Закрыта
default_issue_status_feedback: Обратная связь
default_issue_status_new: Новая
- default_issue_status_rejected: Отказ
+ default_issue_status_rejected: Отклонена
default_issue_status_resolved: Решена
default_priority_high: Высокий
default_priority_immediate: Немедленный
@@ -272,7 +275,7 @@
default_role_manager: Менеджер
default_role_reporter: Генератор отчетов
default_tracker_bug: Ошибка
- default_tracker_feature: Изменение
+ default_tracker_feature: Улучшение
default_tracker_support: Поддержка
enumeration_activities: Действия (учет времени)
@@ -605,7 +608,7 @@
label_optional_description: Описание (опционально)
label_options: Опции
label_overall_activity: Сводная активность
- label_overview: Просмотр
+ label_overview: Обзор
label_password_lost: Восстановление пароля
label_permissions_report: Отчет о правах доступа
label_permissions: Права доступа
@@ -862,7 +865,6 @@
setting_bcc_recipients: Использовать скрытые списки (BCC)
setting_cache_formatted_text: Кешировать форматированный текст
setting_commit_fix_keywords: Назначение ключевых слов
- setting_commit_logs_encoding: Кодировка комментариев в хранилище
setting_commit_ref_keywords: Ключевые слова для поиска
setting_cross_project_issue_relations: Разрешить пересечение задач по проектам
setting_date_format: Формат даты
@@ -1044,12 +1046,46 @@
field_visible: Видимый
setting_emails_header: Заголовок письма
- setting_commit_logtime_activity_id: Activity for logged time
- text_time_logged_by_changeset: Applied in changeset %{value}.
- setting_commit_logtime_enabled: Enable time logging
- notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
- setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
- field_warn_on_leaving_unsaved: Warn me when leaving a page with unsaved text
- text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
- label_my_queries: My custom queries
- text_journal_changed_no_detail: "%{label} updated"
+ setting_commit_logtime_activity_id: Активность для учета времени
+ text_time_logged_by_changeset: Учтено в редакции %{value}.
+ setting_commit_logtime_enabled: Включить учет времени
+ notice_gantt_chart_truncated: Диаграмма будет усечена, поскольку превышено максимальное кол-во элементов, которые могут отображаться (%{max})
+ setting_gantt_items_limit: Максимальное кол-во элементов отображаемых на диаграмме Ганта
+ field_warn_on_leaving_unsaved: Предупреждать при закратии страницы с несохраненным текстом
+ text_warn_on_leaving_unsaved: Текущая страница содержит несохраненный текст, который будет потерян, если вы покинете эту страницу.
+ label_my_queries: Мои сохраненные запросы
+ text_journal_changed_no_detail: "%{label} обновлено"
+ label_news_comment_added: Добавлен комментарий к новости
+ button_expand_all: Развернуть все
+ button_collapse_all: Свернуть все
+ label_additional_workflow_transitions_for_assignee: Дополнительные переходы, когда пользователь является исполнителем
+ label_additional_workflow_transitions_for_author: Дополнительные переходы, когда пользователь является автором
+ label_bulk_edit_selected_time_entries: Массовое изменение выбранных записей затраченного времени времени
+ text_time_entries_destroy_confirmation: Вы уверены что хотите удалить выбраные записи затраченного времени?
+ label_role_anonymous: Аноним
+ label_role_non_member: Не участник
+ label_issue_note_added: Примечание добавлено
+ label_issue_status_updated: Статус обновлен
+ label_issue_priority_updated: Приоритет обновлен
+ label_issues_visibility_own: Задачи созданные или назначенные пользователю
+ field_issues_visibility: Видимость задач
+ label_issues_visibility_all: Все задачи
+ permission_set_own_issues_private: Устанавливать видимость (общая/частная) для собственных задач
+ field_is_private: Частная
+ permission_set_issues_private: Устанавливать видимость (общая/частная) для задач
+ label_issues_visibility_public: Только общие задачи
+ text_issues_destroy_descendants_confirmation: Так же будет удалено %{count} задачи.
+ field_commit_logs_encoding: Кодировка комментариев в хранилище
+ field_scm_path_encoding: Кодировка пути
+ text_scm_path_encoding_note: "По умолчанию: UTF-8"
+ field_path_to_repository: Путь к репозиторию
+ field_root_directory: Корневую директорию
+ field_cvs_module: Модуль
+ field_cvsroot: CVSROOT
+ text_git_repository_note: Локальный и bare репозиторий (например, /gitrepo, c:\gitrepo)
+ text_mercurial_repository_note: Локальный репозиторий (например, /hgrepo, c:\hgrepo)
+ text_scm_command: Command
+ text_scm_command_version: Version
+ label_git_report_last_commit: Report last commit for files and directories
+ text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+ text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
diff -r adc8466df404 -r 753f1380d6bc config/locales/.svn/text-base/sk.yml.svn-base
--- a/config/locales/.svn/text-base/sk.yml.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/.svn/text-base/sk.yml.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -16,7 +16,10 @@
month_names: [~, Január, Február, Marec, Apríl, Máj, Jún, Júl, August, September, Október, November, December]
abbr_month_names: [~, Jan, Feb, Mar, Apr, Máj, Jún, Júl, Aug, Sep, Okt, Nov, Dec]
# Used in date_select and datime_select.
- order: [ :year, :month, :day ]
+ order:
+ - :year
+ - :month
+ - :day
time:
formats:
@@ -236,7 +239,7 @@
field_attr_mail: Email (atribut)
field_onthefly: Automatické vytváranie užívateľov
field_start_date: Začiatok
- field_done_ratio: % hotovo
+ field_done_ratio: "% hotovo"
field_auth_source: Autentifikačný mód
field_hide_mail: Nezobrazovať môj email
field_comments: Komentár
@@ -726,7 +729,6 @@
text_email_delivery_not_configured: "Doručenie emailov nieje nastavené, notifikácie sú vypnuté.\nNastavte váš SMTP server v config/configuration.yml a reštartnite aplikáciu pre aktiváciu funkcie."
field_parent_title: Nadradená stránka
label_issue_watchers: Pozorovatelia
- setting_commit_logs_encoding: Kódovanie prenášaných správ
button_quote: Citácia
setting_sequential_project_identifiers: Generovať sekvenčné identifikátory projektov
notice_unable_delete_version: Verzia nemôže byť zmazaná
@@ -935,3 +937,37 @@
text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
label_my_queries: My custom queries
text_journal_changed_no_detail: "%{label} updated"
+ label_news_comment_added: Comment added to a news
+ button_expand_all: Expand all
+ button_collapse_all: Collapse all
+ label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
+ label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
+ label_bulk_edit_selected_time_entries: Bulk edit selected time entries
+ text_time_entries_destroy_confirmation: Are you sure you want to delete the selected time entr(y/ies)?
+ label_role_anonymous: Anonymous
+ label_role_non_member: Non member
+ label_issue_note_added: Note added
+ label_issue_status_updated: Status updated
+ label_issue_priority_updated: Priority updated
+ label_issues_visibility_own: Issues created by or assigned to the user
+ field_issues_visibility: Issues visibility
+ label_issues_visibility_all: All issues
+ permission_set_own_issues_private: Set own issues public or private
+ field_is_private: Private
+ permission_set_issues_private: Set issues public or private
+ label_issues_visibility_public: All non private issues
+ text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
+ field_commit_logs_encoding: Kódovanie prenášaných správ
+ field_scm_path_encoding: Path encoding
+ text_scm_path_encoding_note: "Default: UTF-8"
+ field_path_to_repository: Path to repository
+ field_root_directory: Root directory
+ field_cvs_module: Module
+ field_cvsroot: CVSROOT
+ text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
+ text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
+ text_scm_command: Command
+ text_scm_command_version: Version
+ label_git_report_last_commit: Report last commit for files and directories
+ text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+ text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
diff -r adc8466df404 -r 753f1380d6bc config/locales/.svn/text-base/sl.yml.svn-base
--- a/config/locales/.svn/text-base/sl.yml.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/.svn/text-base/sl.yml.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -16,7 +16,10 @@
month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
# Used in date_select and datime_select.
- order: [ :year, :month, :day ]
+ order:
+ - :year
+ - :month
+ - :day
time:
formats:
@@ -132,7 +135,7 @@
general_csv_separator: ','
general_csv_decimal_separator: '.'
general_csv_encoding: UTF-8
- general_pdf_encoding: UFT-8
+ general_pdf_encoding: UTF-8
general_first_day_of_week: '1'
notice_account_updated: Račun je bil uspešno posodobljen.
@@ -241,7 +244,7 @@
field_attr_mail: Oznaka za e-naslov
field_onthefly: Sprotna izdelava uporabnikov
field_start_date: Začetek
- field_done_ratio: % Narejeno
+ field_done_ratio: "% Narejeno"
field_auth_source: Način overovljanja
field_hide_mail: Skrij moj e-naslov
field_comments: Komentar
@@ -291,7 +294,6 @@
setting_cross_project_issue_relations: Dovoli povezave zahtevkov med različnimi projekti
setting_issue_list_default_columns: Privzeti stolpci prikazani na seznamu zahtevkov
setting_repositories_encodings: Kodiranje shrambe
- setting_commit_logs_encoding: Kodiranje sporočil ob predaji
setting_emails_footer: Noga e-sporočil
setting_protocol: Protokol
setting_per_page_options: Število elementov na stran
@@ -936,3 +938,37 @@
text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
label_my_queries: My custom queries
text_journal_changed_no_detail: "%{label} updated"
+ label_news_comment_added: Comment added to a news
+ button_expand_all: Expand all
+ button_collapse_all: Collapse all
+ label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
+ label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
+ label_bulk_edit_selected_time_entries: Bulk edit selected time entries
+ text_time_entries_destroy_confirmation: Are you sure you want to delete the selected time entr(y/ies)?
+ label_role_anonymous: Anonymous
+ label_role_non_member: Non member
+ label_issue_note_added: Note added
+ label_issue_status_updated: Status updated
+ label_issue_priority_updated: Priority updated
+ label_issues_visibility_own: Issues created by or assigned to the user
+ field_issues_visibility: Issues visibility
+ label_issues_visibility_all: All issues
+ permission_set_own_issues_private: Set own issues public or private
+ field_is_private: Private
+ permission_set_issues_private: Set issues public or private
+ label_issues_visibility_public: All non private issues
+ text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
+ field_commit_logs_encoding: Kodiranje sporočil ob predaji
+ field_scm_path_encoding: Path encoding
+ text_scm_path_encoding_note: "Default: UTF-8"
+ field_path_to_repository: Path to repository
+ field_root_directory: Root directory
+ field_cvs_module: Module
+ field_cvsroot: CVSROOT
+ text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
+ text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
+ text_scm_command: Command
+ text_scm_command_version: Version
+ label_git_report_last_commit: Report last commit for files and directories
+ text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+ text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
diff -r adc8466df404 -r 753f1380d6bc config/locales/.svn/text-base/sr-YU.yml.svn-base
--- a/config/locales/.svn/text-base/sr-YU.yml.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/.svn/text-base/sr-YU.yml.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -1,942 +1,978 @@
-# Serbian translations for Redmine
-# by Vladimir Medarović (vlada@medarovic.com)
-sr-YU:
- direction: ltr
- date:
- formats:
- # Use the strftime parameters for formats.
- # When no format has been given, it uses default.
- # You can provide other formats here if you like!
- default: "%d.%m.%Y."
- short: "%e %b"
- long: "%B %e, %Y"
-
- day_names: [nedelja, ponedeljak, utorak, sreda, četvrtak, petak, subota]
- abbr_day_names: [ned, pon, uto, sre, čet, pet, sub]
-
- # Don't forget the nil at the beginning; there's no such thing as a 0th month
- month_names: [~, januar, februar, mart, april, maj, jun, jul, avgust, septembar, oktobar, novembar, decembar]
- abbr_month_names: [~, jan, feb, mar, apr, maj, jun, jul, avg, sep, okt, nov, dec]
- # Used in date_select and datime_select.
- order: [ :day, :month, :year ]
-
- time:
- formats:
- default: "%d.%m.%Y. u %H:%M"
- time: "%H:%M"
- short: "%d. %b u %H:%M"
- long: "%d. %B %Y u %H:%M"
- am: "am"
- pm: "pm"
-
- datetime:
- distance_in_words:
- half_a_minute: "pola minuta"
- less_than_x_seconds:
- one: "manje od jedne sekunde"
- other: "manje od %{count} sek."
- x_seconds:
- one: "jedna sekunda"
- other: "%{count} sek."
- less_than_x_minutes:
- one: "manje od minuta"
- other: "manje od %{count} min."
- x_minutes:
- one: "jedan minut"
- other: "%{count} min."
- about_x_hours:
- one: "približno jedan sat"
- other: "približno %{count} sati"
- x_days:
- one: "jedan dan"
- other: "%{count} dana"
- about_x_months:
- one: "približno jedan mesec"
- other: "približno %{count} meseci"
- x_months:
- one: "jedan mesec"
- other: "%{count} meseci"
- about_x_years:
- one: "približno godinu dana"
- other: "približno %{count} god."
- over_x_years:
- one: "preko godinu dana"
- other: "preko %{count} god."
- almost_x_years:
- one: "skoro godinu dana"
- other: "skoro %{count} god."
-
- number:
- format:
- separator: ","
- delimiter: ""
- precision: 3
- human:
- format:
- delimiter: ""
- precision: 1
- storage_units:
- format: "%n %u"
- units:
- byte:
- one: "Byte"
- other: "Bytes"
- kb: "KB"
- mb: "MB"
- gb: "GB"
- tb: "TB"
-
-
-# Used in array.to_sentence.
- support:
- array:
- sentence_connector: "i"
- skip_last_comma: false
-
- activerecord:
- errors:
- template:
- header:
- one: "1 error prohibited this %{model} from being saved"
- other: "%{count} errors prohibited this %{model} from being saved"
- messages:
- inclusion: "nije uključen u spisak"
- exclusion: "je rezervisan"
- invalid: "je neispravan"
- confirmation: "potvrda ne odgovara"
- accepted: "mora biti prihvaćen"
- empty: "ne može biti prazno"
- blank: "ne može biti prazno"
- too_long: "je predugačka (maksimum znakova je %{count})"
- too_short: "je prekratka (minimum znakova je %{count})"
- wrong_length: "je pogrešne dužine (broj znakova mora biti %{count})"
- taken: "je već u upotrebi"
- not_a_number: "nije broj"
- not_a_date: "nije ispravan datum"
- greater_than: "mora biti veći od %{count}"
- greater_than_or_equal_to: "mora biti veći ili jednak %{count}"
- equal_to: "mora biti jednak %{count}"
- less_than: "mora biti manji od %{count}"
- less_than_or_equal_to: "mora biti manji ili jednak %{count}"
- odd: "mora biti paran"
- even: "mora biti neparan"
- greater_than_start_date: "mora biti veći od početnog datuma"
- not_same_project: "ne pripada istom projektu"
- circular_dependency: "Ova veza će stvoriti kružnu referencu"
- cant_link_an_issue_with_a_descendant: "Problem ne može biti povezan sa jednim od svojih podzadataka"
-
- actionview_instancetag_blank_option: Molim odaberite
-
- general_text_No: 'Ne'
- general_text_Yes: 'Da'
- general_text_no: 'ne'
- general_text_yes: 'da'
- general_lang_name: 'Srpski'
- general_csv_separator: ','
- general_csv_decimal_separator: '.'
- general_csv_encoding: UTF-8
- general_pdf_encoding: UTF-8
- general_first_day_of_week: '1'
-
- notice_account_updated: Nalog je uspešno ažuriran.
- notice_account_invalid_creditentials: Neispravno korisničko ime ili lozinka.
- notice_account_password_updated: Lozinka je uspešno ažurirana.
- notice_account_wrong_password: Pogrešna lozinka
- notice_account_register_done: Korisnički nalog je uspešno kreiran. Kliknite na link koji ste dobili u e-poruci za aktivaciju.
- notice_account_unknown_email: Nepoznat korisnik.
- notice_can_t_change_password: Ovaj korisnički nalog za potvrdu identiteta koristi spoljni izvor. Nemoguće je promeniti lozinku.
- notice_account_lost_email_sent: Poslata vam je e-poruka sa uputstvom za izbor nove lozinke
- notice_account_activated: Vaš korisnički nalog je aktiviran. Sada se možete prijaviti.
- notice_successful_create: Uspešno kreiranje.
- notice_successful_update: Uspešno ažuriranje.
- notice_successful_delete: Uspešno brisanje.
- notice_successful_connection: Uspešno povezivanje.
- notice_file_not_found: Strana kojoj želite pristupiti ne postoji ili je uklonjena.
- notice_locking_conflict: Podatak je ažuriran od strane drugog korisnika.
- notice_not_authorized: Niste ovlašćeni za pristup ovoj strani.
- notice_email_sent: "E-poruka je poslata na %{value}"
- notice_email_error: "Dogodila se greška prilikom slanja e-poruke (%{value})"
- notice_feeds_access_key_reseted: Vaš RSS pristupni ključ je poništen.
- notice_api_access_key_reseted: Vaš API pristupni ključ je poništen.
- notice_failed_to_save_issues: "Neuspešno snimanje %{count} problema od %{total} odabranih: %{ids}."
- notice_failed_to_save_members: "Neuspešno snimanje člana(ova): %{errors}."
- notice_no_issue_selected: "Ni jedan problem nije odabran! Molimo, odaberite problem koji želite da menjate."
- notice_account_pending: "Vaš nalog je kreiran i čeka na odobrenje administratora."
- notice_default_data_loaded: Podrazumevano konfigurisanje je uspešno učitano.
- notice_unable_delete_version: Verziju je nemoguće izbrisati.
- notice_unable_delete_time_entry: Stavku evidencije vremena je nemoguće izbrisati.
- notice_issue_done_ratios_updated: Odnos rešenih problema je ažuriran.
-
- error_can_t_load_default_data: "Podrazumevano konfigurisanje je nemoguće učitati: %{value}"
- error_scm_not_found: "Stavka ili ispravka nisu pronađene u spremištu."
- error_scm_command_failed: "Greška se javila prilikom pokušaja pristupa spremištu: %{value}"
- error_scm_annotate: "Stavka ne postoji ili ne može biti označena."
- error_issue_not_found_in_project: 'Problem nije pronađen ili ne pripada ovom projektu.'
- error_no_tracker_in_project: 'Ni jedno praćenje nije povezano sa ovim projektom. Molimo proverite podešavanja projekta.'
- error_no_default_issue_status: 'Podrazumevani status problema nije definisan. Molimo proverite vaše konfigurisanje (idite na "Administracija -> Statusi problema").'
- error_can_not_delete_custom_field: Nemoguće je izbrisati prilagođeno polje
- error_can_not_delete_tracker: "Ovo praćenje sadrži probleme i ne može biti obrisano."
- error_can_not_remove_role: "Ova uloga je u upotrebi i ne može biti obrisana."
- error_can_not_reopen_issue_on_closed_version: 'Problem dodeljen zatvorenoj verziji ne može biti ponovo otvoren'
- error_can_not_archive_project: Ovaj projekat se ne može arhivirati
- error_issue_done_ratios_not_updated: "Odnos rešenih problema nije ažuriran."
- error_workflow_copy_source: 'Molimo odaberite izvorno praćenje ili ulogu'
- error_workflow_copy_target: 'Molimo odaberite odredišno praćenje i ulogu'
- error_unable_delete_issue_status: 'Status problema je nemoguće obrisati'
- error_unable_to_connect: "Povezivanje sa (%{value}) je nemoguće"
- warning_attachments_not_saved: "%{count} datoteka ne može biti snimljena."
-
- mail_subject_lost_password: "Vaša %{value} lozinka"
- mail_body_lost_password: 'Za promenu vaše lozinke, kliknite na sledeći link:'
- mail_subject_register: "Aktivacija vašeg %{value} naloga"
- mail_body_register: 'Za aktivaciju vašeg naloga, kliknite na sledeći link:'
- mail_body_account_information_external: "Vaš nalog %{value} možete koristiti za prijavu."
- mail_body_account_information: Informacije o vašem nalogu
- mail_subject_account_activation_request: "Zahtev za aktivaciju naloga %{value}"
- mail_body_account_activation_request: "Novi korisnik (%{value}) je registrovan. Nalog čeka na vaše odobrenje:"
- mail_subject_reminder: "%{count} problema dospeva narednih %{days} dana"
- mail_body_reminder: "%{count} problema dodeljenih vama dospeva u narednih %{days} dana:"
- mail_subject_wiki_content_added: "Wiki stranica '%{id}' je dodata"
- mail_body_wiki_content_added: "%{author} je dodao wiki stranicu '%{id}'."
- mail_subject_wiki_content_updated: "Wiki stranica '%{id}' je ažurirana"
- mail_body_wiki_content_updated: "%{author} je ažurirao wiki stranicu '%{id}'."
-
- gui_validation_error: jedna greška
- gui_validation_error_plural: "%{count} grešaka"
-
- field_name: Naziv
- field_description: Opis
- field_summary: Rezime
- field_is_required: Obavezno
- field_firstname: Ime
- field_lastname: Prezime
- field_mail: E-adresa
- field_filename: Datoteka
- field_filesize: Veličina
- field_downloads: Preuzimanja
- field_author: Autor
- field_created_on: Kreirano
- field_updated_on: Ažurirano
- field_field_format: Format
- field_is_for_all: Za sve projekte
- field_possible_values: Moguće vrednosti
- field_regexp: Regularan izraz
- field_min_length: Minimalna dužina
- field_max_length: Maksimalna dužina
- field_value: Vrednost
- field_category: Kategorija
- field_title: Naslov
- field_project: Projekat
- field_issue: Problem
- field_status: Status
- field_notes: Beleške
- field_is_closed: Zatvoren problem
- field_is_default: Podrazumevana vrednost
- field_tracker: Praćenje
- field_subject: Predmet
- field_due_date: Krajnji rok
- field_assigned_to: Dodeljeno
- field_priority: Prioritet
- field_fixed_version: Odredišna verzija
- field_user: Korisnik
- field_principal: Glavni
- field_role: Uloga
- field_homepage: Početna stranica
- field_is_public: Javno objavljivanje
- field_parent: Potprojekat od
- field_is_in_roadmap: Problemi prikazani u planu rada
- field_login: Korisničko ime
- field_mail_notification: Obaveštenja putem e-pošte
- field_admin: Administrator
- field_last_login_on: Poslednje povezivanje
- field_language: Jezik
- field_effective_date: Datum
- field_password: Lozinka
- field_new_password: Nova lozinka
- field_password_confirmation: Potvrda lozinke
- field_version: Verzija
- field_type: Tip
- field_host: Glavni računar
- field_port: Port
- field_account: Korisnički nalog
- field_base_dn: Bazni DN
- field_attr_login: Atribut prijavljivanja
- field_attr_firstname: Atribut imena
- field_attr_lastname: Atribut prezimena
- field_attr_mail: Atribut e-adrese
- field_onthefly: Kreiranje korisnika u toku rada
- field_start_date: Početak
- field_done_ratio: % urađeno
- field_auth_source: Režim potvrde identiteta
- field_hide_mail: Sakrij moju e-adresu
- field_comments: Komentar
- field_url: URL
- field_start_page: Početna stranica
- field_subproject: Potprojekat
- field_hours: sati
- field_activity: Aktivnost
- field_spent_on: Datum
- field_identifier: Identifikator
- field_is_filter: Upotrebi kao filter
- field_issue_to: Srodni problemi
- field_delay: Kašnjenje
- field_assignable: Problem može biti dodeljen ovoj ulozi
- field_redirect_existing_links: Preusmeri postojeće veze
- field_estimated_hours: Proteklo vreme
- field_column_names: Kolone
- field_time_zone: Vremenska zona
- field_searchable: Može da se pretražuje
- field_default_value: Podrazumevana vrednost
- field_comments_sorting: Prikaži komentare
- field_parent_title: Matična stranica
- field_editable: Izmenljivo
- field_watcher: Posmatrač
- field_identity_url: OpenID URL
- field_content: Sadržaj
- field_group_by: Grupisanje rezultata po
- field_sharing: Deljenje
- field_parent_issue: Matični zadatak
-
- setting_app_title: Naslov aplikacije
- setting_app_subtitle: Podnaslov aplikacije
- setting_welcome_text: Tekst dobrodošlice
- setting_default_language: Podrazumevani jezik
- setting_login_required: Obavezna potvrda identiteta
- setting_self_registration: Samoregistracija
- setting_attachment_max_size: Maks. veličina priložene datoteke
- setting_issues_export_limit: Ograničenje izvoza „problema“
- setting_mail_from: E-adresa pošiljaoca
- setting_bcc_recipients: Primaoci „Bcc“ kopije
- setting_plain_text_mail: Poruka sa čistim tekstom (bez HTML-a)
- setting_host_name: Putanja i naziv glavnog računara
- setting_text_formatting: Oblikovanje teksta
- setting_wiki_compression: Kompresija Wiki istorije
- setting_feeds_limit: Ograničenje sadržaja izvora vesti
- setting_default_projects_public: Podrazumeva se javno prikazivanje novih projekata
- setting_autofetch_changesets: Izvršavanje automatskog preuzimanja
- setting_sys_api_enabled: Omogućavanje WS za upravljanje spremištem
- setting_commit_ref_keywords: Referenciranje ključnih reči
- setting_commit_fix_keywords: Popravljanje ključnih reči
- setting_autologin: Automatska prijava
- setting_date_format: Format datuma
- setting_time_format: Format vremena
- setting_cross_project_issue_relations: Dozvoli povezivanje problema iz unakrsnih projekata
- setting_issue_list_default_columns: Podrazumevane kolone prikazane na spisku problema
- setting_repositories_encodings: Kodiranje spremišta
- setting_commit_logs_encoding: Kodiranje izvršnih poruka
- setting_emails_footer: Podnožje stranice e-poruke
- setting_protocol: Protokol
- setting_per_page_options: Opcije prikaza objekata po stranici
- setting_user_format: Format prikaza korisnika
- setting_activity_days_default: Broj dana prikazanih na projektnoj aktivnosti
- setting_display_subprojects_issues: Prikazuj probleme iz potprojekata na glavnom projektu, ukoliko nije drugačije navedeno
- setting_enabled_scm: Omogućavanje SCM
- setting_mail_handler_body_delimiters: "Skraćivanje e-poruke nakon jedne od ovih linija"
- setting_mail_handler_api_enabled: Omogućavanje WS dolazne e-poruke
- setting_mail_handler_api_key: API ključ
- setting_sequential_project_identifiers: Generisanje sekvencijalnog imena projekta
- setting_gravatar_enabled: Koristi Gravatar korisničke ikone
- setting_gravatar_default: Podrazumevana Gravatar slika
- setting_diff_max_lines_displayed: Maks. broj prikazanih različitih linija
- setting_file_max_size_displayed: Maks. veličina tekst. datoteka prikazanih umetnuto
- setting_repository_log_display_limit: Maks. broj revizija prikazanih u datoteci za evidenciju
- setting_openid: Dozvoli OpenID prijavu i registraciju
- setting_password_min_length: Minimalna dužina lozinke
- setting_new_project_user_role_id: Kreatoru projekta (koji nije administrator) dodeljuje je uloga
- setting_default_projects_modules: Podrazumevano omogućeni moduli za nove projekte
- setting_issue_done_ratio: Izračunaj odnos rešenih problema
- setting_issue_done_ratio_issue_field: koristeći polje problema
- setting_issue_done_ratio_issue_status: koristeći status problema
- setting_start_of_week: Prvi dan u sedmici
- setting_rest_api_enabled: Omogući REST web usluge
- setting_cache_formatted_text: Keširanje obrađenog teksta
-
- permission_add_project: Kreiranje projekta
- permission_add_subprojects: Kreiranje potpojekta
- permission_edit_project: Izmena projekata
- permission_select_project_modules: Odabiranje modula projekta
- permission_manage_members: Upravljanje članovima
- permission_manage_project_activities: Upravljanje projektnim aktivnostima
- permission_manage_versions: Upravljanje verzijama
- permission_manage_categories: Upravljanje kategorijama problema
- permission_view_issues: Pregled problema
- permission_add_issues: Dodavanje problema
- permission_edit_issues: Izmena problema
- permission_manage_issue_relations: Upravljanje vezama između problema
- permission_add_issue_notes: Dodavanje beleški
- permission_edit_issue_notes: Izmena beleški
- permission_edit_own_issue_notes: Izmena sopstvenih beleški
- permission_move_issues: Pomeranje problema
- permission_delete_issues: Brisanje problema
- permission_manage_public_queries: Upravljanje javnim upitima
- permission_save_queries: Snimanje upita
- permission_view_gantt: Pregledanje Gantovog dijagrama
- permission_view_calendar: Pregledanje kalendara
- permission_view_issue_watchers: Pregledanje spiska posmatrača
- permission_add_issue_watchers: Dodavanje posmatrača
- permission_delete_issue_watchers: Brisanje posmatrača
- permission_log_time: Beleženje utrošenog vremena
- permission_view_time_entries: Pregledanje utrošenog vremena
- permission_edit_time_entries: Izmena utrošenog vremena
- permission_edit_own_time_entries: Izmena sopstvenog utrošenog vremena
- permission_manage_news: Upravljanje vestima
- permission_comment_news: Komentarisanje vesti
- permission_manage_documents: Upravljanje dokumentima
- permission_view_documents: Pregledanje dokumenata
- permission_manage_files: Upravljanje datotekama
- permission_view_files: Pregledanje datoteka
- permission_manage_wiki: Upravljanje wiki stranicama
- permission_rename_wiki_pages: Promena imena wiki stranicama
- permission_delete_wiki_pages: Brisanje wiki stranica
- permission_view_wiki_pages: Pregledanje wiki stranica
- permission_view_wiki_edits: Pregledanje wiki istorije
- permission_edit_wiki_pages: Izmena wiki stranica
- permission_delete_wiki_pages_attachments: Brisanje priloženih datoteka
- permission_protect_wiki_pages: Zaštita wiki stranica
- permission_manage_repository: Upravljanje spremištem
- permission_browse_repository: Pregledanje spremišta
- permission_view_changesets: Pregledanje skupa promena
- permission_commit_access: Potvrda pristupa
- permission_manage_boards: Upravljanje forumima
- permission_view_messages: Pregledanje poruka
- permission_add_messages: Slanje poruka
- permission_edit_messages: Izmena poruka
- permission_edit_own_messages: Izmena sopstvenih poruka
- permission_delete_messages: Brisanje poruka
- permission_delete_own_messages: Brisanje sopstvenih poruka
- permission_export_wiki_pages: Izvoz wiki stranica
- permission_manage_subtasks: Upravljanje podzadacima
-
- project_module_issue_tracking: Praćenje problema
- project_module_time_tracking: Praćenje vremena
- project_module_news: Vesti
- project_module_documents: Dokumenti
- project_module_files: Datoteke
- project_module_wiki: Wiki
- project_module_repository: Spremište
- project_module_boards: Forumi
-
- label_user: Korisnik
- label_user_plural: Korisnici
- label_user_new: Novi korisnik
- label_user_anonymous: Anoniman
- label_project: Projekat
- label_project_new: Novi projekat
- label_project_plural: Projekti
- label_x_projects:
- zero: nema projekata
- one: jedan projekat
- other: "%{count} projekata"
- label_project_all: Svi projekti
- label_project_latest: Poslednji projekti
- label_issue: Problem
- label_issue_new: Novi problem
- label_issue_plural: Problemi
- label_issue_view_all: Prikaz svih problema
- label_issues_by: "Problemi (%{value})"
- label_issue_added: Problem je dodat
- label_issue_updated: Problem je ažuriran
- label_document: Dokument
- label_document_new: Novi dokument
- label_document_plural: Dokumenti
- label_document_added: Dokument je dodat
- label_role: Uloga
- label_role_plural: Uloge
- label_role_new: Nova uloga
- label_role_and_permissions: Uloge i dozvole
- label_member: Član
- label_member_new: Novi član
- label_member_plural: Članovi
- label_tracker: Praćenje
- label_tracker_plural: Praćenja
- label_tracker_new: Novo praćenje
- label_workflow: Tok posla
- label_issue_status: Status problema
- label_issue_status_plural: Statusi problema
- label_issue_status_new: Novi status
- label_issue_category: Kategorija problema
- label_issue_category_plural: Kategorije problema
- label_issue_category_new: Nova kategorija
- label_custom_field: Prilagođeno polje
- label_custom_field_plural: Prilagođena polja
- label_custom_field_new: Novo prilagođeno polje
- label_enumerations: Nabrojiva lista
- label_enumeration_new: Nova vrednost
- label_information: Informacija
- label_information_plural: Informacije
- label_please_login: Molimo, prijavite se
- label_register: Registracija
- label_login_with_open_id_option: ili prijava sa OpenID
- label_password_lost: Izgubljena lozinka
- label_home: Početak
- label_my_page: Moja stranica
- label_my_account: Moj nalog
- label_my_projects: Moji projekti
- label_my_page_block: My page block
- label_administration: Administracija
- label_login: Prijava
- label_logout: Odjava
- label_help: Pomoć
- label_reported_issues: Prijavljeni problemi
- label_assigned_to_me_issues: Problemi dodeljeni meni
- label_last_login: Poslednje povezivanje
- label_registered_on: Registrovan
- label_activity: Aktivnost
- label_overall_activity: Celokupna aktivnost
- label_user_activity: "Aktivnost korisnika %{value}"
- label_new: Novo
- label_logged_as: Prijavljeni ste kao
- label_environment: Okruženje
- label_authentication: Potvrda identiteta
- label_auth_source: Režim potvrde identiteta
- label_auth_source_new: Novi režim potvrde identiteta
- label_auth_source_plural: Režimi potvrde identiteta
- label_subproject_plural: Potprojekti
- label_subproject_new: Novi potprojekat
- label_and_its_subprojects: "%{value} i njegovi potprojekti"
- label_min_max_length: Min. - Maks. dužina
- label_list: Spisak
- label_date: Datum
- label_integer: Ceo broj
- label_float: Sa pokretnim zarezom
- label_boolean: Logički operator
- label_string: Tekst
- label_text: Dugi tekst
- label_attribute: Osobina
- label_attribute_plural: Osobine
- label_download: "%{count} preuzimanje"
- label_download_plural: "%{count} preuzimanja"
- label_no_data: Nema podataka za prikazivanje
- label_change_status: Promena statusa
- label_history: Istorija
- label_attachment: Datoteka
- label_attachment_new: Nova datoteka
- label_attachment_delete: Brisanje datoteke
- label_attachment_plural: Datoteke
- label_file_added: Datoteka je dodata
- label_report: Izveštaj
- label_report_plural: Izveštaji
- label_news: Vesti
- label_news_new: Dodavanje vesti
- label_news_plural: Vesti
- label_news_latest: Poslednje vesti
- label_news_view_all: Prikaz svih vesti
- label_news_added: Vesti su dodate
- label_settings: Podešavanja
- label_overview: Pregled
- label_version: Verzija
- label_version_new: Nova verzija
- label_version_plural: Verzije
- label_close_versions: Zatvori završene verzije
- label_confirmation: Potvrda
- label_export_to: 'Takođe dostupno i u varijanti:'
- label_read: Čitanje...
- label_public_projects: Javni projekti
- label_open_issues: otvoren
- label_open_issues_plural: otvorenih
- label_closed_issues: zatvoren
- label_closed_issues_plural: zatvorenih
- label_x_open_issues_abbr_on_total:
- zero: 0 otvorenih / %{total}
- one: 1 otvoren / %{total}
- other: "%{count} otvorenih / %{total}"
- label_x_open_issues_abbr:
- zero: 0 otvorenih
- one: 1 otvoren
- other: "%{count} otvorenih"
- label_x_closed_issues_abbr:
- zero: 0 zatvorenih
- one: 1 zatvoren
- other: "%{count} zatvorenih"
- label_total: Ukupno
- label_permissions: Dozvole
- label_current_status: Trenutni status
- label_new_statuses_allowed: Novi statusi dozvoljeni
- label_all: svi
- label_none: nijedan
- label_nobody: nikome
- label_next: Sledeće
- label_previous: Prethodno
- label_used_by: Koristio
- label_details: Detalji
- label_add_note: Dodaj belešku
- label_per_page: Po strani
- label_calendar: Kalendar
- label_months_from: meseci od
- label_gantt: Gantov dijagram
- label_internal: Unutrašnji
- label_last_changes: "poslednjih %{count} promena"
- label_change_view_all: Prikaži sve promene
- label_personalize_page: Personalizuj ovu stranu
- label_comment: Komentar
- label_comment_plural: Komentari
- label_x_comments:
- zero: bez komentara
- one: jedan komentar
- other: "%{count} komentara"
- label_comment_add: Dodaj komentar
- label_comment_added: Komentar dodat
- label_comment_delete: Obriši komentare
- label_query: Prilagođen upit
- label_query_plural: Prilagođeni upiti
- label_query_new: Novi upit
- label_filter_add: Dodavanje filtera
- label_filter_plural: Filteri
- label_equals: je
- label_not_equals: nije
- label_in_less_than: manje od
- label_in_more_than: više od
- label_greater_or_equal: '>='
- label_less_or_equal: '<='
- label_in: u
- label_today: danas
- label_all_time: sve vreme
- label_yesterday: juče
- label_this_week: ove sedmice
- label_last_week: poslednje sedmice
- label_last_n_days: "poslednjih %{count} dana"
- label_this_month: ovog meseca
- label_last_month: poslednjeg meseca
- label_this_year: ove godine
- label_date_range: Vremenski period
- label_less_than_ago: pre manje od nekoliko dana
- label_more_than_ago: pre više od nekoliko dana
- label_ago: pre nekoliko dana
- label_contains: sadrži
- label_not_contains: ne sadrži
- label_day_plural: dana
- label_repository: Spremište
- label_repository_plural: Spremišta
- label_browse: Pregledanje
- label_modification: "%{count} promena"
- label_modification_plural: "%{count} promena"
- label_branch: Grana
- label_tag: Oznaka
- label_revision: Revizija
- label_revision_plural: Revizije
- label_revision_id: "Revizija %{value}"
- label_associated_revisions: Pridružene revizije
- label_added: dodato
- label_modified: promenjeno
- label_copied: kopirano
- label_renamed: preimenovano
- label_deleted: izbrisano
- label_latest_revision: Poslednja revizija
- label_latest_revision_plural: Poslednje revizije
- label_view_revisions: Pregled revizija
- label_view_all_revisions: Pregled svih revizija
- label_max_size: Maksimalna veličina
- label_sort_highest: Premeštanje na vrh
- label_sort_higher: Premeštanje na gore
- label_sort_lower: Premeštanje na dole
- label_sort_lowest: Premeštanje na dno
- label_roadmap: Plan rada
- label_roadmap_due_in: "Dospeva %{value}"
- label_roadmap_overdue: "%{value} najkasnije"
- label_roadmap_no_issues: Nema problema za ovu verziju
- label_search: Pretraga
- label_result_plural: Rezultati
- label_all_words: Sve reči
- label_wiki: Wiki
- label_wiki_edit: Wiki izmena
- label_wiki_edit_plural: Wiki izmene
- label_wiki_page: Wiki stranica
- label_wiki_page_plural: Wiki stranice
- label_index_by_title: Indeksiranje po naslovu
- label_index_by_date: Indeksiranje po datumu
- label_current_version: Trenutna verzija
- label_preview: Pregled
- label_feed_plural: Izvori vesti
- label_changes_details: Detalji svih promena
- label_issue_tracking: Praćenje problema
- label_spent_time: Utrošeno vreme
- label_overall_spent_time: Celokupno utrošeno vreme
- label_f_hour: "%{value} sat"
- label_f_hour_plural: "%{value} sati"
- label_time_tracking: Praćenje vremena
- label_change_plural: Promene
- label_statistics: Statistika
- label_commits_per_month: Izvršenja mesečno
- label_commits_per_author: Izvršenja po autoru
- label_view_diff: Pogledaj razlike
- label_diff_inline: unutra
- label_diff_side_by_side: uporedo
- label_options: Opcije
- label_copy_workflow_from: Kopiranje toka posla od
- label_permissions_report: Izveštaj o dozvolama
- label_watched_issues: Posmatrani problemi
- label_related_issues: Srodni problemi
- label_applied_status: Primenjeni statusi
- label_loading: Učitavanje...
- label_relation_new: Nova relacija
- label_relation_delete: Brisanje relacije
- label_relates_to: srodnih sa
- label_duplicates: dupliranih
- label_duplicated_by: dupliranih od
- label_blocks: odbijenih
- label_blocked_by: odbijenih od
- label_precedes: prethodi
- label_follows: praćenih
- label_end_to_start: od kraja do početka
- label_end_to_end: od kraja do kraja
- label_start_to_start: od početka do početka
- label_start_to_end: od početka do kraja
- label_stay_logged_in: Ostanite prijavljeni
- label_disabled: onemogućeno
- label_show_completed_versions: Prikazivanje završene verzije
- label_me: meni
- label_board: Forum
- label_board_new: Novi forum
- label_board_plural: Forumi
- label_board_locked: Zaključana
- label_board_sticky: Lepljiva
- label_topic_plural: Teme
- label_message_plural: Poruke
- label_message_last: Poslednja poruka
- label_message_new: Nova poruka
- label_message_posted: Poruka je dodata
- label_reply_plural: Odgovori
- label_send_information: Pošalji korisniku detalje naloga
- label_year: Godina
- label_month: Mesec
- label_week: Sedmica
- label_date_from: Šalje
- label_date_to: Prima
- label_language_based: Bazirano na jeziku korisnika
- label_sort_by: "Sortirano po %{value}"
- label_send_test_email: Slanje probne e-poruke
- label_feeds_access_key: RSS pristupni ključ
- label_missing_feeds_access_key: RSS pristupni ključ nedostaje
- label_feeds_access_key_created_on: "RSS pristupni ključ je napravljen pre %{value}"
- label_module_plural: Moduli
- label_added_time_by: "Dodao %{author} pre %{age}"
- label_updated_time_by: "Ažurirao %{author} pre %{age}"
- label_updated_time: "Ažurirano pre %{value}"
- label_jump_to_a_project: Skok na projekat...
- label_file_plural: Datoteke
- label_changeset_plural: Skupovi promena
- label_default_columns: Podrazumevane kolone
- label_no_change_option: (Bez promena)
- label_bulk_edit_selected_issues: Grupna izmena odabranih problema
- label_theme: Tema
- label_default: Podrazumevano
- label_search_titles_only: Pretražuj samo naslove
- label_user_mail_option_all: "Za bilo koji događaj na svim mojim projektima"
- label_user_mail_option_selected: "Za bilo koji događaj na samo odabranim projektima..."
- label_user_mail_no_self_notified: "Ne želim biti obaveštavan za promene koje sam pravim"
- label_registration_activation_by_email: aktivacija naloga putem e-poruke
- label_registration_manual_activation: ručna aktivacija naloga
- label_registration_automatic_activation: automatska aktivacija naloga
- label_display_per_page: "Broj stavki po stranici: %{value}"
- label_age: Starost
- label_change_properties: Promeni svojstva
- label_general: Opšti
- label_more: Više
- label_scm: SCM
- label_plugins: Dodatne komponente
- label_ldap_authentication: LDAP potvrda identiteta
- label_downloads_abbr: D/L
- label_optional_description: Opciono opis
- label_add_another_file: Dodaj još jednu datoteku
- label_preferences: Podešavanja
- label_chronological_order: po hronološkom redosledu
- label_reverse_chronological_order: po obrnutom hronološkom redosledu
- label_planning: Planiranje
- label_incoming_emails: Dolazne e-poruke
- label_generate_key: Generisanje ključa
- label_issue_watchers: Posmatrači
- label_example: Primer
- label_display: Prikaz
- label_sort: Sortiranje
- label_ascending: Rastući niz
- label_descending: Opadajući niz
- label_date_from_to: Od %{start} do %{end}
- label_wiki_content_added: Wiki stranica je dodata
- label_wiki_content_updated: Wiki stranica je ažurirana
- label_group: Grupa
- label_group_plural: Grupe
- label_group_new: Nova grupa
- label_time_entry_plural: Utrošeno vreme
- label_version_sharing_none: Nije deljeno
- label_version_sharing_descendants: Sa potprojektima
- label_version_sharing_hierarchy: Sa hijerarhijom projekta
- label_version_sharing_tree: Sa stablom projekta
- label_version_sharing_system: Sa svim projektima
- label_update_issue_done_ratios: Ažuriraj odnos rešenih problema
- label_copy_source: Izvor
- label_copy_target: Odredište
- label_copy_same_as_target: Isto kao odredište
- label_display_used_statuses_only: Prikazuj statuse korišćene samo od strane ovog praćenja
- label_api_access_key: API pristupni ključ
- label_missing_api_access_key: Nedostaje API pristupni ključ
- label_api_access_key_created_on: "API pristupni ključ je kreiran pre %{value}"
- label_profile: Profil
- label_subtask_plural: Podzadatak
- label_project_copy_notifications: Pošalji e-poruku sa obaveštenjem prilikom kopiranja projekta
-
- button_login: Prijava
- button_submit: Pošalji
- button_save: Snimi
- button_check_all: Uključi sve
- button_uncheck_all: Isključi sve
- button_delete: Izbriši
- button_create: Kreiraj
- button_create_and_continue: Kreiraj i nastavi
- button_test: Test
- button_edit: Izmeni
- button_add: Dodaj
- button_change: Promeni
- button_apply: Primeni
- button_clear: Obriši
- button_lock: Zaključaj
- button_unlock: Otključaj
- button_download: Preuzmi
- button_list: Spisak
- button_view: Prikaži
- button_move: Pomeri
- button_move_and_follow: Pomeri i prati
- button_back: Nazad
- button_cancel: Poništi
- button_activate: Aktiviraj
- button_sort: Sortiraj
- button_log_time: Evidentiraj vreme
- button_rollback: Povratak na ovu verziju
- button_watch: Prati
- button_unwatch: Ne prati više
- button_reply: Odgovori
- button_archive: Arhiviraj
- button_unarchive: Vrati iz arhive
- button_reset: Poništi
- button_rename: Preimenuj
- button_change_password: Promeni lozinku
- button_copy: Kopiraj
- button_copy_and_follow: Kopiraj i prati
- button_annotate: Pribeleži
- button_update: Ažuriraj
- button_configure: Podesi
- button_quote: Pod navodnicima
- button_duplicate: Dupliraj
- button_show: Prikaži
-
- status_active: aktivni
- status_registered: registrovani
- status_locked: zaključani
-
- version_status_open: otvoren
- version_status_locked: zaključan
- version_status_closed: zatvoren
-
- field_active: Aktivan
-
- text_select_mail_notifications: Odaberi akcije za koje će obaveštenje biti poslato putem e-pošte.
- text_regexp_info: npr. ^[A-Z0-9]+$
- text_min_max_length_info: 0 znači bez ograničenja
- text_project_destroy_confirmation: Jeste li sigurni da želite da izbrišete ovaj projekat i sve pripadajuće podatke?
- text_subprojects_destroy_warning: "Potprojekti: %{value} će takođe biti izbrisan."
- text_workflow_edit: Odaberite ulogu i praćenje za izmenu toka posla
- text_are_you_sure: Jeste li sigurni?
- text_journal_changed: "%{label} promenjen od %{old} u %{new}"
- text_journal_set_to: "%{label} postavljen u %{value}"
- text_journal_deleted: "%{label} izbrisano (%{old})"
- text_journal_added: "%{label} %{value} dodato"
- text_tip_issue_begin_day: zadatak počinje ovog dana
- text_tip_issue_end_day: zadatak se završava ovog dana
- text_tip_issue_begin_end_day: zadatak počinje i završava ovog dana
- text_project_identifier_info: 'Dozvoljena su samo mala slova (a-š), brojevi i crtice.can not be changed.'
- text_project_homepage_info: 'Link to an external project page.'
- text_project_name_info: "This will be the name of your project throughout this site.can not be changed.'
+ text_project_homepage_info: 'Link to an external project page.'
+ text_project_name_info: "This will be the name of your project throughout this site.contact us if there is any problem.
-
+ text_scm_path_encoding_note: "Default: UTF-8"
+ text_git_repository_note: "Bare and local repository (e.g. /gitrepo, c:\gitrepo)"
+ text_mercurial_repository_note: "Local repository (e.g. /hgrepo, c:\hgrepo)"
+ text_scm_command: Command
+ text_scm_command_version: Version
+ text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+ text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
+
default_role_manager: Manager
default_role_developer: Developer
default_role_reporter: Reporter
@@ -954,9 +990,8 @@
default_priority_immediate: Immediate
default_activity_design: Design
default_activity_development: Development
-
+
enumeration_issue_priorities: Issue priorities
enumeration_doc_categories: Document categories
enumeration_activities: Activities (time tracking)
enumeration_system_activity: System Activity
-
diff -r adc8466df404 -r 753f1380d6bc config/locales/es.yml
--- a/config/locales/es.yml Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/es.yml Mon Jun 06 14:41:04 2011 +0100
@@ -159,7 +159,10 @@
month_names: [~, Enero, Febrero, Marzo, Abril, Mayo, Junio, Julio, Agosto, Setiembre, Octubre, Noviembre, Diciembre]
abbr_month_names: [~, Ene, Feb, Mar, Abr, May, Jun, Jul, Ago, Set, Oct, Nov, Dic]
# Used in date_select and datime_select.
- order: [ :year, :month, :day ]
+ order:
+ - :year
+ - :month
+ - :day
time:
formats:
@@ -264,7 +267,7 @@
field_default_value: Estado por defecto
field_delay: Retraso
field_description: Descripción
- field_done_ratio: % Realizado
+ field_done_ratio: "% Realizado"
field_downloads: Descargas
field_due_date: Fecha fin
field_effective_date: Fecha
@@ -333,7 +336,7 @@
general_csv_separator: ';'
general_first_day_of_week: '1'
general_lang_name: 'Español'
- general_pdf_encoding: ISO-8859-15
+ general_pdf_encoding: UTF-8
general_text_No: 'No'
general_text_Yes: 'Sí'
general_text_no: 'no'
@@ -678,7 +681,7 @@
notice_default_data_loaded: Configuración por defecto cargada correctamente.
notice_email_error: "Ha ocurrido un error mientras enviando el correo (%{value})"
notice_email_sent: "Se ha enviado un correo a %{value}"
- notice_failed_to_save_issues: "Imposible grabar %s peticion(es) en %{count} seleccionado: %{ids}."
+ notice_failed_to_save_issues: "Imposible grabar %{count} peticion(es) de %{total} seleccionada(s): %{ids}."
notice_feeds_access_key_reseted: Su clave de acceso para RSS ha sido reiniciada.
notice_file_not_found: La página a la que intenta acceder no existe.
notice_locking_conflict: Los datos han sido modificados por otro usuario.
@@ -753,7 +756,6 @@
setting_autologin: Conexión automática
setting_bcc_recipients: Ocultar las copias de carbón (bcc)
setting_commit_fix_keywords: Palabras clave para la corrección
- setting_commit_logs_encoding: Codificación de los mensajes de commit
setting_commit_ref_keywords: Palabras clave para la referencia
setting_cross_project_issue_relations: Permitir relacionar peticiones de distintos proyectos
setting_date_format: Formato de fecha
@@ -978,3 +980,37 @@
text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
label_my_queries: My custom queries
text_journal_changed_no_detail: "%{label} updated"
+ label_news_comment_added: Comment added to a news
+ button_expand_all: Expand all
+ button_collapse_all: Collapse all
+ label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
+ label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
+ label_bulk_edit_selected_time_entries: Bulk edit selected time entries
+ text_time_entries_destroy_confirmation: Are you sure you want to delete the selected time entr(y/ies)?
+ label_role_anonymous: Anonymous
+ label_role_non_member: Non member
+ label_issue_note_added: Note added
+ label_issue_status_updated: Status updated
+ label_issue_priority_updated: Priority updated
+ label_issues_visibility_own: Issues created by or assigned to the user
+ field_issues_visibility: Issues visibility
+ label_issues_visibility_all: All issues
+ permission_set_own_issues_private: Set own issues public or private
+ field_is_private: Private
+ permission_set_issues_private: Set issues public or private
+ label_issues_visibility_public: All non private issues
+ text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
+ field_commit_logs_encoding: Codificación de los mensajes de commit
+ field_scm_path_encoding: Path encoding
+ text_scm_path_encoding_note: "Default: UTF-8"
+ field_path_to_repository: Path to repository
+ field_root_directory: Root directory
+ field_cvs_module: Module
+ field_cvsroot: CVSROOT
+ text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
+ text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
+ text_scm_command: Command
+ text_scm_command_version: Version
+ label_git_report_last_commit: Report last commit for files and directories
+ text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+ text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
diff -r adc8466df404 -r 753f1380d6bc config/locales/eu.yml
--- a/config/locales/eu.yml Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/eu.yml Mon Jun 06 14:41:04 2011 +0100
@@ -1,947 +1,983 @@
-# Redmine EU language
-# Author: Ales Zabala Alava (Shagi),
-# 2010-01-25
-# Distributed under the same terms as the Redmine itself.
-eu:
- direction: ltr
- date:
- formats:
- # Use the strftime parameters for formats.
- # When no format has been given, it uses default.
- # You can provide other formats here if you like!
- default: "%Y/%m/%d"
- short: "%b %d"
- long: "%Y %B %d"
-
- day_names: [Igandea, Astelehena, Asteartea, Asteazkena, Osteguna, Ostirala, Larunbata]
- abbr_day_names: [Ig., Al., Ar., Az., Og., Or., La.]
-
- # Don't forget the nil at the beginning; there's no such thing as a 0th month
- month_names: [~, Urtarrila, Otsaila, Martxoa, Apirila, Maiatza, Ekaina, Uztaila, Abuztua, Iraila, Urria, Azaroa, Abendua]
- abbr_month_names: [~, Urt, Ots, Mar, Api, Mai, Eka, Uzt, Abu, Ira, Urr, Aza, Abe]
- # Used in date_select and datime_select.
- order: [ :year, :month, :day ]
-
- time:
- formats:
- default: "%Y/%m/%d %H:%M"
- time: "%H:%M"
- short: "%b %d %H:%M"
- long: "%Y %B %d %H:%M"
- am: "am"
- pm: "pm"
-
- datetime:
- distance_in_words:
- half_a_minute: "minutu erdi"
- less_than_x_seconds:
- one: "segundu bat baino gutxiago"
- other: "%{count} segundu baino gutxiago"
- x_seconds:
- one: "segundu 1"
- other: "%{count} segundu"
- less_than_x_minutes:
- one: "minutu bat baino gutxiago"
- other: "%{count} minutu baino gutxiago"
- x_minutes:
- one: "minutu 1"
- other: "%{count} minutu"
- about_x_hours:
- one: "ordu 1 inguru"
- other: "%{count} ordu inguru"
- x_days:
- one: "egun 1"
- other: "%{count} egun"
- about_x_months:
- one: "hilabete 1 inguru"
- other: "%{count} hilabete inguru"
- x_months:
- one: "hilabete 1"
- other: "%{count} hilabete"
- about_x_years:
- one: "urte 1 inguru"
- other: "%{count} urte inguru"
- over_x_years:
- one: "urte 1 baino gehiago"
- other: "%{count} urte baino gehiago"
- almost_x_years:
- one: "ia urte 1"
- other: "ia %{count} urte"
-
- number:
- format:
- separator: "."
- delimiter: ""
- precision: 3
- human:
- format:
- delimiter: ""
- precision: 1
- storage_units:
- format: "%n %u"
- units:
- byte:
- one: "Byte"
- other: "Byte"
- kb: "KB"
- mb: "MB"
- gb: "GB"
- tb: "TB"
-
-
-# Used in array.to_sentence.
- support:
- array:
- sentence_connector: "eta"
- skip_last_comma: false
-
- activerecord:
- errors:
- template:
- header:
- one: "Errore batek %{model} hau godetzea galarazi du."
- other: "%{count} errorek %{model} hau gordetzea galarazi dute."
- messages:
- inclusion: "ez dago zerrendan"
- exclusion: "erreserbatuta dago"
- invalid: "baliogabea da"
- confirmation: "ez du berrespenarekin bat egiten"
- accepted: "onartu behar da"
- empty: "ezin da hutsik egon"
- blank: "ezin da hutsik egon"
- too_long: "luzeegia da (maximoa %{count} karaktere dira)"
- too_short: "laburregia da (minimoa %{count} karaktere dira)"
- wrong_length: "luzera ezegokia da (%{count} karakter izan beharko litzake)"
- taken: "dagoeneko hartuta dago"
- not_a_number: "ez da zenbaki bat"
- not_a_date: "ez da baliozko data"
- greater_than: "%{count} baino handiagoa izan behar du"
- greater_than_or_equal_to: "%{count} edo handiagoa izan behar du"
- equal_to: "%{count} izan behar du"
- less_than: "%{count} baino gutxiago izan behar du"
- less_than_or_equal_to: "%{count} edo gutxiago izan behar du"
- odd: "bakoitia izan behar du"
- even: "bikoitia izan behar du"
- greater_than_start_date: "hasiera data baino handiagoa izan behar du"
- not_same_project: "ez dago proiektu berdinean"
- circular_dependency: "Erlazio honek mendekotasun zirkular bat sortuko luke"
- cant_link_an_issue_with_a_descendant: "Zeregin bat ezin da bere azpiataza batekin estekatu."
-
- actionview_instancetag_blank_option: Hautatu mesedez
-
- general_text_No: 'Ez'
- general_text_Yes: 'Bai'
- general_text_no: 'ez'
- general_text_yes: 'bai'
- general_lang_name: 'Euskara'
- general_csv_separator: ','
- general_csv_decimal_separator: '.'
- general_csv_encoding: UTF-8
- general_pdf_encoding: UTF-8
- general_first_day_of_week: '1'
-
- notice_account_updated: Kontua ongi eguneratu da.
- notice_account_invalid_creditentials: Erabiltzaile edo pasahitz ezegokia
- notice_account_password_updated: Pasahitza ongi eguneratu da.
- notice_account_wrong_password: Pasahitz ezegokia.
- notice_account_register_done: Kontua ongi sortu da. Kontua gaitzeko klikatu epostan adierazi zaizun estekan.
- notice_account_unknown_email: Erabiltzaile ezezaguna.
- notice_can_t_change_password: Kontu honek kanpoko autentikazio bat erabiltzen du. Ezinezkoa da pasahitza aldatzea.
- notice_account_lost_email_sent: Pasahitz berria aukeratzeko jarraibideak dituen eposta bat bidali zaizu.
- notice_account_activated: Zure kontua gaituta dago. Orain saioa has dezakezu
- notice_successful_create: Sortze arrakastatsua.
- notice_successful_update: Eguneratze arrakastatsua.
- notice_successful_delete: Ezabaketa arrakastatsua.
- notice_successful_connection: Konexio arrakastatsua.
- notice_file_not_found: Atzitu nahi duzun orria ez da exisitzen edo ezabatua izan da.
- notice_locking_conflict: Beste erabiltzaile batek datuak eguneratu ditu.
- notice_not_authorized: Ez duzu orri hau atzitzeko baimenik.
- notice_email_sent: "%{value} helbidera eposta bat bidali da"
- notice_email_error: "Errorea eposta bidaltzean (%{value})"
- notice_feeds_access_key_reseted: Zure RSS atzipen giltza berrezarri da.
- notice_api_access_key_reseted: Zure API atzipen giltza berrezarri da.
- notice_failed_to_save_issues: "Hautatutako %{total} zereginetatik %{count} ezin izan dira konpondu: %{ids}."
- notice_no_issue_selected: "Ez da zereginik hautatu! Mesedez, editatu nahi dituzun arazoak markatu."
- notice_account_pending: "Zure kontua sortu da, orain kudeatzailearen onarpenaren zain dago."
- notice_default_data_loaded: Lehenetsitako konfigurazioa ongi kargatu da.
- notice_unable_delete_version: Ezin da bertsioa ezabatu.
- notice_issue_done_ratios_updated: Burututako zereginen erlazioa eguneratu da.
-
- error_can_t_load_default_data: "Ezin izan da lehenetsitako konfigurazioa kargatu: %{value}"
- error_scm_not_found: "Sarrera edo berrikuspena ez da biltegian topatu."
- error_scm_command_failed: "Errorea gertatu da biltegia atzitzean: %{value}"
- error_scm_annotate: "Sarrera ez da existitzen edo ezin da anotatu."
- error_issue_not_found_in_project: 'Zeregina ez da topatu edo ez da proiektu honetakoa'
- error_no_tracker_in_project: 'Proiektu honek ez du aztarnaririk esleituta. Mesedez egiaztatu Proiektuaren ezarpenak.'
- error_no_default_issue_status: 'Zereginek ez dute lehenetsitako egoerarik. Mesedez egiaztatu zure konfigurazioa ("Kudeaketa -> Arazoen egoerak" atalera joan).'
- error_can_not_reopen_issue_on_closed_version: 'Itxitako bertsio batera esleitutako zereginak ezin dira berrireki'
- error_can_not_archive_project: Proiektu hau ezin da artxibatu
- error_issue_done_ratios_not_updated: "Burututako zereginen erlazioa ez da eguneratu."
- error_workflow_copy_source: 'Mesedez hautatu iturburuko aztarnari edo rola'
- error_workflow_copy_target: 'Mesedez hautatu helburuko aztarnari(ak) edo rola(k)'
-
- warning_attachments_not_saved: "%{count} fitxategi ezin izan d(ir)a gorde."
-
- mail_subject_lost_password: "Zure %{value} pasahitza"
- mail_body_lost_password: 'Zure pasahitza aldatzeko hurrengo estekan klikatu:'
- mail_subject_register: "Zure %{value} kontuaren gaitzea"
- mail_body_register: 'Zure kontua gaitzeko hurrengo estekan klikatu:'
- mail_body_account_information_external: "Zure %{value} kontua erabil dezakezu saioa hasteko."
- mail_body_account_information: Zure kontuaren informazioa
- mail_subject_account_activation_request: "%{value} kontu gaitzeko eskaera"
- mail_body_account_activation_request: "Erabiltzaile berri bat (%{value}) erregistratu da. Kontua zure onarpenaren zain dago:"
- mail_subject_reminder: "%{count} arazo hurrengo %{days} egunetan amaitzen d(ir)a"
- mail_body_reminder: "Zuri esleituta dauden %{count} arazo hurrengo %{days} egunetan amaitzen d(ir)a:"
- mail_subject_wiki_content_added: "'%{id}' wiki orria gehitu da"
- mail_body_wiki_content_added: "%{author}-(e)k '%{id}' wiki orria gehitu du."
- mail_subject_wiki_content_updated: "'%{id}' wiki orria eguneratu da"
- mail_body_wiki_content_updated: "%{author}-(e)k '%{id}' wiki orria eguneratu du."
-
- gui_validation_error: akats 1
- gui_validation_error_plural: "%{count} akats"
-
- field_name: Izena
- field_description: Deskribapena
- field_summary: Laburpena
- field_is_required: Beharrezkoa
- field_firstname: Izena
- field_lastname: Abizenak
- field_mail: Eposta
- field_filename: Fitxategia
- field_filesize: Tamaina
- field_downloads: Deskargak
- field_author: Egilea
- field_created_on: Sortuta
- field_updated_on: Eguneratuta
- field_field_format: Formatua
- field_is_for_all: Proiektu guztietarako
- field_possible_values: Balio posibleak
- field_regexp: Expresio erregularra
- field_min_length: Luzera minimoa
- field_max_length: Luzera maxioma
- field_value: Balioa
- field_category: Kategoria
- field_title: Izenburua
- field_project: Proiektua
- field_issue: Zeregina
- field_status: Egoera
- field_notes: Oharrak
- field_is_closed: Itxitako arazoa
- field_is_default: Lehenetsitako balioa
- field_tracker: Aztarnaria
- field_subject: Gaia
- field_due_date: Amaiera data
- field_assigned_to: Esleituta
- field_priority: Lehentasuna
- field_fixed_version: Helburuko bertsioa
- field_user: Erabiltzilea
- field_role: Rola
- field_homepage: Orri nagusia
- field_is_public: Publikoa
- field_parent: "Honen azpiproiektua:"
- field_is_in_chlog: Zereginak aldaketa egunkarian ikusten dira
- field_is_in_roadmap: Arazoak ibilbide-mapan erakutsi
- field_login: Erabiltzaile izena
- field_mail_notification: Eposta jakinarazpenak
- field_admin: Kudeatzailea
- field_last_login_on: Azken konexioa
- field_language: Hizkuntza
- field_effective_date: Data
- field_password: Pasahitza
- field_new_password: Pasahitz berria
- field_password_confirmation: Berrespena
- field_version: Bertsioa
- field_type: Mota
- field_host: Ostalaria
- field_port: Portua
- field_account: Kontua
- field_base_dn: Base DN
- field_attr_login: Erabiltzaile atributua
- field_attr_firstname: Izena atributua
- field_attr_lastname: Abizenak atributua
- field_attr_mail: Eposta atributua
- field_onthefly: Zuzeneko erabiltzaile sorrera
- field_start_date: Hasiera
- field_done_ratio: Egindako %
- field_auth_source: Autentikazio modua
- field_hide_mail: Nire eposta helbidea ezkutatu
- field_comments: Iruzkina
- field_url: URL
- field_start_page: Hasierako orria
- field_subproject: Azpiproiektua
- field_hours: Ordu
- field_activity: Jarduera
- field_spent_on: Data
- field_identifier: Identifikatzailea
- field_is_filter: Iragazki moduan erabilita
- field_issue_to: Erlazionatutako zereginak
- field_delay: Atzerapena
- field_assignable: Arazoak rol honetara esleitu daitezke
- field_redirect_existing_links: Existitzen diren estekak berbideratu
- field_estimated_hours: Estimatutako denbora
- field_column_names: Zutabeak
- field_time_zone: Ordu zonaldea
- field_searchable: Bilagarria
- field_default_value: Lehenetsitako balioa
- field_comments_sorting: Iruzkinak erakutsi
- field_parent_title: Orri gurasoa
- field_editable: Editagarria
- field_watcher: Behatzailea
- field_identity_url: OpenID URLa
- field_content: Edukia
- field_group_by: Emaitzak honegatik taldekatu
- field_sharing: Partekatzea
-
- setting_app_title: Aplikazioaren izenburua
- setting_app_subtitle: Aplikazioaren azpizenburua
- setting_welcome_text: Ongietorriko testua
- setting_default_language: Lehenetsitako hizkuntza
- setting_login_required: Autentikazioa derrigorrezkoa
- setting_self_registration: Norberak erregistratu
- setting_attachment_max_size: Eranskinen tamaina max.
- setting_issues_export_limit: Zereginen esportatze limitea
- setting_mail_from: Igorlearen eposta helbidea
- setting_bcc_recipients: Hartzaileak ezkutuko kopian (bcc)
- setting_plain_text_mail: Testu soileko epostak (HTML-rik ez)
- setting_host_name: Ostalari izena eta bidea
- setting_text_formatting: Testu formatua
- setting_wiki_compression: Wikiaren historia konprimitu
- setting_feeds_limit: Jarioaren edukiera limitea
- setting_default_projects_public: Proiektu berriak defektuz publikoak dira
- setting_autofetch_changesets: Commit-ak automatikoki hartu
- setting_sys_api_enabled: Biltegien kudeaketarako WS gaitu
- setting_commit_ref_keywords: Erreferentzien gako-hitzak
- setting_commit_fix_keywords: Konpontze gako-hitzak
- setting_autologin: Saioa automatikoki hasi
- setting_date_format: Data formatua
- setting_time_format: Ordu formatua
- setting_cross_project_issue_relations: Zereginak proiektuen artean erlazionatzea baimendu
- setting_issue_list_default_columns: Zereginen zerrendan defektuz ikusten diren zutabeak
- setting_repositories_encodings: Biltegien kodeketak
- setting_commit_logs_encoding: Commit-en egunkarien kodetzea
- setting_emails_footer: Eposten oina
- setting_protocol: Protokoloa
- setting_per_page_options: Orriko objektuen aukerak
- setting_user_format: Erabiltzaileak erakusteko formatua
- setting_activity_days_default: Proiektuen jardueran erakusteko egunak
- setting_display_subprojects_issues: Azpiproiektuen zereginak proiektu nagusian erakutsi defektuz
- setting_enabled_scm: Gaitutako IKKak
- setting_mail_handler_body_delimiters: "Lerro hauteko baten ondoren epostak moztu"
- setting_mail_handler_api_enabled: Sarrerako epostentzako WS gaitu
- setting_mail_handler_api_key: API giltza
- setting_sequential_project_identifiers: Proiektuen identifikadore sekuentzialak sortu
- setting_gravatar_enabled: Erabili Gravatar erabiltzaile ikonoak
- setting_gravatar_default: Lehenetsitako Gravatar irudia
- setting_diff_max_lines_displayed: Erakutsiko diren diff lerro kopuru maximoa
- setting_file_max_size_displayed: Barnean erakuzten diren testu fitxategien tamaina maximoa
- setting_repository_log_display_limit: Egunkari fitxategian erakutsiko diren berrikuspen kopuru maximoa.
- setting_openid: Baimendu OpenID saio hasiera eta erregistatzea
- setting_password_min_length: Pasahitzen luzera minimoa
- setting_new_project_user_role_id: Proiektu berriak sortzerakoan kudeatzaile ez diren erabiltzaileei esleitutako rola
- setting_default_projects_modules: Proiektu berrientzako defektuz gaitutako moduluak
- setting_issue_done_ratio: "Zereginen burututako tasa kalkulatzean erabili:"
- setting_issue_done_ratio_issue_field: Zeregin eremua erabili
- setting_issue_done_ratio_issue_status: Zeregin egoera erabili
- setting_start_of_week: "Egutegiak noiz hasi:"
- setting_rest_api_enabled: Gaitu REST web zerbitzua
-
- permission_add_project: Proiektua sortu
- permission_add_subprojects: Azpiproiektuak sortu
- permission_edit_project: Proiektua editatu
- permission_select_project_modules: Proiektuaren moduluak hautatu
- permission_manage_members: Kideak kudeatu
- permission_manage_versions: Bertsioak kudeatu
- permission_manage_categories: Arazoen kategoriak kudeatu
- permission_view_issues: Zereginak ikusi
- permission_add_issues: Zereginak gehitu
- permission_edit_issues: Zereginak aldatu
- permission_manage_issue_relations: Zereginen erlazioak kudeatu
- permission_add_issue_notes: Oharrak gehitu
- permission_edit_issue_notes: Oharrak aldatu
- permission_edit_own_issue_notes: Nork bere oharrak aldatu
- permission_move_issues: Zereginak mugitu
- permission_delete_issues: Zereginak ezabatu
- permission_manage_public_queries: Galdera publikoak kudeatu
- permission_save_queries: Galderak gorde
- permission_view_gantt: Gantt grafikoa ikusi
- permission_view_calendar: Egutegia ikusi
- permission_view_issue_watchers: Behatzaileen zerrenda ikusi
- permission_add_issue_watchers: Behatzaileak gehitu
- permission_delete_issue_watchers: Behatzaileak ezabatu
- permission_log_time: Igarotako denbora erregistratu
- permission_view_time_entries: Igarotako denbora ikusi
- permission_edit_time_entries: Denbora egunkariak editatu
- permission_edit_own_time_entries: Nork bere denbora egunkariak editatu
- permission_manage_news: Berriak kudeatu
- permission_comment_news: Berrien iruzkinak egin
- permission_manage_documents: Dokumentuak kudeatu
- permission_view_documents: Dokumentuak ikusi
- permission_manage_files: Fitxategiak kudeatu
- permission_view_files: Fitxategiak ikusi
- permission_manage_wiki: Wikia kudeatu
- permission_rename_wiki_pages: Wiki orriak berrizendatu
- permission_delete_wiki_pages: Wiki orriak ezabatu
- permission_view_wiki_pages: Wikia ikusi
- permission_view_wiki_edits: Wikiaren historia ikusi
- permission_edit_wiki_pages: Wiki orriak editatu
- permission_delete_wiki_pages_attachments: Eranskinak ezabatu
- permission_protect_wiki_pages: Wiki orriak babestu
- permission_manage_repository: Biltegiak kudeatu
- permission_browse_repository: Biltegia arakatu
- permission_view_changesets: Aldaketak ikusi
- permission_commit_access: Commit atzipena
- permission_manage_boards: Foroak kudeatu
- permission_view_messages: Mezuak ikusi
- permission_add_messages: Mezuak bidali
- permission_edit_messages: Mezuak aldatu
- permission_edit_own_messages: Nork bere mezuak aldatu
- permission_delete_messages: Mezuak ezabatu
- permission_delete_own_messages: Nork bere mezuak ezabatu
-
- project_module_issue_tracking: Zereginen jarraipena
- project_module_time_tracking: Denbora jarraipena
- project_module_news: Berriak
- project_module_documents: Dokumentuak
- project_module_files: Fitxategiak
- project_module_wiki: Wiki
- project_module_repository: Biltegia
- project_module_boards: Foroak
-
- label_user: Erabiltzailea
- label_user_plural: Erabiltzaileak
- label_user_new: Erabiltzaile berria
- label_user_anonymous: Ezezaguna
- label_project: Proiektua
- label_project_new: Proiektu berria
- label_project_plural: Proiektuak
- label_x_projects:
- zero: proiekturik ez
- one: proiektu bat
- other: "%{count} proiektu"
- label_project_all: Proiektu guztiak
- label_project_latest: Azken proiektuak
- label_issue: Zeregina
- label_issue_new: Zeregin berria
- label_issue_plural: Zereginak
- label_issue_view_all: Zeregin guztiak ikusi
- label_issues_by: "Zereginak honengatik: %{value}"
- label_issue_added: Zeregina gehituta
- label_issue_updated: Zeregina eguneratuta
- label_document: Dokumentua
- label_document_new: Dokumentu berria
- label_document_plural: Dokumentuak
- label_document_added: Dokumentua gehituta
- label_role: Rola
- label_role_plural: Rolak
- label_role_new: Rol berria
- label_role_and_permissions: Rolak eta baimenak
- label_member: Kidea
- label_member_new: Kide berria
- label_member_plural: Kideak
- label_tracker: Aztarnaria
- label_tracker_plural: Aztarnariak
- label_tracker_new: Aztarnari berria
- label_workflow: Lan-fluxua
- label_issue_status: Zeregin egoera
- label_issue_status_plural: Zeregin egoerak
- label_issue_status_new: Egoera berria
- label_issue_category: Zeregin kategoria
- label_issue_category_plural: Zeregin kategoriak
- label_issue_category_new: Kategoria berria
- label_custom_field: Eremu pertsonalizatua
- label_custom_field_plural: Eremu pertsonalizatuak
- label_custom_field_new: Eremu pertsonalizatu berria
- label_enumerations: Enumerazioak
- label_enumeration_new: Balio berria
- label_information: Informazioa
- label_information_plural: Informazioa
- label_please_login: Saioa hasi mesedez
- label_register: Erregistratu
- label_login_with_open_id_option: edo OpenID-rekin saioa hasi
- label_password_lost: Pasahitza galduta
- label_home: Hasiera
- label_home_heading: Hasiera
- label_my_page: Nire orria
- label_my_account: Nire kontua
- label_my_projects: Nire proiektuak
- label_administration: Kudeaketa
- label_login: Saioa hasi
- label_logout: Saioa bukatu
- label_help: Laguntza
- label_reported_issues: Berri emandako zereginak
- label_assigned_to_me_issues: Niri esleitutako arazoak
- label_last_login: Azken konexioa
- label_registered_on: Noiz erregistratuta
- label_activity: Jarduerak
- label_overall_activity: Jarduera guztiak
- label_user_activity: "%{value}-(r)en jarduerak"
- label_new: Berria
- label_logged_as: "Sartutako erabiltzailea:"
- label_environment: Ingurune
- label_authentication: Autentikazioa
- label_auth_source: Autentikazio modua
- label_auth_source_new: Autentikazio modu berria
- label_auth_source_plural: Autentikazio moduak
- label_subproject_plural: Azpiproiektuak
- label_subproject_new: Azpiproiektu berria
- label_and_its_subprojects: "%{value} eta bere azpiproiektuak"
- label_min_max_length: Luzera min - max
- label_list: Zerrenda
- label_date: Data
- label_integer: Osokoa
- label_float: Koma higikorrekoa
- label_boolean: Boolearra
- label_string: Testua
- label_text: Testu luzea
- label_attribute: Atributua
- label_attribute_plural: Atributuak
- label_download: "Deskarga %{count}"
- label_download_plural: "%{count} Deskarga"
- label_no_data: Ez dago erakusteko daturik
- label_change_status: Egoera aldatu
- label_history: Historikoa
- label_attachment: Fitxategia
- label_attachment_new: Fitxategi berria
- label_attachment_delete: Fitxategia ezabatu
- label_attachment_plural: Fitxategiak
- label_file_added: Fitxategia gehituta
- label_report: Berri ematea
- label_report_plural: Berri emateak
- label_news: Berria
- label_news_new: Berria gehitu
- label_news_plural: Berriak
- label_news_latest: Azken berriak
- label_news_view_all: Berri guztiak ikusi
- label_news_added: Berria gehituta
- label_change_log: Aldaketa egunkaria
- label_settings: Ezarpenak
- label_overview: Gainbegirada
- label_version: Bertsioa
- label_version_new: Bertsio berria
- label_version_plural: Bertsioak
- label_close_versions: Burututako bertsioak itxi
- label_confirmation: Baieztapena
- label_export_to: 'Eskuragarri baita:'
- label_read: Irakurri...
- label_public_projects: Proiektu publikoak
- label_open_issues: irekita
- label_open_issues_plural: irekiak
- label_closed_issues: itxita
- label_closed_issues_plural: itxiak
- label_x_open_issues_abbr_on_total:
- zero: 0 irekita / %{total}
- one: 1 irekita / %{total}
- other: "%{count} irekiak / %{total}"
- label_x_open_issues_abbr:
- zero: 0 irekita
- one: 1 irekita
- other: "%{count} irekiak"
- label_x_closed_issues_abbr:
- zero: 0 itxita
- one: 1 itxita
- other: "%{count} itxiak"
- label_total: Guztira
- label_permissions: Baimenak
- label_current_status: Uneko egoera
- label_new_statuses_allowed: Baimendutako egoera berriak
- label_all: guztiak
- label_none: ezer
- label_nobody: inor
- label_next: Hurrengoa
- label_previous: Aurrekoak
- label_used_by: Erabilita
- label_details: Xehetasunak
- label_add_note: Oharra gehitu
- label_per_page: Orriko
- label_calendar: Egutegia
- label_months_from: hilabete noiztik
- label_gantt: Gantt
- label_internal: Barnekoa
- label_last_changes: "azken %{count} aldaketak"
- label_change_view_all: Aldaketa guztiak ikusi
- label_personalize_page: Orri hau pertsonalizatu
- label_comment: Iruzkin
- label_comment_plural: Iruzkinak
- label_x_comments:
- zero: iruzkinik ez
- one: iruzkin 1
- other: "%{count} iruzkin"
- label_comment_add: Iruzkina gehitu
- label_comment_added: Iruzkina gehituta
- label_comment_delete: Iruzkinak ezabatu
- label_query: Galdera pertsonalizatua
- label_query_plural: Pertsonalizatutako galderak
- label_query_new: Galdera berria
- label_filter_add: Iragazkia gehitu
- label_filter_plural: Iragazkiak
- label_equals: da
- label_not_equals: ez da
- label_in_less_than: baino gutxiagotan
- label_in_more_than: baino gehiagotan
- label_greater_or_equal: '>='
- label_less_or_equal: '<='
- label_in: hauetan
- label_today: gaur
- label_all_time: denbora guztia
- label_yesterday: atzo
- label_this_week: aste honetan
- label_last_week: pasadan astean
- label_last_n_days: "azken %{count} egunetan"
- label_this_month: hilabete hau
- label_last_month: pasadan hilabetea
- label_this_year: urte hau
- label_date_range: Data tartea
- label_less_than_ago: egun hauek baino gutxiago
- label_more_than_ago: egun hauek baino gehiago
- label_ago: orain dela
- label_contains: dauka
- label_not_contains: ez dauka
- label_day_plural: egun
- label_repository: Biltegia
- label_repository_plural: Biltegiak
- label_browse: Arakatu
- label_modification: "aldaketa %{count}"
- label_modification_plural: "%{count} aldaketa"
- label_branch: Adarra
- label_tag: Etiketa
- label_revision: Berrikuspena
- label_revision_plural: Berrikuspenak
- label_revision_id: "%{value} berrikuspen"
- label_associated_revisions: Elkartutako berrikuspenak
- label_added: gehituta
- label_modified: aldatuta
- label_copied: kopiatuta
- label_renamed: berrizendatuta
- label_deleted: ezabatuta
- label_latest_revision: Azken berrikuspena
- label_latest_revision_plural: Azken berrikuspenak
- label_view_revisions: Berrikuspenak ikusi
- label_view_all_revisions: Berrikuspen guztiak ikusi
- label_max_size: Tamaina maximoa
- label_sort_highest: Goraino mugitu
- label_sort_higher: Gora mugitu
- label_sort_lower: Behera mugitu
- label_sort_lowest: Beheraino mugitu
- label_roadmap: Ibilbide-mapa
- label_roadmap_due_in: "Epea: %{value}"
- label_roadmap_overdue: "%{value} berandu"
- label_roadmap_no_issues: Ez dago zereginik bertsio honetan
- label_search: Bilatu
- label_result_plural: Emaitzak
- label_all_words: hitz guztiak
- label_wiki: Wikia
- label_wiki_edit: Wiki edizioa
- label_wiki_edit_plural: Wiki edizioak
- label_wiki_page: Wiki orria
- label_wiki_page_plural: Wiki orriak
- label_index_by_title: Izenburuaren araberako indizea
- label_index_by_date: Dataren araberako indizea
- label_current_version: Uneko bertsioa
- label_preview: Aurreikusi
- label_feed_plural: Jarioak
- label_changes_details: Aldaketa guztien xehetasunak
- label_issue_tracking: Zeregin jarraipena
- label_spent_time: Igarotako denbora
- label_f_hour: "ordu %{value}"
- label_f_hour_plural: "%{value} ordu"
- label_time_tracking: Denbora jarraipena
- label_change_plural: Aldaketak
- label_statistics: Estatistikak
- label_commits_per_month: Commit-ak hilabeteka
- label_commits_per_author: Commit-ak egileka
- label_view_diff: Ezberdintasunak ikusi
- label_diff_inline: barnean
- label_diff_side_by_side: aldez alde
- label_options: Aukerak
- label_copy_workflow_from: Kopiatu workflow-a hemendik
- label_permissions_report: Baimenen txostena
- label_watched_issues: Behatutako zereginak
- label_related_issues: Erlazionatutako zereginak
- label_applied_status: Aplikatutako egoera
- label_loading: Kargatzen...
- label_relation_new: Erlazio berria
- label_relation_delete: Erlazioa ezabatu
- label_relates_to: erlazionatuta dago
- label_duplicates: bikoizten du
- label_duplicated_by: honek bikoiztuta
- label_blocks: blokeatzen du
- label_blocked_by: honek blokeatuta
- label_precedes: aurretik doa
- label_follows: jarraitzen du
- label_end_to_start: bukaeratik hasierara
- label_end_to_end: bukaeratik bukaerara
- label_start_to_start: hasieratik hasierhasieratik bukaerara
- label_start_to_end: hasieratik bukaerara
- label_stay_logged_in: Saioa mantendu
- label_disabled: ezgaituta
- label_show_completed_versions: Bukatutako bertsioak ikusi
- label_me: ni
- label_board: Foroa
- label_board_new: Foro berria
- label_board_plural: Foroak
- label_topic_plural: Gaiak
- label_message_plural: Mezuak
- label_message_last: Azken mezua
- label_message_new: Mezu berria
- label_message_posted: Mesua gehituta
- label_reply_plural: Erantzunak
- label_send_information: Erabiltzaileai kontuaren informazioa bidali
- label_year: Urtea
- label_month: Hilabetea
- label_week: Astea
- label_date_from: Nork
- label_date_to: Nori
- label_language_based: Erabiltzailearen hizkuntzaren arabera
- label_sort_by: "Ordenazioa: %{value}"
- label_send_test_email: Frogako mezua bidali
- label_feeds_access_key: RSS atzipen giltza
- label_missing_feeds_access_key: RSS atzipen giltza falta da
- label_feeds_access_key_created_on: "RSS atzipen giltza orain dela %{value} sortuta"
- label_module_plural: Moduluak
- label_added_time_by: "%{author}, orain dela %{age} gehituta"
- label_updated_time_by: "%{author}, orain dela %{age} eguneratuta"
- label_updated_time: "Orain dela %{value} eguneratuta"
- label_jump_to_a_project: Joan proiektura...
- label_file_plural: Fitxategiak
- label_changeset_plural: Aldaketak
- label_default_columns: Lehenetsitako zutabeak
- label_no_change_option: (Aldaketarik ez)
- label_bulk_edit_selected_issues: Hautatutako zereginak batera editatu
- label_theme: Itxura
- label_default: Lehenetsia
- label_search_titles_only: Izenburuetan bakarrik bilatu
- label_user_mail_option_all: "Nire proiektu guztietako gertakari guztientzat"
- label_user_mail_option_selected: "Hautatutako proiektuetako edozein gertakarientzat..."
- label_user_mail_no_self_notified: "Ez dut nik egiten ditudan aldeketen jakinarazpenik jaso nahi"
- label_registration_activation_by_email: kontuak epostaz gaitu
- label_registration_manual_activation: kontuak eskuz gaitu
- label_registration_automatic_activation: kontuak automatikoki gaitu
- label_display_per_page: "Orriko: %{value}"
- label_age: Adina
- label_change_properties: Propietateak aldatu
- label_general: Orokorra
- label_more: Gehiago
- label_scm: IKK
- label_plugins: Pluginak
- label_ldap_authentication: LDAP autentikazioa
- label_downloads_abbr: Desk.
- label_optional_description: Aukerako deskribapena
- label_add_another_file: Beste fitxategia gehitu
- label_preferences: Hobespenak
- label_chronological_order: Orden kronologikoan
- label_reverse_chronological_order: Alderantzizko orden kronologikoan
- label_planning: Planifikazioa
- label_incoming_emails: Sarrerako epostak
- label_generate_key: Giltza sortu
- label_issue_watchers: Behatzaileak
- label_example: Adibidea
- label_display: Bistaratzea
- label_sort: Ordenatu
- label_ascending: Gorantz
- label_descending: Beherantz
- label_date_from_to: "%{start}-tik %{end}-ra"
- label_wiki_content_added: Wiki orria gehituta
- label_wiki_content_updated: Wiki orria eguneratuta
- label_group: Taldea
- label_group_plural: Taldeak
- label_group_new: Talde berria
- label_time_entry_plural: Igarotako denbora
- label_version_sharing_none: Ez partekatuta
- label_version_sharing_descendants: Azpiproiektuekin
- label_version_sharing_hierarchy: Proiektu Hierarkiarekin
- label_version_sharing_tree: Proiektu zuhaitzarekin
- label_version_sharing_system: Proiektu guztiekin
- label_update_issue_done_ratios: Zereginen burututako erlazioa eguneratu
- label_copy_source: Iturburua
- label_copy_target: Helburua
- label_copy_same_as_target: Helburuaren berdina
- label_display_used_statuses_only: Aztarnari honetan erabiltzen diren egoerak bakarrik erakutsi
- label_api_access_key: API atzipen giltza
- label_missing_api_access_key: API atzipen giltza falta da
- label_api_access_key_created_on: "API atzipen giltza sortuta orain dela %{value}"
-
- button_login: Saioa hasi
- button_submit: Bidali
- button_save: Gorde
- button_check_all: Guztiak markatu
- button_uncheck_all: Guztiak desmarkatu
- button_delete: Ezabatu
- button_create: Sortu
- button_create_and_continue: Sortu eta jarraitu
- button_test: Frogatu
- button_edit: Editatu
- button_add: Gehitu
- button_change: Aldatu
- button_apply: Aplikatu
- button_clear: Garbitu
- button_lock: Blokeatu
- button_unlock: Desblokeatu
- button_download: Deskargatu
- button_list: Zerrenda
- button_view: Ikusi
- button_move: Mugitu
- button_move_and_follow: Mugitu eta jarraitu
- button_back: Atzera
- button_cancel: Ezeztatu
- button_activate: Gahitu
- button_sort: Ordenatu
- button_log_time: Denbora erregistratu
- button_rollback: Itzuli bertsio honetara
- button_watch: Behatu
- button_unwatch: Behatzen utzi
- button_reply: Erantzun
- button_archive: Artxibatu
- button_unarchive: Desartxibatu
- button_reset: Berrezarri
- button_rename: Berrizendatu
- button_change_password: Pasahitza aldatu
- button_copy: Kopiatu
- button_copy_and_follow: Kopiatu eta jarraitu
- button_annotate: Anotatu
- button_update: Eguneratu
- button_configure: Konfiguratu
- button_quote: Aipatu
- button_duplicate: Bikoiztu
- button_show: Ikusi
-
- status_active: gaituta
- status_registered: izena emanda
- status_locked: blokeatuta
-
- version_status_open: irekita
- version_status_locked: blokeatuta
- version_status_closed: itxita
-
- field_active: Gaituta
-
- text_select_mail_notifications: Jakinarazpenak zein ekintzetarako bidaliko diren hautatu.
- text_regexp_info: adib. ^[A-Z0-9]+$
- text_min_max_length_info: 0k mugarik gabe esan nahi du
- text_project_destroy_confirmation: Ziur zaude proiektu hau eta erlazionatutako datu guztiak ezabatu nahi dituzula?
- text_subprojects_destroy_warning: "%{value} azpiproiektuak ere ezabatuko dira."
- text_workflow_edit: Hautatu rola eta aztarnaria workflow-a editatzeko
- text_are_you_sure: Ziur zaude?
- text_journal_changed: "%{label} %{old}-(e)tik %{new}-(e)ra aldatuta"
- text_journal_set_to: "%{label}-k %{value} balioa hartu du"
- text_journal_deleted: "%{label} ezabatuta (%{old})"
- text_journal_added: "%{label} %{value} gehituta"
- text_tip_issue_begin_day: gaur hasten diren zereginak
- text_tip_issue_end_day: gaur bukatzen diren zereginak
- text_tip_issue_begin_end_day: gaur hasi eta bukatzen diren zereginak
- text_project_identifier_info: 'Letra xeheak (a-z), zenbakiak eta marrak erabil daitezke bakarrik.
+# 2010-01-25
+# Distributed under the same terms as the Redmine itself.
+eu:
+ direction: ltr
+ date:
+ formats:
+ # Use the strftime parameters for formats.
+ # When no format has been given, it uses default.
+ # You can provide other formats here if you like!
+ default: "%Y/%m/%d"
+ short: "%b %d"
+ long: "%Y %B %d"
+
+ day_names: [Igandea, Astelehena, Asteartea, Asteazkena, Osteguna, Ostirala, Larunbata]
+ abbr_day_names: [Ig., Al., Ar., Az., Og., Or., La.]
+
+ # Don't forget the nil at the beginning; there's no such thing as a 0th month
+ month_names: [~, Urtarrila, Otsaila, Martxoa, Apirila, Maiatza, Ekaina, Uztaila, Abuztua, Iraila, Urria, Azaroa, Abendua]
+ abbr_month_names: [~, Urt, Ots, Mar, Api, Mai, Eka, Uzt, Abu, Ira, Urr, Aza, Abe]
+ # Used in date_select and datime_select.
+ order:
+ - :year
+ - :month
+ - :day
+
+ time:
+ formats:
+ default: "%Y/%m/%d %H:%M"
+ time: "%H:%M"
+ short: "%b %d %H:%M"
+ long: "%Y %B %d %H:%M"
+ am: "am"
+ pm: "pm"
+
+ datetime:
+ distance_in_words:
+ half_a_minute: "minutu erdi"
+ less_than_x_seconds:
+ one: "segundu bat baino gutxiago"
+ other: "%{count} segundu baino gutxiago"
+ x_seconds:
+ one: "segundu 1"
+ other: "%{count} segundu"
+ less_than_x_minutes:
+ one: "minutu bat baino gutxiago"
+ other: "%{count} minutu baino gutxiago"
+ x_minutes:
+ one: "minutu 1"
+ other: "%{count} minutu"
+ about_x_hours:
+ one: "ordu 1 inguru"
+ other: "%{count} ordu inguru"
+ x_days:
+ one: "egun 1"
+ other: "%{count} egun"
+ about_x_months:
+ one: "hilabete 1 inguru"
+ other: "%{count} hilabete inguru"
+ x_months:
+ one: "hilabete 1"
+ other: "%{count} hilabete"
+ about_x_years:
+ one: "urte 1 inguru"
+ other: "%{count} urte inguru"
+ over_x_years:
+ one: "urte 1 baino gehiago"
+ other: "%{count} urte baino gehiago"
+ almost_x_years:
+ one: "ia urte 1"
+ other: "ia %{count} urte"
+
+ number:
+ format:
+ separator: "."
+ delimiter: ""
+ precision: 3
+ human:
+ format:
+ delimiter: ""
+ precision: 1
+ storage_units:
+ format: "%n %u"
+ units:
+ byte:
+ one: "Byte"
+ other: "Byte"
+ kb: "KB"
+ mb: "MB"
+ gb: "GB"
+ tb: "TB"
+
+
+# Used in array.to_sentence.
+ support:
+ array:
+ sentence_connector: "eta"
+ skip_last_comma: false
+
+ activerecord:
+ errors:
+ template:
+ header:
+ one: "Errore batek %{model} hau godetzea galarazi du."
+ other: "%{count} errorek %{model} hau gordetzea galarazi dute."
+ messages:
+ inclusion: "ez dago zerrendan"
+ exclusion: "erreserbatuta dago"
+ invalid: "baliogabea da"
+ confirmation: "ez du berrespenarekin bat egiten"
+ accepted: "onartu behar da"
+ empty: "ezin da hutsik egon"
+ blank: "ezin da hutsik egon"
+ too_long: "luzeegia da (maximoa %{count} karaktere dira)"
+ too_short: "laburregia da (minimoa %{count} karaktere dira)"
+ wrong_length: "luzera ezegokia da (%{count} karakter izan beharko litzake)"
+ taken: "dagoeneko hartuta dago"
+ not_a_number: "ez da zenbaki bat"
+ not_a_date: "ez da baliozko data"
+ greater_than: "%{count} baino handiagoa izan behar du"
+ greater_than_or_equal_to: "%{count} edo handiagoa izan behar du"
+ equal_to: "%{count} izan behar du"
+ less_than: "%{count} baino gutxiago izan behar du"
+ less_than_or_equal_to: "%{count} edo gutxiago izan behar du"
+ odd: "bakoitia izan behar du"
+ even: "bikoitia izan behar du"
+ greater_than_start_date: "hasiera data baino handiagoa izan behar du"
+ not_same_project: "ez dago proiektu berdinean"
+ circular_dependency: "Erlazio honek mendekotasun zirkular bat sortuko luke"
+ cant_link_an_issue_with_a_descendant: "Zeregin bat ezin da bere azpiataza batekin estekatu."
+
+ actionview_instancetag_blank_option: Hautatu mesedez
+
+ general_text_No: 'Ez'
+ general_text_Yes: 'Bai'
+ general_text_no: 'ez'
+ general_text_yes: 'bai'
+ general_lang_name: 'Euskara'
+ general_csv_separator: ','
+ general_csv_decimal_separator: '.'
+ general_csv_encoding: UTF-8
+ general_pdf_encoding: UTF-8
+ general_first_day_of_week: '1'
+
+ notice_account_updated: Kontua ongi eguneratu da.
+ notice_account_invalid_creditentials: Erabiltzaile edo pasahitz ezegokia
+ notice_account_password_updated: Pasahitza ongi eguneratu da.
+ notice_account_wrong_password: Pasahitz ezegokia.
+ notice_account_register_done: Kontua ongi sortu da. Kontua gaitzeko klikatu epostan adierazi zaizun estekan.
+ notice_account_unknown_email: Erabiltzaile ezezaguna.
+ notice_can_t_change_password: Kontu honek kanpoko autentikazio bat erabiltzen du. Ezinezkoa da pasahitza aldatzea.
+ notice_account_lost_email_sent: Pasahitz berria aukeratzeko jarraibideak dituen eposta bat bidali zaizu.
+ notice_account_activated: Zure kontua gaituta dago. Orain saioa has dezakezu
+ notice_successful_create: Sortze arrakastatsua.
+ notice_successful_update: Eguneratze arrakastatsua.
+ notice_successful_delete: Ezabaketa arrakastatsua.
+ notice_successful_connection: Konexio arrakastatsua.
+ notice_file_not_found: Atzitu nahi duzun orria ez da exisitzen edo ezabatua izan da.
+ notice_locking_conflict: Beste erabiltzaile batek datuak eguneratu ditu.
+ notice_not_authorized: Ez duzu orri hau atzitzeko baimenik.
+ notice_email_sent: "%{value} helbidera eposta bat bidali da"
+ notice_email_error: "Errorea eposta bidaltzean (%{value})"
+ notice_feeds_access_key_reseted: Zure RSS atzipen giltza berrezarri da.
+ notice_api_access_key_reseted: Zure API atzipen giltza berrezarri da.
+ notice_failed_to_save_issues: "Hautatutako %{total} zereginetatik %{count} ezin izan dira konpondu: %{ids}."
+ notice_no_issue_selected: "Ez da zereginik hautatu! Mesedez, editatu nahi dituzun arazoak markatu."
+ notice_account_pending: "Zure kontua sortu da, orain kudeatzailearen onarpenaren zain dago."
+ notice_default_data_loaded: Lehenetsitako konfigurazioa ongi kargatu da.
+ notice_unable_delete_version: Ezin da bertsioa ezabatu.
+ notice_issue_done_ratios_updated: Burututako zereginen erlazioa eguneratu da.
+
+ error_can_t_load_default_data: "Ezin izan da lehenetsitako konfigurazioa kargatu: %{value}"
+ error_scm_not_found: "Sarrera edo berrikuspena ez da biltegian topatu."
+ error_scm_command_failed: "Errorea gertatu da biltegia atzitzean: %{value}"
+ error_scm_annotate: "Sarrera ez da existitzen edo ezin da anotatu."
+ error_issue_not_found_in_project: 'Zeregina ez da topatu edo ez da proiektu honetakoa'
+ error_no_tracker_in_project: 'Proiektu honek ez du aztarnaririk esleituta. Mesedez egiaztatu Proiektuaren ezarpenak.'
+ error_no_default_issue_status: 'Zereginek ez dute lehenetsitako egoerarik. Mesedez egiaztatu zure konfigurazioa ("Kudeaketa -> Arazoen egoerak" atalera joan).'
+ error_can_not_reopen_issue_on_closed_version: 'Itxitako bertsio batera esleitutako zereginak ezin dira berrireki'
+ error_can_not_archive_project: Proiektu hau ezin da artxibatu
+ error_issue_done_ratios_not_updated: "Burututako zereginen erlazioa ez da eguneratu."
+ error_workflow_copy_source: 'Mesedez hautatu iturburuko aztarnari edo rola'
+ error_workflow_copy_target: 'Mesedez hautatu helburuko aztarnari(ak) edo rola(k)'
+
+ warning_attachments_not_saved: "%{count} fitxategi ezin izan d(ir)a gorde."
+
+ mail_subject_lost_password: "Zure %{value} pasahitza"
+ mail_body_lost_password: 'Zure pasahitza aldatzeko hurrengo estekan klikatu:'
+ mail_subject_register: "Zure %{value} kontuaren gaitzea"
+ mail_body_register: 'Zure kontua gaitzeko hurrengo estekan klikatu:'
+ mail_body_account_information_external: "Zure %{value} kontua erabil dezakezu saioa hasteko."
+ mail_body_account_information: Zure kontuaren informazioa
+ mail_subject_account_activation_request: "%{value} kontu gaitzeko eskaera"
+ mail_body_account_activation_request: "Erabiltzaile berri bat (%{value}) erregistratu da. Kontua zure onarpenaren zain dago:"
+ mail_subject_reminder: "%{count} arazo hurrengo %{days} egunetan amaitzen d(ir)a"
+ mail_body_reminder: "Zuri esleituta dauden %{count} arazo hurrengo %{days} egunetan amaitzen d(ir)a:"
+ mail_subject_wiki_content_added: "'%{id}' wiki orria gehitu da"
+ mail_body_wiki_content_added: "%{author}-(e)k '%{id}' wiki orria gehitu du."
+ mail_subject_wiki_content_updated: "'%{id}' wiki orria eguneratu da"
+ mail_body_wiki_content_updated: "%{author}-(e)k '%{id}' wiki orria eguneratu du."
+
+ gui_validation_error: akats 1
+ gui_validation_error_plural: "%{count} akats"
+
+ field_name: Izena
+ field_description: Deskribapena
+ field_summary: Laburpena
+ field_is_required: Beharrezkoa
+ field_firstname: Izena
+ field_lastname: Abizenak
+ field_mail: Eposta
+ field_filename: Fitxategia
+ field_filesize: Tamaina
+ field_downloads: Deskargak
+ field_author: Egilea
+ field_created_on: Sortuta
+ field_updated_on: Eguneratuta
+ field_field_format: Formatua
+ field_is_for_all: Proiektu guztietarako
+ field_possible_values: Balio posibleak
+ field_regexp: Expresio erregularra
+ field_min_length: Luzera minimoa
+ field_max_length: Luzera maxioma
+ field_value: Balioa
+ field_category: Kategoria
+ field_title: Izenburua
+ field_project: Proiektua
+ field_issue: Zeregina
+ field_status: Egoera
+ field_notes: Oharrak
+ field_is_closed: Itxitako arazoa
+ field_is_default: Lehenetsitako balioa
+ field_tracker: Aztarnaria
+ field_subject: Gaia
+ field_due_date: Amaiera data
+ field_assigned_to: Esleituta
+ field_priority: Lehentasuna
+ field_fixed_version: Helburuko bertsioa
+ field_user: Erabiltzilea
+ field_role: Rola
+ field_homepage: Orri nagusia
+ field_is_public: Publikoa
+ field_parent: "Honen azpiproiektua:"
+ field_is_in_chlog: Zereginak aldaketa egunkarian ikusten dira
+ field_is_in_roadmap: Arazoak ibilbide-mapan erakutsi
+ field_login: Erabiltzaile izena
+ field_mail_notification: Eposta jakinarazpenak
+ field_admin: Kudeatzailea
+ field_last_login_on: Azken konexioa
+ field_language: Hizkuntza
+ field_effective_date: Data
+ field_password: Pasahitza
+ field_new_password: Pasahitz berria
+ field_password_confirmation: Berrespena
+ field_version: Bertsioa
+ field_type: Mota
+ field_host: Ostalaria
+ field_port: Portua
+ field_account: Kontua
+ field_base_dn: Base DN
+ field_attr_login: Erabiltzaile atributua
+ field_attr_firstname: Izena atributua
+ field_attr_lastname: Abizenak atributua
+ field_attr_mail: Eposta atributua
+ field_onthefly: Zuzeneko erabiltzaile sorrera
+ field_start_date: Hasiera
+ field_done_ratio: Egindako %
+ field_auth_source: Autentikazio modua
+ field_hide_mail: Nire eposta helbidea ezkutatu
+ field_comments: Iruzkina
+ field_url: URL
+ field_start_page: Hasierako orria
+ field_subproject: Azpiproiektua
+ field_hours: Ordu
+ field_activity: Jarduera
+ field_spent_on: Data
+ field_identifier: Identifikatzailea
+ field_is_filter: Iragazki moduan erabilita
+ field_issue_to: Erlazionatutako zereginak
+ field_delay: Atzerapena
+ field_assignable: Arazoak rol honetara esleitu daitezke
+ field_redirect_existing_links: Existitzen diren estekak berbideratu
+ field_estimated_hours: Estimatutako denbora
+ field_column_names: Zutabeak
+ field_time_zone: Ordu zonaldea
+ field_searchable: Bilagarria
+ field_default_value: Lehenetsitako balioa
+ field_comments_sorting: Iruzkinak erakutsi
+ field_parent_title: Orri gurasoa
+ field_editable: Editagarria
+ field_watcher: Behatzailea
+ field_identity_url: OpenID URLa
+ field_content: Edukia
+ field_group_by: Emaitzak honegatik taldekatu
+ field_sharing: Partekatzea
+
+ setting_app_title: Aplikazioaren izenburua
+ setting_app_subtitle: Aplikazioaren azpizenburua
+ setting_welcome_text: Ongietorriko testua
+ setting_default_language: Lehenetsitako hizkuntza
+ setting_login_required: Autentikazioa derrigorrezkoa
+ setting_self_registration: Norberak erregistratu
+ setting_attachment_max_size: Eranskinen tamaina max.
+ setting_issues_export_limit: Zereginen esportatze limitea
+ setting_mail_from: Igorlearen eposta helbidea
+ setting_bcc_recipients: Hartzaileak ezkutuko kopian (bcc)
+ setting_plain_text_mail: Testu soileko epostak (HTML-rik ez)
+ setting_host_name: Ostalari izena eta bidea
+ setting_text_formatting: Testu formatua
+ setting_wiki_compression: Wikiaren historia konprimitu
+ setting_feeds_limit: Jarioaren edukiera limitea
+ setting_default_projects_public: Proiektu berriak defektuz publikoak dira
+ setting_autofetch_changesets: Commit-ak automatikoki hartu
+ setting_sys_api_enabled: Biltegien kudeaketarako WS gaitu
+ setting_commit_ref_keywords: Erreferentzien gako-hitzak
+ setting_commit_fix_keywords: Konpontze gako-hitzak
+ setting_autologin: Saioa automatikoki hasi
+ setting_date_format: Data formatua
+ setting_time_format: Ordu formatua
+ setting_cross_project_issue_relations: Zereginak proiektuen artean erlazionatzea baimendu
+ setting_issue_list_default_columns: Zereginen zerrendan defektuz ikusten diren zutabeak
+ setting_repositories_encodings: Biltegien kodeketak
+ setting_emails_footer: Eposten oina
+ setting_protocol: Protokoloa
+ setting_per_page_options: Orriko objektuen aukerak
+ setting_user_format: Erabiltzaileak erakusteko formatua
+ setting_activity_days_default: Proiektuen jardueran erakusteko egunak
+ setting_display_subprojects_issues: Azpiproiektuen zereginak proiektu nagusian erakutsi defektuz
+ setting_enabled_scm: Gaitutako IKKak
+ setting_mail_handler_body_delimiters: "Lerro hauteko baten ondoren epostak moztu"
+ setting_mail_handler_api_enabled: Sarrerako epostentzako WS gaitu
+ setting_mail_handler_api_key: API giltza
+ setting_sequential_project_identifiers: Proiektuen identifikadore sekuentzialak sortu
+ setting_gravatar_enabled: Erabili Gravatar erabiltzaile ikonoak
+ setting_gravatar_default: Lehenetsitako Gravatar irudia
+ setting_diff_max_lines_displayed: Erakutsiko diren diff lerro kopuru maximoa
+ setting_file_max_size_displayed: Barnean erakuzten diren testu fitxategien tamaina maximoa
+ setting_repository_log_display_limit: Egunkari fitxategian erakutsiko diren berrikuspen kopuru maximoa.
+ setting_openid: Baimendu OpenID saio hasiera eta erregistatzea
+ setting_password_min_length: Pasahitzen luzera minimoa
+ setting_new_project_user_role_id: Proiektu berriak sortzerakoan kudeatzaile ez diren erabiltzaileei esleitutako rola
+ setting_default_projects_modules: Proiektu berrientzako defektuz gaitutako moduluak
+ setting_issue_done_ratio: "Zereginen burututako tasa kalkulatzean erabili:"
+ setting_issue_done_ratio_issue_field: Zeregin eremua erabili
+ setting_issue_done_ratio_issue_status: Zeregin egoera erabili
+ setting_start_of_week: "Egutegiak noiz hasi:"
+ setting_rest_api_enabled: Gaitu REST web zerbitzua
+
+ permission_add_project: Proiektua sortu
+ permission_add_subprojects: Azpiproiektuak sortu
+ permission_edit_project: Proiektua editatu
+ permission_select_project_modules: Proiektuaren moduluak hautatu
+ permission_manage_members: Kideak kudeatu
+ permission_manage_versions: Bertsioak kudeatu
+ permission_manage_categories: Arazoen kategoriak kudeatu
+ permission_view_issues: Zereginak ikusi
+ permission_add_issues: Zereginak gehitu
+ permission_edit_issues: Zereginak aldatu
+ permission_manage_issue_relations: Zereginen erlazioak kudeatu
+ permission_add_issue_notes: Oharrak gehitu
+ permission_edit_issue_notes: Oharrak aldatu
+ permission_edit_own_issue_notes: Nork bere oharrak aldatu
+ permission_move_issues: Zereginak mugitu
+ permission_delete_issues: Zereginak ezabatu
+ permission_manage_public_queries: Galdera publikoak kudeatu
+ permission_save_queries: Galderak gorde
+ permission_view_gantt: Gantt grafikoa ikusi
+ permission_view_calendar: Egutegia ikusi
+ permission_view_issue_watchers: Behatzaileen zerrenda ikusi
+ permission_add_issue_watchers: Behatzaileak gehitu
+ permission_delete_issue_watchers: Behatzaileak ezabatu
+ permission_log_time: Igarotako denbora erregistratu
+ permission_view_time_entries: Igarotako denbora ikusi
+ permission_edit_time_entries: Denbora egunkariak editatu
+ permission_edit_own_time_entries: Nork bere denbora egunkariak editatu
+ permission_manage_news: Berriak kudeatu
+ permission_comment_news: Berrien iruzkinak egin
+ permission_manage_documents: Dokumentuak kudeatu
+ permission_view_documents: Dokumentuak ikusi
+ permission_manage_files: Fitxategiak kudeatu
+ permission_view_files: Fitxategiak ikusi
+ permission_manage_wiki: Wikia kudeatu
+ permission_rename_wiki_pages: Wiki orriak berrizendatu
+ permission_delete_wiki_pages: Wiki orriak ezabatu
+ permission_view_wiki_pages: Wikia ikusi
+ permission_view_wiki_edits: Wikiaren historia ikusi
+ permission_edit_wiki_pages: Wiki orriak editatu
+ permission_delete_wiki_pages_attachments: Eranskinak ezabatu
+ permission_protect_wiki_pages: Wiki orriak babestu
+ permission_manage_repository: Biltegiak kudeatu
+ permission_browse_repository: Biltegia arakatu
+ permission_view_changesets: Aldaketak ikusi
+ permission_commit_access: Commit atzipena
+ permission_manage_boards: Foroak kudeatu
+ permission_view_messages: Mezuak ikusi
+ permission_add_messages: Mezuak bidali
+ permission_edit_messages: Mezuak aldatu
+ permission_edit_own_messages: Nork bere mezuak aldatu
+ permission_delete_messages: Mezuak ezabatu
+ permission_delete_own_messages: Nork bere mezuak ezabatu
+
+ project_module_issue_tracking: Zereginen jarraipena
+ project_module_time_tracking: Denbora jarraipena
+ project_module_news: Berriak
+ project_module_documents: Dokumentuak
+ project_module_files: Fitxategiak
+ project_module_wiki: Wiki
+ project_module_repository: Biltegia
+ project_module_boards: Foroak
+
+ label_user: Erabiltzailea
+ label_user_plural: Erabiltzaileak
+ label_user_new: Erabiltzaile berria
+ label_user_anonymous: Ezezaguna
+ label_project: Proiektua
+ label_project_new: Proiektu berria
+ label_project_plural: Proiektuak
+ label_x_projects:
+ zero: proiekturik ez
+ one: proiektu bat
+ other: "%{count} proiektu"
+ label_project_all: Proiektu guztiak
+ label_project_latest: Azken proiektuak
+ label_issue: Zeregina
+ label_issue_new: Zeregin berria
+ label_issue_plural: Zereginak
+ label_issue_view_all: Zeregin guztiak ikusi
+ label_issues_by: "Zereginak honengatik: %{value}"
+ label_issue_added: Zeregina gehituta
+ label_issue_updated: Zeregina eguneratuta
+ label_document: Dokumentua
+ label_document_new: Dokumentu berria
+ label_document_plural: Dokumentuak
+ label_document_added: Dokumentua gehituta
+ label_role: Rola
+ label_role_plural: Rolak
+ label_role_new: Rol berria
+ label_role_and_permissions: Rolak eta baimenak
+ label_member: Kidea
+ label_member_new: Kide berria
+ label_member_plural: Kideak
+ label_tracker: Aztarnaria
+ label_tracker_plural: Aztarnariak
+ label_tracker_new: Aztarnari berria
+ label_workflow: Lan-fluxua
+ label_issue_status: Zeregin egoera
+ label_issue_status_plural: Zeregin egoerak
+ label_issue_status_new: Egoera berria
+ label_issue_category: Zeregin kategoria
+ label_issue_category_plural: Zeregin kategoriak
+ label_issue_category_new: Kategoria berria
+ label_custom_field: Eremu pertsonalizatua
+ label_custom_field_plural: Eremu pertsonalizatuak
+ label_custom_field_new: Eremu pertsonalizatu berria
+ label_enumerations: Enumerazioak
+ label_enumeration_new: Balio berria
+ label_information: Informazioa
+ label_information_plural: Informazioa
+ label_please_login: Saioa hasi mesedez
+ label_register: Erregistratu
+ label_login_with_open_id_option: edo OpenID-rekin saioa hasi
+ label_password_lost: Pasahitza galduta
+ label_home: Hasiera
+ label_home_heading: Hasiera
+ label_my_page: Nire orria
+ label_my_account: Nire kontua
+ label_my_projects: Nire proiektuak
+ label_administration: Kudeaketa
+ label_login: Saioa hasi
+ label_logout: Saioa bukatu
+ label_help: Laguntza
+ label_reported_issues: Berri emandako zereginak
+ label_assigned_to_me_issues: Niri esleitutako arazoak
+ label_last_login: Azken konexioa
+ label_registered_on: Noiz erregistratuta
+ label_activity: Jarduerak
+ label_overall_activity: Jarduera guztiak
+ label_user_activity: "%{value}-(r)en jarduerak"
+ label_new: Berria
+ label_logged_as: "Sartutako erabiltzailea:"
+ label_environment: Ingurune
+ label_authentication: Autentikazioa
+ label_auth_source: Autentikazio modua
+ label_auth_source_new: Autentikazio modu berria
+ label_auth_source_plural: Autentikazio moduak
+ label_subproject_plural: Azpiproiektuak
+ label_subproject_new: Azpiproiektu berria
+ label_and_its_subprojects: "%{value} eta bere azpiproiektuak"
+ label_min_max_length: Luzera min - max
+ label_list: Zerrenda
+ label_date: Data
+ label_integer: Osokoa
+ label_float: Koma higikorrekoa
+ label_boolean: Boolearra
+ label_string: Testua
+ label_text: Testu luzea
+ label_attribute: Atributua
+ label_attribute_plural: Atributuak
+ label_download: "Deskarga %{count}"
+ label_download_plural: "%{count} Deskarga"
+ label_no_data: Ez dago erakusteko daturik
+ label_change_status: Egoera aldatu
+ label_history: Historikoa
+ label_attachment: Fitxategia
+ label_attachment_new: Fitxategi berria
+ label_attachment_delete: Fitxategia ezabatu
+ label_attachment_plural: Fitxategiak
+ label_file_added: Fitxategia gehituta
+ label_report: Berri ematea
+ label_report_plural: Berri emateak
+ label_news: Berria
+ label_news_new: Berria gehitu
+ label_news_plural: Berriak
+ label_news_latest: Azken berriak
+ label_news_view_all: Berri guztiak ikusi
+ label_news_added: Berria gehituta
+ label_change_log: Aldaketa egunkaria
+ label_settings: Ezarpenak
+ label_overview: Gainbegirada
+ label_version: Bertsioa
+ label_version_new: Bertsio berria
+ label_version_plural: Bertsioak
+ label_close_versions: Burututako bertsioak itxi
+ label_confirmation: Baieztapena
+ label_export_to: 'Eskuragarri baita:'
+ label_read: Irakurri...
+ label_public_projects: Proiektu publikoak
+ label_open_issues: irekita
+ label_open_issues_plural: irekiak
+ label_closed_issues: itxita
+ label_closed_issues_plural: itxiak
+ label_x_open_issues_abbr_on_total:
+ zero: 0 irekita / %{total}
+ one: 1 irekita / %{total}
+ other: "%{count} irekiak / %{total}"
+ label_x_open_issues_abbr:
+ zero: 0 irekita
+ one: 1 irekita
+ other: "%{count} irekiak"
+ label_x_closed_issues_abbr:
+ zero: 0 itxita
+ one: 1 itxita
+ other: "%{count} itxiak"
+ label_total: Guztira
+ label_permissions: Baimenak
+ label_current_status: Uneko egoera
+ label_new_statuses_allowed: Baimendutako egoera berriak
+ label_all: guztiak
+ label_none: ezer
+ label_nobody: inor
+ label_next: Hurrengoa
+ label_previous: Aurrekoak
+ label_used_by: Erabilita
+ label_details: Xehetasunak
+ label_add_note: Oharra gehitu
+ label_per_page: Orriko
+ label_calendar: Egutegia
+ label_months_from: hilabete noiztik
+ label_gantt: Gantt
+ label_internal: Barnekoa
+ label_last_changes: "azken %{count} aldaketak"
+ label_change_view_all: Aldaketa guztiak ikusi
+ label_personalize_page: Orri hau pertsonalizatu
+ label_comment: Iruzkin
+ label_comment_plural: Iruzkinak
+ label_x_comments:
+ zero: iruzkinik ez
+ one: iruzkin 1
+ other: "%{count} iruzkin"
+ label_comment_add: Iruzkina gehitu
+ label_comment_added: Iruzkina gehituta
+ label_comment_delete: Iruzkinak ezabatu
+ label_query: Galdera pertsonalizatua
+ label_query_plural: Pertsonalizatutako galderak
+ label_query_new: Galdera berria
+ label_filter_add: Iragazkia gehitu
+ label_filter_plural: Iragazkiak
+ label_equals: da
+ label_not_equals: ez da
+ label_in_less_than: baino gutxiagotan
+ label_in_more_than: baino gehiagotan
+ label_greater_or_equal: '>='
+ label_less_or_equal: '<='
+ label_in: hauetan
+ label_today: gaur
+ label_all_time: denbora guztia
+ label_yesterday: atzo
+ label_this_week: aste honetan
+ label_last_week: pasadan astean
+ label_last_n_days: "azken %{count} egunetan"
+ label_this_month: hilabete hau
+ label_last_month: pasadan hilabetea
+ label_this_year: urte hau
+ label_date_range: Data tartea
+ label_less_than_ago: egun hauek baino gutxiago
+ label_more_than_ago: egun hauek baino gehiago
+ label_ago: orain dela
+ label_contains: dauka
+ label_not_contains: ez dauka
+ label_day_plural: egun
+ label_repository: Biltegia
+ label_repository_plural: Biltegiak
+ label_browse: Arakatu
+ label_modification: "aldaketa %{count}"
+ label_modification_plural: "%{count} aldaketa"
+ label_branch: Adarra
+ label_tag: Etiketa
+ label_revision: Berrikuspena
+ label_revision_plural: Berrikuspenak
+ label_revision_id: "%{value} berrikuspen"
+ label_associated_revisions: Elkartutako berrikuspenak
+ label_added: gehituta
+ label_modified: aldatuta
+ label_copied: kopiatuta
+ label_renamed: berrizendatuta
+ label_deleted: ezabatuta
+ label_latest_revision: Azken berrikuspena
+ label_latest_revision_plural: Azken berrikuspenak
+ label_view_revisions: Berrikuspenak ikusi
+ label_view_all_revisions: Berrikuspen guztiak ikusi
+ label_max_size: Tamaina maximoa
+ label_sort_highest: Goraino mugitu
+ label_sort_higher: Gora mugitu
+ label_sort_lower: Behera mugitu
+ label_sort_lowest: Beheraino mugitu
+ label_roadmap: Ibilbide-mapa
+ label_roadmap_due_in: "Epea: %{value}"
+ label_roadmap_overdue: "%{value} berandu"
+ label_roadmap_no_issues: Ez dago zereginik bertsio honetan
+ label_search: Bilatu
+ label_result_plural: Emaitzak
+ label_all_words: hitz guztiak
+ label_wiki: Wikia
+ label_wiki_edit: Wiki edizioa
+ label_wiki_edit_plural: Wiki edizioak
+ label_wiki_page: Wiki orria
+ label_wiki_page_plural: Wiki orriak
+ label_index_by_title: Izenburuaren araberako indizea
+ label_index_by_date: Dataren araberako indizea
+ label_current_version: Uneko bertsioa
+ label_preview: Aurreikusi
+ label_feed_plural: Jarioak
+ label_changes_details: Aldaketa guztien xehetasunak
+ label_issue_tracking: Zeregin jarraipena
+ label_spent_time: Igarotako denbora
+ label_f_hour: "ordu %{value}"
+ label_f_hour_plural: "%{value} ordu"
+ label_time_tracking: Denbora jarraipena
+ label_change_plural: Aldaketak
+ label_statistics: Estatistikak
+ label_commits_per_month: Commit-ak hilabeteka
+ label_commits_per_author: Commit-ak egileka
+ label_view_diff: Ezberdintasunak ikusi
+ label_diff_inline: barnean
+ label_diff_side_by_side: aldez alde
+ label_options: Aukerak
+ label_copy_workflow_from: Kopiatu workflow-a hemendik
+ label_permissions_report: Baimenen txostena
+ label_watched_issues: Behatutako zereginak
+ label_related_issues: Erlazionatutako zereginak
+ label_applied_status: Aplikatutako egoera
+ label_loading: Kargatzen...
+ label_relation_new: Erlazio berria
+ label_relation_delete: Erlazioa ezabatu
+ label_relates_to: erlazionatuta dago
+ label_duplicates: bikoizten du
+ label_duplicated_by: honek bikoiztuta
+ label_blocks: blokeatzen du
+ label_blocked_by: honek blokeatuta
+ label_precedes: aurretik doa
+ label_follows: jarraitzen du
+ label_end_to_start: bukaeratik hasierara
+ label_end_to_end: bukaeratik bukaerara
+ label_start_to_start: hasieratik hasierhasieratik bukaerara
+ label_start_to_end: hasieratik bukaerara
+ label_stay_logged_in: Saioa mantendu
+ label_disabled: ezgaituta
+ label_show_completed_versions: Bukatutako bertsioak ikusi
+ label_me: ni
+ label_board: Foroa
+ label_board_new: Foro berria
+ label_board_plural: Foroak
+ label_topic_plural: Gaiak
+ label_message_plural: Mezuak
+ label_message_last: Azken mezua
+ label_message_new: Mezu berria
+ label_message_posted: Mezua gehituta
+ label_reply_plural: Erantzunak
+ label_send_information: Erabiltzaileai kontuaren informazioa bidali
+ label_year: Urtea
+ label_month: Hilabetea
+ label_week: Astea
+ label_date_from: Nork
+ label_date_to: Nori
+ label_language_based: Erabiltzailearen hizkuntzaren arabera
+ label_sort_by: "Ordenazioa: %{value}"
+ label_send_test_email: Frogako mezua bidali
+ label_feeds_access_key: RSS atzipen giltza
+ label_missing_feeds_access_key: RSS atzipen giltza falta da
+ label_feeds_access_key_created_on: "RSS atzipen giltza orain dela %{value} sortuta"
+ label_module_plural: Moduluak
+ label_added_time_by: "%{author}, orain dela %{age} gehituta"
+ label_updated_time_by: "%{author}, orain dela %{age} eguneratuta"
+ label_updated_time: "Orain dela %{value} eguneratuta"
+ label_jump_to_a_project: Joan proiektura...
+ label_file_plural: Fitxategiak
+ label_changeset_plural: Aldaketak
+ label_default_columns: Lehenetsitako zutabeak
+ label_no_change_option: (Aldaketarik ez)
+ label_bulk_edit_selected_issues: Hautatutako zereginak batera editatu
+ label_theme: Itxura
+ label_default: Lehenetsia
+ label_search_titles_only: Izenburuetan bakarrik bilatu
+ label_user_mail_option_all: "Nire proiektu guztietako gertakari guztientzat"
+ label_user_mail_option_selected: "Hautatutako proiektuetako edozein gertakarientzat..."
+ label_user_mail_no_self_notified: "Ez dut nik egiten ditudan aldeketen jakinarazpenik jaso nahi"
+ label_registration_activation_by_email: kontuak epostaz gaitu
+ label_registration_manual_activation: kontuak eskuz gaitu
+ label_registration_automatic_activation: kontuak automatikoki gaitu
+ label_display_per_page: "Orriko: %{value}"
+ label_age: Adina
+ label_change_properties: Propietateak aldatu
+ label_general: Orokorra
+ label_more: Gehiago
+ label_scm: IKK
+ label_plugins: Pluginak
+ label_ldap_authentication: LDAP autentikazioa
+ label_downloads_abbr: Desk.
+ label_optional_description: Aukerako deskribapena
+ label_add_another_file: Beste fitxategia gehitu
+ label_preferences: Hobespenak
+ label_chronological_order: Orden kronologikoan
+ label_reverse_chronological_order: Alderantzizko orden kronologikoan
+ label_planning: Planifikazioa
+ label_incoming_emails: Sarrerako epostak
+ label_generate_key: Giltza sortu
+ label_issue_watchers: Behatzaileak
+ label_example: Adibidea
+ label_display: Bistaratzea
+ label_sort: Ordenatu
+ label_ascending: Gorantz
+ label_descending: Beherantz
+ label_date_from_to: "%{start}-tik %{end}-ra"
+ label_wiki_content_added: Wiki orria gehituta
+ label_wiki_content_updated: Wiki orria eguneratuta
+ label_group: Taldea
+ label_group_plural: Taldeak
+ label_group_new: Talde berria
+ label_time_entry_plural: Igarotako denbora
+ label_version_sharing_none: Ez partekatuta
+ label_version_sharing_descendants: Azpiproiektuekin
+ label_version_sharing_hierarchy: Proiektu Hierarkiarekin
+ label_version_sharing_tree: Proiektu zuhaitzarekin
+ label_version_sharing_system: Proiektu guztiekin
+ label_update_issue_done_ratios: Zereginen burututako erlazioa eguneratu
+ label_copy_source: Iturburua
+ label_copy_target: Helburua
+ label_copy_same_as_target: Helburuaren berdina
+ label_display_used_statuses_only: Aztarnari honetan erabiltzen diren egoerak bakarrik erakutsi
+ label_api_access_key: API atzipen giltza
+ label_missing_api_access_key: API atzipen giltza falta da
+ label_api_access_key_created_on: "API atzipen giltza sortuta orain dela %{value}"
+
+ button_login: Saioa hasi
+ button_submit: Bidali
+ button_save: Gorde
+ button_check_all: Guztiak markatu
+ button_uncheck_all: Guztiak desmarkatu
+ button_delete: Ezabatu
+ button_create: Sortu
+ button_create_and_continue: Sortu eta jarraitu
+ button_test: Frogatu
+ button_edit: Editatu
+ button_add: Gehitu
+ button_change: Aldatu
+ button_apply: Aplikatu
+ button_clear: Garbitu
+ button_lock: Blokeatu
+ button_unlock: Desblokeatu
+ button_download: Deskargatu
+ button_list: Zerrenda
+ button_view: Ikusi
+ button_move: Mugitu
+ button_move_and_follow: Mugitu eta jarraitu
+ button_back: Atzera
+ button_cancel: Ezeztatu
+ button_activate: Gahitu
+ button_sort: Ordenatu
+ button_log_time: Denbora erregistratu
+ button_rollback: Itzuli bertsio honetara
+ button_watch: Behatu
+ button_unwatch: Behatzen utzi
+ button_reply: Erantzun
+ button_archive: Artxibatu
+ button_unarchive: Desartxibatu
+ button_reset: Berrezarri
+ button_rename: Berrizendatu
+ button_change_password: Pasahitza aldatu
+ button_copy: Kopiatu
+ button_copy_and_follow: Kopiatu eta jarraitu
+ button_annotate: Anotatu
+ button_update: Eguneratu
+ button_configure: Konfiguratu
+ button_quote: Aipatu
+ button_duplicate: Bikoiztu
+ button_show: Ikusi
+
+ status_active: gaituta
+ status_registered: izena emanda
+ status_locked: blokeatuta
+
+ version_status_open: irekita
+ version_status_locked: blokeatuta
+ version_status_closed: itxita
+
+ field_active: Gaituta
+
+ text_select_mail_notifications: Jakinarazpenak zein ekintzetarako bidaliko diren hautatu.
+ text_regexp_info: adib. ^[A-Z0-9]+$
+ text_min_max_length_info: 0k mugarik gabe esan nahi du
+ text_project_destroy_confirmation: Ziur zaude proiektu hau eta erlazionatutako datu guztiak ezabatu nahi dituzula?
+ text_subprojects_destroy_warning: "%{value} azpiproiektuak ere ezabatuko dira."
+ text_workflow_edit: Hautatu rola eta aztarnaria workflow-a editatzeko
+ text_are_you_sure: Ziur zaude?
+ text_journal_changed: "%{label} %{old}-(e)tik %{new}-(e)ra aldatuta"
+ text_journal_set_to: "%{label}-k %{value} balioa hartu du"
+ text_journal_deleted: "%{label} ezabatuta (%{old})"
+ text_journal_added: "%{label} %{value} gehituta"
+ text_tip_issue_begin_day: gaur hasten diren zereginak
+ text_tip_issue_end_day: gaur bukatzen diren zereginak
+ text_tip_issue_begin_end_day: gaur hasi eta bukatzen diren zereginak
+ text_project_identifier_info: 'Letra xeheak (a-z), zenbakiak eta marrak erabil daitezke bakarrik.
+# by Alberto Ferreira
pt:
support:
array:
@@ -17,7 +18,10 @@
abbr_day_names: [Dom, Seg, Ter, Qua, Qui, Sex, Sáb]
month_names: [~, Janeiro, Fevereiro, Março, Abril, Maio, Junho, Julho, Agosto, Setembro, Outubro, Novembro, Dezembro]
abbr_month_names: [~, Jan, Fev, Mar, Abr, Mai, Jun, Jul, Ago, Set, Out, Nov, Dez]
- order: [:day, :month, :year]
+ order:
+ - :day
+ - :month
+ - :year
time:
formats:
@@ -141,7 +145,7 @@
general_csv_separator: ';'
general_csv_decimal_separator: ','
general_csv_encoding: ISO-8859-15
- general_pdf_encoding: ISO-8859-15
+ general_pdf_encoding: UTF-8
general_first_day_of_week: '1'
notice_account_updated: A conta foi actualizada com sucesso.
@@ -228,7 +232,7 @@
field_homepage: Página
field_is_public: Público
field_parent: Sub-projecto de
- field_is_in_roadmap: Tarefas mostradas no roadmap
+ field_is_in_roadmap: Tarefas mostradas no mapa de planificação
field_login: Nome de utilizador
field_mail_notification: Notificações por e-mail
field_admin: Administrador
@@ -248,9 +252,9 @@
field_attr_firstname: Atributo nome próprio
field_attr_lastname: Atributo último nome
field_attr_mail: Atributo e-mail
- field_onthefly: Criação de utilizadores na hora
+ field_onthefly: Criação imediata de utilizadores
field_start_date: Início
- field_done_ratio: % Completo
+ field_done_ratio: "% Completo"
field_auth_source: Modo de autenticação
field_hide_mail: Esconder endereço de e-mail
field_comments: Comentário
@@ -264,7 +268,7 @@
field_is_filter: Usado como filtro
field_issue_to: Tarefa relacionada
field_delay: Atraso
- field_assignable: As tarefas podem ser associados a esta função
+ field_assignable: As tarefas podem ser associadas a esta função
field_redirect_existing_links: Redireccionar ligações existentes
field_estimated_hours: Tempo estimado
field_column_names: Colunas
@@ -299,7 +303,6 @@
setting_cross_project_issue_relations: Permitir relações entre tarefas de projectos diferentes
setting_issue_list_default_columns: Colunas na lista de tarefas por omissão
setting_repositories_encodings: Encodings dos repositórios
- setting_commit_logs_encoding: Encoding das mensagens de commit
setting_emails_footer: Rodapé do e-mails
setting_protocol: Protocolo
setting_per_page_options: Opções de objectos por página
@@ -523,7 +526,7 @@
label_sort_higher: Mover para cima
label_sort_lower: Mover para baixo
label_sort_lowest: Mover para o fim
- label_roadmap: Roadmap
+ label_roadmap: Planificação
label_roadmap_due_in: "Termina em %{value}"
label_roadmap_overdue: "Atrasado %{value}"
label_roadmap_no_issues: Sem tarefas para esta versão
@@ -923,25 +926,59 @@
project_module_calendar: Calendário
button_edit_associated_wikipage: "Editar página Wiki associada: %{page_title}"
text_are_you_sure_with_children: Apagar tarefa e todas as sub-tarefas?
- field_text: Text field
- label_user_mail_option_only_owner: Only for things I am the owner of
- setting_default_notification_option: Default notification option
- label_user_mail_option_only_my_events: Only for things I watch or I'm involved in
- label_user_mail_option_only_assigned: Only for things I am assigned to
- label_user_mail_option_none: No events
- field_member_of_group: Assignee's group
- field_assigned_to_role: Assignee's role
- notice_not_authorized_archived_project: The project you're trying to access has been archived.
- label_principal_search: "Search for user or group:"
- label_user_search: "Search for user:"
- field_visible: Visible
- setting_emails_header: Emails header
- setting_commit_logtime_activity_id: Activity for logged time
- text_time_logged_by_changeset: Applied in changeset %{value}.
- setting_commit_logtime_enabled: Enable time logging
- notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
- setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
+ field_text: Campo de texto
+ label_user_mail_option_only_owner: Apenas para tarefas das quais sou proprietário
+ setting_default_notification_option: Opção predefinida de notificação
+ label_user_mail_option_only_my_events: Apenas para tarefas que observo ou em que estou envolvido
+ label_user_mail_option_only_assigned: Apenas para tarefas que me foram atribuídas
+ label_user_mail_option_none: Sem eventos
+ field_member_of_group: Grupo do detentor de atribuição
+ field_assigned_to_role: Papel do detentor de atribuição
+ notice_not_authorized_archived_project: O projecto a que tentou aceder foi arquivado.
+ label_principal_search: "Procurar utilizador ou grupo:"
+ label_user_search: "Procurar utilizador:"
+ field_visible: Visível
+ setting_emails_header: Cabeçalho dos e-mails
+ setting_commit_logtime_activity_id: Actividade para tempo registado
+ text_time_logged_by_changeset: Aplicado no conjunto de alterações %{value}.
+ setting_commit_logtime_enabled: Activar registo de tempo
+ notice_gantt_chart_truncated: O gráfico foi truncado porque excede o número máximo de itens visível (%{máx.})
+ setting_gantt_items_limit: Número máximo de itens exibidos no gráfico Gantt
field_warn_on_leaving_unsaved: Warn me when leaving a page with unsaved text
text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
label_my_queries: My custom queries
text_journal_changed_no_detail: "%{label} updated"
+ label_news_comment_added: Comment added to a news
+ button_expand_all: Expand all
+ button_collapse_all: Collapse all
+ label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
+ label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
+ label_bulk_edit_selected_time_entries: Bulk edit selected time entries
+ text_time_entries_destroy_confirmation: Are you sure you want to delete the selected time entr(y/ies)?
+ label_role_anonymous: Anonymous
+ label_role_non_member: Non member
+ label_issue_note_added: Note added
+ label_issue_status_updated: Status updated
+ label_issue_priority_updated: Priority updated
+ label_issues_visibility_own: Issues created by or assigned to the user
+ field_issues_visibility: Issues visibility
+ label_issues_visibility_all: All issues
+ permission_set_own_issues_private: Set own issues public or private
+ field_is_private: Private
+ permission_set_issues_private: Set issues public or private
+ label_issues_visibility_public: All non private issues
+ text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
+ field_commit_logs_encoding: Encoding das mensagens de commit
+ field_scm_path_encoding: Path encoding
+ text_scm_path_encoding_note: "Default: UTF-8"
+ field_path_to_repository: Path to repository
+ field_root_directory: Root directory
+ field_cvs_module: Module
+ field_cvsroot: CVSROOT
+ text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
+ text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
+ text_scm_command: Command
+ text_scm_command_version: Version
+ label_git_report_last_commit: Report last commit for files and directories
+ text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+ text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
diff -r adc8466df404 -r 753f1380d6bc config/locales/ro.yml
--- a/config/locales/ro.yml Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/ro.yml Mon Jun 06 14:41:04 2011 +0100
@@ -14,7 +14,10 @@
month_names: [~, Ianuarie, Februarie, Martie, Aprilie, Mai, Iunie, Iulie, August, Septembrie, Octombrie, Noiembrie, Decembrie]
abbr_month_names: [~, Ian, Feb, Mar, Apr, Mai, Iun, Iul, Aug, Sep, Oct, Noi, Dec]
# Used in date_select and datime_select.
- order: [ :day, :month, :year ]
+ order:
+ - :day
+ - :month
+ - :year
time:
formats:
@@ -291,7 +294,6 @@
setting_cross_project_issue_relations: Permite legături de tichete între proiecte
setting_issue_list_default_columns: Coloane implicite afișate în lista de tichete
setting_repositories_encodings: Codare pentru depozit
- setting_commit_logs_encoding: Codare pentru mesaje
setting_emails_footer: Subsol email
setting_protocol: Protocol
setting_per_page_options: Număr de obiecte pe pagină
@@ -934,3 +936,37 @@
text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
label_my_queries: My custom queries
text_journal_changed_no_detail: "%{label} updated"
+ label_news_comment_added: Comment added to a news
+ button_expand_all: Expand all
+ button_collapse_all: Collapse all
+ label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
+ label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
+ label_bulk_edit_selected_time_entries: Bulk edit selected time entries
+ text_time_entries_destroy_confirmation: Are you sure you want to delete the selected time entr(y/ies)?
+ label_role_anonymous: Anonymous
+ label_role_non_member: Non member
+ label_issue_note_added: Note added
+ label_issue_status_updated: Status updated
+ label_issue_priority_updated: Priority updated
+ label_issues_visibility_own: Issues created by or assigned to the user
+ field_issues_visibility: Issues visibility
+ label_issues_visibility_all: All issues
+ permission_set_own_issues_private: Set own issues public or private
+ field_is_private: Private
+ permission_set_issues_private: Set issues public or private
+ label_issues_visibility_public: All non private issues
+ text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
+ field_commit_logs_encoding: Codare pentru mesaje
+ field_scm_path_encoding: Path encoding
+ text_scm_path_encoding_note: "Default: UTF-8"
+ field_path_to_repository: Path to repository
+ field_root_directory: Root directory
+ field_cvs_module: Module
+ field_cvsroot: CVSROOT
+ text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
+ text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
+ text_scm_command: Command
+ text_scm_command_version: Version
+ label_git_report_last_commit: Report last commit for files and directories
+ text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+ text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
diff -r adc8466df404 -r 753f1380d6bc config/locales/ru.yml
--- a/config/locales/ru.yml Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/ru.yml Mon Jun 06 14:41:04 2011 +0100
@@ -28,7 +28,10 @@
abbr_month_names: [~, янв., февр., марта, апр., мая, июня, июля, авг., сент., окт., нояб., дек.]
standalone_abbr_month_names: [~, янв., февр., март, апр., май, июнь, июль, авг., сент., окт., нояб., дек.]
- order: [ :day, :month, :year ]
+ order:
+ - :day
+ - :month
+ - :year
time:
formats:
@@ -261,7 +264,7 @@
default_issue_status_closed: Закрыта
default_issue_status_feedback: Обратная связь
default_issue_status_new: Новая
- default_issue_status_rejected: Отказ
+ default_issue_status_rejected: Отклонена
default_issue_status_resolved: Решена
default_priority_high: Высокий
default_priority_immediate: Немедленный
@@ -272,7 +275,7 @@
default_role_manager: Менеджер
default_role_reporter: Генератор отчетов
default_tracker_bug: Ошибка
- default_tracker_feature: Изменение
+ default_tracker_feature: Улучшение
default_tracker_support: Поддержка
enumeration_activities: Действия (учет времени)
@@ -606,7 +609,7 @@
label_optional_description: Описание (опционально)
label_options: Опции
label_overall_activity: Сводная активность
- label_overview: Просмотр
+ label_overview: Обзор
label_password_lost: Восстановление пароля
label_permissions_report: Отчет о правах доступа
label_permissions: Права доступа
@@ -863,7 +866,6 @@
setting_bcc_recipients: Использовать скрытые списки (BCC)
setting_cache_formatted_text: Кешировать форматированный текст
setting_commit_fix_keywords: Назначение ключевых слов
- setting_commit_logs_encoding: Кодировка комментариев в хранилище
setting_commit_ref_keywords: Ключевые слова для поиска
setting_cross_project_issue_relations: Разрешить пересечение задач по проектам
setting_date_format: Формат даты
@@ -1045,12 +1047,46 @@
field_visible: Видимый
setting_emails_header: Заголовок письма
- setting_commit_logtime_activity_id: Activity for logged time
- text_time_logged_by_changeset: Applied in changeset %{value}.
- setting_commit_logtime_enabled: Enable time logging
- notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
- setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
- field_warn_on_leaving_unsaved: Warn me when leaving a page with unsaved text
- text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
- label_my_queries: My custom queries
- text_journal_changed_no_detail: "%{label} updated"
+ setting_commit_logtime_activity_id: Активность для учета времени
+ text_time_logged_by_changeset: Учтено в редакции %{value}.
+ setting_commit_logtime_enabled: Включить учет времени
+ notice_gantt_chart_truncated: Диаграмма будет усечена, поскольку превышено максимальное кол-во элементов, которые могут отображаться (%{max})
+ setting_gantt_items_limit: Максимальное кол-во элементов отображаемых на диаграмме Ганта
+ field_warn_on_leaving_unsaved: Предупреждать при закратии страницы с несохраненным текстом
+ text_warn_on_leaving_unsaved: Текущая страница содержит несохраненный текст, который будет потерян, если вы покинете эту страницу.
+ label_my_queries: Мои сохраненные запросы
+ text_journal_changed_no_detail: "%{label} обновлено"
+ label_news_comment_added: Добавлен комментарий к новости
+ button_expand_all: Развернуть все
+ button_collapse_all: Свернуть все
+ label_additional_workflow_transitions_for_assignee: Дополнительные переходы, когда пользователь является исполнителем
+ label_additional_workflow_transitions_for_author: Дополнительные переходы, когда пользователь является автором
+ label_bulk_edit_selected_time_entries: Массовое изменение выбранных записей затраченного времени времени
+ text_time_entries_destroy_confirmation: Вы уверены что хотите удалить выбраные записи затраченного времени?
+ label_role_anonymous: Аноним
+ label_role_non_member: Не участник
+ label_issue_note_added: Примечание добавлено
+ label_issue_status_updated: Статус обновлен
+ label_issue_priority_updated: Приоритет обновлен
+ label_issues_visibility_own: Задачи созданные или назначенные пользователю
+ field_issues_visibility: Видимость задач
+ label_issues_visibility_all: Все задачи
+ permission_set_own_issues_private: Устанавливать видимость (общая/частная) для собственных задач
+ field_is_private: Частная
+ permission_set_issues_private: Устанавливать видимость (общая/частная) для задач
+ label_issues_visibility_public: Только общие задачи
+ text_issues_destroy_descendants_confirmation: Так же будет удалено %{count} задачи.
+ field_commit_logs_encoding: Кодировка комментариев в хранилище
+ field_scm_path_encoding: Кодировка пути
+ text_scm_path_encoding_note: "По умолчанию: UTF-8"
+ field_path_to_repository: Путь к репозиторию
+ field_root_directory: Корневую директорию
+ field_cvs_module: Модуль
+ field_cvsroot: CVSROOT
+ text_git_repository_note: Локальный и bare репозиторий (например, /gitrepo, c:\gitrepo)
+ text_mercurial_repository_note: Локальный репозиторий (например, /hgrepo, c:\hgrepo)
+ text_scm_command: Command
+ text_scm_command_version: Version
+ label_git_report_last_commit: Report last commit for files and directories
+ text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+ text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
diff -r adc8466df404 -r 753f1380d6bc config/locales/sk.yml
--- a/config/locales/sk.yml Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/sk.yml Mon Jun 06 14:41:04 2011 +0100
@@ -16,7 +16,10 @@
month_names: [~, Január, Február, Marec, Apríl, Máj, Jún, Júl, August, September, Október, November, December]
abbr_month_names: [~, Jan, Feb, Mar, Apr, Máj, Jún, Júl, Aug, Sep, Okt, Nov, Dec]
# Used in date_select and datime_select.
- order: [ :year, :month, :day ]
+ order:
+ - :year
+ - :month
+ - :day
time:
formats:
@@ -236,7 +239,7 @@
field_attr_mail: Email (atribut)
field_onthefly: Automatické vytváranie užívateľov
field_start_date: Začiatok
- field_done_ratio: % hotovo
+ field_done_ratio: "% hotovo"
field_auth_source: Autentifikačný mód
field_hide_mail: Nezobrazovať môj email
field_comments: Komentár
@@ -727,7 +730,6 @@
text_email_delivery_not_configured: "Doručenie emailov nieje nastavené, notifikácie sú vypnuté.\nNastavte váš SMTP server v config/configuration.yml a reštartnite aplikáciu pre aktiváciu funkcie."
field_parent_title: Nadradená stránka
label_issue_watchers: Pozorovatelia
- setting_commit_logs_encoding: Kódovanie prenášaných správ
button_quote: Citácia
setting_sequential_project_identifiers: Generovať sekvenčné identifikátory projektov
notice_unable_delete_version: Verzia nemôže byť zmazaná
@@ -936,3 +938,37 @@
text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
label_my_queries: My custom queries
text_journal_changed_no_detail: "%{label} updated"
+ label_news_comment_added: Comment added to a news
+ button_expand_all: Expand all
+ button_collapse_all: Collapse all
+ label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
+ label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
+ label_bulk_edit_selected_time_entries: Bulk edit selected time entries
+ text_time_entries_destroy_confirmation: Are you sure you want to delete the selected time entr(y/ies)?
+ label_role_anonymous: Anonymous
+ label_role_non_member: Non member
+ label_issue_note_added: Note added
+ label_issue_status_updated: Status updated
+ label_issue_priority_updated: Priority updated
+ label_issues_visibility_own: Issues created by or assigned to the user
+ field_issues_visibility: Issues visibility
+ label_issues_visibility_all: All issues
+ permission_set_own_issues_private: Set own issues public or private
+ field_is_private: Private
+ permission_set_issues_private: Set issues public or private
+ label_issues_visibility_public: All non private issues
+ text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
+ field_commit_logs_encoding: Kódovanie prenášaných správ
+ field_scm_path_encoding: Path encoding
+ text_scm_path_encoding_note: "Default: UTF-8"
+ field_path_to_repository: Path to repository
+ field_root_directory: Root directory
+ field_cvs_module: Module
+ field_cvsroot: CVSROOT
+ text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
+ text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
+ text_scm_command: Command
+ text_scm_command_version: Version
+ label_git_report_last_commit: Report last commit for files and directories
+ text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+ text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
diff -r adc8466df404 -r 753f1380d6bc config/locales/sl.yml
--- a/config/locales/sl.yml Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/sl.yml Mon Jun 06 14:41:04 2011 +0100
@@ -16,7 +16,10 @@
month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
# Used in date_select and datime_select.
- order: [ :year, :month, :day ]
+ order:
+ - :year
+ - :month
+ - :day
time:
formats:
@@ -132,7 +135,7 @@
general_csv_separator: ','
general_csv_decimal_separator: '.'
general_csv_encoding: UTF-8
- general_pdf_encoding: UFT-8
+ general_pdf_encoding: UTF-8
general_first_day_of_week: '1'
notice_account_updated: Račun je bil uspešno posodobljen.
@@ -241,7 +244,7 @@
field_attr_mail: Oznaka za e-naslov
field_onthefly: Sprotna izdelava uporabnikov
field_start_date: Začetek
- field_done_ratio: % Narejeno
+ field_done_ratio: "% Narejeno"
field_auth_source: Način overovljanja
field_hide_mail: Skrij moj e-naslov
field_comments: Komentar
@@ -291,7 +294,6 @@
setting_cross_project_issue_relations: Dovoli povezave zahtevkov med različnimi projekti
setting_issue_list_default_columns: Privzeti stolpci prikazani na seznamu zahtevkov
setting_repositories_encodings: Kodiranje shrambe
- setting_commit_logs_encoding: Kodiranje sporočil ob predaji
setting_emails_footer: Noga e-sporočil
setting_protocol: Protokol
setting_per_page_options: Število elementov na stran
@@ -937,3 +939,37 @@
text_warn_on_leaving_unsaved: The current page contains unsaved text that will be lost if you leave this page.
label_my_queries: My custom queries
text_journal_changed_no_detail: "%{label} updated"
+ label_news_comment_added: Comment added to a news
+ button_expand_all: Expand all
+ button_collapse_all: Collapse all
+ label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
+ label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
+ label_bulk_edit_selected_time_entries: Bulk edit selected time entries
+ text_time_entries_destroy_confirmation: Are you sure you want to delete the selected time entr(y/ies)?
+ label_role_anonymous: Anonymous
+ label_role_non_member: Non member
+ label_issue_note_added: Note added
+ label_issue_status_updated: Status updated
+ label_issue_priority_updated: Priority updated
+ label_issues_visibility_own: Issues created by or assigned to the user
+ field_issues_visibility: Issues visibility
+ label_issues_visibility_all: All issues
+ permission_set_own_issues_private: Set own issues public or private
+ field_is_private: Private
+ permission_set_issues_private: Set issues public or private
+ label_issues_visibility_public: All non private issues
+ text_issues_destroy_descendants_confirmation: This will also delete %{count} subtask(s).
+ field_commit_logs_encoding: Kodiranje sporočil ob predaji
+ field_scm_path_encoding: Path encoding
+ text_scm_path_encoding_note: "Default: UTF-8"
+ field_path_to_repository: Path to repository
+ field_root_directory: Root directory
+ field_cvs_module: Module
+ field_cvsroot: CVSROOT
+ text_git_repository_note: Bare and local repository (e.g. /gitrepo, c:\gitrepo)
+ text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
+ text_scm_command: Command
+ text_scm_command_version: Version
+ label_git_report_last_commit: Report last commit for files and directories
+ text_scm_config: You can configure your scm commands in config/configuration.yml. Please restart the application after editing it.
+ text_scm_command_not_available: Scm command is not available. Please check settings on the administration panel.
diff -r adc8466df404 -r 753f1380d6bc config/locales/sr-YU.yml
--- a/config/locales/sr-YU.yml Thu Mar 03 15:08:45 2011 +0000
+++ b/config/locales/sr-YU.yml Mon Jun 06 14:41:04 2011 +0100
@@ -1,943 +1,979 @@
-# Serbian translations for Redmine
-# by Vladimir Medarović (vlada@medarovic.com)
-sr-YU:
- direction: ltr
- date:
- formats:
- # Use the strftime parameters for formats.
- # When no format has been given, it uses default.
- # You can provide other formats here if you like!
- default: "%d.%m.%Y."
- short: "%e %b"
- long: "%B %e, %Y"
-
- day_names: [nedelja, ponedeljak, utorak, sreda, četvrtak, petak, subota]
- abbr_day_names: [ned, pon, uto, sre, čet, pet, sub]
-
- # Don't forget the nil at the beginning; there's no such thing as a 0th month
- month_names: [~, januar, februar, mart, april, maj, jun, jul, avgust, septembar, oktobar, novembar, decembar]
- abbr_month_names: [~, jan, feb, mar, apr, maj, jun, jul, avg, sep, okt, nov, dec]
- # Used in date_select and datime_select.
- order: [ :day, :month, :year ]
-
- time:
- formats:
- default: "%d.%m.%Y. u %H:%M"
- time: "%H:%M"
- short: "%d. %b u %H:%M"
- long: "%d. %B %Y u %H:%M"
- am: "am"
- pm: "pm"
-
- datetime:
- distance_in_words:
- half_a_minute: "pola minuta"
- less_than_x_seconds:
- one: "manje od jedne sekunde"
- other: "manje od %{count} sek."
- x_seconds:
- one: "jedna sekunda"
- other: "%{count} sek."
- less_than_x_minutes:
- one: "manje od minuta"
- other: "manje od %{count} min."
- x_minutes:
- one: "jedan minut"
- other: "%{count} min."
- about_x_hours:
- one: "približno jedan sat"
- other: "približno %{count} sati"
- x_days:
- one: "jedan dan"
- other: "%{count} dana"
- about_x_months:
- one: "približno jedan mesec"
- other: "približno %{count} meseci"
- x_months:
- one: "jedan mesec"
- other: "%{count} meseci"
- about_x_years:
- one: "približno godinu dana"
- other: "približno %{count} god."
- over_x_years:
- one: "preko godinu dana"
- other: "preko %{count} god."
- almost_x_years:
- one: "skoro godinu dana"
- other: "skoro %{count} god."
-
- number:
- format:
- separator: ","
- delimiter: ""
- precision: 3
- human:
- format:
- delimiter: ""
- precision: 1
- storage_units:
- format: "%n %u"
- units:
- byte:
- one: "Byte"
- other: "Bytes"
- kb: "KB"
- mb: "MB"
- gb: "GB"
- tb: "TB"
-
-
-# Used in array.to_sentence.
- support:
- array:
- sentence_connector: "i"
- skip_last_comma: false
-
- activerecord:
- errors:
- template:
- header:
- one: "1 error prohibited this %{model} from being saved"
- other: "%{count} errors prohibited this %{model} from being saved"
- messages:
- inclusion: "nije uključen u spisak"
- exclusion: "je rezervisan"
- invalid: "je neispravan"
- confirmation: "potvrda ne odgovara"
- accepted: "mora biti prihvaćen"
- empty: "ne može biti prazno"
- blank: "ne može biti prazno"
- too_long: "je predugačka (maksimum znakova je %{count})"
- too_short: "je prekratka (minimum znakova je %{count})"
- wrong_length: "je pogrešne dužine (broj znakova mora biti %{count})"
- taken: "je već u upotrebi"
- not_a_number: "nije broj"
- not_a_date: "nije ispravan datum"
- greater_than: "mora biti veći od %{count}"
- greater_than_or_equal_to: "mora biti veći ili jednak %{count}"
- equal_to: "mora biti jednak %{count}"
- less_than: "mora biti manji od %{count}"
- less_than_or_equal_to: "mora biti manji ili jednak %{count}"
- odd: "mora biti paran"
- even: "mora biti neparan"
- greater_than_start_date: "mora biti veći od početnog datuma"
- not_same_project: "ne pripada istom projektu"
- circular_dependency: "Ova veza će stvoriti kružnu referencu"
- cant_link_an_issue_with_a_descendant: "Problem ne može biti povezan sa jednim od svojih podzadataka"
-
- actionview_instancetag_blank_option: Molim odaberite
-
- general_text_No: 'Ne'
- general_text_Yes: 'Da'
- general_text_no: 'ne'
- general_text_yes: 'da'
- general_lang_name: 'Srpski'
- general_csv_separator: ','
- general_csv_decimal_separator: '.'
- general_csv_encoding: UTF-8
- general_pdf_encoding: UTF-8
- general_first_day_of_week: '1'
-
- notice_account_updated: Nalog je uspešno ažuriran.
- notice_account_invalid_creditentials: Neispravno korisničko ime ili lozinka.
- notice_account_password_updated: Lozinka je uspešno ažurirana.
- notice_account_wrong_password: Pogrešna lozinka
- notice_account_register_done: Korisnički nalog je uspešno kreiran. Kliknite na link koji ste dobili u e-poruci za aktivaciju.
- notice_account_unknown_email: Nepoznat korisnik.
- notice_can_t_change_password: Ovaj korisnički nalog za potvrdu identiteta koristi spoljni izvor. Nemoguće je promeniti lozinku.
- notice_account_lost_email_sent: Poslata vam je e-poruka sa uputstvom za izbor nove lozinke
- notice_account_activated: Vaš korisnički nalog je aktiviran. Sada se možete prijaviti.
- notice_successful_create: Uspešno kreiranje.
- notice_successful_update: Uspešno ažuriranje.
- notice_successful_delete: Uspešno brisanje.
- notice_successful_connection: Uspešno povezivanje.
- notice_file_not_found: Strana kojoj želite pristupiti ne postoji ili je uklonjena.
- notice_locking_conflict: Podatak je ažuriran od strane drugog korisnika.
- notice_not_authorized: Niste ovlašćeni za pristup ovoj strani.
- notice_email_sent: "E-poruka je poslata na %{value}"
- notice_email_error: "Dogodila se greška prilikom slanja e-poruke (%{value})"
- notice_feeds_access_key_reseted: Vaš RSS pristupni ključ je poništen.
- notice_api_access_key_reseted: Vaš API pristupni ključ je poništen.
- notice_failed_to_save_issues: "Neuspešno snimanje %{count} problema od %{total} odabranih: %{ids}."
- notice_failed_to_save_members: "Neuspešno snimanje člana(ova): %{errors}."
- notice_no_issue_selected: "Ni jedan problem nije odabran! Molimo, odaberite problem koji želite da menjate."
- notice_account_pending: "Vaš nalog je kreiran i čeka na odobrenje administratora."
- notice_default_data_loaded: Podrazumevano konfigurisanje je uspešno učitano.
- notice_unable_delete_version: Verziju je nemoguće izbrisati.
- notice_unable_delete_time_entry: Stavku evidencije vremena je nemoguće izbrisati.
- notice_issue_done_ratios_updated: Odnos rešenih problema je ažuriran.
-
- error_can_t_load_default_data: "Podrazumevano konfigurisanje je nemoguće učitati: %{value}"
- error_scm_not_found: "Stavka ili ispravka nisu pronađene u spremištu."
- error_scm_command_failed: "Greška se javila prilikom pokušaja pristupa spremištu: %{value}"
- error_scm_annotate: "Stavka ne postoji ili ne može biti označena."
- error_issue_not_found_in_project: 'Problem nije pronađen ili ne pripada ovom projektu.'
- error_no_tracker_in_project: 'Ni jedno praćenje nije povezano sa ovim projektom. Molimo proverite podešavanja projekta.'
- error_no_default_issue_status: 'Podrazumevani status problema nije definisan. Molimo proverite vaše konfigurisanje (idite na "Administracija -> Statusi problema").'
- error_can_not_delete_custom_field: Nemoguće je izbrisati prilagođeno polje
- error_can_not_delete_tracker: "Ovo praćenje sadrži probleme i ne može biti obrisano."
- error_can_not_remove_role: "Ova uloga je u upotrebi i ne može biti obrisana."
- error_can_not_reopen_issue_on_closed_version: 'Problem dodeljen zatvorenoj verziji ne može biti ponovo otvoren'
- error_can_not_archive_project: Ovaj projekat se ne može arhivirati
- error_issue_done_ratios_not_updated: "Odnos rešenih problema nije ažuriran."
- error_workflow_copy_source: 'Molimo odaberite izvorno praćenje ili ulogu'
- error_workflow_copy_target: 'Molimo odaberite odredišno praćenje i ulogu'
- error_unable_delete_issue_status: 'Status problema je nemoguće obrisati'
- error_unable_to_connect: "Povezivanje sa (%{value}) je nemoguće"
- warning_attachments_not_saved: "%{count} datoteka ne može biti snimljena."
-
- mail_subject_lost_password: "Vaša %{value} lozinka"
- mail_body_lost_password: 'Za promenu vaše lozinke, kliknite na sledeći link:'
- mail_subject_register: "Aktivacija vašeg %{value} naloga"
- mail_body_register: 'Za aktivaciju vašeg naloga, kliknite na sledeći link:'
- mail_body_account_information_external: "Vaš nalog %{value} možete koristiti za prijavu."
- mail_body_account_information: Informacije o vašem nalogu
- mail_subject_account_activation_request: "Zahtev za aktivaciju naloga %{value}"
- mail_body_account_activation_request: "Novi korisnik (%{value}) je registrovan. Nalog čeka na vaše odobrenje:"
- mail_subject_reminder: "%{count} problema dospeva narednih %{days} dana"
- mail_body_reminder: "%{count} problema dodeljenih vama dospeva u narednih %{days} dana:"
- mail_subject_wiki_content_added: "Wiki stranica '%{id}' je dodata"
- mail_body_wiki_content_added: "%{author} je dodao wiki stranicu '%{id}'."
- mail_subject_wiki_content_updated: "Wiki stranica '%{id}' je ažurirana"
- mail_body_wiki_content_updated: "%{author} je ažurirao wiki stranicu '%{id}'."
-
- gui_validation_error: jedna greška
- gui_validation_error_plural: "%{count} grešaka"
-
- field_name: Naziv
- field_description: Opis
- field_summary: Rezime
- field_is_required: Obavezno
- field_firstname: Ime
- field_lastname: Prezime
- field_mail: E-adresa
- field_filename: Datoteka
- field_filesize: Veličina
- field_downloads: Preuzimanja
- field_author: Autor
- field_created_on: Kreirano
- field_updated_on: Ažurirano
- field_field_format: Format
- field_is_for_all: Za sve projekte
- field_possible_values: Moguće vrednosti
- field_regexp: Regularan izraz
- field_min_length: Minimalna dužina
- field_max_length: Maksimalna dužina
- field_value: Vrednost
- field_category: Kategorija
- field_title: Naslov
- field_project: Projekat
- field_issue: Problem
- field_status: Status
- field_notes: Beleške
- field_is_closed: Zatvoren problem
- field_is_default: Podrazumevana vrednost
- field_tracker: Praćenje
- field_subject: Predmet
- field_due_date: Krajnji rok
- field_assigned_to: Dodeljeno
- field_priority: Prioritet
- field_fixed_version: Odredišna verzija
- field_user: Korisnik
- field_principal: Glavni
- field_role: Uloga
- field_homepage: Početna stranica
- field_is_public: Javno objavljivanje
- field_parent: Potprojekat od
- field_is_in_roadmap: Problemi prikazani u planu rada
- field_login: Korisničko ime
- field_mail_notification: Obaveštenja putem e-pošte
- field_admin: Administrator
- field_last_login_on: Poslednje povezivanje
- field_language: Jezik
- field_effective_date: Datum
- field_password: Lozinka
- field_new_password: Nova lozinka
- field_password_confirmation: Potvrda lozinke
- field_version: Verzija
- field_type: Tip
- field_host: Glavni računar
- field_port: Port
- field_account: Korisnički nalog
- field_base_dn: Bazni DN
- field_attr_login: Atribut prijavljivanja
- field_attr_firstname: Atribut imena
- field_attr_lastname: Atribut prezimena
- field_attr_mail: Atribut e-adrese
- field_onthefly: Kreiranje korisnika u toku rada
- field_start_date: Početak
- field_done_ratio: % urađeno
- field_auth_source: Režim potvrde identiteta
- field_hide_mail: Sakrij moju e-adresu
- field_comments: Komentar
- field_url: URL
- field_start_page: Početna stranica
- field_subproject: Potprojekat
- field_hours: sati
- field_activity: Aktivnost
- field_spent_on: Datum
- field_identifier: Identifikator
- field_is_filter: Upotrebi kao filter
- field_issue_to: Srodni problemi
- field_delay: Kašnjenje
- field_assignable: Problem može biti dodeljen ovoj ulozi
- field_redirect_existing_links: Preusmeri postojeće veze
- field_estimated_hours: Proteklo vreme
- field_column_names: Kolone
- field_time_zone: Vremenska zona
- field_searchable: Može da se pretražuje
- field_default_value: Podrazumevana vrednost
- field_comments_sorting: Prikaži komentare
- field_parent_title: Matična stranica
- field_editable: Izmenljivo
- field_watcher: Posmatrač
- field_identity_url: OpenID URL
- field_content: Sadržaj
- field_group_by: Grupisanje rezultata po
- field_sharing: Deljenje
- field_parent_issue: Matični zadatak
-
- setting_app_title: Naslov aplikacije
- setting_app_subtitle: Podnaslov aplikacije
- setting_welcome_text: Tekst dobrodošlice
- setting_default_language: Podrazumevani jezik
- setting_login_required: Obavezna potvrda identiteta
- setting_self_registration: Samoregistracija
- setting_attachment_max_size: Maks. veličina priložene datoteke
- setting_issues_export_limit: Ograničenje izvoza „problema“
- setting_mail_from: E-adresa pošiljaoca
- setting_bcc_recipients: Primaoci „Bcc“ kopije
- setting_plain_text_mail: Poruka sa čistim tekstom (bez HTML-a)
- setting_host_name: Putanja i naziv glavnog računara
- setting_text_formatting: Oblikovanje teksta
- setting_wiki_compression: Kompresija Wiki istorije
- setting_feeds_limit: Ograničenje sadržaja izvora vesti
- setting_default_projects_public: Podrazumeva se javno prikazivanje novih projekata
- setting_autofetch_changesets: Izvršavanje automatskog preuzimanja
- setting_sys_api_enabled: Omogućavanje WS za upravljanje spremištem
- setting_commit_ref_keywords: Referenciranje ključnih reči
- setting_commit_fix_keywords: Popravljanje ključnih reči
- setting_autologin: Automatska prijava
- setting_date_format: Format datuma
- setting_time_format: Format vremena
- setting_cross_project_issue_relations: Dozvoli povezivanje problema iz unakrsnih projekata
- setting_issue_list_default_columns: Podrazumevane kolone prikazane na spisku problema
- setting_repositories_encodings: Kodiranje spremišta
- setting_commit_logs_encoding: Kodiranje izvršnih poruka
- setting_emails_footer: Podnožje stranice e-poruke
- setting_protocol: Protokol
- setting_per_page_options: Opcije prikaza objekata po stranici
- setting_user_format: Format prikaza korisnika
- setting_activity_days_default: Broj dana prikazanih na projektnoj aktivnosti
- setting_display_subprojects_issues: Prikazuj probleme iz potprojekata na glavnom projektu, ukoliko nije drugačije navedeno
- setting_enabled_scm: Omogućavanje SCM
- setting_mail_handler_body_delimiters: "Skraćivanje e-poruke nakon jedne od ovih linija"
- setting_mail_handler_api_enabled: Omogućavanje WS dolazne e-poruke
- setting_mail_handler_api_key: API ključ
- setting_sequential_project_identifiers: Generisanje sekvencijalnog imena projekta
- setting_gravatar_enabled: Koristi Gravatar korisničke ikone
- setting_gravatar_default: Podrazumevana Gravatar slika
- setting_diff_max_lines_displayed: Maks. broj prikazanih različitih linija
- setting_file_max_size_displayed: Maks. veličina tekst. datoteka prikazanih umetnuto
- setting_repository_log_display_limit: Maks. broj revizija prikazanih u datoteci za evidenciju
- setting_openid: Dozvoli OpenID prijavu i registraciju
- setting_password_min_length: Minimalna dužina lozinke
- setting_new_project_user_role_id: Kreatoru projekta (koji nije administrator) dodeljuje je uloga
- setting_default_projects_modules: Podrazumevano omogućeni moduli za nove projekte
- setting_issue_done_ratio: Izračunaj odnos rešenih problema
- setting_issue_done_ratio_issue_field: koristeći polje problema
- setting_issue_done_ratio_issue_status: koristeći status problema
- setting_start_of_week: Prvi dan u sedmici
- setting_rest_api_enabled: Omogući REST web usluge
- setting_cache_formatted_text: Keširanje obrađenog teksta
-
- permission_add_project: Kreiranje projekta
- permission_add_subprojects: Kreiranje potpojekta
- permission_edit_project: Izmena projekata
- permission_select_project_modules: Odabiranje modula projekta
- permission_manage_members: Upravljanje članovima
- permission_manage_project_activities: Upravljanje projektnim aktivnostima
- permission_manage_versions: Upravljanje verzijama
- permission_manage_categories: Upravljanje kategorijama problema
- permission_view_issues: Pregled problema
- permission_add_issues: Dodavanje problema
- permission_edit_issues: Izmena problema
- permission_manage_issue_relations: Upravljanje vezama između problema
- permission_add_issue_notes: Dodavanje beleški
- permission_edit_issue_notes: Izmena beleški
- permission_edit_own_issue_notes: Izmena sopstvenih beleški
- permission_move_issues: Pomeranje problema
- permission_delete_issues: Brisanje problema
- permission_manage_public_queries: Upravljanje javnim upitima
- permission_save_queries: Snimanje upita
- permission_view_gantt: Pregledanje Gantovog dijagrama
- permission_view_calendar: Pregledanje kalendara
- permission_view_issue_watchers: Pregledanje spiska posmatrača
- permission_add_issue_watchers: Dodavanje posmatrača
- permission_delete_issue_watchers: Brisanje posmatrača
- permission_log_time: Beleženje utrošenog vremena
- permission_view_time_entries: Pregledanje utrošenog vremena
- permission_edit_time_entries: Izmena utrošenog vremena
- permission_edit_own_time_entries: Izmena sopstvenog utrošenog vremena
- permission_manage_news: Upravljanje vestima
- permission_comment_news: Komentarisanje vesti
- permission_manage_documents: Upravljanje dokumentima
- permission_view_documents: Pregledanje dokumenata
- permission_manage_files: Upravljanje datotekama
- permission_view_files: Pregledanje datoteka
- permission_manage_wiki: Upravljanje wiki stranicama
- permission_rename_wiki_pages: Promena imena wiki stranicama
- permission_delete_wiki_pages: Brisanje wiki stranica
- permission_view_wiki_pages: Pregledanje wiki stranica
- permission_view_wiki_edits: Pregledanje wiki istorije
- permission_edit_wiki_pages: Izmena wiki stranica
- permission_delete_wiki_pages_attachments: Brisanje priloženih datoteka
- permission_protect_wiki_pages: Zaštita wiki stranica
- permission_manage_repository: Upravljanje spremištem
- permission_browse_repository: Pregledanje spremišta
- permission_view_changesets: Pregledanje skupa promena
- permission_commit_access: Potvrda pristupa
- permission_manage_boards: Upravljanje forumima
- permission_view_messages: Pregledanje poruka
- permission_add_messages: Slanje poruka
- permission_edit_messages: Izmena poruka
- permission_edit_own_messages: Izmena sopstvenih poruka
- permission_delete_messages: Brisanje poruka
- permission_delete_own_messages: Brisanje sopstvenih poruka
- permission_export_wiki_pages: Izvoz wiki stranica
- permission_manage_subtasks: Upravljanje podzadacima
-
- project_module_issue_tracking: Praćenje problema
- project_module_time_tracking: Praćenje vremena
- project_module_news: Vesti
- project_module_documents: Dokumenti
- project_module_files: Datoteke
- project_module_wiki: Wiki
- project_module_repository: Spremište
- project_module_boards: Forumi
-
- label_user: Korisnik
- label_user_plural: Korisnici
- label_user_new: Novi korisnik
- label_user_anonymous: Anoniman
- label_project: Projekat
- label_project_new: Novi projekat
- label_project_plural: Projekti
- label_x_projects:
- zero: nema projekata
- one: jedan projekat
- other: "%{count} projekata"
- label_project_all: Svi projekti
- label_project_latest: Poslednji projekti
- label_issue: Problem
- label_issue_new: Novi problem
- label_issue_plural: Problemi
- label_issue_view_all: Prikaz svih problema
- label_issues_by: "Problemi (%{value})"
- label_issue_added: Problem je dodat
- label_issue_updated: Problem je ažuriran
- label_document: Dokument
- label_document_new: Novi dokument
- label_document_plural: Dokumenti
- label_document_added: Dokument je dodat
- label_role: Uloga
- label_role_plural: Uloge
- label_role_new: Nova uloga
- label_role_and_permissions: Uloge i dozvole
- label_member: Član
- label_member_new: Novi član
- label_member_plural: Članovi
- label_tracker: Praćenje
- label_tracker_plural: Praćenja
- label_tracker_new: Novo praćenje
- label_workflow: Tok posla
- label_issue_status: Status problema
- label_issue_status_plural: Statusi problema
- label_issue_status_new: Novi status
- label_issue_category: Kategorija problema
- label_issue_category_plural: Kategorije problema
- label_issue_category_new: Nova kategorija
- label_custom_field: Prilagođeno polje
- label_custom_field_plural: Prilagođena polja
- label_custom_field_new: Novo prilagođeno polje
- label_enumerations: Nabrojiva lista
- label_enumeration_new: Nova vrednost
- label_information: Informacija
- label_information_plural: Informacije
- label_please_login: Molimo, prijavite se
- label_register: Registracija
- label_login_with_open_id_option: ili prijava sa OpenID
- label_password_lost: Izgubljena lozinka
- label_home: Početak
- label_home_heading: Početak
- label_my_page: Moja stranica
- label_my_account: Moj nalog
- label_my_projects: Moji projekti
- label_my_page_block: My page block
- label_administration: Administracija
- label_login: Prijava
- label_logout: Odjava
- label_help: Pomoć
- label_reported_issues: Prijavljeni problemi
- label_assigned_to_me_issues: Problemi dodeljeni meni
- label_last_login: Poslednje povezivanje
- label_registered_on: Registrovan
- label_activity: Aktivnost
- label_overall_activity: Celokupna aktivnost
- label_user_activity: "Aktivnost korisnika %{value}"
- label_new: Novo
- label_logged_as: Prijavljeni ste kao
- label_environment: Okruženje
- label_authentication: Potvrda identiteta
- label_auth_source: Režim potvrde identiteta
- label_auth_source_new: Novi režim potvrde identiteta
- label_auth_source_plural: Režimi potvrde identiteta
- label_subproject_plural: Potprojekti
- label_subproject_new: Novi potprojekat
- label_and_its_subprojects: "%{value} i njegovi potprojekti"
- label_min_max_length: Min. - Maks. dužina
- label_list: Spisak
- label_date: Datum
- label_integer: Ceo broj
- label_float: Sa pokretnim zarezom
- label_boolean: Logički operator
- label_string: Tekst
- label_text: Dugi tekst
- label_attribute: Osobina
- label_attribute_plural: Osobine
- label_download: "%{count} preuzimanje"
- label_download_plural: "%{count} preuzimanja"
- label_no_data: Nema podataka za prikazivanje
- label_change_status: Promena statusa
- label_history: Istorija
- label_attachment: Datoteka
- label_attachment_new: Nova datoteka
- label_attachment_delete: Brisanje datoteke
- label_attachment_plural: Datoteke
- label_file_added: Datoteka je dodata
- label_report: Izveštaj
- label_report_plural: Izveštaji
- label_news: Vesti
- label_news_new: Dodavanje vesti
- label_news_plural: Vesti
- label_news_latest: Poslednje vesti
- label_news_view_all: Prikaz svih vesti
- label_news_added: Vesti su dodate
- label_settings: Podešavanja
- label_overview: Pregled
- label_version: Verzija
- label_version_new: Nova verzija
- label_version_plural: Verzije
- label_close_versions: Zatvori završene verzije
- label_confirmation: Potvrda
- label_export_to: 'Takođe dostupno i u varijanti:'
- label_read: Čitanje...
- label_public_projects: Javni projekti
- label_open_issues: otvoren
- label_open_issues_plural: otvorenih
- label_closed_issues: zatvoren
- label_closed_issues_plural: zatvorenih
- label_x_open_issues_abbr_on_total:
- zero: 0 otvorenih / %{total}
- one: 1 otvoren / %{total}
- other: "%{count} otvorenih / %{total}"
- label_x_open_issues_abbr:
- zero: 0 otvorenih
- one: 1 otvoren
- other: "%{count} otvorenih"
- label_x_closed_issues_abbr:
- zero: 0 zatvorenih
- one: 1 zatvoren
- other: "%{count} zatvorenih"
- label_total: Ukupno
- label_permissions: Dozvole
- label_current_status: Trenutni status
- label_new_statuses_allowed: Novi statusi dozvoljeni
- label_all: svi
- label_none: nijedan
- label_nobody: nikome
- label_next: Sledeće
- label_previous: Prethodno
- label_used_by: Koristio
- label_details: Detalji
- label_add_note: Dodaj belešku
- label_per_page: Po strani
- label_calendar: Kalendar
- label_months_from: meseci od
- label_gantt: Gantov dijagram
- label_internal: Unutrašnji
- label_last_changes: "poslednjih %{count} promena"
- label_change_view_all: Prikaži sve promene
- label_personalize_page: Personalizuj ovu stranu
- label_comment: Komentar
- label_comment_plural: Komentari
- label_x_comments:
- zero: bez komentara
- one: jedan komentar
- other: "%{count} komentara"
- label_comment_add: Dodaj komentar
- label_comment_added: Komentar dodat
- label_comment_delete: Obriši komentare
- label_query: Prilagođen upit
- label_query_plural: Prilagođeni upiti
- label_query_new: Novi upit
- label_filter_add: Dodavanje filtera
- label_filter_plural: Filteri
- label_equals: je
- label_not_equals: nije
- label_in_less_than: manje od
- label_in_more_than: više od
- label_greater_or_equal: '>='
- label_less_or_equal: '<='
- label_in: u
- label_today: danas
- label_all_time: sve vreme
- label_yesterday: juče
- label_this_week: ove sedmice
- label_last_week: poslednje sedmice
- label_last_n_days: "poslednjih %{count} dana"
- label_this_month: ovog meseca
- label_last_month: poslednjeg meseca
- label_this_year: ove godine
- label_date_range: Vremenski period
- label_less_than_ago: pre manje od nekoliko dana
- label_more_than_ago: pre više od nekoliko dana
- label_ago: pre nekoliko dana
- label_contains: sadrži
- label_not_contains: ne sadrži
- label_day_plural: dana
- label_repository: Spremište
- label_repository_plural: Spremišta
- label_browse: Pregledanje
- label_modification: "%{count} promena"
- label_modification_plural: "%{count} promena"
- label_branch: Grana
- label_tag: Oznaka
- label_revision: Revizija
- label_revision_plural: Revizije
- label_revision_id: "Revizija %{value}"
- label_associated_revisions: Pridružene revizije
- label_added: dodato
- label_modified: promenjeno
- label_copied: kopirano
- label_renamed: preimenovano
- label_deleted: izbrisano
- label_latest_revision: Poslednja revizija
- label_latest_revision_plural: Poslednje revizije
- label_view_revisions: Pregled revizija
- label_view_all_revisions: Pregled svih revizija
- label_max_size: Maksimalna veličina
- label_sort_highest: Premeštanje na vrh
- label_sort_higher: Premeštanje na gore
- label_sort_lower: Premeštanje na dole
- label_sort_lowest: Premeštanje na dno
- label_roadmap: Plan rada
- label_roadmap_due_in: "Dospeva %{value}"
- label_roadmap_overdue: "%{value} najkasnije"
- label_roadmap_no_issues: Nema problema za ovu verziju
- label_search: Pretraga
- label_result_plural: Rezultati
- label_all_words: Sve reči
- label_wiki: Wiki
- label_wiki_edit: Wiki izmena
- label_wiki_edit_plural: Wiki izmene
- label_wiki_page: Wiki stranica
- label_wiki_page_plural: Wiki stranice
- label_index_by_title: Indeksiranje po naslovu
- label_index_by_date: Indeksiranje po datumu
- label_current_version: Trenutna verzija
- label_preview: Pregled
- label_feed_plural: Izvori vesti
- label_changes_details: Detalji svih promena
- label_issue_tracking: Praćenje problema
- label_spent_time: Utrošeno vreme
- label_overall_spent_time: Celokupno utrošeno vreme
- label_f_hour: "%{value} sat"
- label_f_hour_plural: "%{value} sati"
- label_time_tracking: Praćenje vremena
- label_change_plural: Promene
- label_statistics: Statistika
- label_commits_per_month: Izvršenja mesečno
- label_commits_per_author: Izvršenja po autoru
- label_view_diff: Pogledaj razlike
- label_diff_inline: unutra
- label_diff_side_by_side: uporedo
- label_options: Opcije
- label_copy_workflow_from: Kopiranje toka posla od
- label_permissions_report: Izveštaj o dozvolama
- label_watched_issues: Posmatrani problemi
- label_related_issues: Srodni problemi
- label_applied_status: Primenjeni statusi
- label_loading: Učitavanje...
- label_relation_new: Nova relacija
- label_relation_delete: Brisanje relacije
- label_relates_to: srodnih sa
- label_duplicates: dupliranih
- label_duplicated_by: dupliranih od
- label_blocks: odbijenih
- label_blocked_by: odbijenih od
- label_precedes: prethodi
- label_follows: praćenih
- label_end_to_start: od kraja do početka
- label_end_to_end: od kraja do kraja
- label_start_to_start: od početka do početka
- label_start_to_end: od početka do kraja
- label_stay_logged_in: Ostanite prijavljeni
- label_disabled: onemogućeno
- label_show_completed_versions: Prikazivanje završene verzije
- label_me: meni
- label_board: Forum
- label_board_new: Novi forum
- label_board_plural: Forumi
- label_board_locked: Zaključana
- label_board_sticky: Lepljiva
- label_topic_plural: Teme
- label_message_plural: Poruke
- label_message_last: Poslednja poruka
- label_message_new: Nova poruka
- label_message_posted: Poruka je dodata
- label_reply_plural: Odgovori
- label_send_information: Pošalji korisniku detalje naloga
- label_year: Godina
- label_month: Mesec
- label_week: Sedmica
- label_date_from: Šalje
- label_date_to: Prima
- label_language_based: Bazirano na jeziku korisnika
- label_sort_by: "Sortirano po %{value}"
- label_send_test_email: Slanje probne e-poruke
- label_feeds_access_key: RSS pristupni ključ
- label_missing_feeds_access_key: RSS pristupni ključ nedostaje
- label_feeds_access_key_created_on: "RSS pristupni ključ je napravljen pre %{value}"
- label_module_plural: Moduli
- label_added_time_by: "Dodao %{author} pre %{age}"
- label_updated_time_by: "Ažurirao %{author} pre %{age}"
- label_updated_time: "Ažurirano pre %{value}"
- label_jump_to_a_project: Skok na projekat...
- label_file_plural: Datoteke
- label_changeset_plural: Skupovi promena
- label_default_columns: Podrazumevane kolone
- label_no_change_option: (Bez promena)
- label_bulk_edit_selected_issues: Grupna izmena odabranih problema
- label_theme: Tema
- label_default: Podrazumevano
- label_search_titles_only: Pretražuj samo naslove
- label_user_mail_option_all: "Za bilo koji događaj na svim mojim projektima"
- label_user_mail_option_selected: "Za bilo koji događaj na samo odabranim projektima..."
- label_user_mail_no_self_notified: "Ne želim biti obaveštavan za promene koje sam pravim"
- label_registration_activation_by_email: aktivacija naloga putem e-poruke
- label_registration_manual_activation: ručna aktivacija naloga
- label_registration_automatic_activation: automatska aktivacija naloga
- label_display_per_page: "Broj stavki po stranici: %{value}"
- label_age: Starost
- label_change_properties: Promeni svojstva
- label_general: Opšti
- label_more: Više
- label_scm: SCM
- label_plugins: Dodatne komponente
- label_ldap_authentication: LDAP potvrda identiteta
- label_downloads_abbr: D/L
- label_optional_description: Opciono opis
- label_add_another_file: Dodaj još jednu datoteku
- label_preferences: Podešavanja
- label_chronological_order: po hronološkom redosledu
- label_reverse_chronological_order: po obrnutom hronološkom redosledu
- label_planning: Planiranje
- label_incoming_emails: Dolazne e-poruke
- label_generate_key: Generisanje ključa
- label_issue_watchers: Posmatrači
- label_example: Primer
- label_display: Prikaz
- label_sort: Sortiranje
- label_ascending: Rastući niz
- label_descending: Opadajući niz
- label_date_from_to: Od %{start} do %{end}
- label_wiki_content_added: Wiki stranica je dodata
- label_wiki_content_updated: Wiki stranica je ažurirana
- label_group: Grupa
- label_group_plural: Grupe
- label_group_new: Nova grupa
- label_time_entry_plural: Utrošeno vreme
- label_version_sharing_none: Nije deljeno
- label_version_sharing_descendants: Sa potprojektima
- label_version_sharing_hierarchy: Sa hijerarhijom projekta
- label_version_sharing_tree: Sa stablom projekta
- label_version_sharing_system: Sa svim projektima
- label_update_issue_done_ratios: Ažuriraj odnos rešenih problema
- label_copy_source: Izvor
- label_copy_target: Odredište
- label_copy_same_as_target: Isto kao odredište
- label_display_used_statuses_only: Prikazuj statuse korišćene samo od strane ovog praćenja
- label_api_access_key: API pristupni ključ
- label_missing_api_access_key: Nedostaje API pristupni ključ
- label_api_access_key_created_on: "API pristupni ključ je kreiran pre %{value}"
- label_profile: Profil
- label_subtask_plural: Podzadatak
- label_project_copy_notifications: Pošalji e-poruku sa obaveštenjem prilikom kopiranja projekta
-
- button_login: Prijava
- button_submit: Pošalji
- button_save: Snimi
- button_check_all: Uključi sve
- button_uncheck_all: Isključi sve
- button_delete: Izbriši
- button_create: Kreiraj
- button_create_and_continue: Kreiraj i nastavi
- button_test: Test
- button_edit: Izmeni
- button_add: Dodaj
- button_change: Promeni
- button_apply: Primeni
- button_clear: Obriši
- button_lock: Zaključaj
- button_unlock: Otključaj
- button_download: Preuzmi
- button_list: Spisak
- button_view: Prikaži
- button_move: Pomeri
- button_move_and_follow: Pomeri i prati
- button_back: Nazad
- button_cancel: Poništi
- button_activate: Aktiviraj
- button_sort: Sortiraj
- button_log_time: Evidentiraj vreme
- button_rollback: Povratak na ovu verziju
- button_watch: Prati
- button_unwatch: Ne prati više
- button_reply: Odgovori
- button_archive: Arhiviraj
- button_unarchive: Vrati iz arhive
- button_reset: Poništi
- button_rename: Preimenuj
- button_change_password: Promeni lozinku
- button_copy: Kopiraj
- button_copy_and_follow: Kopiraj i prati
- button_annotate: Pribeleži
- button_update: Ažuriraj
- button_configure: Podesi
- button_quote: Pod navodnicima
- button_duplicate: Dupliraj
- button_show: Prikaži
-
- status_active: aktivni
- status_registered: registrovani
- status_locked: zaključani
-
- version_status_open: otvoren
- version_status_locked: zaključan
- version_status_closed: zatvoren
-
- field_active: Aktivan
-
- text_select_mail_notifications: Odaberi akcije za koje će obaveštenje biti poslato putem e-pošte.
- text_regexp_info: npr. ^[A-Z0-9]+$
- text_min_max_length_info: 0 znači bez ograničenja
- text_project_destroy_confirmation: Jeste li sigurni da želite da izbrišete ovaj projekat i sve pripadajuće podatke?
- text_subprojects_destroy_warning: "Potprojekti: %{value} će takođe biti izbrisan."
- text_workflow_edit: Odaberite ulogu i praćenje za izmenu toka posla
- text_are_you_sure: Jeste li sigurni?
- text_journal_changed: "%{label} promenjen od %{old} u %{new}"
- text_journal_set_to: "%{label} postavljen u %{value}"
- text_journal_deleted: "%{label} izbrisano (%{old})"
- text_journal_added: "%{label} %{value} dodato"
- text_tip_issue_begin_day: zadatak počinje ovog dana
- text_tip_issue_end_day: zadatak se završava ovog dana
- text_tip_issue_begin_end_day: zadatak počinje i završava ovog dana
- text_project_identifier_info: 'Dozvoljena su samo mala slova (a-š), brojevi i crtice.').insert(offsets.last, ' ')
+ else
+ line_left
+ end
+ end
+
+ def html_line_right
+ if offsets
+ line_right.dup.insert(offsets.first, '').insert(offsets.last, ' ')
+ else
+ line_right
+ end
+ end
+
+ def html_line
+ if offsets
+ line.dup.insert(offsets.first, '').insert(offsets.last, ' ')
+ else
+ line
+ end
+ end
def inspect
puts '### Start Line Diff ###'
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/.svn/text-base/version.rb.svn-base
--- a/lib/redmine/.svn/text-base/version.rb.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/.svn/text-base/version.rb.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -3,9 +3,9 @@
module Redmine
module VERSION #:nodoc:
MAJOR = 1
- MINOR = 1
- TINY = 1
-
+ MINOR = 2
+ TINY = 0
+
# Branch values:
# * official release: nil
# * stable branch: stable
@@ -20,24 +20,25 @@
f = File.open(entries_path, 'r')
entries = f.read
f.close
- if entries.match(%r{^\d+})
- revision = $1.to_i if entries.match(%r{^\d+\s+dir\s+(\d+)\s})
- else
- xml = REXML::Document.new(entries)
- revision = xml.elements['wc-entries'].elements[1].attributes['revision'].to_i
- end
- rescue
- # Could not find the current revision
- end
- end
- revision
+ if entries.match(%r{^\d+})
+ revision = $1.to_i if entries.match(%r{^\d+\s+dir\s+(\d+)\s})
+ else
+ xml = REXML::Document.new(entries)
+ revision =
+ xml.elements['wc-entries'].elements[1].attributes['revision'].to_i
+ end
+ rescue
+ # Could not find the current revision
+ end
+ end
+ revision
end
REVISION = self.revision
- ARRAY = [MAJOR, MINOR, TINY, BRANCH, REVISION].compact
- STRING = ARRAY.join('.')
+ ARRAY = [MAJOR, MINOR, TINY, BRANCH, REVISION].compact
+ STRING = ARRAY.join('.')
- def self.to_a; ARRAY end
+ def self.to_a; ARRAY end
def self.to_s; STRING end
end
end
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/activity/.svn/entries
--- a/lib/redmine/activity/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/activity/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,8 +1,8 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/lib/redmine/activity
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine/activity
http://redmine.rubyforge.org/svn
@@ -32,7 +32,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:15:00.000000Z
20597949bb74e98a3ffc97bc8a3ead7d
2010-07-06T02:22:03.226147Z
3829
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/codeset_util.rb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/redmine/codeset_util.rb Mon Jun 06 14:41:04 2011 +0100
@@ -0,0 +1,31 @@
+require 'iconv'
+
+module Redmine
+ module CodesetUtil
+
+ def self.replace_invalid_utf8(str)
+ return str if str.nil?
+ if str.respond_to?(:force_encoding)
+ str.force_encoding('UTF-8')
+ if ! str.valid_encoding?
+ str = str.encode("US-ASCII", :invalid => :replace,
+ :undef => :replace, :replace => '?').encode("UTF-8")
+ end
+ else
+ ic = Iconv.new('UTF-8', 'UTF-8')
+ txtar = ""
+ begin
+ txtar += ic.iconv(str)
+ rescue Iconv::IllegalSequence
+ txtar += $!.success
+ str = '?' + $!.failed[1,$!.failed.length]
+ retry
+ rescue
+ txtar += $!.success
+ end
+ str = txtar
+ end
+ str
+ end
+ end
+end
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/core_ext/.svn/entries
--- a/lib/redmine/core_ext/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/core_ext/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,8 +1,8 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/lib/redmine/core_ext
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine/core_ext
http://redmine.rubyforge.org/svn
@@ -35,7 +35,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:15:00.000000Z
fcafa1cc4149d3a5de82816c61b7fa02
2009-08-17T16:32:24.020380Z
2844
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/core_ext/string/.svn/entries
--- a/lib/redmine/core_ext/string/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/core_ext/string/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,8 +1,8 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/lib/redmine/core_ext/string
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine/core_ext/string
http://redmine.rubyforge.org/svn
@@ -32,7 +32,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:15:00.000000Z
e614ecdb2fac85cd9f8808e7cff7f9de
2009-08-17T16:32:24.020380Z
2844
@@ -66,7 +66,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:15:00.000000Z
1cc26c5de967944da3a6b07331512637
2009-10-10T15:09:19.510095Z
2912
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/custom_field_format.rb
--- a/lib/redmine/custom_field_format.rb Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/custom_field_format.rb Mon Jun 06 14:41:04 2011 +0100
@@ -22,12 +22,14 @@
cattr_accessor :available
@@available = {}
- attr_accessor :name, :order, :label
+ attr_accessor :name, :order, :label, :edit_as, :class_names
def initialize(name, options={})
self.name = name
self.label = options[:label]
self.order = options[:order]
+ self.edit_as = options[:edit_as] || name
+ self.class_names = options[:only]
end
def format(value)
@@ -47,12 +49,11 @@
return value
}
end
-
- # Allow displaying the edit type of another field_format
- #
- # Example: display a custom field as a list
- def edit_as
- name
+
+ ['user', 'version'].each do |name|
+ define_method("format_as_#{name}") {|value|
+ return value.blank? ? "" : name.classify.constantize.find_by_id(value.to_i).to_s
+ }
end
class << self
@@ -79,8 +80,10 @@
end
# Return an array of custom field formats which can be used in select_tag
- def as_select
- @@available.values.sort {|a,b|
+ def as_select(class_name=nil)
+ fields = @@available.values
+ fields = fields.select {|field| field.class_names.nil? || field.class_names.include?(class_name)}
+ fields.sort {|a,b|
a.order <=> b.order
}.collect {|custom_field_format|
[ l(custom_field_format.label), custom_field_format.name ]
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/default_data/.svn/all-wcprops
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/redmine/default_data/.svn/all-wcprops Mon Jun 06 14:41:04 2011 +0100
@@ -0,0 +1,11 @@
+K 25
+svn:wc:ra_dav:version-url
+V 63
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/default_data
+END
+loader.rb
+K 25
+svn:wc:ra_dav:version-url
+V 73
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/default_data/loader.rb
+END
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/default_data/.svn/entries
--- a/lib/redmine/default_data/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/default_data/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,15 +1,15 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/lib/redmine/default_data
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine/default_data
http://redmine.rubyforge.org/svn
-2010-06-30T01:55:44.694582Z
-3820
-edavis10
+2011-04-15T13:23:13.506236Z
+5466
+jplang
@@ -32,11 +32,11 @@
-2011-03-03T11:05:14.000000Z
-41958e843a8ba03548eed089e8002549
-2010-06-30T01:55:44.694582Z
-3820
-edavis10
+2011-06-06T13:20:53.000000Z
+a052713b43f76c049afa9cba6ed46e77
+2011-04-15T13:23:13.506236Z
+5466
+jplang
has-props
@@ -58,5 +58,5 @@
-10686
+10750
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/default_data/.svn/text-base/loader.rb.svn-base
--- a/lib/redmine/default_data/.svn/text-base/loader.rb.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/default_data/.svn/text-base/loader.rb.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006-2007 Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -41,6 +41,7 @@
Role.transaction do
# Roles
manager = Role.create! :name => l(:default_role_manager),
+ :issues_visibility => 'all',
:position => 1
manager.permissions = manager.setable_permissions.collect {|p| p.name}
manager.save!
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/default_data/loader.rb
--- a/lib/redmine/default_data/loader.rb Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/default_data/loader.rb Mon Jun 06 14:41:04 2011 +0100
@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006-2007 Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -41,6 +41,7 @@
Role.transaction do
# Roles
manager = Role.create! :name => l(:default_role_manager),
+ :issues_visibility => 'all',
:position => 1
manager.permissions = manager.setable_permissions.collect {|p| p.name}
manager.save!
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/export/.svn/all-wcprops
--- a/lib/redmine/export/.svn/all-wcprops Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/export/.svn/all-wcprops Mon Jun 06 14:41:04 2011 +0100
@@ -1,11 +1,11 @@
K 25
svn:wc:ra_dav:version-url
-V 43
-/svn/!svn/ver/4736/trunk/lib/redmine/export
+V 57
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/export
END
pdf.rb
K 25
svn:wc:ra_dav:version-url
-V 50
-/svn/!svn/ver/4736/trunk/lib/redmine/export/pdf.rb
+V 64
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/export/pdf.rb
END
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/export/.svn/entries
--- a/lib/redmine/export/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/export/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,15 +1,15 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/lib/redmine/export
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine/export
http://redmine.rubyforge.org/svn
-2011-01-22T11:57:02.732751Z
-4736
-jplang
+2011-05-10T01:03:28.091124Z
+5723
+tmaruyama
@@ -32,11 +32,11 @@
-2011-03-03T11:05:14.000000Z
-b8bd24e9575d51f0c49f8245a5d593a2
-2011-01-22T11:57:02.732751Z
-4736
-jplang
+2011-06-06T13:20:53.000000Z
+2ed64538eebb760396d45f10184ff550
+2011-05-10T01:03:28.091124Z
+5723
+tmaruyama
has-props
@@ -58,5 +58,5 @@
-10786
+14982
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/export/.svn/text-base/pdf.rb.svn-base
--- a/lib/redmine/export/.svn/text-base/pdf.rb.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/export/.svn/text-base/pdf.rb.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -1,72 +1,81 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2009 Jean-Philippe Lang
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
require 'iconv'
require 'rfpdf/fpdf'
-require 'rfpdf/chinese'
+require 'fpdf/chinese'
+require 'fpdf/japanese'
+require 'fpdf/korean'
module Redmine
module Export
module PDF
include ActionView::Helpers::TextHelper
include ActionView::Helpers::NumberHelper
-
- class IFPDF < FPDF
+
+ class ITCPDF < TCPDF
include Redmine::I18n
attr_accessor :footer_date
-
+
def initialize(lang)
- super()
set_language_if_valid lang
- case current_language.to_s.downcase
- when 'ko'
+ pdf_encoding = l(:general_pdf_encoding).upcase
+ if RUBY_VERSION < '1.9'
+ @ic = Iconv.new(pdf_encoding, 'UTF-8')
+ end
+ super('P', 'mm', 'A4', (pdf_encoding == 'UTF-8'), pdf_encoding)
+ case pdf_encoding
+ when 'UTF-8'
+ @font_for_content = 'FreeSans'
+ @font_for_footer = 'FreeSans'
+ when 'CP949'
extend(PDF_Korean)
AddUHCFont()
@font_for_content = 'UHC'
- @font_for_footer = 'UHC'
- when 'ja'
+ @font_for_footer = 'UHC'
+ when 'CP932'
extend(PDF_Japanese)
AddSJISFont()
@font_for_content = 'SJIS'
- @font_for_footer = 'SJIS'
- when 'zh'
+ @font_for_footer = 'SJIS'
+ when 'GB18030'
extend(PDF_Chinese)
AddGBFont()
@font_for_content = 'GB'
- @font_for_footer = 'GB'
- when 'zh-tw'
+ @font_for_footer = 'GB'
+ when 'BIG5'
extend(PDF_Chinese)
AddBig5Font()
@font_for_content = 'Big5'
- @font_for_footer = 'Big5'
+ @font_for_footer = 'Big5'
else
@font_for_content = 'Arial'
- @font_for_footer = 'Helvetica'
+ @font_for_footer = 'Helvetica'
end
SetCreator(Redmine::Info.app_name)
SetFont(@font_for_content)
end
-
+
def SetFontStyle(style, size)
SetFont(@font_for_content, style, size)
end
-
+
def SetTitle(txt)
txt = begin
utf16txt = Iconv.conv('UTF-16BE', 'UTF-8', txt)
@@ -78,7 +87,7 @@
end || ''
super(txt)
end
-
+
def textstring(s)
# Format a text string
if s =~ /^ space_left
+ pdf.AddPage("L")
+ base_x = pdf.GetX
+ base_y = pdf.GetY
+ end
+
+ # write the cells on page
+ pdf.RDMCell(col_id_width, row_height, issue.id.to_s, "T", 0, 'C', 1)
+ issues_to_pdf_write_cells(pdf, col_values, col_width, row_height)
+ issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, col_id_width, col_width)
+ pdf.SetY(base_y + max_height);
end
+
if issues.size == Setting.issues_export_limit.to_i
pdf.SetFontStyle('B',10)
- pdf.Cell(0, row_height, '...')
+ pdf.RDMCell(0, row_height, '...')
end
pdf.Output
end
+ # Renders MultiCells and returns the maximum height used
+ def issues_to_pdf_write_cells(pdf, col_values, col_widths,
+ row_height, head=false)
+ base_y = pdf.GetY
+ max_height = row_height
+ col_values.each_with_index do |column, i|
+ col_x = pdf.GetX
+ if head == true
+ pdf.RDMMultiCell(col_widths[i], row_height, column.caption, "T", 'L', 1)
+ else
+ pdf.RDMMultiCell(col_widths[i], row_height, column, "T", 'L', 1)
+ end
+ max_height = (pdf.GetY - base_y) if (pdf.GetY - base_y) > max_height
+ pdf.SetXY(col_x + col_widths[i], base_y);
+ end
+ return max_height
+ end
+
+ # Draw lines to close the row (MultiCell border drawing in not uniform)
+ def issues_to_pdf_draw_borders(pdf, top_x, top_y, lower_y,
+ id_width, col_widths)
+ col_x = top_x + id_width
+ pdf.Line(col_x, top_y, col_x, lower_y) # id right border
+ col_widths.each do |width|
+ col_x += width
+ pdf.Line(col_x, top_y, col_x, lower_y) # columns right border
+ end
+ pdf.Line(top_x, top_y, top_x, lower_y) # left border
+ pdf.Line(top_x, lower_y, col_x, lower_y) # bottom border
+ end
+
# Returns a PDF string of a single issue
def issue_to_pdf(issue)
- pdf = IFPDF.new(current_language)
+ pdf = ITCPDF.new(current_language)
pdf.SetTitle("#{issue.project} - ##{issue.tracker} #{issue.id}")
- pdf.AliasNbPages
+ pdf.alias_nb_pages
pdf.footer_date = format_date(Date.today)
pdf.AddPage
-
- pdf.SetFontStyle('B',11)
- pdf.Cell(190,10, "#{issue.project} - #{issue.tracker} # #{issue.id}: #{issue.subject}")
+ pdf.SetFontStyle('B',11)
+ pdf.RDMMultiCell(190,5,
+ "#{issue.project} - #{issue.tracker} # #{issue.id}: #{issue.subject}")
pdf.Ln
-
+
y0 = pdf.GetY
-
+
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_status) + ":","LT")
+ pdf.RDMCell(35,5, l(:field_status) + ":","LT")
pdf.SetFontStyle('',9)
- pdf.Cell(60,5, issue.status.to_s,"RT")
+ pdf.RDMCell(60,5, issue.status.to_s,"RT")
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_priority) + ":","LT")
+ pdf.RDMCell(35,5, l(:field_priority) + ":","LT")
pdf.SetFontStyle('',9)
- pdf.Cell(60,5, issue.priority.to_s,"RT")
+ pdf.RDMCell(60,5, issue.priority.to_s,"RT")
pdf.Ln
-
+
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_author) + ":","L")
+ pdf.RDMCell(35,5, l(:field_author) + ":","L")
pdf.SetFontStyle('',9)
- pdf.Cell(60,5, issue.author.to_s,"R")
+ pdf.RDMCell(60,5, issue.author.to_s,"R")
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_category) + ":","L")
+ pdf.RDMCell(35,5, l(:field_category) + ":","L")
pdf.SetFontStyle('',9)
- pdf.Cell(60,5, issue.category.to_s,"R")
- pdf.Ln
-
+ pdf.RDMCell(60,5, issue.category.to_s,"R")
+ pdf.Ln
+
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_created_on) + ":","L")
+ pdf.RDMCell(35,5, l(:field_created_on) + ":","L")
pdf.SetFontStyle('',9)
- pdf.Cell(60,5, format_date(issue.created_on),"R")
+ pdf.RDMCell(60,5, format_date(issue.created_on),"R")
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_assigned_to) + ":","L")
+ pdf.RDMCell(35,5, l(:field_assigned_to) + ":","L")
pdf.SetFontStyle('',9)
- pdf.Cell(60,5, issue.assigned_to.to_s,"R")
+ pdf.RDMCell(60,5, issue.assigned_to.to_s,"R")
pdf.Ln
-
+
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_updated_on) + ":","LB")
+ pdf.RDMCell(35,5, l(:field_updated_on) + ":","LB")
pdf.SetFontStyle('',9)
- pdf.Cell(60,5, format_date(issue.updated_on),"RB")
+ pdf.RDMCell(60,5, format_date(issue.updated_on),"RB")
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_due_date) + ":","LB")
+ pdf.RDMCell(35,5, l(:field_due_date) + ":","LB")
pdf.SetFontStyle('',9)
- pdf.Cell(60,5, format_date(issue.due_date),"RB")
+ pdf.RDMCell(60,5, format_date(issue.due_date),"RB")
pdf.Ln
-
+
for custom_value in issue.custom_field_values
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, custom_value.custom_field.name + ":","L")
+ pdf.RDMCell(35,5, custom_value.custom_field.name + ":","L")
pdf.SetFontStyle('',9)
- pdf.MultiCell(155,5, (show_value custom_value),"R")
+ pdf.RDMMultiCell(155,5, (show_value custom_value),"R")
end
-
+
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_subject) + ":","LTB")
+ pdf.RDMCell(35,5, l(:field_subject) + ":","LT")
pdf.SetFontStyle('',9)
- pdf.Cell(155,5, issue.subject,"RTB")
- pdf.Ln
-
+ pdf.RDMMultiCell(155,5, issue.subject,"RT")
+
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_description) + ":")
+ pdf.RDMCell(35,5, l(:field_description) + ":","LT")
pdf.SetFontStyle('',9)
- pdf.MultiCell(155,5, issue.description.to_s,"BR")
-
+ pdf.RDMMultiCell(155,5, issue.description.to_s,"RT")
+
pdf.Line(pdf.GetX, y0, pdf.GetX, pdf.GetY)
- pdf.Line(pdf.GetX, pdf.GetY, 170, pdf.GetY)
+ pdf.Line(pdf.GetX, pdf.GetY, pdf.GetX + 190, pdf.GetY)
pdf.Ln
-
- if issue.changesets.any? && User.current.allowed_to?(:view_changesets, issue.project)
+
+ if issue.changesets.any? &&
+ User.current.allowed_to?(:view_changesets, issue.project)
pdf.SetFontStyle('B',9)
- pdf.Cell(190,5, l(:label_associated_revisions), "B")
+ pdf.RDMCell(190,5, l(:label_associated_revisions), "B")
pdf.Ln
for changeset in issue.changesets
pdf.SetFontStyle('B',8)
- pdf.Cell(190,5, format_time(changeset.committed_on) + " - " + changeset.author.to_s)
+ pdf.RDMCell(190,5,
+ format_time(changeset.committed_on) + " - " + changeset.author.to_s)
pdf.Ln
unless changeset.comments.blank?
pdf.SetFontStyle('',8)
- pdf.MultiCell(190,5, changeset.comments.to_s)
- end
+ pdf.RDMMultiCell(190,5, changeset.comments.to_s)
+ end
pdf.Ln
end
end
-
+
pdf.SetFontStyle('B',9)
- pdf.Cell(190,5, l(:label_history), "B")
- pdf.Ln
- for journal in issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
+ pdf.RDMCell(190,5, l(:label_history), "B")
+ pdf.Ln
+ for journal in issue.journals.find(
+ :all, :include => [:user, :details],
+ :order => "#{Journal.table_name}.created_on ASC")
pdf.SetFontStyle('B',8)
- pdf.Cell(190,5, format_time(journal.created_on) + " - " + journal.user.name)
+ pdf.RDMCell(190,5,
+ format_time(journal.created_on) + " - " + journal.user.name)
pdf.Ln
pdf.SetFontStyle('I',8)
for detail in journal.details
- pdf.Cell(190,5, "- " + show_detail(detail, true))
- pdf.Ln
+ pdf.RDMMultiCell(190,5, "- " + show_detail(detail, true))
end
if journal.notes?
+ pdf.Ln unless journal.details.empty?
pdf.SetFontStyle('',8)
- pdf.MultiCell(190,5, journal.notes.to_s)
- end
+ pdf.RDMMultiCell(190,5, journal.notes.to_s)
+ end
pdf.Ln
end
-
+
if issue.attachments.any?
pdf.SetFontStyle('B',9)
- pdf.Cell(190,5, l(:label_attachment_plural), "B")
+ pdf.RDMCell(190,5, l(:label_attachment_plural), "B")
pdf.Ln
for attachment in issue.attachments
pdf.SetFontStyle('',8)
- pdf.Cell(80,5, attachment.filename)
- pdf.Cell(20,5, number_to_human_size(attachment.filesize),0,0,"R")
- pdf.Cell(25,5, format_date(attachment.created_on),0,0,"R")
- pdf.Cell(65,5, attachment.author.name,0,0,"R")
+ pdf.RDMCell(80,5, attachment.filename)
+ pdf.RDMCell(20,5, number_to_human_size(attachment.filesize),0,0,"R")
+ pdf.RDMCell(25,5, format_date(attachment.created_on),0,0,"R")
+ pdf.RDMCell(65,5, attachment.author.name,0,0,"R")
pdf.Ln
end
end
pdf.Output
end
+ class RDMPdfEncoding
+ include Redmine::I18n
+ def self.rdm_pdf_iconv(ic, txt)
+ txt ||= ''
+ if txt.respond_to?(:force_encoding)
+ txt.force_encoding('UTF-8')
+ if l(:general_pdf_encoding).upcase != 'UTF-8'
+ txt = txt.encode(l(:general_pdf_encoding), :invalid => :replace,
+ :undef => :replace, :replace => '?')
+ else
+ txt = Redmine::CodesetUtil.replace_invalid_utf8(txt)
+ end
+ txt.force_encoding('ASCII-8BIT')
+ else
+ ic ||= Iconv.new(l(:general_pdf_encoding), 'UTF-8')
+ txtar = ""
+ begin
+ txtar += ic.iconv(txt)
+ rescue Iconv::IllegalSequence
+ txtar += $!.success
+ txt = '?' + $!.failed[1,$!.failed.length]
+ retry
+ rescue
+ txtar += $!.success
+ end
+ txt = txtar
+ end
+ txt
+ end
+ end
end
end
end
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/export/pdf.rb
--- a/lib/redmine/export/pdf.rb Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/export/pdf.rb Mon Jun 06 14:41:04 2011 +0100
@@ -1,72 +1,81 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2009 Jean-Philippe Lang
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
require 'iconv'
require 'rfpdf/fpdf'
-require 'rfpdf/chinese'
+require 'fpdf/chinese'
+require 'fpdf/japanese'
+require 'fpdf/korean'
module Redmine
module Export
module PDF
include ActionView::Helpers::TextHelper
include ActionView::Helpers::NumberHelper
-
- class IFPDF < FPDF
+
+ class ITCPDF < TCPDF
include Redmine::I18n
attr_accessor :footer_date
-
+
def initialize(lang)
- super()
set_language_if_valid lang
- case current_language.to_s.downcase
- when 'ko'
+ pdf_encoding = l(:general_pdf_encoding).upcase
+ if RUBY_VERSION < '1.9'
+ @ic = Iconv.new(pdf_encoding, 'UTF-8')
+ end
+ super('P', 'mm', 'A4', (pdf_encoding == 'UTF-8'), pdf_encoding)
+ case pdf_encoding
+ when 'UTF-8'
+ @font_for_content = 'FreeSans'
+ @font_for_footer = 'FreeSans'
+ when 'CP949'
extend(PDF_Korean)
AddUHCFont()
@font_for_content = 'UHC'
- @font_for_footer = 'UHC'
- when 'ja'
+ @font_for_footer = 'UHC'
+ when 'CP932'
extend(PDF_Japanese)
AddSJISFont()
@font_for_content = 'SJIS'
- @font_for_footer = 'SJIS'
- when 'zh'
+ @font_for_footer = 'SJIS'
+ when 'GB18030'
extend(PDF_Chinese)
AddGBFont()
@font_for_content = 'GB'
- @font_for_footer = 'GB'
- when 'zh-tw'
+ @font_for_footer = 'GB'
+ when 'BIG5'
extend(PDF_Chinese)
AddBig5Font()
@font_for_content = 'Big5'
- @font_for_footer = 'Big5'
+ @font_for_footer = 'Big5'
else
@font_for_content = 'Arial'
- @font_for_footer = 'Helvetica'
+ @font_for_footer = 'Helvetica'
end
SetCreator(Redmine::Info.app_name)
SetFont(@font_for_content)
end
-
+
def SetFontStyle(style, size)
SetFont(@font_for_content, style, size)
end
-
+
def SetTitle(txt)
txt = begin
utf16txt = Iconv.conv('UTF-16BE', 'UTF-8', txt)
@@ -78,7 +87,7 @@
end || ''
super(txt)
end
-
+
def textstring(s)
# Format a text string
if s =~ /^ space_left
+ pdf.AddPage("L")
+ base_x = pdf.GetX
+ base_y = pdf.GetY
+ end
+
+ # write the cells on page
+ pdf.RDMCell(col_id_width, row_height, issue.id.to_s, "T", 0, 'C', 1)
+ issues_to_pdf_write_cells(pdf, col_values, col_width, row_height)
+ issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, col_id_width, col_width)
+ pdf.SetY(base_y + max_height);
end
+
if issues.size == Setting.issues_export_limit.to_i
pdf.SetFontStyle('B',10)
- pdf.Cell(0, row_height, '...')
+ pdf.RDMCell(0, row_height, '...')
end
pdf.Output
end
+ # Renders MultiCells and returns the maximum height used
+ def issues_to_pdf_write_cells(pdf, col_values, col_widths,
+ row_height, head=false)
+ base_y = pdf.GetY
+ max_height = row_height
+ col_values.each_with_index do |column, i|
+ col_x = pdf.GetX
+ if head == true
+ pdf.RDMMultiCell(col_widths[i], row_height, column.caption, "T", 'L', 1)
+ else
+ pdf.RDMMultiCell(col_widths[i], row_height, column, "T", 'L', 1)
+ end
+ max_height = (pdf.GetY - base_y) if (pdf.GetY - base_y) > max_height
+ pdf.SetXY(col_x + col_widths[i], base_y);
+ end
+ return max_height
+ end
+
+ # Draw lines to close the row (MultiCell border drawing in not uniform)
+ def issues_to_pdf_draw_borders(pdf, top_x, top_y, lower_y,
+ id_width, col_widths)
+ col_x = top_x + id_width
+ pdf.Line(col_x, top_y, col_x, lower_y) # id right border
+ col_widths.each do |width|
+ col_x += width
+ pdf.Line(col_x, top_y, col_x, lower_y) # columns right border
+ end
+ pdf.Line(top_x, top_y, top_x, lower_y) # left border
+ pdf.Line(top_x, lower_y, col_x, lower_y) # bottom border
+ end
+
# Returns a PDF string of a single issue
def issue_to_pdf(issue)
- pdf = IFPDF.new(current_language)
+ pdf = ITCPDF.new(current_language)
pdf.SetTitle("#{issue.project} - ##{issue.tracker} #{issue.id}")
- pdf.AliasNbPages
+ pdf.alias_nb_pages
pdf.footer_date = format_date(Date.today)
pdf.AddPage
-
- pdf.SetFontStyle('B',11)
- pdf.Cell(190,10, "#{issue.project} - #{issue.tracker} # #{issue.id}: #{issue.subject}")
+ pdf.SetFontStyle('B',11)
+ pdf.RDMMultiCell(190,5,
+ "#{issue.project} - #{issue.tracker} # #{issue.id}: #{issue.subject}")
pdf.Ln
-
+
y0 = pdf.GetY
-
+
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_status) + ":","LT")
+ pdf.RDMCell(35,5, l(:field_status) + ":","LT")
pdf.SetFontStyle('',9)
- pdf.Cell(60,5, issue.status.to_s,"RT")
+ pdf.RDMCell(60,5, issue.status.to_s,"RT")
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_priority) + ":","LT")
+ pdf.RDMCell(35,5, l(:field_priority) + ":","LT")
pdf.SetFontStyle('',9)
- pdf.Cell(60,5, issue.priority.to_s,"RT")
+ pdf.RDMCell(60,5, issue.priority.to_s,"RT")
pdf.Ln
-
+
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_author) + ":","L")
+ pdf.RDMCell(35,5, l(:field_author) + ":","L")
pdf.SetFontStyle('',9)
- pdf.Cell(60,5, issue.author.to_s,"R")
+ pdf.RDMCell(60,5, issue.author.to_s,"R")
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_category) + ":","L")
+ pdf.RDMCell(35,5, l(:field_category) + ":","L")
pdf.SetFontStyle('',9)
- pdf.Cell(60,5, issue.category.to_s,"R")
- pdf.Ln
-
+ pdf.RDMCell(60,5, issue.category.to_s,"R")
+ pdf.Ln
+
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_created_on) + ":","L")
+ pdf.RDMCell(35,5, l(:field_created_on) + ":","L")
pdf.SetFontStyle('',9)
- pdf.Cell(60,5, format_date(issue.created_on),"R")
+ pdf.RDMCell(60,5, format_date(issue.created_on),"R")
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_assigned_to) + ":","L")
+ pdf.RDMCell(35,5, l(:field_assigned_to) + ":","L")
pdf.SetFontStyle('',9)
- pdf.Cell(60,5, issue.assigned_to.to_s,"R")
+ pdf.RDMCell(60,5, issue.assigned_to.to_s,"R")
pdf.Ln
-
+
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_updated_on) + ":","LB")
+ pdf.RDMCell(35,5, l(:field_updated_on) + ":","LB")
pdf.SetFontStyle('',9)
- pdf.Cell(60,5, format_date(issue.updated_on),"RB")
+ pdf.RDMCell(60,5, format_date(issue.updated_on),"RB")
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_due_date) + ":","LB")
+ pdf.RDMCell(35,5, l(:field_due_date) + ":","LB")
pdf.SetFontStyle('',9)
- pdf.Cell(60,5, format_date(issue.due_date),"RB")
+ pdf.RDMCell(60,5, format_date(issue.due_date),"RB")
pdf.Ln
-
+
for custom_value in issue.custom_field_values
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, custom_value.custom_field.name + ":","L")
+ pdf.RDMCell(35,5, custom_value.custom_field.name + ":","L")
pdf.SetFontStyle('',9)
- pdf.MultiCell(155,5, (show_value custom_value),"R")
+ pdf.RDMMultiCell(155,5, (show_value custom_value),"R")
end
-
+
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_subject) + ":","LTB")
+ pdf.RDMCell(35,5, l(:field_subject) + ":","LT")
pdf.SetFontStyle('',9)
- pdf.Cell(155,5, issue.subject,"RTB")
- pdf.Ln
-
+ pdf.RDMMultiCell(155,5, issue.subject,"RT")
+
pdf.SetFontStyle('B',9)
- pdf.Cell(35,5, l(:field_description) + ":")
+ pdf.RDMCell(35,5, l(:field_description) + ":","LT")
pdf.SetFontStyle('',9)
- pdf.MultiCell(155,5, issue.description.to_s,"BR")
-
+ pdf.RDMMultiCell(155,5, issue.description.to_s,"RT")
+
pdf.Line(pdf.GetX, y0, pdf.GetX, pdf.GetY)
- pdf.Line(pdf.GetX, pdf.GetY, 170, pdf.GetY)
+ pdf.Line(pdf.GetX, pdf.GetY, pdf.GetX + 190, pdf.GetY)
pdf.Ln
-
- if issue.changesets.any? && User.current.allowed_to?(:view_changesets, issue.project)
+
+ if issue.changesets.any? &&
+ User.current.allowed_to?(:view_changesets, issue.project)
pdf.SetFontStyle('B',9)
- pdf.Cell(190,5, l(:label_associated_revisions), "B")
+ pdf.RDMCell(190,5, l(:label_associated_revisions), "B")
pdf.Ln
for changeset in issue.changesets
pdf.SetFontStyle('B',8)
- pdf.Cell(190,5, format_time(changeset.committed_on) + " - " + changeset.author.to_s)
+ pdf.RDMCell(190,5,
+ format_time(changeset.committed_on) + " - " + changeset.author.to_s)
pdf.Ln
unless changeset.comments.blank?
pdf.SetFontStyle('',8)
- pdf.MultiCell(190,5, changeset.comments.to_s)
- end
+ pdf.RDMMultiCell(190,5, changeset.comments.to_s)
+ end
pdf.Ln
end
end
-
+
pdf.SetFontStyle('B',9)
- pdf.Cell(190,5, l(:label_history), "B")
- pdf.Ln
- for journal in issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
+ pdf.RDMCell(190,5, l(:label_history), "B")
+ pdf.Ln
+ for journal in issue.journals.find(
+ :all, :include => [:user, :details],
+ :order => "#{Journal.table_name}.created_on ASC")
pdf.SetFontStyle('B',8)
- pdf.Cell(190,5, format_time(journal.created_on) + " - " + journal.user.name)
+ pdf.RDMCell(190,5,
+ format_time(journal.created_on) + " - " + journal.user.name)
pdf.Ln
pdf.SetFontStyle('I',8)
for detail in journal.details
- pdf.Cell(190,5, "- " + show_detail(detail, true))
- pdf.Ln
+ pdf.RDMMultiCell(190,5, "- " + show_detail(detail, true))
end
if journal.notes?
+ pdf.Ln unless journal.details.empty?
pdf.SetFontStyle('',8)
- pdf.MultiCell(190,5, journal.notes.to_s)
- end
+ pdf.RDMMultiCell(190,5, journal.notes.to_s)
+ end
pdf.Ln
end
-
+
if issue.attachments.any?
pdf.SetFontStyle('B',9)
- pdf.Cell(190,5, l(:label_attachment_plural), "B")
+ pdf.RDMCell(190,5, l(:label_attachment_plural), "B")
pdf.Ln
for attachment in issue.attachments
pdf.SetFontStyle('',8)
- pdf.Cell(80,5, attachment.filename)
- pdf.Cell(20,5, number_to_human_size(attachment.filesize),0,0,"R")
- pdf.Cell(25,5, format_date(attachment.created_on),0,0,"R")
- pdf.Cell(65,5, attachment.author.name,0,0,"R")
+ pdf.RDMCell(80,5, attachment.filename)
+ pdf.RDMCell(20,5, number_to_human_size(attachment.filesize),0,0,"R")
+ pdf.RDMCell(25,5, format_date(attachment.created_on),0,0,"R")
+ pdf.RDMCell(65,5, attachment.author.name,0,0,"R")
pdf.Ln
end
end
pdf.Output
end
+ class RDMPdfEncoding
+ include Redmine::I18n
+ def self.rdm_pdf_iconv(ic, txt)
+ txt ||= ''
+ if txt.respond_to?(:force_encoding)
+ txt.force_encoding('UTF-8')
+ if l(:general_pdf_encoding).upcase != 'UTF-8'
+ txt = txt.encode(l(:general_pdf_encoding), :invalid => :replace,
+ :undef => :replace, :replace => '?')
+ else
+ txt = Redmine::CodesetUtil.replace_invalid_utf8(txt)
+ end
+ txt.force_encoding('ASCII-8BIT')
+ else
+ ic ||= Iconv.new(l(:general_pdf_encoding), 'UTF-8')
+ txtar = ""
+ begin
+ txtar += ic.iconv(txt)
+ rescue Iconv::IllegalSequence
+ txtar += $!.success
+ txt = '?' + $!.failed[1,$!.failed.length]
+ retry
+ rescue
+ txtar += $!.success
+ end
+ txt = txtar
+ end
+ txt
+ end
+ end
end
end
end
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/helpers/.svn/all-wcprops
--- a/lib/redmine/helpers/.svn/all-wcprops Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/helpers/.svn/all-wcprops Mon Jun 06 14:41:04 2011 +0100
@@ -1,23 +1,17 @@
K 25
svn:wc:ra_dav:version-url
-V 44
-/svn/!svn/ver/4968/trunk/lib/redmine/helpers
+V 58
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/helpers
END
gantt.rb
K 25
svn:wc:ra_dav:version-url
-V 53
-/svn/!svn/ver/4968/trunk/lib/redmine/helpers/gantt.rb
-END
-diff.rb
-K 25
-svn:wc:ra_dav:version-url
-V 52
-/svn/!svn/ver/4953/trunk/lib/redmine/helpers/diff.rb
+V 67
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/helpers/gantt.rb
END
calendar.rb
K 25
svn:wc:ra_dav:version-url
-V 56
-/svn/!svn/ver/3166/trunk/lib/redmine/helpers/calendar.rb
+V 70
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/helpers/calendar.rb
END
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/helpers/.svn/entries
--- a/lib/redmine/helpers/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/helpers/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,15 +1,15 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/lib/redmine/helpers
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine/helpers
http://redmine.rubyforge.org/svn
-2011-02-28T20:23:28.847227Z
-4968
-jplang
+2011-05-09T11:12:27.265905Z
+5720
+tmaruyama
@@ -32,11 +32,11 @@
-2011-03-03T11:40:18.000000Z
-b06b1d003a56093679e3004b619b0e04
-2011-02-28T20:23:28.847227Z
-4968
-jplang
+2011-06-06T13:20:53.000000Z
+111af23362cad335d5d23c03cc7668d1
+2011-05-09T11:12:27.265905Z
+5720
+tmaruyama
has-props
@@ -58,7 +58,7 @@
-32380
+31709
diff.rb
file
@@ -66,7 +66,7 @@
-2011-03-03T11:40:18.000000Z
+2011-06-06T13:15:00.000000Z
a3487dfca2baab10aacea141b7c0fc5f
2011-02-27T12:50:47.369941Z
4953
@@ -100,11 +100,11 @@
-2011-03-03T11:05:14.000000Z
-0a7d81755cf7c1519d4b4c1d84712139
-2009-12-13T04:06:55.726600Z
-3166
-edavis10
+2011-06-06T13:20:53.000000Z
+4e48abe08914d8b6e345e9752257a603
+2011-03-27T15:43:26.269165Z
+5228
+jplang
has-props
@@ -126,5 +126,5 @@
-2733
+2787
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/helpers/.svn/text-base/calendar.rb.svn-base
--- a/lib/redmine/helpers/.svn/text-base/calendar.rb.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/helpers/.svn/text-base/calendar.rb.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -68,6 +68,8 @@
case Setting.start_of_week.to_i
when 1
@first_dow ||= (1 - 1)%7 + 1
+ when 6
+ @first_dow ||= (6 - 1)%7 + 1
when 7
@first_dow ||= (7 - 1)%7 + 1
else
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/helpers/.svn/text-base/gantt.rb.svn-base
--- a/lib/redmine/helpers/.svn/text-base/gantt.rb.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/helpers/.svn/text-base/gantt.rb.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -1,16 +1,16 @@
# Redmine - project management software
-# Copyright (C) 2006-2008 Jean-Philippe Lang
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -38,10 +38,10 @@
attr_accessor :query
attr_accessor :project
attr_accessor :view
-
+
def initialize(options={})
options = options.dup
-
+
if options[:year] && options[:year].to_i >0
@year_from = options[:year].to_i
if options[:month] && options[:month].to_i >=1 && options[:month].to_i <= 12
@@ -53,27 +53,27 @@
@month_from ||= Date.today.month
@year_from ||= Date.today.year
end
-
+
zoom = (options[:zoom] || User.current.pref[:gantt_zoom]).to_i
- @zoom = (zoom > 0 && zoom < 5) ? zoom : 2
+ @zoom = (zoom > 0 && zoom < 5) ? zoom : 2
months = (options[:months] || User.current.pref[:gantt_months]).to_i
@months = (months > 0 && months < 25) ? months : 6
-
+
# Save gantt parameters as user preference (zoom and months count)
if (User.current.logged? && (@zoom != User.current.pref[:gantt_zoom] || @months != User.current.pref[:gantt_months]))
User.current.pref[:gantt_zoom], User.current.pref[:gantt_months] = @zoom, @months
User.current.preference.save
end
-
+
@date_from = Date.civil(@year_from, @month_from, 1)
@date_to = (@date_from >> @months) - 1
-
+
@subjects = ''
@lines = ''
@number_of_rows = nil
-
+
@issue_ancestors = []
-
+
@truncated = false
if options.has_key?(:max_rows)
@max_rows = options[:max_rows]
@@ -85,61 +85,35 @@
def common_params
{ :controller => 'gantts', :action => 'show', :project_id => @project }
end
-
+
def params
common_params.merge({ :zoom => zoom, :year => year_from, :month => month_from, :months => months })
end
-
+
def params_previous
common_params.merge({:year => (date_from << months).year, :month => (date_from << months).month, :zoom => zoom, :months => months })
end
-
+
def params_next
common_params.merge({:year => (date_from >> months).year, :month => (date_from >> months).month, :zoom => zoom, :months => months })
end
- ### Extracted from the HTML view/helpers
# Returns the number of rows that will be rendered on the Gantt chart
def number_of_rows
return @number_of_rows if @number_of_rows
-
- rows = if @project
- number_of_rows_on_project(@project)
- else
- Project.roots.visible.has_module('issue_tracking').inject(0) do |total, project|
- total += number_of_rows_on_project(project)
- end
- end
-
+
+ rows = projects.inject(0) {|total, p| total += number_of_rows_on_project(p)}
rows > @max_rows ? @max_rows : rows
end
# Returns the number of rows that will be used to list a project on
# the Gantt chart. This will recurse for each subproject.
def number_of_rows_on_project(project)
- # Remove the project requirement for Versions because it will
- # restrict issues to only be on the current project. This
- # ends up missing issues which are assigned to shared versions.
- @query.project = nil if @query.project
+ return 0 unless projects.include?(project)
- # One Root project
count = 1
- # Issues without a Version
- count += project.issues.for_gantt.without_version.with_query(@query).count
-
- # Versions
- count += project.versions.count
-
- # Issues on the Versions
- project.versions.each do |version|
- count += version.fixed_issues.for_gantt.with_query(@query).count
- end
-
- # Subprojects
- project.children.visible.has_module('issue_tracking').each do |subproject|
- count += number_of_rows_on_project(subproject)
- end
-
+ count += project_issues(project).size
+ count += project_versions(project).size
count
end
@@ -154,96 +128,119 @@
render(options.merge(:only => :lines)) unless @lines_rendered
@lines
end
-
+
+ # Returns issues that will be rendered
+ def issues
+ @issues ||= @query.issues(
+ :include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
+ :order => "#{Project.table_name}.lft ASC, #{Issue.table_name}.id ASC",
+ :limit => @max_rows
+ )
+ end
+
+ # Return all the project nodes that will be displayed
+ def projects
+ return @projects if @projects
+
+ ids = issues.collect(&:project).uniq.collect(&:id)
+ if ids.any?
+ # All issues projects and their visible ancestors
+ @projects = Project.visible.all(
+ :joins => "LEFT JOIN #{Project.table_name} child ON #{Project.table_name}.lft <= child.lft AND #{Project.table_name}.rgt >= child.rgt",
+ :conditions => ["child.id IN (?)", ids],
+ :order => "#{Project.table_name}.lft ASC"
+ ).uniq
+ else
+ @projects = []
+ end
+ end
+
+ # Returns the issues that belong to +project+
+ def project_issues(project)
+ @issues_by_project ||= issues.group_by(&:project)
+ @issues_by_project[project] || []
+ end
+
+ # Returns the distinct versions of the issues that belong to +project+
+ def project_versions(project)
+ project_issues(project).collect(&:fixed_version).compact.uniq
+ end
+
+ # Returns the issues that belong to +project+ and are assigned to +version+
+ def version_issues(project, version)
+ project_issues(project).select {|issue| issue.fixed_version == version}
+ end
+
def render(options={})
- options = {:indent => 4, :render => :subject, :format => :html}.merge(options)
-
+ options = {:top => 0, :top_increment => 20, :indent_increment => 20, :render => :subject, :format => :html}.merge(options)
+ indent = options[:indent] || 4
+
@subjects = '' unless options[:only] == :lines
@lines = '' unless options[:only] == :subjects
@number_of_rows = 0
-
- if @project
- render_project(@project, options)
- else
- Project.roots.visible.has_module('issue_tracking').each do |project|
- render_project(project, options)
- break if abort?
- end
+
+ Project.project_tree(projects) do |project, level|
+ options[:indent] = indent + level * options[:indent_increment]
+ render_project(project, options)
+ break if abort?
end
-
+
@subjects_rendered = true unless options[:only] == :lines
@lines_rendered = true unless options[:only] == :subjects
-
+
render_end(options)
end
def render_project(project, options={})
- options[:top] = 0 unless options.key? :top
- options[:indent_increment] = 20 unless options.key? :indent_increment
- options[:top_increment] = 20 unless options.key? :top_increment
-
subject_for_project(project, options) unless options[:only] == :lines
line_for_project(project, options) unless options[:only] == :subjects
-
+
options[:top] += options[:top_increment]
options[:indent] += options[:indent_increment]
@number_of_rows += 1
return if abort?
-
- # Second, Issues without a version
- issues = project.issues.for_gantt.without_version.with_query(@query).all(:limit => current_limit)
+
+ issues = project_issues(project).select {|i| i.fixed_version.nil?}
sort_issues!(issues)
if issues
render_issues(issues, options)
return if abort?
end
- # Third, Versions
- project.versions.sort.each do |version|
- render_version(version, options)
- return if abort?
+ versions = project_versions(project)
+ versions.each do |version|
+ render_version(project, version, options)
end
- # Fourth, subprojects
- project.children.visible.has_module('issue_tracking').each do |project|
- render_project(project, options)
- return if abort?
- end unless project.leaf?
-
# Remove indent to hit the next sibling
options[:indent] -= options[:indent_increment]
end
def render_issues(issues, options={})
@issue_ancestors = []
-
+
issues.each do |i|
subject_for_issue(i, options) unless options[:only] == :lines
line_for_issue(i, options) unless options[:only] == :subjects
-
+
options[:top] += options[:top_increment]
@number_of_rows += 1
break if abort?
end
-
+
options[:indent] -= (options[:indent_increment] * @issue_ancestors.size)
end
- def render_version(version, options={})
+ def render_version(project, version, options={})
# Version header
subject_for_version(version, options) unless options[:only] == :lines
line_for_version(version, options) unless options[:only] == :subjects
-
+
options[:top] += options[:top_increment]
@number_of_rows += 1
return if abort?
-
- # Remove the project requirement for Versions because it will
- # restrict issues to only be on the current project. This
- # ends up missing issues which are assigned to shared versions.
- @query.project = nil if @query.project
-
- issues = version.fixed_issues.for_gantt.with_query(@query).all(:limit => current_limit)
+
+ issues = version_issues(project, version)
if issues
sort_issues!(issues)
# Indent issues
@@ -252,10 +249,10 @@
options[:indent] -= options[:indent_increment]
end
end
-
+
def render_end(options={})
case options[:format]
- when :pdf
+ when :pdf
options[:pdf].Line(15, options[:top], PDF::TotalWidth, options[:top])
end
end
@@ -280,10 +277,10 @@
if project.is_a?(Project) && project.start_date && project.due_date
options[:zoom] ||= 1
options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom]
-
+
coords = coordinates(project.start_date, project.due_date, nil, options[:zoom])
label = h(project)
-
+
case options[:format]
when :html
html_task(options, coords, :css => "project task", :label => label, :markers => true)
@@ -318,7 +315,7 @@
if version.is_a?(Version) && version.start_date && version.due_date
options[:zoom] ||= 1
options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom]
-
+
coords = coordinates(version.start_date, version.due_date, version.completed_pourcent, options[:zoom])
label = "#{h version } #{h version.completed_pourcent.to_i.to_s}%"
label = h("#{version.project} -") + label unless @project && @project == version.project
@@ -342,14 +339,14 @@
@issue_ancestors.pop
options[:indent] -= options[:indent_increment]
end
-
+
output = case options[:format]
when :html
css_classes = ''
css_classes << ' issue-overdue' if issue.overdue?
css_classes << ' issue-behind-schedule' if issue.behind_schedule?
css_classes << ' icon icon-issue' unless Setting.gravatar_enabled? && issue.assigned_to
-
+
subject = ""
if issue.assigned_to.present?
assigned_string = l(:field_assigned_to) + ": " + issue.assigned_to.name
@@ -369,7 +366,7 @@
@issue_ancestors << issue
options[:indent] += options[:indent_increment]
end
-
+
output
end
@@ -378,7 +375,7 @@
if issue.is_a?(Issue) && issue.due_before
coords = coordinates(issue.start_date, issue.due_before, issue.done_ratio, options[:zoom])
label = "#{ issue.status.name } #{ issue.done_ratio }%"
-
+
case options[:format]
when :html
html_task(options, coords, :css => "task " + (issue.leaf? ? 'leaf' : 'parent'), :label => label, :issue => issue, :markers => !issue.leaf?)
@@ -396,31 +393,31 @@
# Generates a gantt image
# Only defined if RMagick is avalaible
def to_image(format='PNG')
- date_to = (@date_from >> @months)-1
+ date_to = (@date_from >> @months)-1
show_weeks = @zoom > 1
show_days = @zoom > 2
-
+
subject_width = 400
- header_heigth = 18
+ header_height = 18
# width of one day in pixels
zoom = @zoom*2
g_width = (@date_to - @date_from + 1)*zoom
g_height = 20 * number_of_rows + 30
- headers_heigth = (show_weeks ? 2*header_heigth : header_heigth)
- height = g_height + headers_heigth
-
+ headers_height = (show_weeks ? 2*header_height : header_height)
+ height = g_height + headers_height
+
imgl = Magick::ImageList.new
imgl.new_image(subject_width+g_width+1, height)
gc = Magick::Draw.new
-
+
# Subjects
gc.stroke('transparent')
- subjects(:image => gc, :top => (headers_heigth + 20), :indent => 4, :format => :image)
-
+ subjects(:image => gc, :top => (headers_height + 20), :indent => 4, :format => :image)
+
# Months headers
month_f = @date_from
left = subject_width
- @months.times do
+ @months.times do
width = ((month_f >> 1) - month_f) * zoom
gc.fill('white')
gc.stroke('grey')
@@ -433,11 +430,11 @@
left = left + width
month_f = month_f >> 1
end
-
+
# Weeks headers
if show_weeks
left = subject_width
- height = header_heigth
+ height = header_height
if @date_from.cwday == 1
# date_from is monday
week_f = date_from
@@ -448,7 +445,7 @@
gc.fill('white')
gc.stroke('grey')
gc.stroke_width(1)
- gc.rectangle(left, header_heigth, left + width, 2*header_heigth + g_height-1)
+ gc.rectangle(left, header_height, left + width, 2*header_height + g_height-1)
left = left + width
end
while week_f <= date_to
@@ -456,111 +453,111 @@
gc.fill('white')
gc.stroke('grey')
gc.stroke_width(1)
- gc.rectangle(left.round, header_heigth, left.round + width, 2*header_heigth + g_height-1)
+ gc.rectangle(left.round, header_height, left.round + width, 2*header_height + g_height-1)
gc.fill('black')
gc.stroke('transparent')
gc.stroke_width(1)
- gc.text(left.round + 2, header_heigth + 14, week_f.cweek.to_s)
+ gc.text(left.round + 2, header_height + 14, week_f.cweek.to_s)
left = left + width
week_f = week_f+7
end
end
-
+
# Days details (week-end in grey)
if show_days
left = subject_width
- height = g_height + header_heigth - 1
+ height = g_height + header_height - 1
wday = @date_from.cwday
- (date_to - @date_from + 1).to_i.times do
+ (date_to - @date_from + 1).to_i.times do
width = zoom
gc.fill(wday == 6 || wday == 7 ? '#eee' : 'white')
gc.stroke('#ddd')
gc.stroke_width(1)
- gc.rectangle(left, 2*header_heigth, left + width, 2*header_heigth + g_height-1)
+ gc.rectangle(left, 2*header_height, left + width, 2*header_height + g_height-1)
left = left + width
wday = wday + 1
wday = 1 if wday > 7
end
end
-
+
# border
gc.fill('transparent')
gc.stroke('grey')
gc.stroke_width(1)
- gc.rectangle(0, 0, subject_width+g_width, headers_heigth)
+ gc.rectangle(0, 0, subject_width+g_width, headers_height)
gc.stroke('black')
- gc.rectangle(0, 0, subject_width+g_width, g_height+ headers_heigth-1)
-
+ gc.rectangle(0, 0, subject_width+g_width, g_height+ headers_height-1)
+
# content
- top = headers_heigth + 20
+ top = headers_height + 20
gc.stroke('transparent')
lines(:image => gc, :top => top, :zoom => zoom, :subject_width => subject_width, :format => :image)
-
+
# today red line
if Date.today >= @date_from and Date.today <= date_to
gc.stroke('red')
x = (Date.today-@date_from+1)*zoom + subject_width
- gc.line(x, headers_heigth, x, headers_heigth + g_height-1)
- end
-
+ gc.line(x, headers_height, x, headers_height + g_height-1)
+ end
+
gc.draw(imgl)
imgl.format = format
imgl.to_blob
end if Object.const_defined?(:Magick)
def to_pdf
- pdf = ::Redmine::Export::PDF::IFPDF.new(current_language)
+ pdf = ::Redmine::Export::PDF::ITCPDF.new(current_language)
pdf.SetTitle("#{l(:label_gantt)} #{project}")
- pdf.AliasNbPages
+ pdf.alias_nb_pages
pdf.footer_date = format_date(Date.today)
pdf.AddPage("L")
pdf.SetFontStyle('B',12)
pdf.SetX(15)
- pdf.Cell(PDF::LeftPaneWidth, 20, project.to_s)
+ pdf.RDMCell(PDF::LeftPaneWidth, 20, project.to_s)
pdf.Ln
pdf.SetFontStyle('B',9)
-
+
subject_width = PDF::LeftPaneWidth
- header_heigth = 5
-
- headers_heigth = header_heigth
+ header_height = 5
+
+ headers_height = header_height
show_weeks = false
show_days = false
-
+
if self.months < 7
show_weeks = true
- headers_heigth = 2*header_heigth
+ headers_height = 2*header_height
if self.months < 3
show_days = true
- headers_heigth = 3*header_heigth
+ headers_height = 3*header_height
end
end
-
+
g_width = PDF.right_pane_width
zoom = (g_width) / (self.date_to - self.date_from + 1)
g_height = 120
- t_height = g_height + headers_heigth
-
+ t_height = g_height + headers_height
+
y_start = pdf.GetY
-
+
# Months headers
month_f = self.date_from
left = subject_width
- height = header_heigth
- self.months.times do
- width = ((month_f >> 1) - month_f) * zoom
+ height = header_height
+ self.months.times do
+ width = ((month_f >> 1) - month_f) * zoom
pdf.SetY(y_start)
pdf.SetX(left)
- pdf.Cell(width, height, "#{month_f.year}-#{month_f.month}", "LTR", 0, "C")
+ pdf.RDMCell(width, height, "#{month_f.year}-#{month_f.month}", "LTR", 0, "C")
left = left + width
month_f = month_f >> 1
- end
-
+ end
+
# Weeks headers
if show_weeks
left = subject_width
- height = header_heigth
+ height = header_height
if self.date_from.cwday == 1
# self.date_from is monday
week_f = self.date_from
@@ -568,44 +565,44 @@
# find next monday after self.date_from
week_f = self.date_from + (7 - self.date_from.cwday + 1)
width = (7 - self.date_from.cwday + 1) * zoom-1
- pdf.SetY(y_start + header_heigth)
+ pdf.SetY(y_start + header_height)
pdf.SetX(left)
- pdf.Cell(width + 1, height, "", "LTR")
+ pdf.RDMCell(width + 1, height, "", "LTR")
left = left + width+1
end
while week_f <= self.date_to
width = (week_f + 6 <= self.date_to) ? 7 * zoom : (self.date_to - week_f + 1) * zoom
- pdf.SetY(y_start + header_heigth)
+ pdf.SetY(y_start + header_height)
pdf.SetX(left)
- pdf.Cell(width, height, (width >= 5 ? week_f.cweek.to_s : ""), "LTR", 0, "C")
+ pdf.RDMCell(width, height, (width >= 5 ? week_f.cweek.to_s : ""), "LTR", 0, "C")
left = left + width
week_f = week_f+7
end
end
-
+
# Days headers
if show_days
left = subject_width
- height = header_heigth
+ height = header_height
wday = self.date_from.cwday
pdf.SetFontStyle('B',7)
- (self.date_to - self.date_from + 1).to_i.times do
+ (self.date_to - self.date_from + 1).to_i.times do
width = zoom
- pdf.SetY(y_start + 2 * header_heigth)
+ pdf.SetY(y_start + 2 * header_height)
pdf.SetX(left)
- pdf.Cell(width, height, day_name(wday).first, "LTR", 0, "C")
+ pdf.RDMCell(width, height, day_name(wday).first, "LTR", 0, "C")
left = left + width
wday = wday + 1
wday = 1 if wday > 7
end
end
-
+
pdf.SetY(y_start)
pdf.SetX(15)
- pdf.Cell(subject_width+g_width-15, headers_heigth, "", 1)
-
+ pdf.RDMCell(subject_width+g_width-15, headers_height, "", 1)
+
# Tasks
- top = headers_heigth + y_start
+ top = headers_height + y_start
options = {
:top => top,
:zoom => zoom,
@@ -620,12 +617,12 @@
render(options)
pdf.Output
end
-
+
private
-
+
def coordinates(start_date, end_date, progress, zoom=nil)
zoom ||= @zoom
-
+
coords = {}
if start_date && end_date && start_date < self.date_to && end_date > self.date_from
if start_date > self.date_from
@@ -640,17 +637,17 @@
else
coords[:bar_end] = self.date_to - self.date_from + 1
end
-
+
if progress
- progress_date = start_date + (end_date - start_date) * (progress / 100.0)
+ progress_date = start_date + (end_date - start_date + 1) * (progress / 100.0)
if progress_date > self.date_from && progress_date > start_date
if progress_date < self.date_to
- coords[:bar_progress_end] = progress_date - self.date_from + 1
+ coords[:bar_progress_end] = progress_date - self.date_from
else
coords[:bar_progress_end] = self.date_to - self.date_from + 1
end
end
-
+
if progress_date < Date.today
late_date = [Date.today, end_date].min
if late_date > self.date_from && late_date > start_date
@@ -663,7 +660,7 @@
end
end
end
-
+
# Transforms dates into pixels witdh
coords.keys.each do |key|
coords[key] = (coords[key] * zoom).floor
@@ -675,7 +672,7 @@
def sort_issues!(issues)
issues.sort! { |a, b| gantt_issue_compare(a, b, issues) }
end
-
+
# TODO: top level issues should be sorted by start date
def gantt_issue_compare(x, y, issues)
if x.root_id == y.root_id
@@ -684,7 +681,7 @@
x.root_id <=> y.root_id
end
end
-
+
def current_limit
if @max_rows
@max_rows - @number_of_rows
@@ -692,13 +689,13 @@
nil
end
end
-
+
def abort?
if @max_rows && @number_of_rows >= @max_rows
@truncated = true
end
end
-
+
def pdf_new_page?(options)
if options[:top] > 180
options[:pdf].Line(15, options[:top], PDF::TotalWidth, options[:top])
@@ -707,41 +704,41 @@
options[:pdf].Line(15, options[:top] - 0.1, PDF::TotalWidth, options[:top] - 0.1)
end
end
-
+
def html_subject(params, subject, options={})
style = "position: absolute;top:#{params[:top]}px;left:#{params[:indent]}px;"
style << "width:#{params[:subject_width] - params[:indent]}px;" if params[:subject_width]
-
+
output = view.content_tag 'div', subject, :class => options[:css], :style => style, :title => options[:title]
@subjects << output
output
end
-
+
def pdf_subject(params, subject, options={})
params[:pdf].SetY(params[:top])
params[:pdf].SetX(15)
-
+
char_limit = PDF::MaxCharactorsForSubject - params[:indent]
- params[:pdf].Cell(params[:subject_width]-15, 5, (" " * params[:indent]) + subject.to_s.sub(/^(.{#{char_limit}}[^\s]*\s).*$/, '\1 (...)'), "LR")
-
+ params[:pdf].RDMCell(params[:subject_width]-15, 5, (" " * params[:indent]) + subject.to_s.sub(/^(.{#{char_limit}}[^\s]*\s).*$/, '\1 (...)'), "LR")
+
params[:pdf].SetY(params[:top])
params[:pdf].SetX(params[:subject_width])
- params[:pdf].Cell(params[:g_width], 5, "", "LR")
+ params[:pdf].RDMCell(params[:g_width], 5, "", "LR")
end
-
+
def image_subject(params, subject, options={})
params[:image].fill('black')
params[:image].stroke('transparent')
params[:image].stroke_width(1)
params[:image].text(params[:indent], params[:top] + 2, subject)
end
-
+
def html_task(params, coords, options={})
output = ''
# Renders the task bar, with progress and late
if coords[:bar_start] && coords[:bar_end]
output << "
"
-
+
if coords[:bar_late_end]
output << "
"
end
@@ -774,28 +771,28 @@
@lines << output
output
end
-
+
def pdf_task(params, coords, options={})
height = options[:height] || 2
-
+
# Renders the task bar, with progress and late
if coords[:bar_start] && coords[:bar_end]
params[:pdf].SetY(params[:top]+1.5)
params[:pdf].SetX(params[:subject_width] + coords[:bar_start])
params[:pdf].SetFillColor(200,200,200)
- params[:pdf].Cell(coords[:bar_end] - coords[:bar_start], height, "", 0, 0, "", 1)
-
+ params[:pdf].RDMCell(coords[:bar_end] - coords[:bar_start], height, "", 0, 0, "", 1)
+
if coords[:bar_late_end]
params[:pdf].SetY(params[:top]+1.5)
params[:pdf].SetX(params[:subject_width] + coords[:bar_start])
params[:pdf].SetFillColor(255,100,100)
- params[:pdf].Cell(coords[:bar_late_end] - coords[:bar_start], height, "", 0, 0, "", 1)
+ params[:pdf].RDMCell(coords[:bar_late_end] - coords[:bar_start], height, "", 0, 0, "", 1)
end
if coords[:bar_progress_end]
params[:pdf].SetY(params[:top]+1.5)
params[:pdf].SetX(params[:subject_width] + coords[:bar_start])
params[:pdf].SetFillColor(90,200,90)
- params[:pdf].Cell(coords[:bar_progress_end] - coords[:bar_start], height, "", 0, 0, "", 1)
+ params[:pdf].RDMCell(coords[:bar_progress_end] - coords[:bar_start], height, "", 0, 0, "", 1)
end
end
# Renders the markers
@@ -804,30 +801,30 @@
params[:pdf].SetY(params[:top] + 1)
params[:pdf].SetX(params[:subject_width] + coords[:start] - 1)
params[:pdf].SetFillColor(50,50,200)
- params[:pdf].Cell(2, 2, "", 0, 0, "", 1)
+ params[:pdf].RDMCell(2, 2, "", 0, 0, "", 1)
end
if coords[:end]
params[:pdf].SetY(params[:top] + 1)
params[:pdf].SetX(params[:subject_width] + coords[:end] - 1)
params[:pdf].SetFillColor(50,50,200)
- params[:pdf].Cell(2, 2, "", 0, 0, "", 1)
+ params[:pdf].RDMCell(2, 2, "", 0, 0, "", 1)
end
end
# Renders the label on the right
if options[:label]
params[:pdf].SetX(params[:subject_width] + (coords[:bar_end] || 0) + 5)
- params[:pdf].Cell(30, 2, options[:label])
+ params[:pdf].RDMCell(30, 2, options[:label])
end
end
def image_task(params, coords, options={})
height = options[:height] || 6
-
+
# Renders the task bar, with progress and late
if coords[:bar_start] && coords[:bar_end]
params[:image].fill('#aaa')
params[:image].rectangle(params[:subject_width] + coords[:bar_start], params[:top], params[:subject_width] + coords[:bar_end], params[:top] - height)
-
+
if coords[:bar_late_end]
params[:image].fill('#f66')
params[:image].rectangle(params[:subject_width] + coords[:bar_start], params[:top], params[:subject_width] + coords[:bar_late_end], params[:top] - height)
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/helpers/calendar.rb
--- a/lib/redmine/helpers/calendar.rb Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/helpers/calendar.rb Mon Jun 06 14:41:04 2011 +0100
@@ -68,6 +68,8 @@
case Setting.start_of_week.to_i
when 1
@first_dow ||= (1 - 1)%7 + 1
+ when 6
+ @first_dow ||= (6 - 1)%7 + 1
when 7
@first_dow ||= (7 - 1)%7 + 1
else
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/helpers/gantt.rb
--- a/lib/redmine/helpers/gantt.rb Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/helpers/gantt.rb Mon Jun 06 14:41:04 2011 +0100
@@ -1,16 +1,16 @@
# Redmine - project management software
-# Copyright (C) 2006-2008 Jean-Philippe Lang
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -38,10 +38,10 @@
attr_accessor :query
attr_accessor :project
attr_accessor :view
-
+
def initialize(options={})
options = options.dup
-
+
if options[:year] && options[:year].to_i >0
@year_from = options[:year].to_i
if options[:month] && options[:month].to_i >=1 && options[:month].to_i <= 12
@@ -53,27 +53,27 @@
@month_from ||= Date.today.month
@year_from ||= Date.today.year
end
-
+
zoom = (options[:zoom] || User.current.pref[:gantt_zoom]).to_i
- @zoom = (zoom > 0 && zoom < 5) ? zoom : 2
+ @zoom = (zoom > 0 && zoom < 5) ? zoom : 2
months = (options[:months] || User.current.pref[:gantt_months]).to_i
@months = (months > 0 && months < 25) ? months : 6
-
+
# Save gantt parameters as user preference (zoom and months count)
if (User.current.logged? && (@zoom != User.current.pref[:gantt_zoom] || @months != User.current.pref[:gantt_months]))
User.current.pref[:gantt_zoom], User.current.pref[:gantt_months] = @zoom, @months
User.current.preference.save
end
-
+
@date_from = Date.civil(@year_from, @month_from, 1)
@date_to = (@date_from >> @months) - 1
-
+
@subjects = ''
@lines = ''
@number_of_rows = nil
-
+
@issue_ancestors = []
-
+
@truncated = false
if options.has_key?(:max_rows)
@max_rows = options[:max_rows]
@@ -85,61 +85,35 @@
def common_params
{ :controller => 'gantts', :action => 'show', :project_id => @project }
end
-
+
def params
common_params.merge({ :zoom => zoom, :year => year_from, :month => month_from, :months => months })
end
-
+
def params_previous
common_params.merge({:year => (date_from << months).year, :month => (date_from << months).month, :zoom => zoom, :months => months })
end
-
+
def params_next
common_params.merge({:year => (date_from >> months).year, :month => (date_from >> months).month, :zoom => zoom, :months => months })
end
- ### Extracted from the HTML view/helpers
# Returns the number of rows that will be rendered on the Gantt chart
def number_of_rows
return @number_of_rows if @number_of_rows
-
- rows = if @project
- number_of_rows_on_project(@project)
- else
- Project.roots.visible.has_module('issue_tracking').inject(0) do |total, project|
- total += number_of_rows_on_project(project)
- end
- end
-
+
+ rows = projects.inject(0) {|total, p| total += number_of_rows_on_project(p)}
rows > @max_rows ? @max_rows : rows
end
# Returns the number of rows that will be used to list a project on
# the Gantt chart. This will recurse for each subproject.
def number_of_rows_on_project(project)
- # Remove the project requirement for Versions because it will
- # restrict issues to only be on the current project. This
- # ends up missing issues which are assigned to shared versions.
- @query.project = nil if @query.project
+ return 0 unless projects.include?(project)
- # One Root project
count = 1
- # Issues without a Version
- count += project.issues.for_gantt.without_version.with_query(@query).count
-
- # Versions
- count += project.versions.count
-
- # Issues on the Versions
- project.versions.each do |version|
- count += version.fixed_issues.for_gantt.with_query(@query).count
- end
-
- # Subprojects
- project.children.visible.has_module('issue_tracking').each do |subproject|
- count += number_of_rows_on_project(subproject)
- end
-
+ count += project_issues(project).size
+ count += project_versions(project).size
count
end
@@ -154,96 +128,119 @@
render(options.merge(:only => :lines)) unless @lines_rendered
@lines
end
-
+
+ # Returns issues that will be rendered
+ def issues
+ @issues ||= @query.issues(
+ :include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
+ :order => "#{Project.table_name}.lft ASC, #{Issue.table_name}.id ASC",
+ :limit => @max_rows
+ )
+ end
+
+ # Return all the project nodes that will be displayed
+ def projects
+ return @projects if @projects
+
+ ids = issues.collect(&:project).uniq.collect(&:id)
+ if ids.any?
+ # All issues projects and their visible ancestors
+ @projects = Project.visible.all(
+ :joins => "LEFT JOIN #{Project.table_name} child ON #{Project.table_name}.lft <= child.lft AND #{Project.table_name}.rgt >= child.rgt",
+ :conditions => ["child.id IN (?)", ids],
+ :order => "#{Project.table_name}.lft ASC"
+ ).uniq
+ else
+ @projects = []
+ end
+ end
+
+ # Returns the issues that belong to +project+
+ def project_issues(project)
+ @issues_by_project ||= issues.group_by(&:project)
+ @issues_by_project[project] || []
+ end
+
+ # Returns the distinct versions of the issues that belong to +project+
+ def project_versions(project)
+ project_issues(project).collect(&:fixed_version).compact.uniq
+ end
+
+ # Returns the issues that belong to +project+ and are assigned to +version+
+ def version_issues(project, version)
+ project_issues(project).select {|issue| issue.fixed_version == version}
+ end
+
def render(options={})
- options = {:indent => 4, :render => :subject, :format => :html}.merge(options)
-
+ options = {:top => 0, :top_increment => 20, :indent_increment => 20, :render => :subject, :format => :html}.merge(options)
+ indent = options[:indent] || 4
+
@subjects = '' unless options[:only] == :lines
@lines = '' unless options[:only] == :subjects
@number_of_rows = 0
-
- if @project
- render_project(@project, options)
- else
- Project.roots.visible.has_module('issue_tracking').each do |project|
- render_project(project, options)
- break if abort?
- end
+
+ Project.project_tree(projects) do |project, level|
+ options[:indent] = indent + level * options[:indent_increment]
+ render_project(project, options)
+ break if abort?
end
-
+
@subjects_rendered = true unless options[:only] == :lines
@lines_rendered = true unless options[:only] == :subjects
-
+
render_end(options)
end
def render_project(project, options={})
- options[:top] = 0 unless options.key? :top
- options[:indent_increment] = 20 unless options.key? :indent_increment
- options[:top_increment] = 20 unless options.key? :top_increment
-
subject_for_project(project, options) unless options[:only] == :lines
line_for_project(project, options) unless options[:only] == :subjects
-
+
options[:top] += options[:top_increment]
options[:indent] += options[:indent_increment]
@number_of_rows += 1
return if abort?
-
- # Second, Issues without a version
- issues = project.issues.for_gantt.without_version.with_query(@query).all(:limit => current_limit)
+
+ issues = project_issues(project).select {|i| i.fixed_version.nil?}
sort_issues!(issues)
if issues
render_issues(issues, options)
return if abort?
end
- # Third, Versions
- project.versions.sort.each do |version|
- render_version(version, options)
- return if abort?
+ versions = project_versions(project)
+ versions.each do |version|
+ render_version(project, version, options)
end
- # Fourth, subprojects
- project.children.visible.has_module('issue_tracking').each do |project|
- render_project(project, options)
- return if abort?
- end unless project.leaf?
-
# Remove indent to hit the next sibling
options[:indent] -= options[:indent_increment]
end
def render_issues(issues, options={})
@issue_ancestors = []
-
+
issues.each do |i|
subject_for_issue(i, options) unless options[:only] == :lines
line_for_issue(i, options) unless options[:only] == :subjects
-
+
options[:top] += options[:top_increment]
@number_of_rows += 1
break if abort?
end
-
+
options[:indent] -= (options[:indent_increment] * @issue_ancestors.size)
end
- def render_version(version, options={})
+ def render_version(project, version, options={})
# Version header
subject_for_version(version, options) unless options[:only] == :lines
line_for_version(version, options) unless options[:only] == :subjects
-
+
options[:top] += options[:top_increment]
@number_of_rows += 1
return if abort?
-
- # Remove the project requirement for Versions because it will
- # restrict issues to only be on the current project. This
- # ends up missing issues which are assigned to shared versions.
- @query.project = nil if @query.project
-
- issues = version.fixed_issues.for_gantt.with_query(@query).all(:limit => current_limit)
+
+ issues = version_issues(project, version)
if issues
sort_issues!(issues)
# Indent issues
@@ -252,10 +249,10 @@
options[:indent] -= options[:indent_increment]
end
end
-
+
def render_end(options={})
case options[:format]
- when :pdf
+ when :pdf
options[:pdf].Line(15, options[:top], PDF::TotalWidth, options[:top])
end
end
@@ -280,10 +277,10 @@
if project.is_a?(Project) && project.start_date && project.due_date
options[:zoom] ||= 1
options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom]
-
+
coords = coordinates(project.start_date, project.due_date, nil, options[:zoom])
label = h(project)
-
+
case options[:format]
when :html
html_task(options, coords, :css => "project task", :label => label, :markers => true)
@@ -318,7 +315,7 @@
if version.is_a?(Version) && version.start_date && version.due_date
options[:zoom] ||= 1
options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom]
-
+
coords = coordinates(version.start_date, version.due_date, version.completed_pourcent, options[:zoom])
label = "#{h version } #{h version.completed_pourcent.to_i.to_s}%"
label = h("#{version.project} -") + label unless @project && @project == version.project
@@ -342,14 +339,14 @@
@issue_ancestors.pop
options[:indent] -= options[:indent_increment]
end
-
+
output = case options[:format]
when :html
css_classes = ''
css_classes << ' issue-overdue' if issue.overdue?
css_classes << ' issue-behind-schedule' if issue.behind_schedule?
css_classes << ' icon icon-issue' unless Setting.gravatar_enabled? && issue.assigned_to
-
+
subject = ""
if issue.assigned_to.present?
assigned_string = l(:field_assigned_to) + ": " + issue.assigned_to.name
@@ -369,7 +366,7 @@
@issue_ancestors << issue
options[:indent] += options[:indent_increment]
end
-
+
output
end
@@ -378,7 +375,7 @@
if issue.is_a?(Issue) && issue.due_before
coords = coordinates(issue.start_date, issue.due_before, issue.done_ratio, options[:zoom])
label = "#{ issue.status.name } #{ issue.done_ratio }%"
-
+
case options[:format]
when :html
html_task(options, coords, :css => "task " + (issue.leaf? ? 'leaf' : 'parent'), :label => label, :issue => issue, :markers => !issue.leaf?)
@@ -396,31 +393,31 @@
# Generates a gantt image
# Only defined if RMagick is avalaible
def to_image(format='PNG')
- date_to = (@date_from >> @months)-1
+ date_to = (@date_from >> @months)-1
show_weeks = @zoom > 1
show_days = @zoom > 2
-
+
subject_width = 400
- header_heigth = 18
+ header_height = 18
# width of one day in pixels
zoom = @zoom*2
g_width = (@date_to - @date_from + 1)*zoom
g_height = 20 * number_of_rows + 30
- headers_heigth = (show_weeks ? 2*header_heigth : header_heigth)
- height = g_height + headers_heigth
-
+ headers_height = (show_weeks ? 2*header_height : header_height)
+ height = g_height + headers_height
+
imgl = Magick::ImageList.new
imgl.new_image(subject_width+g_width+1, height)
gc = Magick::Draw.new
-
+
# Subjects
gc.stroke('transparent')
- subjects(:image => gc, :top => (headers_heigth + 20), :indent => 4, :format => :image)
-
+ subjects(:image => gc, :top => (headers_height + 20), :indent => 4, :format => :image)
+
# Months headers
month_f = @date_from
left = subject_width
- @months.times do
+ @months.times do
width = ((month_f >> 1) - month_f) * zoom
gc.fill('white')
gc.stroke('grey')
@@ -433,11 +430,11 @@
left = left + width
month_f = month_f >> 1
end
-
+
# Weeks headers
if show_weeks
left = subject_width
- height = header_heigth
+ height = header_height
if @date_from.cwday == 1
# date_from is monday
week_f = date_from
@@ -448,7 +445,7 @@
gc.fill('white')
gc.stroke('grey')
gc.stroke_width(1)
- gc.rectangle(left, header_heigth, left + width, 2*header_heigth + g_height-1)
+ gc.rectangle(left, header_height, left + width, 2*header_height + g_height-1)
left = left + width
end
while week_f <= date_to
@@ -456,111 +453,111 @@
gc.fill('white')
gc.stroke('grey')
gc.stroke_width(1)
- gc.rectangle(left.round, header_heigth, left.round + width, 2*header_heigth + g_height-1)
+ gc.rectangle(left.round, header_height, left.round + width, 2*header_height + g_height-1)
gc.fill('black')
gc.stroke('transparent')
gc.stroke_width(1)
- gc.text(left.round + 2, header_heigth + 14, week_f.cweek.to_s)
+ gc.text(left.round + 2, header_height + 14, week_f.cweek.to_s)
left = left + width
week_f = week_f+7
end
end
-
+
# Days details (week-end in grey)
if show_days
left = subject_width
- height = g_height + header_heigth - 1
+ height = g_height + header_height - 1
wday = @date_from.cwday
- (date_to - @date_from + 1).to_i.times do
+ (date_to - @date_from + 1).to_i.times do
width = zoom
gc.fill(wday == 6 || wday == 7 ? '#eee' : 'white')
gc.stroke('#ddd')
gc.stroke_width(1)
- gc.rectangle(left, 2*header_heigth, left + width, 2*header_heigth + g_height-1)
+ gc.rectangle(left, 2*header_height, left + width, 2*header_height + g_height-1)
left = left + width
wday = wday + 1
wday = 1 if wday > 7
end
end
-
+
# border
gc.fill('transparent')
gc.stroke('grey')
gc.stroke_width(1)
- gc.rectangle(0, 0, subject_width+g_width, headers_heigth)
+ gc.rectangle(0, 0, subject_width+g_width, headers_height)
gc.stroke('black')
- gc.rectangle(0, 0, subject_width+g_width, g_height+ headers_heigth-1)
-
+ gc.rectangle(0, 0, subject_width+g_width, g_height+ headers_height-1)
+
# content
- top = headers_heigth + 20
+ top = headers_height + 20
gc.stroke('transparent')
lines(:image => gc, :top => top, :zoom => zoom, :subject_width => subject_width, :format => :image)
-
+
# today red line
if Date.today >= @date_from and Date.today <= date_to
gc.stroke('red')
x = (Date.today-@date_from+1)*zoom + subject_width
- gc.line(x, headers_heigth, x, headers_heigth + g_height-1)
- end
-
+ gc.line(x, headers_height, x, headers_height + g_height-1)
+ end
+
gc.draw(imgl)
imgl.format = format
imgl.to_blob
end if Object.const_defined?(:Magick)
def to_pdf
- pdf = ::Redmine::Export::PDF::IFPDF.new(current_language)
+ pdf = ::Redmine::Export::PDF::ITCPDF.new(current_language)
pdf.SetTitle("#{l(:label_gantt)} #{project}")
- pdf.AliasNbPages
+ pdf.alias_nb_pages
pdf.footer_date = format_date(Date.today)
pdf.AddPage("L")
pdf.SetFontStyle('B',12)
pdf.SetX(15)
- pdf.Cell(PDF::LeftPaneWidth, 20, project.to_s)
+ pdf.RDMCell(PDF::LeftPaneWidth, 20, project.to_s)
pdf.Ln
pdf.SetFontStyle('B',9)
-
+
subject_width = PDF::LeftPaneWidth
- header_heigth = 5
-
- headers_heigth = header_heigth
+ header_height = 5
+
+ headers_height = header_height
show_weeks = false
show_days = false
-
+
if self.months < 7
show_weeks = true
- headers_heigth = 2*header_heigth
+ headers_height = 2*header_height
if self.months < 3
show_days = true
- headers_heigth = 3*header_heigth
+ headers_height = 3*header_height
end
end
-
+
g_width = PDF.right_pane_width
zoom = (g_width) / (self.date_to - self.date_from + 1)
g_height = 120
- t_height = g_height + headers_heigth
-
+ t_height = g_height + headers_height
+
y_start = pdf.GetY
-
+
# Months headers
month_f = self.date_from
left = subject_width
- height = header_heigth
- self.months.times do
- width = ((month_f >> 1) - month_f) * zoom
+ height = header_height
+ self.months.times do
+ width = ((month_f >> 1) - month_f) * zoom
pdf.SetY(y_start)
pdf.SetX(left)
- pdf.Cell(width, height, "#{month_f.year}-#{month_f.month}", "LTR", 0, "C")
+ pdf.RDMCell(width, height, "#{month_f.year}-#{month_f.month}", "LTR", 0, "C")
left = left + width
month_f = month_f >> 1
- end
-
+ end
+
# Weeks headers
if show_weeks
left = subject_width
- height = header_heigth
+ height = header_height
if self.date_from.cwday == 1
# self.date_from is monday
week_f = self.date_from
@@ -568,44 +565,44 @@
# find next monday after self.date_from
week_f = self.date_from + (7 - self.date_from.cwday + 1)
width = (7 - self.date_from.cwday + 1) * zoom-1
- pdf.SetY(y_start + header_heigth)
+ pdf.SetY(y_start + header_height)
pdf.SetX(left)
- pdf.Cell(width + 1, height, "", "LTR")
+ pdf.RDMCell(width + 1, height, "", "LTR")
left = left + width+1
end
while week_f <= self.date_to
width = (week_f + 6 <= self.date_to) ? 7 * zoom : (self.date_to - week_f + 1) * zoom
- pdf.SetY(y_start + header_heigth)
+ pdf.SetY(y_start + header_height)
pdf.SetX(left)
- pdf.Cell(width, height, (width >= 5 ? week_f.cweek.to_s : ""), "LTR", 0, "C")
+ pdf.RDMCell(width, height, (width >= 5 ? week_f.cweek.to_s : ""), "LTR", 0, "C")
left = left + width
week_f = week_f+7
end
end
-
+
# Days headers
if show_days
left = subject_width
- height = header_heigth
+ height = header_height
wday = self.date_from.cwday
pdf.SetFontStyle('B',7)
- (self.date_to - self.date_from + 1).to_i.times do
+ (self.date_to - self.date_from + 1).to_i.times do
width = zoom
- pdf.SetY(y_start + 2 * header_heigth)
+ pdf.SetY(y_start + 2 * header_height)
pdf.SetX(left)
- pdf.Cell(width, height, day_name(wday).first, "LTR", 0, "C")
+ pdf.RDMCell(width, height, day_name(wday).first, "LTR", 0, "C")
left = left + width
wday = wday + 1
wday = 1 if wday > 7
end
end
-
+
pdf.SetY(y_start)
pdf.SetX(15)
- pdf.Cell(subject_width+g_width-15, headers_heigth, "", 1)
-
+ pdf.RDMCell(subject_width+g_width-15, headers_height, "", 1)
+
# Tasks
- top = headers_heigth + y_start
+ top = headers_height + y_start
options = {
:top => top,
:zoom => zoom,
@@ -620,12 +617,12 @@
render(options)
pdf.Output
end
-
+
private
-
+
def coordinates(start_date, end_date, progress, zoom=nil)
zoom ||= @zoom
-
+
coords = {}
if start_date && end_date && start_date < self.date_to && end_date > self.date_from
if start_date > self.date_from
@@ -640,17 +637,17 @@
else
coords[:bar_end] = self.date_to - self.date_from + 1
end
-
+
if progress
- progress_date = start_date + (end_date - start_date) * (progress / 100.0)
+ progress_date = start_date + (end_date - start_date + 1) * (progress / 100.0)
if progress_date > self.date_from && progress_date > start_date
if progress_date < self.date_to
- coords[:bar_progress_end] = progress_date - self.date_from + 1
+ coords[:bar_progress_end] = progress_date - self.date_from
else
coords[:bar_progress_end] = self.date_to - self.date_from + 1
end
end
-
+
if progress_date < Date.today
late_date = [Date.today, end_date].min
if late_date > self.date_from && late_date > start_date
@@ -663,7 +660,7 @@
end
end
end
-
+
# Transforms dates into pixels witdh
coords.keys.each do |key|
coords[key] = (coords[key] * zoom).floor
@@ -675,7 +672,7 @@
def sort_issues!(issues)
issues.sort! { |a, b| gantt_issue_compare(a, b, issues) }
end
-
+
# TODO: top level issues should be sorted by start date
def gantt_issue_compare(x, y, issues)
if x.root_id == y.root_id
@@ -684,7 +681,7 @@
x.root_id <=> y.root_id
end
end
-
+
def current_limit
if @max_rows
@max_rows - @number_of_rows
@@ -692,13 +689,13 @@
nil
end
end
-
+
def abort?
if @max_rows && @number_of_rows >= @max_rows
@truncated = true
end
end
-
+
def pdf_new_page?(options)
if options[:top] > 180
options[:pdf].Line(15, options[:top], PDF::TotalWidth, options[:top])
@@ -707,41 +704,41 @@
options[:pdf].Line(15, options[:top] - 0.1, PDF::TotalWidth, options[:top] - 0.1)
end
end
-
+
def html_subject(params, subject, options={})
style = "position: absolute;top:#{params[:top]}px;left:#{params[:indent]}px;"
style << "width:#{params[:subject_width] - params[:indent]}px;" if params[:subject_width]
-
+
output = view.content_tag 'div', subject, :class => options[:css], :style => style, :title => options[:title]
@subjects << output
output
end
-
+
def pdf_subject(params, subject, options={})
params[:pdf].SetY(params[:top])
params[:pdf].SetX(15)
-
+
char_limit = PDF::MaxCharactorsForSubject - params[:indent]
- params[:pdf].Cell(params[:subject_width]-15, 5, (" " * params[:indent]) + subject.to_s.sub(/^(.{#{char_limit}}[^\s]*\s).*$/, '\1 (...)'), "LR")
-
+ params[:pdf].RDMCell(params[:subject_width]-15, 5, (" " * params[:indent]) + subject.to_s.sub(/^(.{#{char_limit}}[^\s]*\s).*$/, '\1 (...)'), "LR")
+
params[:pdf].SetY(params[:top])
params[:pdf].SetX(params[:subject_width])
- params[:pdf].Cell(params[:g_width], 5, "", "LR")
+ params[:pdf].RDMCell(params[:g_width], 5, "", "LR")
end
-
+
def image_subject(params, subject, options={})
params[:image].fill('black')
params[:image].stroke('transparent')
params[:image].stroke_width(1)
params[:image].text(params[:indent], params[:top] + 2, subject)
end
-
+
def html_task(params, coords, options={})
output = ''
# Renders the task bar, with progress and late
if coords[:bar_start] && coords[:bar_end]
output << "
"
-
+
if coords[:bar_late_end]
output << "
"
end
@@ -774,28 +771,28 @@
@lines << output
output
end
-
+
def pdf_task(params, coords, options={})
height = options[:height] || 2
-
+
# Renders the task bar, with progress and late
if coords[:bar_start] && coords[:bar_end]
params[:pdf].SetY(params[:top]+1.5)
params[:pdf].SetX(params[:subject_width] + coords[:bar_start])
params[:pdf].SetFillColor(200,200,200)
- params[:pdf].Cell(coords[:bar_end] - coords[:bar_start], height, "", 0, 0, "", 1)
-
+ params[:pdf].RDMCell(coords[:bar_end] - coords[:bar_start], height, "", 0, 0, "", 1)
+
if coords[:bar_late_end]
params[:pdf].SetY(params[:top]+1.5)
params[:pdf].SetX(params[:subject_width] + coords[:bar_start])
params[:pdf].SetFillColor(255,100,100)
- params[:pdf].Cell(coords[:bar_late_end] - coords[:bar_start], height, "", 0, 0, "", 1)
+ params[:pdf].RDMCell(coords[:bar_late_end] - coords[:bar_start], height, "", 0, 0, "", 1)
end
if coords[:bar_progress_end]
params[:pdf].SetY(params[:top]+1.5)
params[:pdf].SetX(params[:subject_width] + coords[:bar_start])
params[:pdf].SetFillColor(90,200,90)
- params[:pdf].Cell(coords[:bar_progress_end] - coords[:bar_start], height, "", 0, 0, "", 1)
+ params[:pdf].RDMCell(coords[:bar_progress_end] - coords[:bar_start], height, "", 0, 0, "", 1)
end
end
# Renders the markers
@@ -804,30 +801,30 @@
params[:pdf].SetY(params[:top] + 1)
params[:pdf].SetX(params[:subject_width] + coords[:start] - 1)
params[:pdf].SetFillColor(50,50,200)
- params[:pdf].Cell(2, 2, "", 0, 0, "", 1)
+ params[:pdf].RDMCell(2, 2, "", 0, 0, "", 1)
end
if coords[:end]
params[:pdf].SetY(params[:top] + 1)
params[:pdf].SetX(params[:subject_width] + coords[:end] - 1)
params[:pdf].SetFillColor(50,50,200)
- params[:pdf].Cell(2, 2, "", 0, 0, "", 1)
+ params[:pdf].RDMCell(2, 2, "", 0, 0, "", 1)
end
end
# Renders the label on the right
if options[:label]
params[:pdf].SetX(params[:subject_width] + (coords[:bar_end] || 0) + 5)
- params[:pdf].Cell(30, 2, options[:label])
+ params[:pdf].RDMCell(30, 2, options[:label])
end
end
def image_task(params, coords, options={})
height = options[:height] || 6
-
+
# Renders the task bar, with progress and late
if coords[:bar_start] && coords[:bar_end]
params[:image].fill('#aaa')
params[:image].rectangle(params[:subject_width] + coords[:bar_start], params[:top], params[:subject_width] + coords[:bar_end], params[:top] - height)
-
+
if coords[:bar_late_end]
params[:image].fill('#f66')
params[:image].rectangle(params[:subject_width] + coords[:bar_start], params[:top], params[:subject_width] + coords[:bar_late_end], params[:top] - height)
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/mime_type.rb
--- a/lib/redmine/mime_type.rb Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/mime_type.rb Mon Jun 06 14:41:04 2011 +0100
@@ -37,6 +37,7 @@
'text/xml' => 'xml,xsd,mxml',
'text/yaml' => 'yml,yaml',
'text/csv' => 'csv',
+ 'text/x-po' => 'po',
'image/gif' => 'gif',
'image/jpeg' => 'jpg,jpeg,jpe',
'image/png' => 'png',
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/notifiable.rb
--- a/lib/redmine/notifiable.rb Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/notifiable.rb Mon Jun 06 14:41:04 2011 +0100
@@ -14,6 +14,7 @@
notifications << Notifiable.new('issue_status_updated', 'issue_updated')
notifications << Notifiable.new('issue_priority_updated', 'issue_updated')
notifications << Notifiable.new('news_added')
+ notifications << Notifiable.new('news_comment_added')
notifications << Notifiable.new('document_added')
notifications << Notifiable.new('file_added')
notifications << Notifiable.new('message_posted')
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/.svn/all-wcprops
--- a/lib/redmine/scm/.svn/all-wcprops Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/.svn/all-wcprops Mon Jun 06 14:41:04 2011 +0100
@@ -1,11 +1,5 @@
K 25
svn:wc:ra_dav:version-url
-V 40
-/svn/!svn/ver/4993/trunk/lib/redmine/scm
+V 54
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/scm
END
-base.rb
-K 25
-svn:wc:ra_dav:version-url
-V 48
-/svn/!svn/ver/3440/trunk/lib/redmine/scm/base.rb
-END
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/.svn/entries
--- a/lib/redmine/scm/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,14 +1,14 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/lib/redmine/scm
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine/scm
http://redmine.rubyforge.org/svn
-2011-03-03T05:51:46.224821Z
-4993
+2011-05-21T02:39:42.521746Z
+5870
tmaruyama
@@ -35,7 +35,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:15:00.000000Z
3a053c03d210decd9105a24ff5e1aa8f
2010-02-16T22:41:59.625572Z
3440
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/.svn/all-wcprops
--- a/lib/redmine/scm/adapters/.svn/all-wcprops Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/.svn/all-wcprops Mon Jun 06 14:41:04 2011 +0100
@@ -1,53 +1,53 @@
K 25
svn:wc:ra_dav:version-url
-V 49
-/svn/!svn/ver/4993/trunk/lib/redmine/scm/adapters
+V 63
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/scm/adapters
END
subversion_adapter.rb
K 25
svn:wc:ra_dav:version-url
-V 71
-/svn/!svn/ver/4993/trunk/lib/redmine/scm/adapters/subversion_adapter.rb
+V 85
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/scm/adapters/subversion_adapter.rb
END
bazaar_adapter.rb
K 25
svn:wc:ra_dav:version-url
-V 67
-/svn/!svn/ver/4992/trunk/lib/redmine/scm/adapters/bazaar_adapter.rb
+V 81
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/scm/adapters/bazaar_adapter.rb
END
abstract_adapter.rb
K 25
svn:wc:ra_dav:version-url
-V 69
-/svn/!svn/ver/4959/trunk/lib/redmine/scm/adapters/abstract_adapter.rb
+V 83
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/scm/adapters/abstract_adapter.rb
END
git_adapter.rb
K 25
svn:wc:ra_dav:version-url
-V 64
-/svn/!svn/ver/4992/trunk/lib/redmine/scm/adapters/git_adapter.rb
+V 78
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/scm/adapters/git_adapter.rb
END
mercurial_adapter.rb
K 25
svn:wc:ra_dav:version-url
-V 70
-/svn/!svn/ver/4993/trunk/lib/redmine/scm/adapters/mercurial_adapter.rb
+V 84
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/scm/adapters/mercurial_adapter.rb
END
filesystem_adapter.rb
K 25
svn:wc:ra_dav:version-url
-V 71
-/svn/!svn/ver/4941/trunk/lib/redmine/scm/adapters/filesystem_adapter.rb
+V 85
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/scm/adapters/filesystem_adapter.rb
END
cvs_adapter.rb
K 25
svn:wc:ra_dav:version-url
-V 64
-/svn/!svn/ver/4992/trunk/lib/redmine/scm/adapters/cvs_adapter.rb
+V 78
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/scm/adapters/cvs_adapter.rb
END
darcs_adapter.rb
K 25
svn:wc:ra_dav:version-url
-V 66
-/svn/!svn/ver/4992/trunk/lib/redmine/scm/adapters/darcs_adapter.rb
+V 80
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/scm/adapters/darcs_adapter.rb
END
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/.svn/entries
--- a/lib/redmine/scm/adapters/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,14 +1,14 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/lib/redmine/scm/adapters
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine/scm/adapters
http://redmine.rubyforge.org/svn
-2011-03-03T05:51:46.224821Z
-4993
+2011-05-21T02:39:42.521746Z
+5870
tmaruyama
@@ -32,11 +32,12 @@
-2011-03-03T11:40:18.000000Z
-7e0b7e8a12996f271854b48e2d7611e4
-2011-03-03T05:51:46.224821Z
-4993
+2011-06-06T13:20:53.000000Z
+bf7d7b180f55d2100736e363ce125552
+2011-05-10T17:52:56.415969Z
+5731
tmaruyama
+has-props
@@ -57,8 +58,7 @@
-
-11535
+11495
bazaar_adapter.rb
file
@@ -66,10 +66,10 @@
-2011-03-03T11:40:18.000000Z
-2614557fb37905301939071ec226fe16
-2011-03-03T05:32:33.802461Z
-4992
+2011-06-06T13:20:53.000000Z
+8bcb2a65cfdf8d27dc53f10469887018
+2011-05-06T12:57:32.851840Z
+5668
tmaruyama
has-props
@@ -92,7 +92,7 @@
-8274
+8398
mercurial
dir
@@ -103,10 +103,10 @@
-2011-03-03T11:40:18.000000Z
-5cc0323dd42df9a3377099b0fdf9e95f
-2011-02-28T04:46:42.639929Z
-4959
+2011-06-06T13:20:53.000000Z
+b5e95cdfce320e25a25588b5bf01d39a
+2011-05-21T02:16:51.624699Z
+5863
tmaruyama
has-props
@@ -129,7 +129,7 @@
-9832
+9625
git_adapter.rb
file
@@ -137,10 +137,10 @@
-2011-03-03T11:40:18.000000Z
-ba10ae64fed2363f2533aa558752be37
-2011-03-03T05:32:33.802461Z
-4992
+2011-06-06T13:20:53.000000Z
+8b7b85fc7884f18402dfd33412bb1632
+2011-05-21T02:39:42.521746Z
+5870
tmaruyama
has-props
@@ -163,7 +163,7 @@
-11905
+13537
mercurial_adapter.rb
file
@@ -171,10 +171,10 @@
-2011-03-03T11:40:18.000000Z
-fe99380d7b29fe936554e10293751813
-2011-03-03T05:51:46.224821Z
-4993
+2011-06-06T13:20:53.000000Z
+ef24fdf73dd59d164e60121c21aa5b93
+2011-05-21T02:38:04.545904Z
+5868
tmaruyama
has-props
@@ -197,7 +197,7 @@
-11159
+11824
filesystem_adapter.rb
file
@@ -205,10 +205,10 @@
-2011-03-03T11:40:18.000000Z
-4acd04cfa5dac0e54a35b8ef4a565217
-2011-02-24T05:58:59.661399Z
-4941
+2011-06-06T13:20:53.000000Z
+23ac49fabb89c7578c173ef09c7f280f
+2011-05-21T02:17:34.152882Z
+5864
tmaruyama
has-props
@@ -231,7 +231,7 @@
-4266
+4409
cvs_adapter.rb
file
@@ -239,10 +239,10 @@
-2011-03-03T11:40:18.000000Z
-a3914eff33df4b5a05a108945137360b
-2011-03-03T05:32:33.802461Z
-4992
+2011-06-06T13:20:53.000000Z
+0c56303ba5340dfff7860be537a1ccc1
+2011-05-21T02:18:53.346845Z
+5866
tmaruyama
has-props
@@ -265,7 +265,7 @@
-14573
+16766
darcs_adapter.rb
file
@@ -273,10 +273,10 @@
-2011-03-03T11:40:18.000000Z
-23725596dd2797f4dcdd5336e715c59a
-2011-03-03T05:32:33.802461Z
-4992
+2011-06-06T13:20:53.000000Z
+f039e19c659f52d26c9be8a566b90539
+2011-05-06T12:57:54.181968Z
+5669
tmaruyama
has-props
@@ -299,5 +299,5 @@
-8925
+8935
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/.svn/text-base/abstract_adapter.rb.svn-base
--- a/lib/redmine/scm/adapters/.svn/text-base/abstract_adapter.rb.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/.svn/text-base/abstract_adapter.rb.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -1,16 +1,16 @@
-# redMine - project management software
-# Copyright (C) 2006-2007 Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -90,12 +90,16 @@
def url
@url
end
-
+
+ def path_encoding
+ nil
+ end
+
# get info about the svn repository
def info
return nil
end
-
+
# Returns the entry identified by path and revision identifier
# or nil if entry doesn't exist in the repository
def entry(path=nil, identifier=nil)
@@ -111,10 +115,10 @@
es ? es.detect {|e| e.name == search_name} : nil
end
end
-
+
# Returns an Entries collection
# or nil if the given path doesn't exist in the repository
- def entries(path=nil, identifier=nil)
+ def entries(path=nil, identifier=nil, options={})
return nil
end
@@ -122,30 +126,30 @@
return nil
end
- def tags
+ def tags
return nil
end
def default_branch
return nil
end
-
+
def properties(path, identifier=nil)
return nil
end
-
+
def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
return nil
end
-
+
def diff(path, identifier_from, identifier_to=nil)
return nil
end
-
+
def cat(path, identifier=nil)
return nil
end
-
+
def with_leading_slash(path)
path ||= ''
(path[0,1]!="/") ? "/#{path}" : path
@@ -175,7 +179,7 @@
info = self.info
info ? info.root_url : nil
end
-
+
def target(path)
path ||= ''
base = path.match(/^\//) ? root_url : url
@@ -223,7 +227,7 @@
q = (Redmine::Platform.mswin? ? '"' : "'")
cmd.to_s.gsub(/(\-\-(password|username))\s+(#{q}[^#{q}]+#{q}|[^#{q}]\S+)/, '\\1 xxxx')
end
-
+
def strip_credential(cmd)
self.class.strip_credential(cmd)
end
@@ -242,7 +246,7 @@
class Entries < Array
def sort_by_name
- sort {|x,y|
+ sort {|x,y|
if x.kind == y.kind
x.name.to_s <=> y.name.to_s
else
@@ -250,12 +254,12 @@
end
}
end
-
+
def revisions
revisions ||= Revisions.new(collect{|entry| entry.lastrev}.compact)
end
end
-
+
class Info
attr_accessor :root_url, :lastrev
def initialize(attributes={})
@@ -263,7 +267,7 @@
self.lastrev = attributes[:lastrev]
end
end
-
+
class Entry
attr_accessor :name, :path, :kind, :size, :lastrev
def initialize(attributes={})
@@ -273,20 +277,20 @@
self.size = attributes[:size].to_i if attributes[:size]
self.lastrev = attributes[:lastrev]
end
-
+
def is_file?
'file' == self.kind
end
-
+
def is_dir?
'dir' == self.kind
end
-
+
def is_text?
Redmine::MimeType.is_type?('text', name)
end
end
-
+
class Revisions < Array
def latest
sort {|x,y|
@@ -296,53 +300,48 @@
0
end
}.last
- end
+ end
end
-
+
class Revision
- attr_accessor :scmid, :name, :author, :time, :message, :paths, :revision, :branch
- attr_writer :identifier
+ attr_accessor :scmid, :name, :author, :time, :message,
+ :paths, :revision, :branch, :identifier
def initialize(attributes={})
self.identifier = attributes[:identifier]
- self.scmid = attributes[:scmid]
- self.name = attributes[:name] || self.identifier
- self.author = attributes[:author]
- self.time = attributes[:time]
- self.message = attributes[:message] || ""
- self.paths = attributes[:paths]
- self.revision = attributes[:revision]
- self.branch = attributes[:branch]
- end
-
- # Returns the identifier of this revision; see also Changeset model
- def identifier
- (@identifier || revision).to_s
+ self.scmid = attributes[:scmid]
+ self.name = attributes[:name] || self.identifier
+ self.author = attributes[:author]
+ self.time = attributes[:time]
+ self.message = attributes[:message] || ""
+ self.paths = attributes[:paths]
+ self.revision = attributes[:revision]
+ self.branch = attributes[:branch]
end
# Returns the readable identifier.
def format_identifier
- identifier
+ self.identifier.to_s
end
end
class Annotate
attr_reader :lines, :revisions
-
+
def initialize
@lines = []
@revisions = []
end
-
+
def add_line(line, revision)
@lines << line
@revisions << revision
end
-
+
def content
content = lines.join("\n")
end
-
+
def empty?
lines.empty?
end
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/.svn/text-base/bazaar_adapter.rb.svn-base
--- a/lib/redmine/scm/adapters/.svn/text-base/bazaar_adapter.rb.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/.svn/text-base/bazaar_adapter.rb.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -1,16 +1,16 @@
-# redMine - project management software
-# Copyright (C) 2006-2007 Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -78,12 +78,12 @@
# Returns an Entries collection
# or nil if the given path doesn't exist in the repository
- def entries(path=nil, identifier=nil)
+ def entries(path=nil, identifier=nil, options={})
path ||= ''
entries = Entries.new
cmd = "#{self.class.sq_bin} ls -v --show-ids"
- identifier = -1 unless identifier && identifier.to_i > 0
- cmd << " -r#{identifier.to_i}"
+ identifier = -1 unless identifier && identifier.to_i > 0
+ cmd << " -r#{identifier.to_i}"
cmd << " #{target(path)}"
shellout(cmd) do |io|
prefix = "#{url}/#{path}".gsub('\\', '/')
@@ -120,7 +120,6 @@
parsing = nil
else
next unless revision
-
if line =~ /^revno: (\d+)($|\s\[merge\]$)/
revision.identifier = $1.to_i
elsif line =~ /^committer: (.+)$/
@@ -168,7 +167,7 @@
def diff(path, identifier_from, identifier_to=nil)
path ||= ''
if identifier_to
- identifier_to = identifier_to.to_i
+ identifier_to = identifier_to.to_i
else
identifier_to = identifier_from.to_i - 1
end
@@ -209,7 +208,13 @@
identifier = nil
io.each_line do |line|
next unless line =~ %r{^(\d+) ([^|]+)\| (.*)$}
- blame.add_line($3.rstrip, Revision.new(:identifier => $1.to_i, :author => $2.strip))
+ rev = $1
+ blame.add_line($3.rstrip,
+ Revision.new(
+ :identifier => rev,
+ :revision => rev,
+ :author => $2.strip
+ ))
end
end
return nil if $? && $?.exitstatus != 0
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/.svn/text-base/cvs_adapter.rb.svn-base
--- a/lib/redmine/scm/adapters/.svn/text-base/cvs_adapter.rb.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/.svn/text-base/cvs_adapter.rb.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -5,12 +5,12 @@
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -25,6 +25,9 @@
# CVS executable name
CVS_BIN = Redmine::Configuration['scm_cvs_command'] || "cvs"
+ # raised if scm command exited with error, e.g. unknown revision.
+ class ScmCommandAborted < CommandFailed; end
+
class << self
def client_command
@@bin ||= CVS_BIN
@@ -58,26 +61,25 @@
end
# Guidelines for the input:
- # url -> the project-path, relative to the cvsroot (eg. module name)
+ # url -> the project-path, relative to the cvsroot (eg. module name)
# root_url -> the good old, sometimes damned, CVSROOT
- # login -> unnecessary
+ # login -> unnecessary
# password -> unnecessary too
def initialize(url, root_url=nil, login=nil, password=nil,
path_encoding=nil)
- @url = url
- @login = login if login && !login.empty?
+ @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding
+ @url = url
+ # TODO: better Exception here (IllegalArgumentException)
+ raise CommandFailed if root_url.blank?
+ @root_url = root_url
+
+ # These are unused.
+ @login = login if login && !login.empty?
@password = (password || "") if @login
- #TODO: better Exception here (IllegalArgumentException)
- raise CommandFailed if root_url.blank?
- @root_url = root_url
end
- def root_url
- @root_url
- end
-
- def url
- @url
+ def path_encoding
+ @path_encoding
end
def info
@@ -92,43 +94,59 @@
# Returns an Entries collection
# or nil if the given path doesn't exist in the repository
# this method is used by the repository-browser (aka LIST)
- def entries(path=nil, identifier=nil)
+ def entries(path=nil, identifier=nil, options={})
logger.debug " entries '#{path}' with identifier '#{identifier}'"
- path_with_project="#{url}#{with_leading_slash(path)}"
+ path_locale = scm_iconv(@path_encoding, 'UTF-8', path)
+ path_locale.force_encoding("ASCII-8BIT") if path_locale.respond_to?(:force_encoding)
entries = Entries.new
- cmd = "#{self.class.sq_bin} -d #{shell_quote root_url} rls -e"
- cmd << " -D \"#{time_to_cvstime(identifier)}\"" if identifier
- cmd << " #{shell_quote path_with_project}"
- shellout(cmd) do |io|
- io.each_line(){|line|
- fields=line.chop.split('/',-1)
+ cmd_args = %w|-q rls -e|
+ cmd_args << "-D" << time_to_cvstime_rlog(identifier) if identifier
+ cmd_args << path_with_proj(path)
+ scm_cmd(*cmd_args) do |io|
+ io.each_line() do |line|
+ fields = line.chop.split('/',-1)
logger.debug(">>InspectLine #{fields.inspect}")
-
if fields[0]!="D"
- entries << Entry.new({:name => fields[-5],
+ time = nil
+ # Thu Dec 13 16:27:22 2007
+ time_l = fields[-3].split(' ')
+ if time_l.size == 5 && time_l[4].length == 4
+ begin
+ time = Time.parse(
+ "#{time_l[1]} #{time_l[2]} #{time_l[3]} GMT #{time_l[4]}")
+ rescue
+ end
+ end
+ entries << Entry.new(
+ {
+ :name => scm_iconv('UTF-8', @path_encoding, fields[-5]),
#:path => fields[-4].include?(path)?fields[-4]:(path + "/"+ fields[-4]),
- :path => "#{path}/#{fields[-5]}",
+ :path => scm_iconv('UTF-8', @path_encoding, "#{path_locale}/#{fields[-5]}"),
:kind => 'file',
:size => nil,
- :lastrev => Revision.new({
- :revision => fields[-4],
- :name => fields[-4],
- :time => Time.parse(fields[-3]),
- :author => ''
+ :lastrev => Revision.new(
+ {
+ :revision => fields[-4],
+ :name => scm_iconv('UTF-8', @path_encoding, fields[-4]),
+ :time => time,
+ :author => ''
+ })
})
- })
else
- entries << Entry.new({:name => fields[1],
- :path => "#{path}/#{fields[1]}",
- :kind => 'dir',
- :size => nil,
+ entries << Entry.new(
+ {
+ :name => scm_iconv('UTF-8', @path_encoding, fields[1]),
+ :path => scm_iconv('UTF-8', @path_encoding, "#{path_locale}/#{fields[1]}"),
+ :kind => 'dir',
+ :size => nil,
:lastrev => nil
- })
+ })
end
- }
+ end
end
- return nil if $? && $?.exitstatus != 0
entries.sort_by_name
+ rescue ScmCommandAborted
+ nil
end
STARTLOG="----------------------------"
@@ -138,111 +156,106 @@
# in the repository. both identifier have to be dates or nil.
# these method returns nothing but yield every result in block
def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={}, &block)
- logger.debug " revisions path:'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}"
-
- path_with_project="#{url}#{with_leading_slash(path)}"
- cmd = "#{self.class.sq_bin} -d #{shell_quote root_url} rlog"
- cmd << " -d\">#{time_to_cvstime_rlog(identifier_from)}\"" if identifier_from
- cmd << " #{shell_quote path_with_project}"
- shellout(cmd) do |io|
- state="entry_start"
-
- commit_log=String.new
- revision=nil
- date=nil
- author=nil
- entry_path=nil
- entry_name=nil
- file_state=nil
- branch_map=nil
-
+ path_with_project_utf8 = path_with_proj(path)
+ path_with_project_locale = scm_iconv(@path_encoding, 'UTF-8', path_with_project_utf8)
+ logger.debug " revisions path:" +
+ "'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}"
+ cmd_args = %w|-q rlog|
+ cmd_args << "-d" << ">#{time_to_cvstime_rlog(identifier_from)}" if identifier_from
+ cmd_args << path_with_project_utf8
+ scm_cmd(*cmd_args) do |io|
+ state = "entry_start"
+ commit_log = String.new
+ revision = nil
+ date = nil
+ author = nil
+ entry_path = nil
+ entry_name = nil
+ file_state = nil
+ branch_map = nil
io.each_line() do |line|
-
- if state!="revision" && /^#{ENDLOG}/ =~ line
- commit_log=String.new
- revision=nil
- state="entry_start"
+ if state != "revision" && /^#{ENDLOG}/ =~ line
+ commit_log = String.new
+ revision = nil
+ state = "entry_start"
end
-
- if state=="entry_start"
- branch_map=Hash.new
- if /^RCS file: #{Regexp.escape(root_url_path)}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line
+ if state == "entry_start"
+ branch_map = Hash.new
+ if /^RCS file: #{Regexp.escape(root_url_path)}\/#{Regexp.escape(path_with_project_locale)}(.+),v$/ =~ line
entry_path = normalize_cvs_path($1)
entry_name = normalize_path(File.basename($1))
logger.debug("Path #{entry_path} <=> Name #{entry_name}")
elsif /^head: (.+)$/ =~ line
entry_headRev = $1 #unless entry.nil?
elsif /^symbolic names:/ =~ line
- state="symbolic" #unless entry.nil?
+ state = "symbolic" #unless entry.nil?
elsif /^#{STARTLOG}/ =~ line
- commit_log=String.new
- state="revision"
- end
+ commit_log = String.new
+ state = "revision"
+ end
next
- elsif state=="symbolic"
- if /^(.*):\s(.*)/ =~ (line.strip)
- branch_map[$1]=$2
+ elsif state == "symbolic"
+ if /^(.*):\s(.*)/ =~ (line.strip)
+ branch_map[$1] = $2
else
- state="tags"
+ state = "tags"
next
- end
- elsif state=="tags"
+ end
+ elsif state == "tags"
if /^#{STARTLOG}/ =~ line
commit_log = ""
- state="revision"
+ state = "revision"
elsif /^#{ENDLOG}/ =~ line
- state="head"
+ state = "head"
end
next
- elsif state=="revision"
+ elsif state == "revision"
if /^#{ENDLOG}/ =~ line || /^#{STARTLOG}/ =~ line
if revision
-
- revHelper=CvsRevisionHelper.new(revision)
- revBranch="HEAD"
-
- branch_map.each() do |branch_name,branch_point|
+ revHelper = CvsRevisionHelper.new(revision)
+ revBranch = "HEAD"
+ branch_map.each() do |branch_name, branch_point|
if revHelper.is_in_branch_with_symbol(branch_point)
- revBranch=branch_name
+ revBranch = branch_name
end
end
-
logger.debug("********** YIELD Revision #{revision}::#{revBranch}")
-
yield Revision.new({
- :time => date,
- :author => author,
- :message=>commit_log.chomp,
+ :time => date,
+ :author => author,
+ :message => commit_log.chomp,
:paths => [{
:revision => revision,
- :branch=> revBranch,
- :path=>entry_path,
- :name=>entry_name,
- :kind=>'file',
- :action=>file_state
- }]
- })
+ :branch => revBranch,
+ :path => scm_iconv('UTF-8', @path_encoding, entry_path),
+ :name => scm_iconv('UTF-8', @path_encoding, entry_name),
+ :kind => 'file',
+ :action => file_state
+ }]
+ })
end
-
- commit_log=String.new
- revision=nil
-
+ commit_log = String.new
+ revision = nil
if /^#{ENDLOG}/ =~ line
- state="entry_start"
+ state = "entry_start"
end
next
end
if /^branches: (.+)$/ =~ line
- #TODO: version.branch = $1
+ # TODO: version.branch = $1
elsif /^revision (\d+(?:\.\d+)+).*$/ =~ line
- revision = $1
+ revision = $1
elsif /^date:\s+(\d+.\d+.\d+\s+\d+:\d+:\d+)/ =~ line
- date = Time.parse($1)
- author = /author: ([^;]+)/.match(line)[1]
- file_state = /state: ([^;]+)/.match(line)[1]
- #TODO: linechanges only available in CVS.... maybe a feature our SVN implementation. i'm sure, they are
- # useful for stats or something else
+ date = Time.parse($1)
+ line_utf8 = scm_iconv('UTF-8', options[:log_encoding], line)
+ author_utf8 = /author: ([^;]+)/.match(line_utf8)[1]
+ author = scm_iconv(options[:log_encoding], 'UTF-8', author_utf8)
+ file_state = /state: ([^;]+)/.match(line)[1]
+ # TODO:
+ # linechanges only available in CVS....
+ # maybe a feature our SVN implementation.
+ # I'm sure, they are useful for stats or something else
# linechanges =/lines: \+(\d+) -(\d+)/.match(line)
# unless linechanges.nil?
# version.line_plus = linechanges[1]
@@ -257,52 +270,66 @@
end
end
end
+ rescue ScmCommandAborted
+ Revisions.new
end
def diff(path, identifier_from, identifier_to=nil)
- logger.debug " diff path:'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}"
- path_with_project="#{url}#{with_leading_slash(path)}"
- cmd = "#{self.class.sq_bin} -d #{shell_quote root_url} rdiff -u -r#{identifier_to} -r#{identifier_from} #{shell_quote path_with_project}"
+ logger.debug " diff path:'#{path}'" +
+ ",identifier_from #{identifier_from}, identifier_to #{identifier_to}"
+ cmd_args = %w|rdiff -u|
+ cmd_args << "-r#{identifier_to}"
+ cmd_args << "-r#{identifier_from}"
+ cmd_args << path_with_proj(path)
diff = []
- shellout(cmd) do |io|
+ scm_cmd(*cmd_args) do |io|
io.each_line do |line|
diff << line
end
end
- return nil if $? && $?.exitstatus != 0
diff
+ rescue ScmCommandAborted
+ nil
end
def cat(path, identifier=nil)
identifier = (identifier) ? identifier : "HEAD"
logger.debug " cat path:'#{path}',identifier #{identifier}"
- path_with_project="#{url}#{with_leading_slash(path)}"
- cmd = "#{self.class.sq_bin} -d #{shell_quote root_url} co"
- cmd << " -D \"#{time_to_cvstime(identifier)}\"" if identifier
- cmd << " -p #{shell_quote path_with_project}"
+ cmd_args = %w|-q co|
+ cmd_args << "-D" << time_to_cvstime(identifier) if identifier
+ cmd_args << "-p" << path_with_proj(path)
cat = nil
- shellout(cmd) do |io|
+ scm_cmd(*cmd_args) do |io|
io.binmode
cat = io.read
end
- return nil if $? && $?.exitstatus != 0
cat
+ rescue ScmCommandAborted
+ nil
end
def annotate(path, identifier=nil)
- identifier = (identifier) ? identifier.to_i : "HEAD"
+ identifier = (identifier) ? identifier : "HEAD"
logger.debug " annotate path:'#{path}',identifier #{identifier}"
- path_with_project="#{url}#{with_leading_slash(path)}"
- cmd = "#{self.class.sq_bin} -d #{shell_quote root_url} rannotate -r#{identifier} #{shell_quote path_with_project}"
+ cmd_args = %w|rannotate|
+ cmd_args << "-D" << time_to_cvstime(identifier) if identifier
+ cmd_args << path_with_proj(path)
blame = Annotate.new
- shellout(cmd) do |io|
+ scm_cmd(*cmd_args) do |io|
io.each_line do |line|
next unless line =~ %r{^([\d\.]+)\s+\(([^\)]+)\s+[^\)]+\):\s(.*)$}
- blame.add_line($3.rstrip, Revision.new(:revision => $1, :author => $2.strip))
+ blame.add_line(
+ $3.rstrip,
+ Revision.new(
+ :revision => $1,
+ :identifier => nil,
+ :author => $2.strip
+ ))
end
end
- return nil if $? && $?.exitstatus != 0
blame
+ rescue ScmCommandAborted
+ Annotate.new
end
private
@@ -317,12 +344,12 @@
# convert a date/time into the CVS-format
def time_to_cvstime(time)
return nil if time.nil?
- return Time.now if time == 'HEAD'
-
+ time = Time.now if time == 'HEAD'
+
unless time.kind_of? Time
time = Time.parse(time)
end
- return time.strftime("%Y-%m-%d %H:%M:%S")
+ return time_to_cvstime_rlog(time)
end
def time_to_cvstime_rlog(time)
@@ -330,77 +357,104 @@
t1 = time.clone.localtime
return t1.strftime("%Y-%m-%d %H:%M:%S")
end
-
+
def normalize_cvs_path(path)
normalize_path(path.gsub(/Attic\//,''))
end
-
+
def normalize_path(path)
path.sub(/^(\/)*(.*)/,'\2').sub(/(.*)(,v)+/,'\1')
- end
- end
-
+ end
+
+ def path_with_proj(path)
+ "#{url}#{with_leading_slash(path)}"
+ end
+ private :path_with_proj
+
+ class Revision < Redmine::Scm::Adapters::Revision
+ # Returns the readable identifier
+ def format_identifier
+ revision.to_s
+ end
+ end
+
+ def scm_cmd(*args, &block)
+ full_args = [CVS_BIN, '-d', root_url]
+ full_args += args
+ full_args_locale = []
+ full_args.map do |e|
+ full_args_locale << scm_iconv(@path_encoding, 'UTF-8', e)
+ end
+ ret = shellout(full_args_locale.map { |e| shell_quote e.to_s }.join(' '), &block)
+ if $? && $?.exitstatus != 0
+ raise ScmCommandAborted, "cvs exited with non-zero status: #{$?.exitstatus}"
+ end
+ ret
+ end
+ private :scm_cmd
+ end
+
class CvsRevisionHelper
attr_accessor :complete_rev, :revision, :base, :branchid
-
+
def initialize(complete_rev)
@complete_rev = complete_rev
parseRevision()
end
-
+
def branchPoint
return @base
end
-
+
def branchVersion
if isBranchRevision
return @base+"."+@branchid
end
return @base
end
-
+
def isBranchRevision
!@branchid.nil?
end
-
+
def prevRev
- unless @revision==0
- return buildRevision(@revision-1)
+ unless @revision == 0
+ return buildRevision( @revision - 1 )
end
- return buildRevision(@revision)
+ return buildRevision( @revision )
end
-
+
def is_in_branch_with_symbol(branch_symbol)
- bpieces=branch_symbol.split(".")
- branch_start="#{bpieces[0..-3].join(".")}.#{bpieces[-1]}"
- return (branchVersion==branch_start)
+ bpieces = branch_symbol.split(".")
+ branch_start = "#{bpieces[0..-3].join(".")}.#{bpieces[-1]}"
+ return ( branchVersion == branch_start )
end
-
+
private
def buildRevision(rev)
- if rev== 0
+ if rev == 0
if @branchid.nil?
- @base+".0"
+ @base + ".0"
else
@base
end
- elsif @branchid.nil?
- @base+"."+rev.to_s
+ elsif @branchid.nil?
+ @base + "." + rev.to_s
else
- @base+"."+@branchid+"."+rev.to_s
+ @base + "." + @branchid + "." + rev.to_s
end
end
-
+
# Interpretiert die cvs revisionsnummern wie z.b. 1.14 oder 1.3.0.15
def parseRevision()
- pieces=@complete_rev.split(".")
- @revision=pieces.last.to_i
- baseSize=1
- baseSize+=(pieces.size/2)
- @base=pieces[0..-baseSize].join(".")
+ pieces = @complete_rev.split(".")
+ @revision = pieces.last.to_i
+ baseSize = 1
+ baseSize += (pieces.size / 2)
+ @base = pieces[0..-baseSize].join(".")
if baseSize > 2
- @branchid=pieces[-2]
- end
+ @branchid = pieces[-2]
+ end
end
end
end
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/.svn/text-base/darcs_adapter.rb.svn-base
--- a/lib/redmine/scm/adapters/.svn/text-base/darcs_adapter.rb.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/.svn/text-base/darcs_adapter.rb.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -1,16 +1,16 @@
-# redMine - project management software
-# Copyright (C) 2006-2007 Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -76,7 +76,7 @@
# Returns an Entries collection
# or nil if the given path doesn't exist in the repository
- def entries(path=nil, identifier=nil)
+ def entries(path=nil, identifier=nil, options={})
path_prefix = (path.blank? ? '' : "#{path}/")
if path.blank?
path = ( self.class.client_version_above?([2, 2, 0]) ? @url : '.' )
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/.svn/text-base/filesystem_adapter.rb.svn-base
--- a/lib/redmine/scm/adapters/.svn/text-base/filesystem_adapter.rb.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/.svn/text-base/filesystem_adapter.rb.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006-2007 Jean-Philippe Lang
+# RedMine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# FileSystem adapter
# File written by Paul Rivier, at Demotera.
@@ -8,12 +8,12 @@
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -35,14 +35,18 @@
def initialize(url, root_url=nil, login=nil, password=nil,
path_encoding=nil)
@url = with_trailling_slash(url)
- @path_encoding = path_encoding || 'UTF-8'
+ @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding
+ end
+
+ def path_encoding
+ @path_encoding
end
def format_path_ends(path, leading=true, trailling=true)
- path = leading ? with_leading_slash(path) :
+ path = leading ? with_leading_slash(path) :
without_leading_slash(path)
- trailling ? with_trailling_slash(path) :
- without_trailling_slash(path)
+ trailling ? with_trailling_slash(path) :
+ without_trailling_slash(path)
end
def info
@@ -54,13 +58,15 @@
return nil
end
- def entries(path="", identifier=nil)
+ def entries(path="", identifier=nil, options={})
entries = Entries.new
trgt_utf8 = target(path)
trgt = scm_iconv(@path_encoding, 'UTF-8', trgt_utf8)
Dir.new(trgt).each do |e1|
e_utf8 = scm_iconv('UTF-8', @path_encoding, e1)
- relative_path_utf8 = format_path_ends((format_path_ends(path,false,true) + e_utf8),false,false)
+ next if e_utf8.blank?
+ relative_path_utf8 = format_path_ends(
+ (format_path_ends(path,false,true) + e_utf8),false,false)
t1_utf8 = target(relative_path_utf8)
t1 = scm_iconv(@path_encoding, 'UTF-8', t1_utf8)
relative_path = scm_iconv(@path_encoding, 'UTF-8', relative_path_utf8)
@@ -76,7 +82,7 @@
:path => utf_8_path,
:kind => (File.directory?(t1) ? 'dir' : 'file'),
:size => (File.directory?(t1) ? nil : [File.size(t1)].pack('l').unpack('L').first),
- :lastrev =>
+ :lastrev =>
Revision.new({:time => (File.mtime(t1)) })
})
end
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/.svn/text-base/git_adapter.rb.svn-base
--- a/lib/redmine/scm/adapters/.svn/text-base/git_adapter.rb.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/.svn/text-base/git_adapter.rb.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -1,16 +1,16 @@
-# redMine - project management software
-# Copyright (C) 2006-2007 Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -22,8 +22,6 @@
module Adapters
class GitAdapter < AbstractAdapter
- SCM_GIT_REPORT_LAST_COMMIT = true
-
# Git executable name
GIT_BIN = Redmine::Configuration['scm_git_command'] || "git"
@@ -64,7 +62,11 @@
def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil)
super
- @flag_report_last_commit = SCM_GIT_REPORT_LAST_COMMIT
+ @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding
+ end
+
+ def path_encoding
+ @path_encoding
end
def info
@@ -78,59 +80,88 @@
def branches
return @branches if @branches
@branches = []
- cmd = "#{self.class.sq_bin} --git-dir #{target('')} branch --no-color"
- shellout(cmd) do |io|
+ cmd_args = %w|branch --no-color|
+ scm_cmd(*cmd_args) do |io|
io.each_line do |line|
@branches << line.match('\s*\*?\s*(.*)$')[1]
end
end
@branches.sort!
+ rescue ScmCommandAborted
+ nil
end
def tags
return @tags if @tags
- cmd = "#{self.class.sq_bin} --git-dir #{target('')} tag"
- shellout(cmd) do |io|
+ cmd_args = %w|tag|
+ scm_cmd(*cmd_args) do |io|
@tags = io.readlines.sort!.map{|t| t.strip}
end
+ rescue ScmCommandAborted
+ nil
+ end
+
+ def default_branch
+ bras = self.branches
+ return nil if bras.nil?
+ bras.include?('master') ? 'master' : bras.first
+ end
+
+ def entry(path=nil, identifier=nil)
+ parts = path.to_s.split(%r{[\/\\]}).select {|n| !n.blank?}
+ search_path = parts[0..-2].join('/')
+ search_name = parts[-1]
+ if search_path.blank? && search_name.blank?
+ # Root entry
+ Entry.new(:path => '', :kind => 'dir')
+ else
+ # Search for the entry in the parent directory
+ es = entries(search_path, identifier,
+ options = {:report_last_commit => false})
+ es ? es.detect {|e| e.name == search_name} : nil
+ end
end
- def default_branch
- branches.include?('master') ? 'master' : branches.first
- end
-
- def entries(path=nil, identifier=nil)
+ def entries(path=nil, identifier=nil, options={})
path ||= ''
+ p = scm_iconv(@path_encoding, 'UTF-8', path)
entries = Entries.new
- cmd = "#{self.class.sq_bin} --git-dir #{target('')} ls-tree -l "
- cmd << shell_quote("HEAD:" + path) if identifier.nil?
- cmd << shell_quote(identifier + ":" + path) if identifier
- shellout(cmd) do |io|
+ cmd_args = %w|ls-tree -l|
+ cmd_args << "HEAD:#{p}" if identifier.nil?
+ cmd_args << "#{identifier}:#{p}" if identifier
+ scm_cmd(*cmd_args) do |io|
io.each_line do |line|
e = line.chomp.to_s
if e =~ /^\d+\s+(\w+)\s+([0-9a-f]{40})\s+([0-9-]+)\t(.+)$/
type = $1
- sha = $2
+ sha = $2
size = $3
name = $4
- full_path = path.empty? ? name : "#{path}/#{name}"
- entries << Entry.new({:name => name,
- :path => full_path,
+ if name.respond_to?(:force_encoding)
+ name.force_encoding(@path_encoding)
+ end
+ full_path = p.empty? ? name : "#{p}/#{name}"
+ n = scm_iconv('UTF-8', @path_encoding, name)
+ full_p = scm_iconv('UTF-8', @path_encoding, full_path)
+ entries << Entry.new({:name => n,
+ :path => full_p,
:kind => (type == "tree") ? 'dir' : 'file',
:size => (type == "tree") ? nil : size,
- :lastrev => @flag_report_last_commit ? lastrev(full_path,identifier) : Revision.new
+ :lastrev => options[:report_last_commit] ?
+ lastrev(full_path, identifier) : Revision.new
}) unless entries.detect{|entry| entry.name == name}
end
end
end
- return nil if $? && $?.exitstatus != 0
entries.sort_by_name
+ rescue ScmCommandAborted
+ nil
end
def lastrev(path, rev)
return nil if path.nil?
cmd_args = %w|log --no-color --encoding=UTF-8 --date=iso --pretty=fuller --no-merges -n 1|
- cmd_args << rev if rev
+ cmd_args << rev if rev
cmd_args << "--" << path unless path.empty?
lines = []
scm_cmd(*cmd_args) { |io| lines = io.readlines }
@@ -141,11 +172,11 @@
Revision.new({
:identifier => id,
- :scmid => id,
- :author => author,
- :time => time,
- :message => nil,
- :paths => nil
+ :scmid => id,
+ :author => author,
+ :time => time,
+ :message => nil,
+ :paths => nil
})
rescue NoMethodError => e
logger.error("The revision '#{path}' has a wrong format")
@@ -156,7 +187,7 @@
end
def revisions(path, identifier_from, identifier_to, options={})
- revisions = Revisions.new
+ revs = Revisions.new
cmd_args = %w|log --no-color --encoding=UTF-8 --raw --date=iso --pretty=fuller|
cmd_args << "--reverse" if options[:reverse]
cmd_args << "--all" if options[:all]
@@ -166,13 +197,12 @@
from_to << "#{identifier_to}" if identifier_to
cmd_args << from_to if !from_to.empty?
cmd_args << "--since=#{options[:since].strftime("%Y-%m-%d %H:%M:%S")}" if options[:since]
- cmd_args << "--" << path if path && !path.empty?
+ cmd_args << "--" << scm_iconv(@path_encoding, 'UTF-8', path) if path && !path.empty?
scm_cmd *cmd_args do |io|
files=[]
changeset = {}
parsing_descr = 0 #0: not parsing desc or files, 1: parsing desc, 2: parsing files
- revno = 1
io.each_line do |line|
if line =~ /^commit ([0-9a-f]{40})$/
@@ -182,20 +212,19 @@
parsing_descr = 0
revision = Revision.new({
:identifier => changeset[:commit],
- :scmid => changeset[:commit],
- :author => changeset[:author],
- :time => Time.parse(changeset[:date]),
- :message => changeset[:description],
- :paths => files
+ :scmid => changeset[:commit],
+ :author => changeset[:author],
+ :time => Time.parse(changeset[:date]),
+ :message => changeset[:description],
+ :paths => files
})
if block_given?
yield revision
else
- revisions << revision
+ revs << revision
end
changeset = {}
files = []
- revno = revno + 1
end
changeset[:commit] = $1
elsif (parsing_descr == 0) && line =~ /^(\w+):\s*(.*)$/
@@ -210,73 +239,75 @@
parsing_descr = 1
changeset[:description] = ""
elsif (parsing_descr == 1 || parsing_descr == 2) \
- && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\t(.+)$/
+ && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\t(.+)$/
parsing_descr = 2
- fileaction = $1
- filepath = $2
- files << {:action => fileaction, :path => filepath}
+ fileaction = $1
+ filepath = $2
+ p = scm_iconv('UTF-8', @path_encoding, filepath)
+ files << {:action => fileaction, :path => p}
elsif (parsing_descr == 1 || parsing_descr == 2) \
- && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\d+\s+(\S+)\t(.+)$/
+ && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\d+\s+(\S+)\t(.+)$/
parsing_descr = 2
- fileaction = $1
- filepath = $3
- files << {:action => fileaction, :path => filepath}
+ fileaction = $1
+ filepath = $3
+ p = scm_iconv('UTF-8', @path_encoding, filepath)
+ files << {:action => fileaction, :path => p}
elsif (parsing_descr == 1) && line.chomp.to_s == ""
parsing_descr = 2
elsif (parsing_descr == 1)
changeset[:description] << line[4..-1]
end
- end
+ end
if changeset[:commit]
revision = Revision.new({
:identifier => changeset[:commit],
- :scmid => changeset[:commit],
- :author => changeset[:author],
- :time => Time.parse(changeset[:date]),
- :message => changeset[:description],
- :paths => files
- })
-
+ :scmid => changeset[:commit],
+ :author => changeset[:author],
+ :time => Time.parse(changeset[:date]),
+ :message => changeset[:description],
+ :paths => files
+ })
if block_given?
yield revision
else
- revisions << revision
+ revs << revision
end
end
end
- revisions
- rescue ScmCommandAborted
- revisions
+ revs
+ rescue ScmCommandAborted => e
+ logger.error("git log #{from_to.to_s} error: #{e.message}")
+ revs
end
def diff(path, identifier_from, identifier_to=nil)
path ||= ''
-
+ cmd_args = []
if identifier_to
- cmd = "#{self.class.sq_bin} --git-dir #{target('')} diff --no-color #{shell_quote identifier_to} #{shell_quote identifier_from}"
+ cmd_args << "diff" << "--no-color" << identifier_to << identifier_from
else
- cmd = "#{self.class.sq_bin} --git-dir #{target('')} show --no-color #{shell_quote identifier_from}"
+ cmd_args << "show" << "--no-color" << identifier_from
end
-
- cmd << " -- #{shell_quote path}" unless path.empty?
+ cmd_args << "--" << scm_iconv(@path_encoding, 'UTF-8', path) unless path.empty?
diff = []
- shellout(cmd) do |io|
+ scm_cmd *cmd_args do |io|
io.each_line do |line|
diff << line
end
end
- return nil if $? && $?.exitstatus != 0
diff
+ rescue ScmCommandAborted
+ nil
end
-
+
def annotate(path, identifier=nil)
identifier = 'HEAD' if identifier.blank?
- cmd = "#{self.class.sq_bin} --git-dir #{target('')} blame -p #{shell_quote identifier} -- #{shell_quote path}"
+ cmd_args = %w|blame|
+ cmd_args << "-p" << identifier << "--" << scm_iconv(@path_encoding, 'UTF-8', path)
blame = Annotate.new
content = nil
- shellout(cmd) { |io| io.binmode; content = io.read }
- return nil if $? && $?.exitstatus != 0
+ scm_cmd(*cmd_args) { |io| io.binmode; content = io.read }
# git annotates binary files
return nil if content.is_binary_data?
identifier = ''
@@ -288,26 +319,35 @@
elsif line =~ /^author (.+)/
authors_by_commit[identifier] = $1.strip
elsif line =~ /^\t(.*)/
- blame.add_line($1, Revision.new(:identifier => identifier, :author => authors_by_commit[identifier]))
+ blame.add_line($1, Revision.new(
+ :identifier => identifier,
+ :revision => identifier,
+ :scmid => identifier,
+ :author => authors_by_commit[identifier]
+ ))
identifier = ''
author = ''
end
end
blame
+ rescue ScmCommandAborted
+ nil
end
def cat(path, identifier=nil)
if identifier.nil?
identifier = 'HEAD'
end
- cmd = "#{self.class.sq_bin} --git-dir #{target('')} show --no-color #{shell_quote(identifier + ':' + path)}"
+ cmd_args = %w|show --no-color|
+ cmd_args << "#{identifier}:#{scm_iconv(@path_encoding, 'UTF-8', path)}"
cat = nil
- shellout(cmd) do |io|
+ scm_cmd(*cmd_args) do |io|
io.binmode
cat = io.read
end
- return nil if $? && $?.exitstatus != 0
cat
+ rescue ScmCommandAborted
+ nil
end
class Revision < Redmine::Scm::Adapters::Revision
@@ -320,6 +360,10 @@
def scm_cmd(*args, &block)
repo_path = root_url || url
full_args = [GIT_BIN, '--git-dir', repo_path]
+ if self.class.client_version_above?([1, 7, 2])
+ full_args << '-c' << 'core.quotepath=false'
+ full_args << '-c' << 'log.decorate=no'
+ end
full_args += args
ret = shellout(full_args.map { |e| shell_quote e.to_s }.join(' '), &block)
if $? && $?.exitstatus != 0
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/.svn/text-base/mercurial_adapter.rb.svn-base
--- a/lib/redmine/scm/adapters/.svn/text-base/mercurial_adapter.rb.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/.svn/text-base/mercurial_adapter.rb.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -1,16 +1,16 @@
-# redMine - project management software
-# Copyright (C) 2006-2007 Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -47,7 +47,7 @@
end
def client_available
- !client_version.empty?
+ client_version_above?([0, 9, 5])
end
def hgversion
@@ -83,7 +83,11 @@
def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil)
super
- @path_encoding = path_encoding || 'UTF-8'
+ @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding
+ end
+
+ def path_encoding
+ @path_encoding
end
def info
@@ -118,7 +122,7 @@
end
def summary
- return @summary if @summary
+ return @summary if @summary
hg 'rhsummary' do |io|
output = io.read
if output.respond_to?(:force_encoding)
@@ -132,7 +136,7 @@
end
private :summary
- def entries(path=nil, identifier=nil)
+ def entries(path=nil, identifier=nil, options={})
p1 = scm_iconv(@path_encoding, 'UTF-8', path)
manifest = hg('rhmanifest', '-r', CGI.escape(hgrev(identifier)),
CGI.escape(without_leading_slash(p1.to_s))) do |io|
@@ -193,30 +197,39 @@
rescue
end
end
-
as_ary(log['logentry']).each do |le|
cpalist = as_ary(le['paths']['path-copied']).map do |e|
- [e['__content__'], e['copyfrom-path']].map { |s| CGI.unescape(s) }
+ [e['__content__'], e['copyfrom-path']].map do |s|
+ scm_iconv('UTF-8', @path_encoding, CGI.unescape(s))
+ end
end
cpmap = Hash[*cpalist.flatten]
-
paths = as_ary(le['paths']['path']).map do |e|
p = scm_iconv('UTF-8', @path_encoding, CGI.unescape(e['__content__']) )
- {:action => e['action'], :path => with_leading_slash(p),
- :from_path => (cpmap.member?(p) ? with_leading_slash(cpmap[p]) : nil),
- :from_revision => (cpmap.member?(p) ? le['revision'] : nil)}
+ {:action => e['action'],
+ :path => with_leading_slash(p),
+ :from_path => (cpmap.member?(p) ? with_leading_slash(cpmap[p]) : nil),
+ :from_revision => (cpmap.member?(p) ? le['node'] : nil)}
end.sort { |a, b| a[:path] <=> b[:path] }
-
yield Revision.new(:revision => le['revision'],
- :scmid => le['node'],
- :author => (le['author']['__content__'] rescue ''),
- :time => Time.parse(le['date']['__content__']).localtime,
- :message => le['msg']['__content__'],
- :paths => paths)
+ :scmid => le['node'],
+ :author => (le['author']['__content__'] rescue ''),
+ :time => Time.parse(le['date']['__content__']),
+ :message => le['msg']['__content__'],
+ :paths => paths)
end
self
end
+ # Returns list of nodes in the specified branch
+ def nodes_in_branch(branch, options={})
+ hg_args = ['rhlog', '--template', '{node|short}\n', '--rhbranch', CGI.escape(branch)]
+ hg_args << '--from' << CGI.escape(branch)
+ hg_args << '--to' << '0'
+ hg_args << '--limit' << options[:limit] if options[:limit]
+ hg(*hg_args) { |io| io.readlines.map { |e| e.chomp } }
+ end
+
def diff(path, identifier_from, identifier_to=nil)
hg_args = %w|rhdiff|
if identifier_to
@@ -241,7 +254,7 @@
def cat(path, identifier=nil)
p = CGI.escape(scm_iconv(@path_encoding, 'UTF-8', path))
- hg 'rhcat', '-r', hgrev(identifier), hgtarget(p) do |io|
+ hg 'rhcat', '-r', CGI.escape(hgrev(identifier)), hgtarget(p) do |io|
io.binmode
io.read
end
@@ -252,7 +265,7 @@
def annotate(path, identifier=nil)
p = CGI.escape(scm_iconv(@path_encoding, 'UTF-8', path))
blame = Annotate.new
- hg 'rhannotate', '-ncu', '-r', hgrev(identifier), hgtarget(p) do |io|
+ hg 'rhannotate', '-ncu', '-r', CGI.escape(hgrev(identifier)), hgtarget(p) do |io|
io.each_line do |line|
line.force_encoding('ASCII-8BIT') if line.respond_to?(:force_encoding)
next unless line =~ %r{^([^:]+)\s(\d+)\s([0-9a-f]+):\s(.*)$}
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/.svn/text-base/subversion_adapter.rb.svn-base
--- a/lib/redmine/scm/adapters/.svn/text-base/subversion_adapter.rb.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/.svn/text-base/subversion_adapter.rb.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -1,282 +1,291 @@
-# Redmine - project management software
-# Copyright (C) 2006-2010 Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-require 'redmine/scm/adapters/abstract_adapter'
-require 'uri'
-
-module Redmine
- module Scm
- module Adapters
- class SubversionAdapter < AbstractAdapter
-
- # SVN executable name
- SVN_BIN = Redmine::Configuration['scm_subversion_command'] || "svn"
-
- class << self
- def client_command
- @@bin ||= SVN_BIN
- end
-
- def sq_bin
- @@sq_bin ||= shell_quote(SVN_BIN)
- end
-
- def client_version
- @@client_version ||= (svn_binary_version || [])
- end
-
- def client_available
- !client_version.empty?
- end
-
- def svn_binary_version
- scm_version = scm_version_from_command_line.dup
- if scm_version.respond_to?(:force_encoding)
- scm_version.force_encoding('ASCII-8BIT')
- end
- if m = scm_version.match(%r{\A(.*?)((\d+\.)+\d+)})
- m[2].scan(%r{\d+}).collect(&:to_i)
- end
- end
-
- def scm_version_from_command_line
- shellout("#{sq_bin} --version") { |io| io.read }.to_s
- end
- end
-
- # Get info about the svn repository
- def info
- cmd = "#{self.class.sq_bin} info --xml #{target}"
- cmd << credentials_string
- info = nil
- shellout(cmd) do |io|
- output = io.read
- if output.respond_to?(:force_encoding)
- output.force_encoding('UTF-8')
- end
- begin
- doc = ActiveSupport::XmlMini.parse(output)
- #root_url = doc.elements["info/entry/repository/root"].text
- info = Info.new({:root_url => doc['info']['entry']['repository']['root']['__content__'],
- :lastrev => Revision.new({
- :identifier => doc['info']['entry']['commit']['revision'],
- :time => Time.parse(doc['info']['entry']['commit']['date']['__content__']).localtime,
- :author => (doc['info']['entry']['commit']['author'] ? doc['info']['entry']['commit']['author']['__content__'] : "")
- })
- })
- rescue
- end
- end
- return nil if $? && $?.exitstatus != 0
- info
- rescue CommandFailed
- return nil
- end
-
- # Returns an Entries collection
- # or nil if the given path doesn't exist in the repository
- def entries(path=nil, identifier=nil)
- path ||= ''
- identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
- entries = Entries.new
- cmd = "#{self.class.sq_bin} list --xml #{target(path)}@#{identifier}"
- cmd << credentials_string
- shellout(cmd) do |io|
- output = io.read
- if output.respond_to?(:force_encoding)
- output.force_encoding('UTF-8')
- end
- begin
- doc = ActiveSupport::XmlMini.parse(output)
- each_xml_element(doc['lists']['list'], 'entry') do |entry|
- commit = entry['commit']
- commit_date = commit['date']
- # Skip directory if there is no commit date (usually that
- # means that we don't have read access to it)
- next if entry['kind'] == 'dir' && commit_date.nil?
- name = entry['name']['__content__']
- entries << Entry.new({:name => URI.unescape(name),
- :path => ((path.empty? ? "" : "#{path}/") + name),
- :kind => entry['kind'],
- :size => ((s = entry['size']) ? s['__content__'].to_i : nil),
- :lastrev => Revision.new({
- :identifier => commit['revision'],
- :time => Time.parse(commit_date['__content__'].to_s).localtime,
- :author => ((a = commit['author']) ? a['__content__'] : nil)
- })
- })
- end
- rescue Exception => e
- logger.error("Error parsing svn output: #{e.message}")
- logger.error("Output was:\n #{output}")
- end
- end
- return nil if $? && $?.exitstatus != 0
- logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
- entries.sort_by_name
- end
-
- def properties(path, identifier=nil)
- # proplist xml output supported in svn 1.5.0 and higher
- return nil unless self.class.client_version_above?([1, 5, 0])
-
- identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
- cmd = "#{self.class.sq_bin} proplist --verbose --xml #{target(path)}@#{identifier}"
- cmd << credentials_string
- properties = {}
- shellout(cmd) do |io|
- output = io.read
- if output.respond_to?(:force_encoding)
- output.force_encoding('UTF-8')
- end
- begin
- doc = ActiveSupport::XmlMini.parse(output)
- each_xml_element(doc['properties']['target'], 'property') do |property|
- properties[ property['name'] ] = property['__content__'].to_s
- end
- rescue
- end
- end
- return nil if $? && $?.exitstatus != 0
- properties
- end
-
- def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
- path ||= ''
- identifier_from = (identifier_from && identifier_from.to_i > 0) ? identifier_from.to_i : "HEAD"
- identifier_to = (identifier_to && identifier_to.to_i > 0) ? identifier_to.to_i : 1
- revisions = Revisions.new
- cmd = "#{self.class.sq_bin} log --xml -r #{identifier_from}:#{identifier_to}"
- cmd << credentials_string
- cmd << " --verbose " if options[:with_paths]
- cmd << " --limit #{options[:limit].to_i}" if options[:limit]
- cmd << ' ' + target(path)
- shellout(cmd) do |io|
- output = io.read
- if output.respond_to?(:force_encoding)
- output.force_encoding('UTF-8')
- end
- begin
- doc = ActiveSupport::XmlMini.parse(output)
- each_xml_element(doc['log'], 'logentry') do |logentry|
- paths = []
- each_xml_element(logentry['paths'], 'path') do |path|
- paths << {:action => path['action'],
- :path => path['__content__'],
- :from_path => path['copyfrom-path'],
- :from_revision => path['copyfrom-rev']
- }
- end if logentry['paths'] && logentry['paths']['path']
- paths.sort! { |x,y| x[:path] <=> y[:path] }
-
- revisions << Revision.new({:identifier => logentry['revision'],
- :author => (logentry['author'] ? logentry['author']['__content__'] : ""),
- :time => Time.parse(logentry['date']['__content__'].to_s).localtime,
- :message => logentry['msg']['__content__'],
- :paths => paths
- })
- end
- rescue
- end
- end
- return nil if $? && $?.exitstatus != 0
- revisions
- end
-
- def diff(path, identifier_from, identifier_to=nil, type="inline")
- path ||= ''
- identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : ''
-
- identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : (identifier_from.to_i - 1)
-
- cmd = "#{self.class.sq_bin} diff -r "
- cmd << "#{identifier_to}:"
- cmd << "#{identifier_from}"
- cmd << " #{target(path)}@#{identifier_from}"
- cmd << credentials_string
- diff = []
- shellout(cmd) do |io|
- io.each_line do |line|
- diff << line
- end
- end
- return nil if $? && $?.exitstatus != 0
- diff
- end
-
- def cat(path, identifier=nil)
- identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
- cmd = "#{self.class.sq_bin} cat #{target(path)}@#{identifier}"
- cmd << credentials_string
- cat = nil
- shellout(cmd) do |io|
- io.binmode
- cat = io.read
- end
- return nil if $? && $?.exitstatus != 0
- cat
- end
-
- def annotate(path, identifier=nil)
- identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
- cmd = "#{self.class.sq_bin} blame #{target(path)}@#{identifier}"
- cmd << credentials_string
- blame = Annotate.new
- shellout(cmd) do |io|
- io.each_line do |line|
- next unless line =~ %r{^\s*(\d+)\s*(\S+)\s(.*)$}
- blame.add_line($3.rstrip, Revision.new(:identifier => $1.to_i, :author => $2.strip))
- end
- end
- return nil if $? && $?.exitstatus != 0
- blame
- end
-
- private
-
- def credentials_string
- str = ''
- str << " --username #{shell_quote(@login)}" unless @login.blank?
- str << " --password #{shell_quote(@password)}" unless @login.blank? || @password.blank?
- str << " --no-auth-cache --non-interactive"
- str
- end
-
- # Helper that iterates over the child elements of a xml node
- # MiniXml returns a hash when a single child is found or an array of hashes for multiple children
- def each_xml_element(node, name)
- if node && node[name]
- if node[name].is_a?(Hash)
- yield node[name]
- else
- node[name].each do |element|
- yield element
- end
- end
- end
- end
-
- def target(path = '')
- base = path.match(/^\//) ? root_url : url
- uri = "#{base}/#{path}"
- uri = URI.escape(URI.escape(uri), '[]')
- shell_quote(uri.gsub(/[?<>\*]/, ''))
- end
- end
- end
- end
-end
+# Redmine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+require 'redmine/scm/adapters/abstract_adapter'
+require 'uri'
+
+module Redmine
+ module Scm
+ module Adapters
+ class SubversionAdapter < AbstractAdapter
+
+ # SVN executable name
+ SVN_BIN = Redmine::Configuration['scm_subversion_command'] || "svn"
+
+ class << self
+ def client_command
+ @@bin ||= SVN_BIN
+ end
+
+ def sq_bin
+ @@sq_bin ||= shell_quote(SVN_BIN)
+ end
+
+ def client_version
+ @@client_version ||= (svn_binary_version || [])
+ end
+
+ def client_available
+ # --xml options are introduced in 1.3.
+ # http://subversion.apache.org/docs/release-notes/1.3.html
+ client_version_above?([1, 3])
+ end
+
+ def svn_binary_version
+ scm_version = scm_version_from_command_line.dup
+ if scm_version.respond_to?(:force_encoding)
+ scm_version.force_encoding('ASCII-8BIT')
+ end
+ if m = scm_version.match(%r{\A(.*?)((\d+\.)+\d+)})
+ m[2].scan(%r{\d+}).collect(&:to_i)
+ end
+ end
+
+ def scm_version_from_command_line
+ shellout("#{sq_bin} --version") { |io| io.read }.to_s
+ end
+ end
+
+ # Get info about the svn repository
+ def info
+ cmd = "#{self.class.sq_bin} info --xml #{target}"
+ cmd << credentials_string
+ info = nil
+ shellout(cmd) do |io|
+ output = io.read
+ if output.respond_to?(:force_encoding)
+ output.force_encoding('UTF-8')
+ end
+ begin
+ doc = ActiveSupport::XmlMini.parse(output)
+ # root_url = doc.elements["info/entry/repository/root"].text
+ info = Info.new({:root_url => doc['info']['entry']['repository']['root']['__content__'],
+ :lastrev => Revision.new({
+ :identifier => doc['info']['entry']['commit']['revision'],
+ :time => Time.parse(doc['info']['entry']['commit']['date']['__content__']).localtime,
+ :author => (doc['info']['entry']['commit']['author'] ? doc['info']['entry']['commit']['author']['__content__'] : "")
+ })
+ })
+ rescue
+ end
+ end
+ return nil if $? && $?.exitstatus != 0
+ info
+ rescue CommandFailed
+ return nil
+ end
+
+ # Returns an Entries collection
+ # or nil if the given path doesn't exist in the repository
+ def entries(path=nil, identifier=nil, options={})
+ path ||= ''
+ identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
+ entries = Entries.new
+ cmd = "#{self.class.sq_bin} list --xml #{target(path)}@#{identifier}"
+ cmd << credentials_string
+ shellout(cmd) do |io|
+ output = io.read
+ if output.respond_to?(:force_encoding)
+ output.force_encoding('UTF-8')
+ end
+ begin
+ doc = ActiveSupport::XmlMini.parse(output)
+ each_xml_element(doc['lists']['list'], 'entry') do |entry|
+ commit = entry['commit']
+ commit_date = commit['date']
+ # Skip directory if there is no commit date (usually that
+ # means that we don't have read access to it)
+ next if entry['kind'] == 'dir' && commit_date.nil?
+ name = entry['name']['__content__']
+ entries << Entry.new({:name => URI.unescape(name),
+ :path => ((path.empty? ? "" : "#{path}/") + name),
+ :kind => entry['kind'],
+ :size => ((s = entry['size']) ? s['__content__'].to_i : nil),
+ :lastrev => Revision.new({
+ :identifier => commit['revision'],
+ :time => Time.parse(commit_date['__content__'].to_s).localtime,
+ :author => ((a = commit['author']) ? a['__content__'] : nil)
+ })
+ })
+ end
+ rescue Exception => e
+ logger.error("Error parsing svn output: #{e.message}")
+ logger.error("Output was:\n #{output}")
+ end
+ end
+ return nil if $? && $?.exitstatus != 0
+ logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
+ entries.sort_by_name
+ end
+
+ def properties(path, identifier=nil)
+ # proplist xml output supported in svn 1.5.0 and higher
+ return nil unless self.class.client_version_above?([1, 5, 0])
+
+ identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
+ cmd = "#{self.class.sq_bin} proplist --verbose --xml #{target(path)}@#{identifier}"
+ cmd << credentials_string
+ properties = {}
+ shellout(cmd) do |io|
+ output = io.read
+ if output.respond_to?(:force_encoding)
+ output.force_encoding('UTF-8')
+ end
+ begin
+ doc = ActiveSupport::XmlMini.parse(output)
+ each_xml_element(doc['properties']['target'], 'property') do |property|
+ properties[ property['name'] ] = property['__content__'].to_s
+ end
+ rescue
+ end
+ end
+ return nil if $? && $?.exitstatus != 0
+ properties
+ end
+
+ def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
+ path ||= ''
+ identifier_from = (identifier_from && identifier_from.to_i > 0) ? identifier_from.to_i : "HEAD"
+ identifier_to = (identifier_to && identifier_to.to_i > 0) ? identifier_to.to_i : 1
+ revisions = Revisions.new
+ cmd = "#{self.class.sq_bin} log --xml -r #{identifier_from}:#{identifier_to}"
+ cmd << credentials_string
+ cmd << " --verbose " if options[:with_paths]
+ cmd << " --limit #{options[:limit].to_i}" if options[:limit]
+ cmd << ' ' + target(path)
+ shellout(cmd) do |io|
+ output = io.read
+ if output.respond_to?(:force_encoding)
+ output.force_encoding('UTF-8')
+ end
+ begin
+ doc = ActiveSupport::XmlMini.parse(output)
+ each_xml_element(doc['log'], 'logentry') do |logentry|
+ paths = []
+ each_xml_element(logentry['paths'], 'path') do |path|
+ paths << {:action => path['action'],
+ :path => path['__content__'],
+ :from_path => path['copyfrom-path'],
+ :from_revision => path['copyfrom-rev']
+ }
+ end if logentry['paths'] && logentry['paths']['path']
+ paths.sort! { |x,y| x[:path] <=> y[:path] }
+
+ revisions << Revision.new({:identifier => logentry['revision'],
+ :author => (logentry['author'] ? logentry['author']['__content__'] : ""),
+ :time => Time.parse(logentry['date']['__content__'].to_s).localtime,
+ :message => logentry['msg']['__content__'],
+ :paths => paths
+ })
+ end
+ rescue
+ end
+ end
+ return nil if $? && $?.exitstatus != 0
+ revisions
+ end
+
+ def diff(path, identifier_from, identifier_to=nil, type="inline")
+ path ||= ''
+ identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : ''
+
+ identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : (identifier_from.to_i - 1)
+
+ cmd = "#{self.class.sq_bin} diff -r "
+ cmd << "#{identifier_to}:"
+ cmd << "#{identifier_from}"
+ cmd << " #{target(path)}@#{identifier_from}"
+ cmd << credentials_string
+ diff = []
+ shellout(cmd) do |io|
+ io.each_line do |line|
+ diff << line
+ end
+ end
+ return nil if $? && $?.exitstatus != 0
+ diff
+ end
+
+ def cat(path, identifier=nil)
+ identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
+ cmd = "#{self.class.sq_bin} cat #{target(path)}@#{identifier}"
+ cmd << credentials_string
+ cat = nil
+ shellout(cmd) do |io|
+ io.binmode
+ cat = io.read
+ end
+ return nil if $? && $?.exitstatus != 0
+ cat
+ end
+
+ def annotate(path, identifier=nil)
+ identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
+ cmd = "#{self.class.sq_bin} blame #{target(path)}@#{identifier}"
+ cmd << credentials_string
+ blame = Annotate.new
+ shellout(cmd) do |io|
+ io.each_line do |line|
+ next unless line =~ %r{^\s*(\d+)\s*(\S+)\s(.*)$}
+ rev = $1
+ blame.add_line($3.rstrip,
+ Revision.new(
+ :identifier => rev,
+ :revision => rev,
+ :author => $2.strip
+ ))
+ end
+ end
+ return nil if $? && $?.exitstatus != 0
+ blame
+ end
+
+ private
+
+ def credentials_string
+ str = ''
+ str << " --username #{shell_quote(@login)}" unless @login.blank?
+ str << " --password #{shell_quote(@password)}" unless @login.blank? || @password.blank?
+ str << " --no-auth-cache --non-interactive"
+ str
+ end
+
+ # Helper that iterates over the child elements of a xml node
+ # MiniXml returns a hash when a single child is found
+ # or an array of hashes for multiple children
+ def each_xml_element(node, name)
+ if node && node[name]
+ if node[name].is_a?(Hash)
+ yield node[name]
+ else
+ node[name].each do |element|
+ yield element
+ end
+ end
+ end
+ end
+
+ def target(path = '')
+ base = path.match(/^\//) ? root_url : url
+ uri = "#{base}/#{path}"
+ uri = URI.escape(URI.escape(uri), '[]')
+ shell_quote(uri.gsub(/[?<>\*]/, ''))
+ end
+ end
+ end
+ end
+end
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/abstract_adapter.rb
--- a/lib/redmine/scm/adapters/abstract_adapter.rb Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb Mon Jun 06 14:41:04 2011 +0100
@@ -1,16 +1,16 @@
-# redMine - project management software
-# Copyright (C) 2006-2007 Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -90,12 +90,16 @@
def url
@url
end
-
+
+ def path_encoding
+ nil
+ end
+
# get info about the svn repository
def info
return nil
end
-
+
# Returns the entry identified by path and revision identifier
# or nil if entry doesn't exist in the repository
def entry(path=nil, identifier=nil)
@@ -111,10 +115,10 @@
es ? es.detect {|e| e.name == search_name} : nil
end
end
-
+
# Returns an Entries collection
# or nil if the given path doesn't exist in the repository
- def entries(path=nil, identifier=nil)
+ def entries(path=nil, identifier=nil, options={})
return nil
end
@@ -122,30 +126,30 @@
return nil
end
- def tags
+ def tags
return nil
end
def default_branch
return nil
end
-
+
def properties(path, identifier=nil)
return nil
end
-
+
def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
return nil
end
-
+
def diff(path, identifier_from, identifier_to=nil)
return nil
end
-
+
def cat(path, identifier=nil)
return nil
end
-
+
def with_leading_slash(path)
path ||= ''
(path[0,1]!="/") ? "/#{path}" : path
@@ -175,7 +179,7 @@
info = self.info
info ? info.root_url : nil
end
-
+
def target(path)
path ||= ''
base = path.match(/^\//) ? root_url : url
@@ -223,7 +227,7 @@
q = (Redmine::Platform.mswin? ? '"' : "'")
cmd.to_s.gsub(/(\-\-(password|username))\s+(#{q}[^#{q}]+#{q}|[^#{q}]\S+)/, '\\1 xxxx')
end
-
+
def strip_credential(cmd)
self.class.strip_credential(cmd)
end
@@ -242,7 +246,7 @@
class Entries < Array
def sort_by_name
- sort {|x,y|
+ sort {|x,y|
if x.kind == y.kind
x.name.to_s <=> y.name.to_s
else
@@ -250,12 +254,12 @@
end
}
end
-
+
def revisions
revisions ||= Revisions.new(collect{|entry| entry.lastrev}.compact)
end
end
-
+
class Info
attr_accessor :root_url, :lastrev
def initialize(attributes={})
@@ -263,7 +267,7 @@
self.lastrev = attributes[:lastrev]
end
end
-
+
class Entry
attr_accessor :name, :path, :kind, :size, :lastrev
def initialize(attributes={})
@@ -273,20 +277,20 @@
self.size = attributes[:size].to_i if attributes[:size]
self.lastrev = attributes[:lastrev]
end
-
+
def is_file?
'file' == self.kind
end
-
+
def is_dir?
'dir' == self.kind
end
-
+
def is_text?
Redmine::MimeType.is_type?('text', name)
end
end
-
+
class Revisions < Array
def latest
sort {|x,y|
@@ -296,53 +300,48 @@
0
end
}.last
- end
+ end
end
-
+
class Revision
- attr_accessor :scmid, :name, :author, :time, :message, :paths, :revision, :branch
- attr_writer :identifier
+ attr_accessor :scmid, :name, :author, :time, :message,
+ :paths, :revision, :branch, :identifier
def initialize(attributes={})
self.identifier = attributes[:identifier]
- self.scmid = attributes[:scmid]
- self.name = attributes[:name] || self.identifier
- self.author = attributes[:author]
- self.time = attributes[:time]
- self.message = attributes[:message] || ""
- self.paths = attributes[:paths]
- self.revision = attributes[:revision]
- self.branch = attributes[:branch]
- end
-
- # Returns the identifier of this revision; see also Changeset model
- def identifier
- (@identifier || revision).to_s
+ self.scmid = attributes[:scmid]
+ self.name = attributes[:name] || self.identifier
+ self.author = attributes[:author]
+ self.time = attributes[:time]
+ self.message = attributes[:message] || ""
+ self.paths = attributes[:paths]
+ self.revision = attributes[:revision]
+ self.branch = attributes[:branch]
end
# Returns the readable identifier.
def format_identifier
- identifier
+ self.identifier.to_s
end
end
class Annotate
attr_reader :lines, :revisions
-
+
def initialize
@lines = []
@revisions = []
end
-
+
def add_line(line, revision)
@lines << line
@revisions << revision
end
-
+
def content
content = lines.join("\n")
end
-
+
def empty?
lines.empty?
end
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/bazaar_adapter.rb
--- a/lib/redmine/scm/adapters/bazaar_adapter.rb Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/bazaar_adapter.rb Mon Jun 06 14:41:04 2011 +0100
@@ -1,16 +1,16 @@
-# redMine - project management software
-# Copyright (C) 2006-2007 Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -78,12 +78,12 @@
# Returns an Entries collection
# or nil if the given path doesn't exist in the repository
- def entries(path=nil, identifier=nil)
+ def entries(path=nil, identifier=nil, options={})
path ||= ''
entries = Entries.new
cmd = "#{self.class.sq_bin} ls -v --show-ids"
- identifier = -1 unless identifier && identifier.to_i > 0
- cmd << " -r#{identifier.to_i}"
+ identifier = -1 unless identifier && identifier.to_i > 0
+ cmd << " -r#{identifier.to_i}"
cmd << " #{target(path)}"
shellout(cmd) do |io|
prefix = "#{url}/#{path}".gsub('\\', '/')
@@ -120,7 +120,6 @@
parsing = nil
else
next unless revision
-
if line =~ /^revno: (\d+)($|\s\[merge\]$)/
revision.identifier = $1.to_i
elsif line =~ /^committer: (.+)$/
@@ -168,7 +167,7 @@
def diff(path, identifier_from, identifier_to=nil)
path ||= ''
if identifier_to
- identifier_to = identifier_to.to_i
+ identifier_to = identifier_to.to_i
else
identifier_to = identifier_from.to_i - 1
end
@@ -209,7 +208,13 @@
identifier = nil
io.each_line do |line|
next unless line =~ %r{^(\d+) ([^|]+)\| (.*)$}
- blame.add_line($3.rstrip, Revision.new(:identifier => $1.to_i, :author => $2.strip))
+ rev = $1
+ blame.add_line($3.rstrip,
+ Revision.new(
+ :identifier => rev,
+ :revision => rev,
+ :author => $2.strip
+ ))
end
end
return nil if $? && $?.exitstatus != 0
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/cvs_adapter.rb
--- a/lib/redmine/scm/adapters/cvs_adapter.rb Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb Mon Jun 06 14:41:04 2011 +0100
@@ -5,12 +5,12 @@
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -25,6 +25,9 @@
# CVS executable name
CVS_BIN = Redmine::Configuration['scm_cvs_command'] || "cvs"
+ # raised if scm command exited with error, e.g. unknown revision.
+ class ScmCommandAborted < CommandFailed; end
+
class << self
def client_command
@@bin ||= CVS_BIN
@@ -58,26 +61,25 @@
end
# Guidelines for the input:
- # url -> the project-path, relative to the cvsroot (eg. module name)
+ # url -> the project-path, relative to the cvsroot (eg. module name)
# root_url -> the good old, sometimes damned, CVSROOT
- # login -> unnecessary
+ # login -> unnecessary
# password -> unnecessary too
def initialize(url, root_url=nil, login=nil, password=nil,
path_encoding=nil)
- @url = url
- @login = login if login && !login.empty?
+ @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding
+ @url = url
+ # TODO: better Exception here (IllegalArgumentException)
+ raise CommandFailed if root_url.blank?
+ @root_url = root_url
+
+ # These are unused.
+ @login = login if login && !login.empty?
@password = (password || "") if @login
- #TODO: better Exception here (IllegalArgumentException)
- raise CommandFailed if root_url.blank?
- @root_url = root_url
end
- def root_url
- @root_url
- end
-
- def url
- @url
+ def path_encoding
+ @path_encoding
end
def info
@@ -92,43 +94,59 @@
# Returns an Entries collection
# or nil if the given path doesn't exist in the repository
# this method is used by the repository-browser (aka LIST)
- def entries(path=nil, identifier=nil)
+ def entries(path=nil, identifier=nil, options={})
logger.debug " entries '#{path}' with identifier '#{identifier}'"
- path_with_project="#{url}#{with_leading_slash(path)}"
+ path_locale = scm_iconv(@path_encoding, 'UTF-8', path)
+ path_locale.force_encoding("ASCII-8BIT") if path_locale.respond_to?(:force_encoding)
entries = Entries.new
- cmd = "#{self.class.sq_bin} -d #{shell_quote root_url} rls -e"
- cmd << " -D \"#{time_to_cvstime(identifier)}\"" if identifier
- cmd << " #{shell_quote path_with_project}"
- shellout(cmd) do |io|
- io.each_line(){|line|
- fields=line.chop.split('/',-1)
+ cmd_args = %w|-q rls -e|
+ cmd_args << "-D" << time_to_cvstime_rlog(identifier) if identifier
+ cmd_args << path_with_proj(path)
+ scm_cmd(*cmd_args) do |io|
+ io.each_line() do |line|
+ fields = line.chop.split('/',-1)
logger.debug(">>InspectLine #{fields.inspect}")
-
if fields[0]!="D"
- entries << Entry.new({:name => fields[-5],
+ time = nil
+ # Thu Dec 13 16:27:22 2007
+ time_l = fields[-3].split(' ')
+ if time_l.size == 5 && time_l[4].length == 4
+ begin
+ time = Time.parse(
+ "#{time_l[1]} #{time_l[2]} #{time_l[3]} GMT #{time_l[4]}")
+ rescue
+ end
+ end
+ entries << Entry.new(
+ {
+ :name => scm_iconv('UTF-8', @path_encoding, fields[-5]),
#:path => fields[-4].include?(path)?fields[-4]:(path + "/"+ fields[-4]),
- :path => "#{path}/#{fields[-5]}",
+ :path => scm_iconv('UTF-8', @path_encoding, "#{path_locale}/#{fields[-5]}"),
:kind => 'file',
:size => nil,
- :lastrev => Revision.new({
- :revision => fields[-4],
- :name => fields[-4],
- :time => Time.parse(fields[-3]),
- :author => ''
+ :lastrev => Revision.new(
+ {
+ :revision => fields[-4],
+ :name => scm_iconv('UTF-8', @path_encoding, fields[-4]),
+ :time => time,
+ :author => ''
+ })
})
- })
else
- entries << Entry.new({:name => fields[1],
- :path => "#{path}/#{fields[1]}",
- :kind => 'dir',
- :size => nil,
+ entries << Entry.new(
+ {
+ :name => scm_iconv('UTF-8', @path_encoding, fields[1]),
+ :path => scm_iconv('UTF-8', @path_encoding, "#{path_locale}/#{fields[1]}"),
+ :kind => 'dir',
+ :size => nil,
:lastrev => nil
- })
+ })
end
- }
+ end
end
- return nil if $? && $?.exitstatus != 0
entries.sort_by_name
+ rescue ScmCommandAborted
+ nil
end
STARTLOG="----------------------------"
@@ -138,111 +156,106 @@
# in the repository. both identifier have to be dates or nil.
# these method returns nothing but yield every result in block
def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={}, &block)
- logger.debug " revisions path:'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}"
-
- path_with_project="#{url}#{with_leading_slash(path)}"
- cmd = "#{self.class.sq_bin} -d #{shell_quote root_url} rlog"
- cmd << " -d\">#{time_to_cvstime_rlog(identifier_from)}\"" if identifier_from
- cmd << " #{shell_quote path_with_project}"
- shellout(cmd) do |io|
- state="entry_start"
-
- commit_log=String.new
- revision=nil
- date=nil
- author=nil
- entry_path=nil
- entry_name=nil
- file_state=nil
- branch_map=nil
-
+ path_with_project_utf8 = path_with_proj(path)
+ path_with_project_locale = scm_iconv(@path_encoding, 'UTF-8', path_with_project_utf8)
+ logger.debug " revisions path:" +
+ "'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}"
+ cmd_args = %w|-q rlog|
+ cmd_args << "-d" << ">#{time_to_cvstime_rlog(identifier_from)}" if identifier_from
+ cmd_args << path_with_project_utf8
+ scm_cmd(*cmd_args) do |io|
+ state = "entry_start"
+ commit_log = String.new
+ revision = nil
+ date = nil
+ author = nil
+ entry_path = nil
+ entry_name = nil
+ file_state = nil
+ branch_map = nil
io.each_line() do |line|
-
- if state!="revision" && /^#{ENDLOG}/ =~ line
- commit_log=String.new
- revision=nil
- state="entry_start"
+ if state != "revision" && /^#{ENDLOG}/ =~ line
+ commit_log = String.new
+ revision = nil
+ state = "entry_start"
end
-
- if state=="entry_start"
- branch_map=Hash.new
- if /^RCS file: #{Regexp.escape(root_url_path)}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line
+ if state == "entry_start"
+ branch_map = Hash.new
+ if /^RCS file: #{Regexp.escape(root_url_path)}\/#{Regexp.escape(path_with_project_locale)}(.+),v$/ =~ line
entry_path = normalize_cvs_path($1)
entry_name = normalize_path(File.basename($1))
logger.debug("Path #{entry_path} <=> Name #{entry_name}")
elsif /^head: (.+)$/ =~ line
entry_headRev = $1 #unless entry.nil?
elsif /^symbolic names:/ =~ line
- state="symbolic" #unless entry.nil?
+ state = "symbolic" #unless entry.nil?
elsif /^#{STARTLOG}/ =~ line
- commit_log=String.new
- state="revision"
- end
+ commit_log = String.new
+ state = "revision"
+ end
next
- elsif state=="symbolic"
- if /^(.*):\s(.*)/ =~ (line.strip)
- branch_map[$1]=$2
+ elsif state == "symbolic"
+ if /^(.*):\s(.*)/ =~ (line.strip)
+ branch_map[$1] = $2
else
- state="tags"
+ state = "tags"
next
- end
- elsif state=="tags"
+ end
+ elsif state == "tags"
if /^#{STARTLOG}/ =~ line
commit_log = ""
- state="revision"
+ state = "revision"
elsif /^#{ENDLOG}/ =~ line
- state="head"
+ state = "head"
end
next
- elsif state=="revision"
+ elsif state == "revision"
if /^#{ENDLOG}/ =~ line || /^#{STARTLOG}/ =~ line
if revision
-
- revHelper=CvsRevisionHelper.new(revision)
- revBranch="HEAD"
-
- branch_map.each() do |branch_name,branch_point|
+ revHelper = CvsRevisionHelper.new(revision)
+ revBranch = "HEAD"
+ branch_map.each() do |branch_name, branch_point|
if revHelper.is_in_branch_with_symbol(branch_point)
- revBranch=branch_name
+ revBranch = branch_name
end
end
-
logger.debug("********** YIELD Revision #{revision}::#{revBranch}")
-
yield Revision.new({
- :time => date,
- :author => author,
- :message=>commit_log.chomp,
+ :time => date,
+ :author => author,
+ :message => commit_log.chomp,
:paths => [{
:revision => revision,
- :branch=> revBranch,
- :path=>entry_path,
- :name=>entry_name,
- :kind=>'file',
- :action=>file_state
- }]
- })
+ :branch => revBranch,
+ :path => scm_iconv('UTF-8', @path_encoding, entry_path),
+ :name => scm_iconv('UTF-8', @path_encoding, entry_name),
+ :kind => 'file',
+ :action => file_state
+ }]
+ })
end
-
- commit_log=String.new
- revision=nil
-
+ commit_log = String.new
+ revision = nil
if /^#{ENDLOG}/ =~ line
- state="entry_start"
+ state = "entry_start"
end
next
end
if /^branches: (.+)$/ =~ line
- #TODO: version.branch = $1
+ # TODO: version.branch = $1
elsif /^revision (\d+(?:\.\d+)+).*$/ =~ line
- revision = $1
+ revision = $1
elsif /^date:\s+(\d+.\d+.\d+\s+\d+:\d+:\d+)/ =~ line
- date = Time.parse($1)
- author = /author: ([^;]+)/.match(line)[1]
- file_state = /state: ([^;]+)/.match(line)[1]
- #TODO: linechanges only available in CVS.... maybe a feature our SVN implementation. i'm sure, they are
- # useful for stats or something else
+ date = Time.parse($1)
+ line_utf8 = scm_iconv('UTF-8', options[:log_encoding], line)
+ author_utf8 = /author: ([^;]+)/.match(line_utf8)[1]
+ author = scm_iconv(options[:log_encoding], 'UTF-8', author_utf8)
+ file_state = /state: ([^;]+)/.match(line)[1]
+ # TODO:
+ # linechanges only available in CVS....
+ # maybe a feature our SVN implementation.
+ # I'm sure, they are useful for stats or something else
# linechanges =/lines: \+(\d+) -(\d+)/.match(line)
# unless linechanges.nil?
# version.line_plus = linechanges[1]
@@ -257,52 +270,66 @@
end
end
end
+ rescue ScmCommandAborted
+ Revisions.new
end
def diff(path, identifier_from, identifier_to=nil)
- logger.debug " diff path:'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}"
- path_with_project="#{url}#{with_leading_slash(path)}"
- cmd = "#{self.class.sq_bin} -d #{shell_quote root_url} rdiff -u -r#{identifier_to} -r#{identifier_from} #{shell_quote path_with_project}"
+ logger.debug " diff path:'#{path}'" +
+ ",identifier_from #{identifier_from}, identifier_to #{identifier_to}"
+ cmd_args = %w|rdiff -u|
+ cmd_args << "-r#{identifier_to}"
+ cmd_args << "-r#{identifier_from}"
+ cmd_args << path_with_proj(path)
diff = []
- shellout(cmd) do |io|
+ scm_cmd(*cmd_args) do |io|
io.each_line do |line|
diff << line
end
end
- return nil if $? && $?.exitstatus != 0
diff
+ rescue ScmCommandAborted
+ nil
end
def cat(path, identifier=nil)
identifier = (identifier) ? identifier : "HEAD"
logger.debug " cat path:'#{path}',identifier #{identifier}"
- path_with_project="#{url}#{with_leading_slash(path)}"
- cmd = "#{self.class.sq_bin} -d #{shell_quote root_url} co"
- cmd << " -D \"#{time_to_cvstime(identifier)}\"" if identifier
- cmd << " -p #{shell_quote path_with_project}"
+ cmd_args = %w|-q co|
+ cmd_args << "-D" << time_to_cvstime(identifier) if identifier
+ cmd_args << "-p" << path_with_proj(path)
cat = nil
- shellout(cmd) do |io|
+ scm_cmd(*cmd_args) do |io|
io.binmode
cat = io.read
end
- return nil if $? && $?.exitstatus != 0
cat
+ rescue ScmCommandAborted
+ nil
end
def annotate(path, identifier=nil)
- identifier = (identifier) ? identifier.to_i : "HEAD"
+ identifier = (identifier) ? identifier : "HEAD"
logger.debug " annotate path:'#{path}',identifier #{identifier}"
- path_with_project="#{url}#{with_leading_slash(path)}"
- cmd = "#{self.class.sq_bin} -d #{shell_quote root_url} rannotate -r#{identifier} #{shell_quote path_with_project}"
+ cmd_args = %w|rannotate|
+ cmd_args << "-D" << time_to_cvstime(identifier) if identifier
+ cmd_args << path_with_proj(path)
blame = Annotate.new
- shellout(cmd) do |io|
+ scm_cmd(*cmd_args) do |io|
io.each_line do |line|
next unless line =~ %r{^([\d\.]+)\s+\(([^\)]+)\s+[^\)]+\):\s(.*)$}
- blame.add_line($3.rstrip, Revision.new(:revision => $1, :author => $2.strip))
+ blame.add_line(
+ $3.rstrip,
+ Revision.new(
+ :revision => $1,
+ :identifier => nil,
+ :author => $2.strip
+ ))
end
end
- return nil if $? && $?.exitstatus != 0
blame
+ rescue ScmCommandAborted
+ Annotate.new
end
private
@@ -317,12 +344,12 @@
# convert a date/time into the CVS-format
def time_to_cvstime(time)
return nil if time.nil?
- return Time.now if time == 'HEAD'
-
+ time = Time.now if time == 'HEAD'
+
unless time.kind_of? Time
time = Time.parse(time)
end
- return time.strftime("%Y-%m-%d %H:%M:%S")
+ return time_to_cvstime_rlog(time)
end
def time_to_cvstime_rlog(time)
@@ -330,77 +357,104 @@
t1 = time.clone.localtime
return t1.strftime("%Y-%m-%d %H:%M:%S")
end
-
+
def normalize_cvs_path(path)
normalize_path(path.gsub(/Attic\//,''))
end
-
+
def normalize_path(path)
path.sub(/^(\/)*(.*)/,'\2').sub(/(.*)(,v)+/,'\1')
- end
- end
-
+ end
+
+ def path_with_proj(path)
+ "#{url}#{with_leading_slash(path)}"
+ end
+ private :path_with_proj
+
+ class Revision < Redmine::Scm::Adapters::Revision
+ # Returns the readable identifier
+ def format_identifier
+ revision.to_s
+ end
+ end
+
+ def scm_cmd(*args, &block)
+ full_args = [CVS_BIN, '-d', root_url]
+ full_args += args
+ full_args_locale = []
+ full_args.map do |e|
+ full_args_locale << scm_iconv(@path_encoding, 'UTF-8', e)
+ end
+ ret = shellout(full_args_locale.map { |e| shell_quote e.to_s }.join(' '), &block)
+ if $? && $?.exitstatus != 0
+ raise ScmCommandAborted, "cvs exited with non-zero status: #{$?.exitstatus}"
+ end
+ ret
+ end
+ private :scm_cmd
+ end
+
class CvsRevisionHelper
attr_accessor :complete_rev, :revision, :base, :branchid
-
+
def initialize(complete_rev)
@complete_rev = complete_rev
parseRevision()
end
-
+
def branchPoint
return @base
end
-
+
def branchVersion
if isBranchRevision
return @base+"."+@branchid
end
return @base
end
-
+
def isBranchRevision
!@branchid.nil?
end
-
+
def prevRev
- unless @revision==0
- return buildRevision(@revision-1)
+ unless @revision == 0
+ return buildRevision( @revision - 1 )
end
- return buildRevision(@revision)
+ return buildRevision( @revision )
end
-
+
def is_in_branch_with_symbol(branch_symbol)
- bpieces=branch_symbol.split(".")
- branch_start="#{bpieces[0..-3].join(".")}.#{bpieces[-1]}"
- return (branchVersion==branch_start)
+ bpieces = branch_symbol.split(".")
+ branch_start = "#{bpieces[0..-3].join(".")}.#{bpieces[-1]}"
+ return ( branchVersion == branch_start )
end
-
+
private
def buildRevision(rev)
- if rev== 0
+ if rev == 0
if @branchid.nil?
- @base+".0"
+ @base + ".0"
else
@base
end
- elsif @branchid.nil?
- @base+"."+rev.to_s
+ elsif @branchid.nil?
+ @base + "." + rev.to_s
else
- @base+"."+@branchid+"."+rev.to_s
+ @base + "." + @branchid + "." + rev.to_s
end
end
-
+
# Interpretiert die cvs revisionsnummern wie z.b. 1.14 oder 1.3.0.15
def parseRevision()
- pieces=@complete_rev.split(".")
- @revision=pieces.last.to_i
- baseSize=1
- baseSize+=(pieces.size/2)
- @base=pieces[0..-baseSize].join(".")
+ pieces = @complete_rev.split(".")
+ @revision = pieces.last.to_i
+ baseSize = 1
+ baseSize += (pieces.size / 2)
+ @base = pieces[0..-baseSize].join(".")
if baseSize > 2
- @branchid=pieces[-2]
- end
+ @branchid = pieces[-2]
+ end
end
end
end
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/darcs_adapter.rb
--- a/lib/redmine/scm/adapters/darcs_adapter.rb Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/darcs_adapter.rb Mon Jun 06 14:41:04 2011 +0100
@@ -1,16 +1,16 @@
-# redMine - project management software
-# Copyright (C) 2006-2007 Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -76,7 +76,7 @@
# Returns an Entries collection
# or nil if the given path doesn't exist in the repository
- def entries(path=nil, identifier=nil)
+ def entries(path=nil, identifier=nil, options={})
path_prefix = (path.blank? ? '' : "#{path}/")
if path.blank?
path = ( self.class.client_version_above?([2, 2, 0]) ? @url : '.' )
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/filesystem_adapter.rb
--- a/lib/redmine/scm/adapters/filesystem_adapter.rb Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/filesystem_adapter.rb Mon Jun 06 14:41:04 2011 +0100
@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006-2007 Jean-Philippe Lang
+# RedMine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# FileSystem adapter
# File written by Paul Rivier, at Demotera.
@@ -8,12 +8,12 @@
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -35,14 +35,18 @@
def initialize(url, root_url=nil, login=nil, password=nil,
path_encoding=nil)
@url = with_trailling_slash(url)
- @path_encoding = path_encoding || 'UTF-8'
+ @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding
+ end
+
+ def path_encoding
+ @path_encoding
end
def format_path_ends(path, leading=true, trailling=true)
- path = leading ? with_leading_slash(path) :
+ path = leading ? with_leading_slash(path) :
without_leading_slash(path)
- trailling ? with_trailling_slash(path) :
- without_trailling_slash(path)
+ trailling ? with_trailling_slash(path) :
+ without_trailling_slash(path)
end
def info
@@ -54,13 +58,15 @@
return nil
end
- def entries(path="", identifier=nil)
+ def entries(path="", identifier=nil, options={})
entries = Entries.new
trgt_utf8 = target(path)
trgt = scm_iconv(@path_encoding, 'UTF-8', trgt_utf8)
Dir.new(trgt).each do |e1|
e_utf8 = scm_iconv('UTF-8', @path_encoding, e1)
- relative_path_utf8 = format_path_ends((format_path_ends(path,false,true) + e_utf8),false,false)
+ next if e_utf8.blank?
+ relative_path_utf8 = format_path_ends(
+ (format_path_ends(path,false,true) + e_utf8),false,false)
t1_utf8 = target(relative_path_utf8)
t1 = scm_iconv(@path_encoding, 'UTF-8', t1_utf8)
relative_path = scm_iconv(@path_encoding, 'UTF-8', relative_path_utf8)
@@ -76,7 +82,7 @@
:path => utf_8_path,
:kind => (File.directory?(t1) ? 'dir' : 'file'),
:size => (File.directory?(t1) ? nil : [File.size(t1)].pack('l').unpack('L').first),
- :lastrev =>
+ :lastrev =>
Revision.new({:time => (File.mtime(t1)) })
})
end
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/git_adapter.rb
--- a/lib/redmine/scm/adapters/git_adapter.rb Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/git_adapter.rb Mon Jun 06 14:41:04 2011 +0100
@@ -1,16 +1,16 @@
-# redMine - project management software
-# Copyright (C) 2006-2007 Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -22,8 +22,6 @@
module Adapters
class GitAdapter < AbstractAdapter
- SCM_GIT_REPORT_LAST_COMMIT = true
-
# Git executable name
GIT_BIN = Redmine::Configuration['scm_git_command'] || "git"
@@ -64,7 +62,11 @@
def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil)
super
- @flag_report_last_commit = SCM_GIT_REPORT_LAST_COMMIT
+ @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding
+ end
+
+ def path_encoding
+ @path_encoding
end
def info
@@ -78,59 +80,88 @@
def branches
return @branches if @branches
@branches = []
- cmd = "#{self.class.sq_bin} --git-dir #{target('')} branch --no-color"
- shellout(cmd) do |io|
+ cmd_args = %w|branch --no-color|
+ scm_cmd(*cmd_args) do |io|
io.each_line do |line|
@branches << line.match('\s*\*?\s*(.*)$')[1]
end
end
@branches.sort!
+ rescue ScmCommandAborted
+ nil
end
def tags
return @tags if @tags
- cmd = "#{self.class.sq_bin} --git-dir #{target('')} tag"
- shellout(cmd) do |io|
+ cmd_args = %w|tag|
+ scm_cmd(*cmd_args) do |io|
@tags = io.readlines.sort!.map{|t| t.strip}
end
+ rescue ScmCommandAborted
+ nil
+ end
+
+ def default_branch
+ bras = self.branches
+ return nil if bras.nil?
+ bras.include?('master') ? 'master' : bras.first
+ end
+
+ def entry(path=nil, identifier=nil)
+ parts = path.to_s.split(%r{[\/\\]}).select {|n| !n.blank?}
+ search_path = parts[0..-2].join('/')
+ search_name = parts[-1]
+ if search_path.blank? && search_name.blank?
+ # Root entry
+ Entry.new(:path => '', :kind => 'dir')
+ else
+ # Search for the entry in the parent directory
+ es = entries(search_path, identifier,
+ options = {:report_last_commit => false})
+ es ? es.detect {|e| e.name == search_name} : nil
+ end
end
- def default_branch
- branches.include?('master') ? 'master' : branches.first
- end
-
- def entries(path=nil, identifier=nil)
+ def entries(path=nil, identifier=nil, options={})
path ||= ''
+ p = scm_iconv(@path_encoding, 'UTF-8', path)
entries = Entries.new
- cmd = "#{self.class.sq_bin} --git-dir #{target('')} ls-tree -l "
- cmd << shell_quote("HEAD:" + path) if identifier.nil?
- cmd << shell_quote(identifier + ":" + path) if identifier
- shellout(cmd) do |io|
+ cmd_args = %w|ls-tree -l|
+ cmd_args << "HEAD:#{p}" if identifier.nil?
+ cmd_args << "#{identifier}:#{p}" if identifier
+ scm_cmd(*cmd_args) do |io|
io.each_line do |line|
e = line.chomp.to_s
if e =~ /^\d+\s+(\w+)\s+([0-9a-f]{40})\s+([0-9-]+)\t(.+)$/
type = $1
- sha = $2
+ sha = $2
size = $3
name = $4
- full_path = path.empty? ? name : "#{path}/#{name}"
- entries << Entry.new({:name => name,
- :path => full_path,
+ if name.respond_to?(:force_encoding)
+ name.force_encoding(@path_encoding)
+ end
+ full_path = p.empty? ? name : "#{p}/#{name}"
+ n = scm_iconv('UTF-8', @path_encoding, name)
+ full_p = scm_iconv('UTF-8', @path_encoding, full_path)
+ entries << Entry.new({:name => n,
+ :path => full_p,
:kind => (type == "tree") ? 'dir' : 'file',
:size => (type == "tree") ? nil : size,
- :lastrev => @flag_report_last_commit ? lastrev(full_path,identifier) : Revision.new
+ :lastrev => options[:report_last_commit] ?
+ lastrev(full_path, identifier) : Revision.new
}) unless entries.detect{|entry| entry.name == name}
end
end
end
- return nil if $? && $?.exitstatus != 0
entries.sort_by_name
+ rescue ScmCommandAborted
+ nil
end
def lastrev(path, rev)
return nil if path.nil?
cmd_args = %w|log --no-color --encoding=UTF-8 --date=iso --pretty=fuller --no-merges -n 1|
- cmd_args << rev if rev
+ cmd_args << rev if rev
cmd_args << "--" << path unless path.empty?
lines = []
scm_cmd(*cmd_args) { |io| lines = io.readlines }
@@ -141,11 +172,11 @@
Revision.new({
:identifier => id,
- :scmid => id,
- :author => author,
- :time => time,
- :message => nil,
- :paths => nil
+ :scmid => id,
+ :author => author,
+ :time => time,
+ :message => nil,
+ :paths => nil
})
rescue NoMethodError => e
logger.error("The revision '#{path}' has a wrong format")
@@ -156,7 +187,7 @@
end
def revisions(path, identifier_from, identifier_to, options={})
- revisions = Revisions.new
+ revs = Revisions.new
cmd_args = %w|log --no-color --encoding=UTF-8 --raw --date=iso --pretty=fuller|
cmd_args << "--reverse" if options[:reverse]
cmd_args << "--all" if options[:all]
@@ -166,13 +197,12 @@
from_to << "#{identifier_to}" if identifier_to
cmd_args << from_to if !from_to.empty?
cmd_args << "--since=#{options[:since].strftime("%Y-%m-%d %H:%M:%S")}" if options[:since]
- cmd_args << "--" << path if path && !path.empty?
+ cmd_args << "--" << scm_iconv(@path_encoding, 'UTF-8', path) if path && !path.empty?
scm_cmd *cmd_args do |io|
files=[]
changeset = {}
parsing_descr = 0 #0: not parsing desc or files, 1: parsing desc, 2: parsing files
- revno = 1
io.each_line do |line|
if line =~ /^commit ([0-9a-f]{40})$/
@@ -182,20 +212,19 @@
parsing_descr = 0
revision = Revision.new({
:identifier => changeset[:commit],
- :scmid => changeset[:commit],
- :author => changeset[:author],
- :time => Time.parse(changeset[:date]),
- :message => changeset[:description],
- :paths => files
+ :scmid => changeset[:commit],
+ :author => changeset[:author],
+ :time => Time.parse(changeset[:date]),
+ :message => changeset[:description],
+ :paths => files
})
if block_given?
yield revision
else
- revisions << revision
+ revs << revision
end
changeset = {}
files = []
- revno = revno + 1
end
changeset[:commit] = $1
elsif (parsing_descr == 0) && line =~ /^(\w+):\s*(.*)$/
@@ -210,73 +239,75 @@
parsing_descr = 1
changeset[:description] = ""
elsif (parsing_descr == 1 || parsing_descr == 2) \
- && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\t(.+)$/
+ && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\t(.+)$/
parsing_descr = 2
- fileaction = $1
- filepath = $2
- files << {:action => fileaction, :path => filepath}
+ fileaction = $1
+ filepath = $2
+ p = scm_iconv('UTF-8', @path_encoding, filepath)
+ files << {:action => fileaction, :path => p}
elsif (parsing_descr == 1 || parsing_descr == 2) \
- && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\d+\s+(\S+)\t(.+)$/
+ && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\d+\s+(\S+)\t(.+)$/
parsing_descr = 2
- fileaction = $1
- filepath = $3
- files << {:action => fileaction, :path => filepath}
+ fileaction = $1
+ filepath = $3
+ p = scm_iconv('UTF-8', @path_encoding, filepath)
+ files << {:action => fileaction, :path => p}
elsif (parsing_descr == 1) && line.chomp.to_s == ""
parsing_descr = 2
elsif (parsing_descr == 1)
changeset[:description] << line[4..-1]
end
- end
+ end
if changeset[:commit]
revision = Revision.new({
:identifier => changeset[:commit],
- :scmid => changeset[:commit],
- :author => changeset[:author],
- :time => Time.parse(changeset[:date]),
- :message => changeset[:description],
- :paths => files
- })
-
+ :scmid => changeset[:commit],
+ :author => changeset[:author],
+ :time => Time.parse(changeset[:date]),
+ :message => changeset[:description],
+ :paths => files
+ })
if block_given?
yield revision
else
- revisions << revision
+ revs << revision
end
end
end
- revisions
- rescue ScmCommandAborted
- revisions
+ revs
+ rescue ScmCommandAborted => e
+ logger.error("git log #{from_to.to_s} error: #{e.message}")
+ revs
end
def diff(path, identifier_from, identifier_to=nil)
path ||= ''
-
+ cmd_args = []
if identifier_to
- cmd = "#{self.class.sq_bin} --git-dir #{target('')} diff --no-color #{shell_quote identifier_to} #{shell_quote identifier_from}"
+ cmd_args << "diff" << "--no-color" << identifier_to << identifier_from
else
- cmd = "#{self.class.sq_bin} --git-dir #{target('')} show --no-color #{shell_quote identifier_from}"
+ cmd_args << "show" << "--no-color" << identifier_from
end
-
- cmd << " -- #{shell_quote path}" unless path.empty?
+ cmd_args << "--" << scm_iconv(@path_encoding, 'UTF-8', path) unless path.empty?
diff = []
- shellout(cmd) do |io|
+ scm_cmd *cmd_args do |io|
io.each_line do |line|
diff << line
end
end
- return nil if $? && $?.exitstatus != 0
diff
+ rescue ScmCommandAborted
+ nil
end
-
+
def annotate(path, identifier=nil)
identifier = 'HEAD' if identifier.blank?
- cmd = "#{self.class.sq_bin} --git-dir #{target('')} blame -p #{shell_quote identifier} -- #{shell_quote path}"
+ cmd_args = %w|blame|
+ cmd_args << "-p" << identifier << "--" << scm_iconv(@path_encoding, 'UTF-8', path)
blame = Annotate.new
content = nil
- shellout(cmd) { |io| io.binmode; content = io.read }
- return nil if $? && $?.exitstatus != 0
+ scm_cmd(*cmd_args) { |io| io.binmode; content = io.read }
# git annotates binary files
return nil if content.is_binary_data?
identifier = ''
@@ -288,26 +319,35 @@
elsif line =~ /^author (.+)/
authors_by_commit[identifier] = $1.strip
elsif line =~ /^\t(.*)/
- blame.add_line($1, Revision.new(:identifier => identifier, :author => authors_by_commit[identifier]))
+ blame.add_line($1, Revision.new(
+ :identifier => identifier,
+ :revision => identifier,
+ :scmid => identifier,
+ :author => authors_by_commit[identifier]
+ ))
identifier = ''
author = ''
end
end
blame
+ rescue ScmCommandAborted
+ nil
end
def cat(path, identifier=nil)
if identifier.nil?
identifier = 'HEAD'
end
- cmd = "#{self.class.sq_bin} --git-dir #{target('')} show --no-color #{shell_quote(identifier + ':' + path)}"
+ cmd_args = %w|show --no-color|
+ cmd_args << "#{identifier}:#{scm_iconv(@path_encoding, 'UTF-8', path)}"
cat = nil
- shellout(cmd) do |io|
+ scm_cmd(*cmd_args) do |io|
io.binmode
cat = io.read
end
- return nil if $? && $?.exitstatus != 0
cat
+ rescue ScmCommandAborted
+ nil
end
class Revision < Redmine::Scm::Adapters::Revision
@@ -320,6 +360,10 @@
def scm_cmd(*args, &block)
repo_path = root_url || url
full_args = [GIT_BIN, '--git-dir', repo_path]
+ if self.class.client_version_above?([1, 7, 2])
+ full_args << '-c' << 'core.quotepath=false'
+ full_args << '-c' << 'log.decorate=no'
+ end
full_args += args
ret = shellout(full_args.map { |e| shell_quote e.to_s }.join(' '), &block)
if $? && $?.exitstatus != 0
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/mercurial/.svn/all-wcprops
--- a/lib/redmine/scm/adapters/mercurial/.svn/all-wcprops Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/mercurial/.svn/all-wcprops Mon Jun 06 14:41:04 2011 +0100
@@ -1,23 +1,11 @@
K 25
svn:wc:ra_dav:version-url
-V 59
-/svn/!svn/ver/4989/trunk/lib/redmine/scm/adapters/mercurial
-END
-hg-template-0.9.5.tmpl
-K 25
-svn:wc:ra_dav:version-url
-V 82
-/svn/!svn/ver/4633/trunk/lib/redmine/scm/adapters/mercurial/hg-template-0.9.5.tmpl
+V 73
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/scm/adapters/mercurial
END
redminehelper.py
K 25
svn:wc:ra_dav:version-url
-V 76
-/svn/!svn/ver/4989/trunk/lib/redmine/scm/adapters/mercurial/redminehelper.py
+V 90
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/scm/adapters/mercurial/redminehelper.py
END
-hg-template-1.0.tmpl
-K 25
-svn:wc:ra_dav:version-url
-V 80
-/svn/!svn/ver/4633/trunk/lib/redmine/scm/adapters/mercurial/hg-template-1.0.tmpl
-END
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/mercurial/.svn/entries
--- a/lib/redmine/scm/adapters/mercurial/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/mercurial/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,14 +1,14 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/lib/redmine/scm/adapters/mercurial
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine/scm/adapters/mercurial
http://redmine.rubyforge.org/svn
-2011-03-02T10:17:36.526269Z
-4989
+2011-03-14T02:23:54.474379Z
+5112
tmaruyama
has-props
@@ -32,7 +32,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:15:00.000000Z
961af0eb6ab17203d985cdeac685937e
2011-01-05T15:02:24.961855Z
4633
@@ -66,10 +66,10 @@
-2011-03-03T11:40:18.000000Z
-5bf6790a201bf33c17cae96c6a9d75fc
-2011-03-02T10:17:36.526269Z
-4989
+2011-06-06T13:20:53.000000Z
+e00d9a9bc9249ea3dca63636370ba377
+2011-03-14T02:23:54.474379Z
+5112
tmaruyama
@@ -92,7 +92,7 @@
-6270
+7856
hg-template-1.0.tmpl
file
@@ -100,7 +100,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:15:00.000000Z
9d5de62ae8cdc141d3f8b970dbba07a0
2011-01-05T15:02:24.961855Z
4633
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/mercurial/.svn/text-base/redminehelper.py.svn-base
--- a/lib/redmine/scm/adapters/mercurial/.svn/text-base/redminehelper.py.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/mercurial/.svn/text-base/redminehelper.py.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -120,9 +120,13 @@
ui.write('\n')
def rhannotate(ui, repo, *pats, **opts):
+ rev = urllib.unquote_plus(opts.pop('rev', None))
+ opts['rev'] = rev
return commands.annotate(ui, repo, *map(urllib.unquote_plus, pats), **opts)
def rhcat(ui, repo, file1, *pats, **opts):
+ rev = urllib.unquote_plus(opts.pop('rev', None))
+ opts['rev'] = rev
return commands.cat(ui, repo, urllib.unquote_plus(file1), *map(urllib.unquote_plus, pats), **opts)
def rhdiff(ui, repo, *pats, **opts):
@@ -134,6 +138,18 @@
opts['nodates'] = True
return commands.diff(ui, repo, *map(urllib.unquote_plus, pats), **opts)
+def rhlog(ui, repo, *pats, **opts):
+ rev = opts.pop('rev')
+ bra0 = opts.pop('branch')
+ from_rev = urllib.unquote_plus(opts.pop('from', None))
+ to_rev = urllib.unquote_plus(opts.pop('to' , None))
+ bra = urllib.unquote_plus(opts.pop('rhbranch', None))
+ from_rev = from_rev.replace('"', '\\"')
+ to_rev = to_rev.replace('"', '\\"')
+ opts['rev'] = ['"%s":"%s"' % (from_rev, to_rev)]
+ opts['branch'] = [bra]
+ return commands.log(ui, repo, *map(urllib.unquote_plus, pats), **opts)
+
def rhmanifest(ui, repo, path='', **opts):
"""output the sub-manifest of the specified directory"""
ui.write('\n')
@@ -176,6 +192,26 @@
[('r', 'rev', [], 'revision'),
('c', 'change', '', 'change made by revision')],
'hg rhdiff ([-c REV] | [-r REV] ...) [FILE]...'),
+ 'rhlog': (rhlog,
+ [
+ ('r', 'rev', [], 'show the specified revision'),
+ ('b', 'branch', [],
+ 'show changesets within the given named branch', 'BRANCH'),
+ ('l', 'limit', '',
+ 'limit number of changes displayed', 'NUM'),
+ ('d', 'date', '',
+ 'show revisions matching date spec', 'DATE'),
+ ('u', 'user', [],
+ 'revisions committed by user', 'USER'),
+ ('', 'from', '',
+ '', ''),
+ ('', 'to', '',
+ '', ''),
+ ('', 'rhbranch', '',
+ '', ''),
+ ('', 'template', '',
+ 'display with template', 'TEMPLATE')],
+ 'hg rhlog [OPTION]... [FILE]'),
'rhmanifest': (rhmanifest,
[('r', 'rev', '', 'show the specified revision')],
'hg rhmanifest [-r REV] [PATH]'),
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/mercurial/redminehelper.py
--- a/lib/redmine/scm/adapters/mercurial/redminehelper.py Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/mercurial/redminehelper.py Mon Jun 06 14:41:04 2011 +0100
@@ -120,9 +120,13 @@
ui.write('\n')
def rhannotate(ui, repo, *pats, **opts):
+ rev = urllib.unquote_plus(opts.pop('rev', None))
+ opts['rev'] = rev
return commands.annotate(ui, repo, *map(urllib.unquote_plus, pats), **opts)
def rhcat(ui, repo, file1, *pats, **opts):
+ rev = urllib.unquote_plus(opts.pop('rev', None))
+ opts['rev'] = rev
return commands.cat(ui, repo, urllib.unquote_plus(file1), *map(urllib.unquote_plus, pats), **opts)
def rhdiff(ui, repo, *pats, **opts):
@@ -134,6 +138,18 @@
opts['nodates'] = True
return commands.diff(ui, repo, *map(urllib.unquote_plus, pats), **opts)
+def rhlog(ui, repo, *pats, **opts):
+ rev = opts.pop('rev')
+ bra0 = opts.pop('branch')
+ from_rev = urllib.unquote_plus(opts.pop('from', None))
+ to_rev = urllib.unquote_plus(opts.pop('to' , None))
+ bra = urllib.unquote_plus(opts.pop('rhbranch', None))
+ from_rev = from_rev.replace('"', '\\"')
+ to_rev = to_rev.replace('"', '\\"')
+ opts['rev'] = ['"%s":"%s"' % (from_rev, to_rev)]
+ opts['branch'] = [bra]
+ return commands.log(ui, repo, *map(urllib.unquote_plus, pats), **opts)
+
def rhmanifest(ui, repo, path='', **opts):
"""output the sub-manifest of the specified directory"""
ui.write('\n')
@@ -176,6 +192,26 @@
[('r', 'rev', [], 'revision'),
('c', 'change', '', 'change made by revision')],
'hg rhdiff ([-c REV] | [-r REV] ...) [FILE]...'),
+ 'rhlog': (rhlog,
+ [
+ ('r', 'rev', [], 'show the specified revision'),
+ ('b', 'branch', [],
+ 'show changesets within the given named branch', 'BRANCH'),
+ ('l', 'limit', '',
+ 'limit number of changes displayed', 'NUM'),
+ ('d', 'date', '',
+ 'show revisions matching date spec', 'DATE'),
+ ('u', 'user', [],
+ 'revisions committed by user', 'USER'),
+ ('', 'from', '',
+ '', ''),
+ ('', 'to', '',
+ '', ''),
+ ('', 'rhbranch', '',
+ '', ''),
+ ('', 'template', '',
+ 'display with template', 'TEMPLATE')],
+ 'hg rhlog [OPTION]... [FILE]'),
'rhmanifest': (rhmanifest,
[('r', 'rev', '', 'show the specified revision')],
'hg rhmanifest [-r REV] [PATH]'),
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/mercurial_adapter.rb
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb Mon Jun 06 14:41:04 2011 +0100
@@ -1,16 +1,16 @@
-# redMine - project management software
-# Copyright (C) 2006-2007 Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -47,7 +47,7 @@
end
def client_available
- !client_version.empty?
+ client_version_above?([0, 9, 5])
end
def hgversion
@@ -83,7 +83,11 @@
def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil)
super
- @path_encoding = path_encoding || 'UTF-8'
+ @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding
+ end
+
+ def path_encoding
+ @path_encoding
end
def info
@@ -118,7 +122,7 @@
end
def summary
- return @summary if @summary
+ return @summary if @summary
hg 'rhsummary' do |io|
output = io.read
if output.respond_to?(:force_encoding)
@@ -132,7 +136,7 @@
end
private :summary
- def entries(path=nil, identifier=nil)
+ def entries(path=nil, identifier=nil, options={})
p1 = scm_iconv(@path_encoding, 'UTF-8', path)
manifest = hg('rhmanifest', '-r', CGI.escape(hgrev(identifier)),
CGI.escape(without_leading_slash(p1.to_s))) do |io|
@@ -192,30 +196,39 @@
rescue
end
end
-
as_ary(log['logentry']).each do |le|
cpalist = as_ary(le['paths']['path-copied']).map do |e|
- [e['__content__'], e['copyfrom-path']].map { |s| CGI.unescape(s) }
+ [e['__content__'], e['copyfrom-path']].map do |s|
+ scm_iconv('UTF-8', @path_encoding, CGI.unescape(s))
+ end
end
cpmap = Hash[*cpalist.flatten]
-
paths = as_ary(le['paths']['path']).map do |e|
p = scm_iconv('UTF-8', @path_encoding, CGI.unescape(e['__content__']) )
- {:action => e['action'], :path => with_leading_slash(p),
- :from_path => (cpmap.member?(p) ? with_leading_slash(cpmap[p]) : nil),
- :from_revision => (cpmap.member?(p) ? le['revision'] : nil)}
+ {:action => e['action'],
+ :path => with_leading_slash(p),
+ :from_path => (cpmap.member?(p) ? with_leading_slash(cpmap[p]) : nil),
+ :from_revision => (cpmap.member?(p) ? le['node'] : nil)}
end.sort { |a, b| a[:path] <=> b[:path] }
-
yield Revision.new(:revision => le['revision'],
- :scmid => le['node'],
- :author => (le['author']['__content__'] rescue ''),
- :time => Time.parse(le['date']['__content__']).localtime,
- :message => le['msg']['__content__'],
- :paths => paths)
+ :scmid => le['node'],
+ :author => (le['author']['__content__'] rescue ''),
+ :time => Time.parse(le['date']['__content__']),
+ :message => le['msg']['__content__'],
+ :paths => paths)
end
self
end
+ # Returns list of nodes in the specified branch
+ def nodes_in_branch(branch, options={})
+ hg_args = ['rhlog', '--template', '{node|short}\n', '--rhbranch', CGI.escape(branch)]
+ hg_args << '--from' << CGI.escape(branch)
+ hg_args << '--to' << '0'
+ hg_args << '--limit' << options[:limit] if options[:limit]
+ hg(*hg_args) { |io| io.readlines.map { |e| e.chomp } }
+ end
+
def diff(path, identifier_from, identifier_to=nil)
hg_args = %w|rhdiff|
if identifier_to
@@ -240,7 +253,7 @@
def cat(path, identifier=nil)
p = CGI.escape(scm_iconv(@path_encoding, 'UTF-8', path))
- hg 'rhcat', '-r', hgrev(identifier), hgtarget(p) do |io|
+ hg 'rhcat', '-r', CGI.escape(hgrev(identifier)), hgtarget(p) do |io|
io.binmode
io.read
end
@@ -251,7 +264,7 @@
def annotate(path, identifier=nil)
p = CGI.escape(scm_iconv(@path_encoding, 'UTF-8', path))
blame = Annotate.new
- hg 'rhannotate', '-ncu', '-r', hgrev(identifier), hgtarget(p) do |io|
+ hg 'rhannotate', '-ncu', '-r', CGI.escape(hgrev(identifier)), hgtarget(p) do |io|
io.each_line do |line|
line.force_encoding('ASCII-8BIT') if line.respond_to?(:force_encoding)
next unless line =~ %r{^([^:]+)\s(\d+)\s([0-9a-f]+):\s(.*)$}
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/scm/adapters/subversion_adapter.rb
--- a/lib/redmine/scm/adapters/subversion_adapter.rb Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/scm/adapters/subversion_adapter.rb Mon Jun 06 14:41:04 2011 +0100
@@ -1,282 +1,291 @@
-# Redmine - project management software
-# Copyright (C) 2006-2010 Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-require 'redmine/scm/adapters/abstract_adapter'
-require 'uri'
-
-module Redmine
- module Scm
- module Adapters
- class SubversionAdapter < AbstractAdapter
-
- # SVN executable name
- SVN_BIN = Redmine::Configuration['scm_subversion_command'] || "svn"
-
- class << self
- def client_command
- @@bin ||= SVN_BIN
- end
-
- def sq_bin
- @@sq_bin ||= shell_quote(SVN_BIN)
- end
-
- def client_version
- @@client_version ||= (svn_binary_version || [])
- end
-
- def client_available
- !client_version.empty?
- end
-
- def svn_binary_version
- scm_version = scm_version_from_command_line.dup
- if scm_version.respond_to?(:force_encoding)
- scm_version.force_encoding('ASCII-8BIT')
- end
- if m = scm_version.match(%r{\A(.*?)((\d+\.)+\d+)})
- m[2].scan(%r{\d+}).collect(&:to_i)
- end
- end
-
- def scm_version_from_command_line
- shellout("#{sq_bin} --version") { |io| io.read }.to_s
- end
- end
-
- # Get info about the svn repository
- def info
- cmd = "#{self.class.sq_bin} info --xml #{target}"
- cmd << credentials_string
- info = nil
- shellout(cmd) do |io|
- output = io.read
- if output.respond_to?(:force_encoding)
- output.force_encoding('UTF-8')
- end
- begin
- doc = ActiveSupport::XmlMini.parse(output)
- #root_url = doc.elements["info/entry/repository/root"].text
- info = Info.new({:root_url => doc['info']['entry']['repository']['root']['__content__'],
- :lastrev => Revision.new({
- :identifier => doc['info']['entry']['commit']['revision'],
- :time => Time.parse(doc['info']['entry']['commit']['date']['__content__']).localtime,
- :author => (doc['info']['entry']['commit']['author'] ? doc['info']['entry']['commit']['author']['__content__'] : "")
- })
- })
- rescue
- end
- end
- return nil if $? && $?.exitstatus != 0
- info
- rescue CommandFailed
- return nil
- end
-
- # Returns an Entries collection
- # or nil if the given path doesn't exist in the repository
- def entries(path=nil, identifier=nil)
- path ||= ''
- identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
- entries = Entries.new
- cmd = "#{self.class.sq_bin} list --xml #{target(path)}@#{identifier}"
- cmd << credentials_string
- shellout(cmd) do |io|
- output = io.read
- if output.respond_to?(:force_encoding)
- output.force_encoding('UTF-8')
- end
- begin
- doc = ActiveSupport::XmlMini.parse(output)
- each_xml_element(doc['lists']['list'], 'entry') do |entry|
- commit = entry['commit']
- commit_date = commit['date']
- # Skip directory if there is no commit date (usually that
- # means that we don't have read access to it)
- next if entry['kind'] == 'dir' && commit_date.nil?
- name = entry['name']['__content__']
- entries << Entry.new({:name => URI.unescape(name),
- :path => ((path.empty? ? "" : "#{path}/") + name),
- :kind => entry['kind'],
- :size => ((s = entry['size']) ? s['__content__'].to_i : nil),
- :lastrev => Revision.new({
- :identifier => commit['revision'],
- :time => Time.parse(commit_date['__content__'].to_s).localtime,
- :author => ((a = commit['author']) ? a['__content__'] : nil)
- })
- })
- end
- rescue Exception => e
- logger.error("Error parsing svn output: #{e.message}")
- logger.error("Output was:\n #{output}")
- end
- end
- return nil if $? && $?.exitstatus != 0
- logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
- entries.sort_by_name
- end
-
- def properties(path, identifier=nil)
- # proplist xml output supported in svn 1.5.0 and higher
- return nil unless self.class.client_version_above?([1, 5, 0])
-
- identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
- cmd = "#{self.class.sq_bin} proplist --verbose --xml #{target(path)}@#{identifier}"
- cmd << credentials_string
- properties = {}
- shellout(cmd) do |io|
- output = io.read
- if output.respond_to?(:force_encoding)
- output.force_encoding('UTF-8')
- end
- begin
- doc = ActiveSupport::XmlMini.parse(output)
- each_xml_element(doc['properties']['target'], 'property') do |property|
- properties[ property['name'] ] = property['__content__'].to_s
- end
- rescue
- end
- end
- return nil if $? && $?.exitstatus != 0
- properties
- end
-
- def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
- path ||= ''
- identifier_from = (identifier_from && identifier_from.to_i > 0) ? identifier_from.to_i : "HEAD"
- identifier_to = (identifier_to && identifier_to.to_i > 0) ? identifier_to.to_i : 1
- revisions = Revisions.new
- cmd = "#{self.class.sq_bin} log --xml -r #{identifier_from}:#{identifier_to}"
- cmd << credentials_string
- cmd << " --verbose " if options[:with_paths]
- cmd << " --limit #{options[:limit].to_i}" if options[:limit]
- cmd << ' ' + target(path)
- shellout(cmd) do |io|
- output = io.read
- if output.respond_to?(:force_encoding)
- output.force_encoding('UTF-8')
- end
- begin
- doc = ActiveSupport::XmlMini.parse(output)
- each_xml_element(doc['log'], 'logentry') do |logentry|
- paths = []
- each_xml_element(logentry['paths'], 'path') do |path|
- paths << {:action => path['action'],
- :path => path['__content__'],
- :from_path => path['copyfrom-path'],
- :from_revision => path['copyfrom-rev']
- }
- end if logentry['paths'] && logentry['paths']['path']
- paths.sort! { |x,y| x[:path] <=> y[:path] }
-
- revisions << Revision.new({:identifier => logentry['revision'],
- :author => (logentry['author'] ? logentry['author']['__content__'] : ""),
- :time => Time.parse(logentry['date']['__content__'].to_s).localtime,
- :message => logentry['msg']['__content__'],
- :paths => paths
- })
- end
- rescue
- end
- end
- return nil if $? && $?.exitstatus != 0
- revisions
- end
-
- def diff(path, identifier_from, identifier_to=nil, type="inline")
- path ||= ''
- identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : ''
-
- identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : (identifier_from.to_i - 1)
-
- cmd = "#{self.class.sq_bin} diff -r "
- cmd << "#{identifier_to}:"
- cmd << "#{identifier_from}"
- cmd << " #{target(path)}@#{identifier_from}"
- cmd << credentials_string
- diff = []
- shellout(cmd) do |io|
- io.each_line do |line|
- diff << line
- end
- end
- return nil if $? && $?.exitstatus != 0
- diff
- end
-
- def cat(path, identifier=nil)
- identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
- cmd = "#{self.class.sq_bin} cat #{target(path)}@#{identifier}"
- cmd << credentials_string
- cat = nil
- shellout(cmd) do |io|
- io.binmode
- cat = io.read
- end
- return nil if $? && $?.exitstatus != 0
- cat
- end
-
- def annotate(path, identifier=nil)
- identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
- cmd = "#{self.class.sq_bin} blame #{target(path)}@#{identifier}"
- cmd << credentials_string
- blame = Annotate.new
- shellout(cmd) do |io|
- io.each_line do |line|
- next unless line =~ %r{^\s*(\d+)\s*(\S+)\s(.*)$}
- blame.add_line($3.rstrip, Revision.new(:identifier => $1.to_i, :author => $2.strip))
- end
- end
- return nil if $? && $?.exitstatus != 0
- blame
- end
-
- private
-
- def credentials_string
- str = ''
- str << " --username #{shell_quote(@login)}" unless @login.blank?
- str << " --password #{shell_quote(@password)}" unless @login.blank? || @password.blank?
- str << " --no-auth-cache --non-interactive"
- str
- end
-
- # Helper that iterates over the child elements of a xml node
- # MiniXml returns a hash when a single child is found or an array of hashes for multiple children
- def each_xml_element(node, name)
- if node && node[name]
- if node[name].is_a?(Hash)
- yield node[name]
- else
- node[name].each do |element|
- yield element
- end
- end
- end
- end
-
- def target(path = '')
- base = path.match(/^\//) ? root_url : url
- uri = "#{base}/#{path}"
- uri = URI.escape(URI.escape(uri), '[]')
- shell_quote(uri.gsub(/[?<>\*]/, ''))
- end
- end
- end
- end
-end
+# Redmine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+require 'redmine/scm/adapters/abstract_adapter'
+require 'uri'
+
+module Redmine
+ module Scm
+ module Adapters
+ class SubversionAdapter < AbstractAdapter
+
+ # SVN executable name
+ SVN_BIN = Redmine::Configuration['scm_subversion_command'] || "svn"
+
+ class << self
+ def client_command
+ @@bin ||= SVN_BIN
+ end
+
+ def sq_bin
+ @@sq_bin ||= shell_quote(SVN_BIN)
+ end
+
+ def client_version
+ @@client_version ||= (svn_binary_version || [])
+ end
+
+ def client_available
+ # --xml options are introduced in 1.3.
+ # http://subversion.apache.org/docs/release-notes/1.3.html
+ client_version_above?([1, 3])
+ end
+
+ def svn_binary_version
+ scm_version = scm_version_from_command_line.dup
+ if scm_version.respond_to?(:force_encoding)
+ scm_version.force_encoding('ASCII-8BIT')
+ end
+ if m = scm_version.match(%r{\A(.*?)((\d+\.)+\d+)})
+ m[2].scan(%r{\d+}).collect(&:to_i)
+ end
+ end
+
+ def scm_version_from_command_line
+ shellout("#{sq_bin} --version") { |io| io.read }.to_s
+ end
+ end
+
+ # Get info about the svn repository
+ def info
+ cmd = "#{self.class.sq_bin} info --xml #{target}"
+ cmd << credentials_string
+ info = nil
+ shellout(cmd) do |io|
+ output = io.read
+ if output.respond_to?(:force_encoding)
+ output.force_encoding('UTF-8')
+ end
+ begin
+ doc = ActiveSupport::XmlMini.parse(output)
+ # root_url = doc.elements["info/entry/repository/root"].text
+ info = Info.new({:root_url => doc['info']['entry']['repository']['root']['__content__'],
+ :lastrev => Revision.new({
+ :identifier => doc['info']['entry']['commit']['revision'],
+ :time => Time.parse(doc['info']['entry']['commit']['date']['__content__']).localtime,
+ :author => (doc['info']['entry']['commit']['author'] ? doc['info']['entry']['commit']['author']['__content__'] : "")
+ })
+ })
+ rescue
+ end
+ end
+ return nil if $? && $?.exitstatus != 0
+ info
+ rescue CommandFailed
+ return nil
+ end
+
+ # Returns an Entries collection
+ # or nil if the given path doesn't exist in the repository
+ def entries(path=nil, identifier=nil, options={})
+ path ||= ''
+ identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
+ entries = Entries.new
+ cmd = "#{self.class.sq_bin} list --xml #{target(path)}@#{identifier}"
+ cmd << credentials_string
+ shellout(cmd) do |io|
+ output = io.read
+ if output.respond_to?(:force_encoding)
+ output.force_encoding('UTF-8')
+ end
+ begin
+ doc = ActiveSupport::XmlMini.parse(output)
+ each_xml_element(doc['lists']['list'], 'entry') do |entry|
+ commit = entry['commit']
+ commit_date = commit['date']
+ # Skip directory if there is no commit date (usually that
+ # means that we don't have read access to it)
+ next if entry['kind'] == 'dir' && commit_date.nil?
+ name = entry['name']['__content__']
+ entries << Entry.new({:name => URI.unescape(name),
+ :path => ((path.empty? ? "" : "#{path}/") + name),
+ :kind => entry['kind'],
+ :size => ((s = entry['size']) ? s['__content__'].to_i : nil),
+ :lastrev => Revision.new({
+ :identifier => commit['revision'],
+ :time => Time.parse(commit_date['__content__'].to_s).localtime,
+ :author => ((a = commit['author']) ? a['__content__'] : nil)
+ })
+ })
+ end
+ rescue Exception => e
+ logger.error("Error parsing svn output: #{e.message}")
+ logger.error("Output was:\n #{output}")
+ end
+ end
+ return nil if $? && $?.exitstatus != 0
+ logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
+ entries.sort_by_name
+ end
+
+ def properties(path, identifier=nil)
+ # proplist xml output supported in svn 1.5.0 and higher
+ return nil unless self.class.client_version_above?([1, 5, 0])
+
+ identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
+ cmd = "#{self.class.sq_bin} proplist --verbose --xml #{target(path)}@#{identifier}"
+ cmd << credentials_string
+ properties = {}
+ shellout(cmd) do |io|
+ output = io.read
+ if output.respond_to?(:force_encoding)
+ output.force_encoding('UTF-8')
+ end
+ begin
+ doc = ActiveSupport::XmlMini.parse(output)
+ each_xml_element(doc['properties']['target'], 'property') do |property|
+ properties[ property['name'] ] = property['__content__'].to_s
+ end
+ rescue
+ end
+ end
+ return nil if $? && $?.exitstatus != 0
+ properties
+ end
+
+ def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
+ path ||= ''
+ identifier_from = (identifier_from && identifier_from.to_i > 0) ? identifier_from.to_i : "HEAD"
+ identifier_to = (identifier_to && identifier_to.to_i > 0) ? identifier_to.to_i : 1
+ revisions = Revisions.new
+ cmd = "#{self.class.sq_bin} log --xml -r #{identifier_from}:#{identifier_to}"
+ cmd << credentials_string
+ cmd << " --verbose " if options[:with_paths]
+ cmd << " --limit #{options[:limit].to_i}" if options[:limit]
+ cmd << ' ' + target(path)
+ shellout(cmd) do |io|
+ output = io.read
+ if output.respond_to?(:force_encoding)
+ output.force_encoding('UTF-8')
+ end
+ begin
+ doc = ActiveSupport::XmlMini.parse(output)
+ each_xml_element(doc['log'], 'logentry') do |logentry|
+ paths = []
+ each_xml_element(logentry['paths'], 'path') do |path|
+ paths << {:action => path['action'],
+ :path => path['__content__'],
+ :from_path => path['copyfrom-path'],
+ :from_revision => path['copyfrom-rev']
+ }
+ end if logentry['paths'] && logentry['paths']['path']
+ paths.sort! { |x,y| x[:path] <=> y[:path] }
+
+ revisions << Revision.new({:identifier => logentry['revision'],
+ :author => (logentry['author'] ? logentry['author']['__content__'] : ""),
+ :time => Time.parse(logentry['date']['__content__'].to_s).localtime,
+ :message => logentry['msg']['__content__'],
+ :paths => paths
+ })
+ end
+ rescue
+ end
+ end
+ return nil if $? && $?.exitstatus != 0
+ revisions
+ end
+
+ def diff(path, identifier_from, identifier_to=nil, type="inline")
+ path ||= ''
+ identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : ''
+
+ identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : (identifier_from.to_i - 1)
+
+ cmd = "#{self.class.sq_bin} diff -r "
+ cmd << "#{identifier_to}:"
+ cmd << "#{identifier_from}"
+ cmd << " #{target(path)}@#{identifier_from}"
+ cmd << credentials_string
+ diff = []
+ shellout(cmd) do |io|
+ io.each_line do |line|
+ diff << line
+ end
+ end
+ return nil if $? && $?.exitstatus != 0
+ diff
+ end
+
+ def cat(path, identifier=nil)
+ identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
+ cmd = "#{self.class.sq_bin} cat #{target(path)}@#{identifier}"
+ cmd << credentials_string
+ cat = nil
+ shellout(cmd) do |io|
+ io.binmode
+ cat = io.read
+ end
+ return nil if $? && $?.exitstatus != 0
+ cat
+ end
+
+ def annotate(path, identifier=nil)
+ identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
+ cmd = "#{self.class.sq_bin} blame #{target(path)}@#{identifier}"
+ cmd << credentials_string
+ blame = Annotate.new
+ shellout(cmd) do |io|
+ io.each_line do |line|
+ next unless line =~ %r{^\s*(\d+)\s*(\S+)\s(.*)$}
+ rev = $1
+ blame.add_line($3.rstrip,
+ Revision.new(
+ :identifier => rev,
+ :revision => rev,
+ :author => $2.strip
+ ))
+ end
+ end
+ return nil if $? && $?.exitstatus != 0
+ blame
+ end
+
+ private
+
+ def credentials_string
+ str = ''
+ str << " --username #{shell_quote(@login)}" unless @login.blank?
+ str << " --password #{shell_quote(@password)}" unless @login.blank? || @password.blank?
+ str << " --no-auth-cache --non-interactive"
+ str
+ end
+
+ # Helper that iterates over the child elements of a xml node
+ # MiniXml returns a hash when a single child is found
+ # or an array of hashes for multiple children
+ def each_xml_element(node, name)
+ if node && node[name]
+ if node[name].is_a?(Hash)
+ yield node[name]
+ else
+ node[name].each do |element|
+ yield element
+ end
+ end
+ end
+ end
+
+ def target(path = '')
+ base = path.match(/^\//) ? root_url : url
+ uri = "#{base}/#{path}"
+ uri = URI.escape(URI.escape(uri), '[]')
+ shell_quote(uri.gsub(/[?<>\*]/, ''))
+ end
+ end
+ end
+ end
+end
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/unified_diff.rb
--- a/lib/redmine/unified_diff.rb Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/unified_diff.rb Mon Jun 06 14:41:04 2011 +0100
@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006-2008 Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -17,14 +17,16 @@
module Redmine
# Class used to parse unified diffs
- class UnifiedDiff < Array
+ class UnifiedDiff < Array
+ attr_reader :diff_type
+
def initialize(diff, options={})
options.assert_valid_keys(:type, :max_lines)
diff = diff.split("\n") if diff.is_a?(String)
- diff_type = options[:type] || 'inline'
+ @diff_type = options[:type] || 'inline'
lines = 0
@truncated = false
- diff_table = DiffTable.new(diff_type)
+ diff_table = DiffTable.new(@diff_type)
diff.each do |line|
line_encoding = nil
if line.respond_to?(:force_encoding)
@@ -53,17 +55,15 @@
end
# Class that represents a file diff
- class DiffTable < Hash
- attr_reader :file_name, :line_num_l, :line_num_r
+ class DiffTable < Array
+ attr_reader :file_name
# Initialize with a Diff file and the type of Diff View
# The type view must be inline or sbs (side_by_side)
def initialize(type="inline")
@parsing = false
- @nb_line = 1
- @start = false
- @before = 'same'
- @second = true
+ @added = 0
+ @removed = 0
@type = type
end
@@ -86,11 +86,21 @@
@line_num_l = $2.to_i
@line_num_r = $5.to_i
else
- @nb_line += 1 if parse_line(line, @type)
+ parse_line(line, @type)
end
end
return true
end
+
+ def each_line
+ prev_line_left, prev_line_right = nil, nil
+ each do |line|
+ spacing = prev_line_left && prev_line_right && (line.nb_line_left != prev_line_left+1) && (line.nb_line_right != prev_line_right+1)
+ yield spacing, line
+ prev_line_left = line.nb_line_left.to_i if line.nb_line_left.to_i > 0
+ prev_line_right = line.nb_line_right.to_i if line.nb_line_right.to_i > 0
+ end
+ end
def inspect
puts '### DIFF TABLE ###'
@@ -100,74 +110,91 @@
end
end
- private
- # Test if is a Side By Side type
- def sbs?(type, func)
- if @start and type == "sbs"
- if @before == func and @second
- tmp_nb_line = @nb_line
- self[tmp_nb_line] = Diff.new
- else
- @second = false
- tmp_nb_line = @start
- @start += 1
- @nb_line -= 1
- end
- else
- tmp_nb_line = @nb_line
- @start = @nb_line
- self[tmp_nb_line] = Diff.new
- @second = true
- end
- unless self[tmp_nb_line]
- @nb_line += 1
- self[tmp_nb_line] = Diff.new
- else
- self[tmp_nb_line]
- end
- end
+ private
# Escape the HTML for the diff
def escapeHTML(line)
CGI.escapeHTML(line)
end
+
+ def diff_for_added_line
+ if @type == 'sbs' && @removed > 0 && @added < @removed
+ self[-(@removed - @added)]
+ else
+ diff = Diff.new
+ self << diff
+ diff
+ end
+ end
def parse_line(line, type="inline")
if line[0, 1] == "+"
- diff = sbs? type, 'add'
- @before = 'add'
+ diff = diff_for_added_line
diff.line_right = escapeHTML line[1..-1]
diff.nb_line_right = @line_num_r
diff.type_diff_right = 'diff_in'
@line_num_r += 1
+ @added += 1
true
elsif line[0, 1] == "-"
- diff = sbs? type, 'remove'
- @before = 'remove'
+ diff = Diff.new
diff.line_left = escapeHTML line[1..-1]
diff.nb_line_left = @line_num_l
diff.type_diff_left = 'diff_out'
+ self << diff
@line_num_l += 1
+ @removed += 1
true
- elsif line[0, 1] =~ /\s/
- @before = 'same'
- @start = false
- diff = Diff.new
- diff.line_right = escapeHTML line[1..-1]
- diff.nb_line_right = @line_num_r
- diff.line_left = escapeHTML line[1..-1]
- diff.nb_line_left = @line_num_l
- self[@nb_line] = diff
- @line_num_l += 1
- @line_num_r += 1
- true
- elsif line[0, 1] = "\\"
+ else
+ write_offsets
+ if line[0, 1] =~ /\s/
+ diff = Diff.new
+ diff.line_right = escapeHTML line[1..-1]
+ diff.nb_line_right = @line_num_r
+ diff.line_left = escapeHTML line[1..-1]
+ diff.nb_line_left = @line_num_l
+ self << diff
+ @line_num_l += 1
+ @line_num_r += 1
+ true
+ elsif line[0, 1] = "\\"
true
else
false
end
end
end
+
+ def write_offsets
+ if @added > 0 && @added == @removed
+ @added.times do |i|
+ line = self[-(1 + i)]
+ removed = (@type == 'sbs') ? line : self[-(1 + @added + i)]
+ offsets = offsets(removed.line_left, line.line_right)
+ removed.offsets = line.offsets = offsets
+ end
+ end
+ @added = 0
+ @removed = 0
+ end
+
+ def offsets(line_left, line_right)
+ if line_left.present? && line_right.present? && line_left != line_right
+ max = [line_left.size, line_right.size].min
+ starting = 0
+ while starting < max && line_left[starting] == line_right[starting]
+ starting += 1
+ end
+ ending = -1
+ while ending >= -(max - starting) && line_left[ending] == line_right[ending]
+ ending -= 1
+ end
+ unless starting == 0 && ending == -1
+ [starting, ending]
+ end
+ end
+ end
+ end
# A line of diff
class Diff
@@ -177,6 +204,7 @@
attr_accessor :line_right
attr_accessor :type_diff_right
attr_accessor :type_diff_left
+ attr_accessor :offsets
def initialize()
self.nb_line_left = ''
@@ -186,6 +214,38 @@
self.type_diff_right = ''
self.type_diff_left = ''
end
+
+ def type_diff
+ type_diff_right == 'diff_in' ? type_diff_right : type_diff_left
+ end
+
+ def line
+ type_diff_right == 'diff_in' ? line_right : line_left
+ end
+
+ def html_line_left
+ if offsets
+ line_left.dup.insert(offsets.first, '').insert(offsets.last, ' ')
+ else
+ line_left
+ end
+ end
+
+ def html_line_right
+ if offsets
+ line_right.dup.insert(offsets.first, '').insert(offsets.last, ' ')
+ else
+ line_right
+ end
+ end
+
+ def html_line
+ if offsets
+ line.dup.insert(offsets.first, '').insert(offsets.last, ' ')
+ else
+ line
+ end
+ end
def inspect
puts '### Start Line Diff ###'
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/version.rb
--- a/lib/redmine/version.rb Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/version.rb Mon Jun 06 14:41:04 2011 +0100
@@ -3,9 +3,9 @@
module Redmine
module VERSION #:nodoc:
MAJOR = 1
- MINOR = 1
- TINY = 1
-
+ MINOR = 2
+ TINY = 0
+
# Branch values:
# * official release: nil
# * stable branch: stable
@@ -20,24 +20,25 @@
f = File.open(entries_path, 'r')
entries = f.read
f.close
- if entries.match(%r{^\d+})
- revision = $1.to_i if entries.match(%r{^\d+\s+dir\s+(\d+)\s})
- else
- xml = REXML::Document.new(entries)
- revision = xml.elements['wc-entries'].elements[1].attributes['revision'].to_i
- end
- rescue
- # Could not find the current revision
- end
- end
- revision
+ if entries.match(%r{^\d+})
+ revision = $1.to_i if entries.match(%r{^\d+\s+dir\s+(\d+)\s})
+ else
+ xml = REXML::Document.new(entries)
+ revision =
+ xml.elements['wc-entries'].elements[1].attributes['revision'].to_i
+ end
+ rescue
+ # Could not find the current revision
+ end
+ end
+ revision
end
REVISION = self.revision
- ARRAY = [MAJOR, MINOR, TINY, BRANCH, REVISION].compact
- STRING = ARRAY.join('.')
+ ARRAY = [MAJOR, MINOR, TINY, BRANCH, REVISION].compact
+ STRING = ARRAY.join('.')
- def self.to_a; ARRAY end
+ def self.to_a; ARRAY end
def self.to_s; STRING end
end
end
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/views/.svn/entries
--- a/lib/redmine/views/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/views/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,8 +1,8 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/lib/redmine/views
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine/views
http://redmine.rubyforge.org/svn
@@ -35,7 +35,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:15:00.000000Z
e0e38b713c41ea63221dd877c6939983
2010-12-03T11:25:21.858858Z
4452
@@ -69,7 +69,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:15:00.000000Z
849e9df27c041f540e690c6192939edf
2009-01-29T13:54:44.887081Z
2334
@@ -106,7 +106,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:15:00.000000Z
04feeced33ca55e9fb99099efe2fdcf6
2010-12-03T11:25:21.858858Z
4452
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/views/builders/.svn/entries
--- a/lib/redmine/views/builders/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/views/builders/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,8 +1,8 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/lib/redmine/views/builders
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine/views/builders
http://redmine.rubyforge.org/svn
@@ -32,7 +32,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:15:00.000000Z
8816150c9264dfa6e639af165670cbb1
2010-12-11T13:13:49.013705Z
4489
@@ -66,7 +66,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:15:00.000000Z
f9654f4bc43dbb5c01d5be2d6b045dd7
2010-12-11T13:13:49.013705Z
4489
@@ -100,7 +100,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:15:00.000000Z
4b47e2fa5030d1cdad48f3abb5ab7c44
2010-12-03T11:25:21.858858Z
4452
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/views/my_page/.svn/entries
--- a/lib/redmine/views/my_page/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/views/my_page/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,8 +1,8 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/lib/redmine/views/my_page
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine/views/my_page
http://redmine.rubyforge.org/svn
@@ -32,7 +32,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:15:00.000000Z
b06dfe20a85191516f81de5874f37ec6
2009-04-05T13:33:54.194067Z
2659
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/wiki_formatting/.svn/all-wcprops
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/redmine/wiki_formatting/.svn/all-wcprops Mon Jun 06 14:41:04 2011 +0100
@@ -0,0 +1,5 @@
+K 25
+svn:wc:ra_dav:version-url
+V 66
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/wiki_formatting
+END
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/wiki_formatting/.svn/entries
--- a/lib/redmine/wiki_formatting/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/wiki_formatting/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,14 +1,14 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/lib/redmine/wiki_formatting
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine/wiki_formatting
http://redmine.rubyforge.org/svn
-2010-11-06T17:47:27.890964Z
-4376
+2011-03-28T20:16:05.752041Z
+5242
jplang
@@ -32,7 +32,7 @@
-2011-03-03T11:05:14.000000Z
+2011-06-06T13:15:00.000000Z
879f8ce24a6bb5e4f5ea3b6f798b7a63
2010-11-06T17:47:27.890964Z
4376
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/wiki_formatting/textile/.svn/all-wcprops
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/redmine/wiki_formatting/textile/.svn/all-wcprops Mon Jun 06 14:41:04 2011 +0100
@@ -0,0 +1,17 @@
+K 25
+svn:wc:ra_dav:version-url
+V 74
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/wiki_formatting/textile
+END
+helper.rb
+K 25
+svn:wc:ra_dav:version-url
+V 84
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/wiki_formatting/textile/helper.rb
+END
+formatter.rb
+K 25
+svn:wc:ra_dav:version-url
+V 87
+/svn/!svn/ver/5878/branches/1.2-stable/lib/redmine/wiki_formatting/textile/formatter.rb
+END
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/wiki_formatting/textile/.svn/entries
--- a/lib/redmine/wiki_formatting/textile/.svn/entries Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/wiki_formatting/textile/.svn/entries Mon Jun 06 14:41:04 2011 +0100
@@ -1,14 +1,14 @@
10
dir
-4993
-http://redmine.rubyforge.org/svn/trunk/lib/redmine/wiki_formatting/textile
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/lib/redmine/wiki_formatting/textile
http://redmine.rubyforge.org/svn
-2010-11-06T17:47:27.890964Z
-4376
+2011-03-28T20:16:05.752041Z
+5242
jplang
@@ -32,10 +32,10 @@
-2011-03-03T11:05:14.000000Z
-dec83b1d0d7f682d1ebf1f172fe3c90b
-2009-11-11T10:55:19.574870Z
-3025
+2011-06-06T13:20:53.000000Z
+e4c07fbafae7798129e133c528e1eec8
+2011-03-28T20:16:05.752041Z
+5242
jplang
has-props
@@ -58,7 +58,7 @@
-1936
+2123
formatter.rb
file
@@ -66,10 +66,10 @@
-2011-03-03T11:05:14.000000Z
-b8052f700ecb0991fabdd3a5b684a412
-2010-11-06T17:47:27.890964Z
-4376
+2011-06-06T13:20:53.000000Z
+aeba307e1011ac3f15b25fd91065ae2e
+2011-03-14T20:35:36.619571Z
+5133
jplang
has-props
@@ -92,5 +92,5 @@
-4724
+4722
diff -r adc8466df404 -r 753f1380d6bc lib/redmine/wiki_formatting/textile/.svn/text-base/formatter.rb.svn-base
--- a/lib/redmine/wiki_formatting/textile/.svn/text-base/formatter.rb.svn-base Thu Mar 03 15:08:45 2011 +0000
+++ b/lib/redmine/wiki_formatting/textile/.svn/text-base/formatter.rb.svn-base Mon Jun 06 14:41:04 2011 +0100
@@ -43,7 +43,7 @@
# Patch for RedCloth. Fixed in RedCloth r128 but _why hasn't released it yet.
# http://code.whytheluckystiff.net/redcloth/changeset/128
def hard_break( text )
- text.gsub!( /(.)\n(?!\n|\Z|>| *([#*=]+(\s|$)|[{|]))/, "\\1http://code.whytheluckystiff.net/redcloth/changeset/128
def hard_break( text )
- text.gsub!( /(.)\n(?!\n|\Z|>| *([#*=]+(\s|$)|[{|]))/, "\\1redMine 404 error
+Redmine 404 error