diff --git a/app/views/dmsf/_list_view.erb b/app/views/dmsf/_list_view.erb index 6ef48f67..c89f9113 100644 --- a/app/views/dmsf/_list_view.erb +++ b/app/views/dmsf/_list_view.erb @@ -29,7 +29,7 @@ <%= l(:link_title) %> <%= l(:link_size) %> <%= l(:link_modified) %> - <%= l(:link_ver) %> + <%= l(:link_ver) %> <%= l(:link_workflow) %> <%= l(:link_author) %> diff --git a/app/views/dmsf/_tree_view.erb b/app/views/dmsf/_tree_view.erb index dd467356..6c8aed60 100644 --- a/app/views/dmsf/_tree_view.erb +++ b/app/views/dmsf/_tree_view.erb @@ -29,7 +29,7 @@ <%= l(:link_title) %> <%= l(:link_size) %> <%= l(:link_modified) %> - <%= l(:link_ver) %> + <%= l(:link_ver) %> <%= l(:link_workflow) %> <%= l(:link_author) %> diff --git a/app/views/dmsf/trash.html.erb b/app/views/dmsf/trash.html.erb index 9b9a232c..9d1af75e 100644 --- a/app/views/dmsf/trash.html.erb +++ b/app/views/dmsf/trash.html.erb @@ -53,7 +53,7 @@ <%= l(:link_title) %> <%= l(:link_size) %> <%= l(:link_modified) %> - <%= l(:link_ver) %> + <%= l(:link_ver) %> <%= l(:link_workflow) %> <%= l(:link_author) %> diff --git a/app/views/dmsf_files/_file_new_revision.html.erb b/app/views/dmsf_files/_file_new_revision.html.erb index 215efc29..27b38162 100644 --- a/app/views/dmsf_files/_file_new_revision.html.erb +++ b/app/views/dmsf_files/_file_new_revision.html.erb @@ -48,7 +48,7 @@

- <%= label_tag('version_0', l(:label_version)) %> + <%= label_tag('version_0', l(:label_dmsf_version)) %> <%= radio_button_tag('version', 0, @revision.version == @file.last_revision.version) %> <%= @file.last_revision.major_version %>.<%= @file.last_revision.minor_version %> <%= l(:option_version_same) %>
diff --git a/app/views/dmsf_files/show.html.erb b/app/views/dmsf_files/show.html.erb index cd0f9484..191d1d9d 100644 --- a/app/views/dmsf_files/show.html.erb +++ b/app/views/dmsf_files/show.html.erb @@ -114,7 +114,7 @@

<% end %>

- <%= label_tag('', l(:label_version)) %> + <%= label_tag('', l(:label_dmsf_version)) %> <%= revision.major_version %>.<%= revision.minor_version %>

diff --git a/app/views/dmsf_mailer/files_deleted.html.erb b/app/views/dmsf_mailer/files_deleted.html.erb index 6000d864..7e780433 100644 --- a/app/views/dmsf_mailer/files_deleted.html.erb +++ b/app/views/dmsf_mailer/files_deleted.html.erb @@ -24,7 +24,7 @@

<%= h(file.dmsf_path_str) %> (<%= file.name %>) <% if file.last_revision %> - , <%= number_to_human_size(file.last_revision.size) %>, <%= l(:label_version) %> <%= file.last_revision.major_version %>.<%= file.last_revision.minor_version %> + , <%= number_to_human_size(file.last_revision.size) %>, <%= l(:label_dmsf_version) %> <%= file.last_revision.major_version %>.<%= file.last_revision.minor_version %> <% end %>

<% end %> \ No newline at end of file diff --git a/app/views/dmsf_mailer/files_deleted.text.erb b/app/views/dmsf_mailer/files_deleted.text.erb index a6cd02a0..bfd77ff6 100644 --- a/app/views/dmsf_mailer/files_deleted.text.erb +++ b/app/views/dmsf_mailer/files_deleted.text.erb @@ -22,6 +22,6 @@ <% @files.each do |file| %> <%= h(file.dmsf_path_str) %> (<%= file.name %>) <% if file.last_revision %> - , <%= number_to_human_size(file.last_revision.size) %>, <%= l(:label_version) %> <%= file.last_revision.major_version %>.<%= file.last_revision.minor_version %> + , <%= number_to_human_size(file.last_revision.size) %>, <%= l(:label_dmsf_version) %> <%= file.last_revision.major_version %>.<%= file.last_revision.minor_version %> <% end %> <% end %> \ No newline at end of file diff --git a/app/views/dmsf_mailer/files_updated.html.erb b/app/views/dmsf_mailer/files_updated.html.erb index d3e2a999..cd366281 100644 --- a/app/views/dmsf_mailer/files_updated.html.erb +++ b/app/views/dmsf_mailer/files_updated.html.erb @@ -26,7 +26,7 @@ dmsf_file_url(file, :download => '')) %> (<%= file.name %>), <%= number_to_human_size(file.last_revision.size) %>, - <%= l(:label_version) %> <%= file.last_revision.major_version %>.<%= file.last_revision.minor_version %>, + <%= l(:label_dmsf_version) %> <%= file.last_revision.major_version %>.<%= file.last_revision.minor_version %>, <%= "#{file.last_revision.workflow_str(true)}," if file.last_revision.workflow_str(true) != l(:title_none) %> <%= link_to(l(:link_details, :title => h(file.title)), dmsf_file_url(file)) %> diff --git a/app/views/dmsf_mailer/files_updated.text.erb b/app/views/dmsf_mailer/files_updated.text.erb index 899d3b71..de0d8d9f 100644 --- a/app/views/dmsf_mailer/files_updated.text.erb +++ b/app/views/dmsf_mailer/files_updated.text.erb @@ -23,7 +23,7 @@ <% @files.each do |file| %> <%= h(file.dmsf_path_str) %> (<%= file.name %>), <%= number_to_human_size(file.last_revision.size) %>, - <%= l(:label_version) %> <%= file.last_revision.major_version %>.<%= file.last_revision.minor_version %>, + <%= l(:label_dmsf_version) %> <%= file.last_revision.major_version %>.<%= file.last_revision.minor_version %>, <%= "#{file.last_revision.workflow_str(true)}," if file.last_revision.workflow_str(true) != l(:title_none) %> <%= dmsf_file_url(file) %> <% if file.last_revision.comment.present? %> diff --git a/app/views/dmsf_upload/_upload_file.html.erb b/app/views/dmsf_upload/_upload_file.html.erb index c7fb7edb..a7c27f1c 100644 --- a/app/views/dmsf_upload/_upload_file.html.erb +++ b/app/views/dmsf_upload/_upload_file.html.erb @@ -46,7 +46,7 @@

- <%= label_tag("commited_files[#{i}][version]_minor", l(:label_version)) %> + <%= label_tag("commited_files[#{i}][version]_minor", l(:label_dmsf_version)) %> <%= radio_button_tag("commited_files[#{i}][version]", 1, true) %> <%= upload.major_version %>.<%= upload.minor_version + 1 %> <%= l(:option_version_minor) %>
diff --git a/app/views/dmsf_upload/_upload_file_locked.html.erb b/app/views/dmsf_upload/_upload_file_locked.html.erb index 6abdf98a..97a52432 100644 --- a/app/views/dmsf_upload/_upload_file_locked.html.erb +++ b/app/views/dmsf_upload/_upload_file_locked.html.erb @@ -51,7 +51,7 @@

- <%= label_tag('', l(:label_version)) %> + <%= label_tag('', l(:label_dmsf_version)) %> <%= upload.major_version %>.<%= upload.minor_version %>

diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 3fc3c650..36a9f54f 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -323,6 +323,7 @@ cs: error_unlock_parent_locked: Nelze odemknout - nadřazený objekt je zamčený field_dmsf_tree_view: Zobrazit složky jako stromovou strukturu + label_dmsf_version: Verze my: blocks: diff --git a/config/locales/de.yml b/config/locales/de.yml index bdeef3e3..75cf3cee 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -323,6 +323,7 @@ de: error_unlock_parent_locked: Unlock failed - resource parent is locked field_dmsf_tree_view: Navigate folders in a tree + label_dmsf_version: Version my: blocks: diff --git a/config/locales/en.yml b/config/locales/en.yml index 0f6e1140..4a472eb6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -323,6 +323,7 @@ en: error_unlock_parent_locked: Unlock failed - resource parent is locked field_dmsf_tree_view: Navigate folders in a tree + label_dmsf_version: Version my: blocks: diff --git a/config/locales/es.yml b/config/locales/es.yml index ad698efd..bd89668f 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -323,6 +323,7 @@ es: error_unlock_parent_locked: Unlock failed - resource parent is locked field_dmsf_tree_view: Navigate folders in a tree + label_dmsf_version: Versión my: blocks: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 62e19416..f2a9ed32 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -323,6 +323,7 @@ fr: error_unlock_parent_locked: Unlock failed - resource parent is locked field_dmsf_tree_view: Navigate folders in a tree + label_dmsf_version: Version my: blocks: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 47f2ebcb..349dc8a4 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -323,6 +323,7 @@ ja: error_unlock_parent_locked: Unlock failed - resource parent is locked field_dmsf_tree_view: Navigate folders in a tree + label_dmsf_version: バージョン my: blocks: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index ee77e5a1..f23c8bfd 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -323,6 +323,7 @@ pl: error_unlock_parent_locked: Unlock failed - resource parent is locked field_dmsf_tree_view: Navigate folders in a tree + label_dmsf_version: Wersja my: blocks: diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 25c15dad..70cee525 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -323,6 +323,7 @@ pt-BR: error_unlock_parent_locked: Unlock failed - resource parent is locked field_dmsf_tree_view: Navigate folders in a tree + label_dmsf_version: Versão my: blocks: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 0cb33f61..4db75444 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -323,6 +323,7 @@ ru: error_unlock_parent_locked: Разблокировка не удалась - родительская запись заблокирована field_dmsf_tree_view: Navigate folders in a tree + label_dmsf_version: Версия my: blocks: diff --git a/config/locales/sl.yml b/config/locales/sl.yml index e477eb1f..46dff91c 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -323,6 +323,7 @@ sl: error_unlock_parent_locked: Unlock failed - resource parent is locked field_dmsf_tree_view: Navigate folders in a tree + label_dmsf_version: Verzija my: blocks: diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 2ef6fcc9..f879ae03 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -323,6 +323,7 @@ zh-TW: error_unlock_parent_locked: Unlock failed - resource parent is locked field_dmsf_tree_view: Navigate folders in a tree + label_dmsf_version: 版本 my: blocks: diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 5ef12d8f..07af3617 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -323,6 +323,7 @@ zh: error_unlock_parent_locked: Unlock failed - resource parent is locked field_dmsf_tree_view: Navigate folders in a tree + label_dmsf_version: 版本 my: blocks: