Merge branch 'js/ming-strftime' into next

diff --git a/perl/Git/I18N.pm b/perl/Git/I18N.pm
index c41425c8d07a4b9a223ef3fb71e24ff526cb9fc9..dba96fff0aecef6eac83aacdaa54b46806cdb0a4 100644 (file)
--- a/perl/Git/I18N.pm
+++ b/perl/Git/I18N.pm
@@ -18,7 +18,7 @@ BEGIN
 
 sub __bootstrap_locale_messages {
        our $TEXTDOMAIN = 'git';
-       our $TEXTDOMAINDIR = $ENV{GIT_TEXTDOMAINDIR} || '++LOCALEDIR++';
+       our $TEXTDOMAINDIR = $ENV{GIT_TEXTDOMAINDIR} || '@@LOCALEDIR@@';
 
        require POSIX;
        POSIX->import(qw(setlocale));
@@ -74,7 +74,7 @@ =head1 SYNOPSIS
 
        printf __("The following error occurred: %s\n"), $error;
 
-       printf __n("commited %d file\n", "commited %d files\n", $files), $files;
+       printf __n("committed %d file\n", "committed %d files\n", $files), $files;
 
 
 =head1 DESCRIPTION