Skip to content

Commit

Permalink
# This is a combination of 8 commits.
Browse files Browse the repository at this point in the history
# This is the 1st commit message:
add warning from issue yarnpkg#2495

# This is the commit message yarnpkg#2:

fix comments of Deniel15

# This is the commit message yarnpkg#3:

remove spaces

# This is the commit message yarnpkg#4:

fix spaces

# This is the commit message yarnpkg#5:

Drop `diff`. (yarnpkg#2592)

# This is the commit message yarnpkg#6:

Remove empty lines

# This is the commit message yarnpkg#7:

Replace `user-home` with `os.homedir`. (yarnpkg#2635)

* Replace `user-home` with `os.homedir`.

* Replace `os.homedir` with `user-home-dir`.

* Fix use `require('user-home-dir').default`.

# This is the commit message yarnpkg#8:

add space that were removed
  • Loading branch information
mnsn committed Feb 18, 2017
1 parent 1472005 commit 10efa97
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions src/reporters/lang/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ const messages = {

verboseFileCopy: 'Copying $0 to $1.',
verboseFileLink: 'Creating hardlink at $0 to $1.',
verboseFileLink: 'Creating hardlink at $0 to $1.',
verboseFileSymlink: 'Creating symlink at $0 to $1.',
verboseFileSkip: 'Skipping copying of file $0 as the file at $1 is the same size ($2) and mtime ($3).',
verboseFileSkipSymlink: 'Skipping copying of $0 as the file at $1 is the same symlink ($2).',
Expand Down Expand Up @@ -250,7 +251,7 @@ const messages = {
packageInstalledWithBinaries: 'Installed $0 with binaries:',
packageHasBinaries: '$0 has binaries:',
packageHasNoBinaries: '$0 has no binaries',

couldBeDeduped: '$0 could be deduped from $1 to $2',
lockfileNotContainPatter: 'Lockfile does not contain pattern: $0',
integrityHashesDontMatch: 'Integrity hashes don\'t match, expected $0 but got $1',
Expand All @@ -259,7 +260,13 @@ const messages = {
optionalDepNotInstalled: 'Optional dependency $0 not installed',
packageWrongVersion: '$0 is wrong version: expected $1, got $2',
packageDontSatisfy: '$0 doesn\'t satisfy found match of $1',


lockfileExists: 'Lockfile already exists, not importing.',
skippingImport: 'Skipping import of $0 for $1',
importFailed: 'Import of $0 for $1 failed, resolving normally.',
importResolveFailed: 'Import of $0 failed starting in $1',
importResolvedRangeMatch: 'Using version $0 of $1 instead of $2 for $3',
verboseFileSkipHardlink: 'Skipping copying of $0 as the file at $1 is the same hardlink ($2).',
lockfileExists: 'Lockfile already exists, not importing.',
skippingImport: 'Skipping import of $0 for $1',
importFailed: 'Import of $0 for $1 failed, resolving normally.',
Expand Down

0 comments on commit 10efa97

Please sign in to comment.