Index: app/controllers/admin_controller.rb
===================================================================
--- app/controllers/admin_controller.rb (revision 12240)
+++ app/controllers/admin_controller.rb (working copy)
@@ -77,7 +77,8 @@
[:text_default_administrator_account_changed, User.default_admin_account_changed?],
[:text_file_repository_writable, File.writable?(Attachment.storage_path)],
[:text_plugin_assets_writable, File.writable?(Redmine::Plugin.public_directory)],
- [:text_rmagick_available, Object.const_defined?(:Magick)]
+ [:text_rmagick_available, Object.const_defined?(:Magick)],
+ [:text_convert_available, Redmine::Thumbnail.convert_available?]
]
end
end
Index: config/locales/zh-TW.yml
===================================================================
--- config/locales/zh-TW.yml (revision 12240)
+++ config/locales/zh-TW.yml (working copy)
@@ -1180,3 +1180,4 @@
description_date_from: 輸入起始日期
description_date_to: 輸入結束日期
text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。
一旦儲存之後, 代碼便無法再次被更改。'
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/eu.yml
===================================================================
--- config/locales/eu.yml (revision 12240)
+++ config/locales/eu.yml (working copy)
@@ -1101,3 +1101,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/ko.yml
===================================================================
--- config/locales/ko.yml (revision 12240)
+++ config/locales/ko.yml (working copy)
@@ -1149,3 +1149,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/mn.yml
===================================================================
--- config/locales/mn.yml (revision 12240)
+++ config/locales/mn.yml (working copy)
@@ -1101,3 +1101,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/az.yml
===================================================================
--- config/locales/az.yml (revision 12240)
+++ config/locales/az.yml (working copy)
@@ -1197,3 +1197,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/it.yml
===================================================================
--- config/locales/it.yml (revision 12240)
+++ config/locales/it.yml (working copy)
@@ -1099,3 +1099,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/sk.yml
===================================================================
--- config/locales/sk.yml (revision 12240)
+++ config/locales/sk.yml (working copy)
@@ -1090,3 +1090,4 @@
field_must_change_passwd: Pri najbližšom prihlásení je potrebné zmeniť heslo
notice_new_password_must_be_different: Nové heslo nesmie byť rovnaké ako súčasné heslo
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/sl.yml
===================================================================
--- config/locales/sl.yml (revision 12240)
+++ config/locales/sl.yml (working copy)
@@ -1100,3 +1100,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/uk.yml
===================================================================
--- config/locales/uk.yml (revision 12240)
+++ config/locales/uk.yml (working copy)
@@ -1095,3 +1095,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/sq.yml
===================================================================
--- config/locales/sq.yml (revision 12240)
+++ config/locales/sq.yml (working copy)
@@ -1096,3 +1096,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/sr.yml
===================================================================
--- config/locales/sr.yml (revision 12240)
+++ config/locales/sr.yml (working copy)
@@ -1101,3 +1101,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/da.yml
===================================================================
--- config/locales/da.yml (revision 12240)
+++ config/locales/da.yml (working copy)
@@ -1117,3 +1117,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/fa.yml
===================================================================
--- config/locales/fa.yml (revision 12240)
+++ config/locales/fa.yml (working copy)
@@ -1102,3 +1102,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/bg.yml
===================================================================
--- config/locales/bg.yml (revision 12240)
+++ config/locales/bg.yml (working copy)
@@ -1097,3 +1097,4 @@
description_date_from: Въведете начална дата
description_date_to: Въведете крайна дата
text_repository_identifier_info: 'Позволени са малки букви (a-z), цифри, тирета и _.
Промяна след създаването му не е възможна.'
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/de.yml
===================================================================
--- config/locales/de.yml (revision 12240)
+++ config/locales/de.yml (working copy)
@@ -1112,3 +1112,4 @@
version_status_open: offen
warning_attachments_not_saved: "%{count} Datei(en) konnten nicht gespeichert werden."
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/sv.yml
===================================================================
--- config/locales/sv.yml (revision 12240)
+++ config/locales/sv.yml (working copy)
@@ -1138,3 +1138,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/ja.yml
===================================================================
--- config/locales/ja.yml (revision 12240)
+++ config/locales/ja.yml (working copy)
@@ -1127,3 +1127,4 @@
field_must_change_passwd: 次回ログイン時にパスワード変更を強制
notice_new_password_must_be_different: 新しいパスワードは現在のパスワードと異なるものでなければなりません
setting_mail_handler_excluded_filenames: 除外する添付ファイル名
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/he.yml
===================================================================
--- config/locales/he.yml (revision 12240)
+++ config/locales/he.yml (working copy)
@@ -1105,3 +1105,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/fi.yml
===================================================================
--- config/locales/fi.yml (revision 12240)
+++ config/locales/fi.yml (working copy)
@@ -1121,3 +1121,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/bs.yml
===================================================================
--- config/locales/bs.yml (revision 12240)
+++ config/locales/bs.yml (working copy)
@@ -1113,3 +1113,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/fr.yml
===================================================================
--- config/locales/fr.yml (revision 12240)
+++ config/locales/fr.yml (working copy)
@@ -1111,3 +1111,4 @@
setting_repositories_encodings: Encodages des fichiers et des dépôts
label_search_for_watchers: Rechercher des observateurs
text_repository_identifier_info: 'Seuls les lettres minuscules (a-z), chiffres, tirets et tirets bas sont autorisés.
Un fois sauvegardé, l''identifiant ne pourra plus être modifié.'
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/hr.yml
===================================================================
--- config/locales/hr.yml (revision 12240)
+++ config/locales/hr.yml (working copy)
@@ -1101,3 +1101,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/nl.yml
===================================================================
--- config/locales/nl.yml (revision 12240)
+++ config/locales/nl.yml (working copy)
@@ -1079,3 +1079,4 @@
field_must_change_passwd: Moet wachtwoord wijziging bij volgende keer inloggen
notice_new_password_must_be_different: Het nieuwe wachtwoord mag niet hetzelfde zijn als het huidige wachtwoord
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert beschikbaar (optioneel)
Index: config/locales/pl.yml
===================================================================
--- config/locales/pl.yml (revision 12240)
+++ config/locales/pl.yml (working copy)
@@ -1122,3 +1122,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/th.yml
===================================================================
--- config/locales/th.yml (revision 12240)
+++ config/locales/th.yml (working copy)
@@ -1097,3 +1097,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/no.yml
===================================================================
--- config/locales/no.yml (revision 12240)
+++ config/locales/no.yml (working copy)
@@ -1090,3 +1090,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/hu.yml
===================================================================
--- config/locales/hu.yml (revision 12240)
+++ config/locales/hu.yml (working copy)
@@ -1119,3 +1119,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/vi.yml
===================================================================
--- config/locales/vi.yml (revision 12240)
+++ config/locales/vi.yml (working copy)
@@ -1153,3 +1153,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/lt.yml
===================================================================
--- config/locales/lt.yml (revision 12240)
+++ config/locales/lt.yml (working copy)
@@ -1159,3 +1159,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/sr-YU.yml
===================================================================
--- config/locales/sr-YU.yml (revision 12240)
+++ config/locales/sr-YU.yml (working copy)
@@ -1102,3 +1102,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/ro.yml
===================================================================
--- config/locales/ro.yml (revision 12240)
+++ config/locales/ro.yml (working copy)
@@ -1095,3 +1095,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/lv.yml
===================================================================
--- config/locales/lv.yml (revision 12240)
+++ config/locales/lv.yml (working copy)
@@ -1094,3 +1094,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/zh.yml
===================================================================
--- config/locales/zh.yml (revision 12240)
+++ config/locales/zh.yml (working copy)
@@ -1101,3 +1101,4 @@
field_must_change_passwd: 下次登录时必须修改密码
notice_new_password_must_be_different: 新密码必须和旧密码不同
setting_mail_handler_excluded_filenames: 移除符合下列名称的附件
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/pt.yml
===================================================================
--- config/locales/pt.yml (revision 12240)
+++ config/locales/pt.yml (working copy)
@@ -1106,3 +1106,4 @@
field_must_change_passwd: Tem que alterar a palavra-passe no próximo início de sessão
notice_new_password_must_be_different: A palavra-passe tem de ser diferente da actual
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/ca.yml
===================================================================
--- config/locales/ca.yml (revision 12240)
+++ config/locales/ca.yml (working copy)
@@ -1102,3 +1102,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/pt-BR.yml
===================================================================
--- config/locales/pt-BR.yml (revision 12240)
+++ config/locales/pt-BR.yml (working copy)
@@ -1120,3 +1120,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/tr.yml
===================================================================
--- config/locales/tr.yml (revision 12240)
+++ config/locales/tr.yml (working copy)
@@ -1119,3 +1119,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/ru.yml
===================================================================
--- config/locales/ru.yml (revision 12240)
+++ config/locales/ru.yml (working copy)
@@ -1210,3 +1210,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/en-GB.yml
===================================================================
--- config/locales/en-GB.yml (revision 12240)
+++ config/locales/en-GB.yml (working copy)
@@ -1102,3 +1102,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/id.yml
===================================================================
--- config/locales/id.yml (revision 12240)
+++ config/locales/id.yml (working copy)
@@ -1104,3 +1104,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/el.yml
===================================================================
--- config/locales/el.yml (revision 12240)
+++ config/locales/el.yml (working copy)
@@ -1100,3 +1100,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/en.yml
===================================================================
--- config/locales/en.yml (revision 12240)
+++ config/locales/en.yml (working copy)
@@ -1014,6 +1014,7 @@
text_file_repository_writable: Attachments directory writable
text_plugin_assets_writable: Plugin assets directory writable
text_rmagick_available: RMagick available (optional)
+ text_convert_available: ImageMagick convert available (optional)
text_destroy_time_entries_question: "%{hours} hours were reported on the issues you are about to delete. What do you want to do?"
text_destroy_time_entries: Delete reported hours
text_assign_time_entries_to_project: Assign reported hours to the project
Index: config/locales/gl.yml
===================================================================
--- config/locales/gl.yml (revision 12240)
+++ config/locales/gl.yml (working copy)
@@ -1111,3 +1111,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/ar.yml
===================================================================
--- config/locales/ar.yml (revision 12240)
+++ config/locales/ar.yml (working copy)
@@ -1100,3 +1100,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/cs.yml
===================================================================
--- config/locales/cs.yml (revision 12240)
+++ config/locales/cs.yml (working copy)
@@ -1104,3 +1104,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/mk.yml
===================================================================
--- config/locales/mk.yml (revision 12240)
+++ config/locales/mk.yml (working copy)
@@ -1100,3 +1100,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/es.yml
===================================================================
--- config/locales/es.yml (revision 12240)
+++ config/locales/es.yml (working copy)
@@ -1135,3 +1135,4 @@
field_must_change_passwd: Cambiar la contraseña en el siguiente identificación
notice_new_password_must_be_different: Nueva contraseña debe ser diferente de la actual
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)
Index: config/locales/et.yml
===================================================================
--- config/locales/et.yml (revision 12240)
+++ config/locales/et.yml (working copy)
@@ -1113,3 +1113,4 @@
notice_new_password_must_be_different: The new password must be different from the
current password
setting_mail_handler_excluded_filenames: Exclude attachments by name
+ text_convert_available: ImageMagick convert available (optional)