diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index e89bc94c4..8a881e51f 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1386,9 +1386,6 @@ ar:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 34e6b17bd..10de3df55 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -1478,9 +1478,6 @@ az:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 81f81edbf..607d2ce96 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1355,9 +1355,6 @@ bg:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 7394df919..f46874bf5 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1399,9 +1399,6 @@ bs:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 35e92436a..7415b6897 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1376,9 +1376,6 @@ ca:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 3351f28f2..f3c470c0f 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1376,9 +1376,6 @@ cs:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 070a4195b..7cd659a96 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1403,9 +1403,6 @@ da:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 330b11e5b..2b150d952 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1360,9 +1360,6 @@ de:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 2387b241d..2fff61add 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1386,9 +1386,6 @@ el:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 925f8bfeb..90933acc2 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1387,9 +1387,6 @@ en-GB:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 559672371..d11b6692b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -235,8 +235,6 @@ en:
   error_not_allowed_to_log_time_for_other_users: "You are not allowed to log time for other users"
   error_can_not_execute_macro_html: "Error executing the <strong>%{name}</strong> macro (%{error})"
   error_macro_does_not_accept_block: "This macro does not accept a block of text"
-  error_invalid_macro_name: "Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters are accepted)"
-  error_can_not_create_macro_without_block: "Can not create a macro without a block!"
   error_childpages_macro_no_argument: "With no argument, this macro can be called from wiki pages only"
   error_circular_inclusion: "Circular inclusion detected"
   error_page_not_found: "Page not found"
diff --git a/config/locales/es-PA.yml b/config/locales/es-PA.yml
index 63c24e624..46bd91395 100644
--- a/config/locales/es-PA.yml
+++ b/config/locales/es-PA.yml
@@ -1416,9 +1416,6 @@ es-PA:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 785c71fb7..e446ea5fb 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1414,9 +1414,6 @@ es:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 7bac38d1c..187f599e5 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1391,9 +1391,6 @@ et:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index b1db8872a..d745e1d1f 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1387,9 +1387,6 @@ eu:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index d4f4cf661..f6a093120 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1360,9 +1360,6 @@ fa:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index ded033ddd..be34efa43 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1407,9 +1407,6 @@ fi:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index b34a8da28..78e700efd 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1376,9 +1376,6 @@ fr:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 9367474d9..96fbffbf8 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1393,9 +1393,6 @@ gl:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/he.yml b/config/locales/he.yml
index f30e1e002..4940b8cdc 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1391,9 +1391,6 @@ he:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 063fb6416..000ff8e59 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1383,9 +1383,6 @@ hr:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 1685e672e..2dfccc523 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1405,9 +1405,6 @@
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 76717c77b..0848a6dc7 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1388,9 +1388,6 @@ id:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 9cd19b7ab..85b8b6a23 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1379,9 +1379,6 @@ it:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 83cb4fb4a..470ca4f10 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1362,9 +1362,6 @@ ja:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index adbcb210c..7a08295fc 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1424,9 +1424,6 @@ ko:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 1f2b27b0d..289a29936 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1376,9 +1376,6 @@ lt:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 571794339..e5b5e1b99 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1380,9 +1380,6 @@ lv:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index f1d57e721..443768d8b 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1386,9 +1386,6 @@ mk:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index eb8a743cd..ffc845076 100644
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -1386,9 +1386,6 @@ mn:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index d7a98266a..3b18ff60e 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1361,9 +1361,6 @@ nl:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/no.yml b/config/locales/no.yml
index fddd2a589..474909034 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1376,9 +1376,6 @@
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 368e02cf7..734dcc6ea 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1399,9 +1399,6 @@ pl:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 563c4a9a1..14659f4a5 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1391,9 +1391,6 @@ pt-BR:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index b02def5f6..c59059498 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -1379,9 +1379,6 @@ pt:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 6b0f438f9..5736a42e1 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1381,9 +1381,6 @@ ro:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 50a39357c..f9f467b53 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1471,9 +1471,6 @@ ru:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index a90867594..5f5869448 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1375,9 +1375,6 @@ sk:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index f48108063..56190b522 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1386,9 +1386,6 @@ sl:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 85d73b4b1..d0065807c 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1382,9 +1382,6 @@ sq:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index 9c31c0330..e5a7fd7ff 100644
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -1388,9 +1388,6 @@ sr-YU:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 50b6edb97..8e5f73613 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1387,9 +1387,6 @@ sr:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index f92fbfecc..2c50f3f32 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1419,9 +1419,6 @@ sv:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 0c40c87a2..1aff062e2 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1382,9 +1382,6 @@ th:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 948ca8a95..a70f0ed45 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1393,9 +1393,6 @@ tr:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 5545921ba..3b7e13095 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1374,9 +1374,6 @@ uk:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 946fb9461..7a325865d 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1438,9 +1438,6 @@ vi:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 2480efc08..78d2857ad 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1424,9 +1424,6 @@
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 399bc9518..bd2f6285c 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1363,9 +1363,6 @@ zh:
   error_can_not_execute_macro_html: Error executing the <strong>%{name}</strong> macro
     (%{error})
   error_macro_does_not_accept_block: This macro does not accept a block of text
-  error_invalid_macro_name: 'Invalid macro name: %{name} (only 0-9, A-Z, a-z and _ characters
-    are accepted)'
-  error_can_not_create_macro_without_block: Can not create a macro without a block!
   error_childpages_macro_no_argument: With no argument, this macro can be called from
     wiki pages only
   error_circular_inclusion: Circular inclusion detected
diff --git a/lib/redmine/wiki_formatting/macros.rb b/lib/redmine/wiki_formatting/macros.rb
index 03eeecde9..db0a5ae01 100644
--- a/lib/redmine/wiki_formatting/macros.rb
+++ b/lib/redmine/wiki_formatting/macros.rb
@@ -152,10 +152,10 @@ module Redmine
         def macro(name, options={}, &block)
           options.assert_valid_keys(:desc, :parse_args)
           unless /\A\w+\z/.match?(name.to_s)
-            raise t(:error_invalid_macro_name, :name => name)
+            raise "Invalid macro name: #{name} (only 0-9, A-Z, a-z and _ characters are accepted)"
           end
           unless block_given?
-            raise t(:error_can_not_create_macro_without_block)
+            raise "Can not create a macro without a block!"
           end
           name = name.to_s.downcase.to_sym
           available_macros[name] = {:desc => @@desc || ''}.merge(options)