1.7.1dev: merge [17851,17853] from 1.6-stable (fix for #13778)

[skip ci]


git-svn-id: http://trac.edgewall.org/intertrac/log:/trunk@17855 af82e41b-90c4-0310-8c96-b1721e28e2e2

trac/htdocs/js/admin_enums.js

@@ -6,8 +6,10 @@ jQuery(function($) {
   $enumlist.addSelectAllCheckboxes();
 
   // Insert 'Revert changes' button after the 'Apply changes' button
-  var $revert_button = $('<input type="submit" name="revert" value="Revert changes" disabled="disabled" />')
-                       .insertAfter($apply_button);
+  var $revert_button = $($.htmlFormat(
+    '<input type="submit" name="revert" value="$1" disabled="disabled" />',
+    _("Revert changes")));
+  $revert_button.insertAfter($apply_button);
 
   // Disable the 'Apply changes' button until there is a change
   $apply_button.prop('disabled', true);

trac/locale/ja/LC_MESSAGES/messages-js.po

@@ -16,12 +16,16 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.15.0\n"
 
 #: tracopt/ticket/htdocs/ticketclone.js:22
 msgid "Clone"
 msgstr "コピー"
 
+#: trac/htdocs/js/admin_enums.js:11
+msgid "Revert changes"
+msgstr "変更を元に戻す"
+
 #: tracopt/ticket/htdocs/ticketclone.js:34
 msgid "Create a new ticket from this comment"
 msgstr "このコメントから新規チケットを作成する"

trac/locale/messages-js.pot

@@ -21,6 +21,10 @@ msgstr ""
 msgid "Clone"
 msgstr ""
 
+#: trac/htdocs/js/admin_enums.js:11
+msgid "Revert changes"
+msgstr ""
+
 #: tracopt/ticket/htdocs/ticketclone.js:34
 msgid "Create a new ticket from this comment"
 msgstr ""