##// END OF EJS Templates
Merged r4426 from trunk....
Jean-Philippe Lang -
r4319:92b37c0bea09
parent child
Show More
@@ -6,7 +6,7
6 <p><%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
6 <p><%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
7 <%= wikitoolbar_for 'settings_welcome_text' %>
7 <%= wikitoolbar_for 'settings_welcome_text' %>
8
8
9 <p><%= setting_text_field :attachment_max_size, :size => 6 %> KB</p>
9 <p><%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
10
10
11 <p><%= setting_text_field :per_page_options, :size => 20 %><br />
11 <p><%= setting_text_field :per_page_options, :size => 20 %><br />
12 <em><%= l(:text_comma_separated) %></em></p>
12 <em><%= l(:text_comma_separated) %></em></p>
@@ -26,7 +26,7
26
26
27 <p><%= setting_text_field :feeds_limit, :size => 6 %></p>
27 <p><%= setting_text_field :feeds_limit, :size => 6 %></p>
28
28
29 <p><%= setting_text_field :file_max_size_displayed, :size => 6 %> KB</p>
29 <p><%= setting_text_field :file_max_size_displayed, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
30
30
31 <p><%= setting_text_field :diff_max_lines_displayed, :size => 6 %></p>
31 <p><%= setting_text_field :diff_max_lines_displayed, :size => 6 %></p>
32
32
General Comments 0
You need to be logged in to leave comments. Login now