From 4fc133ca1a0589171f99533c42658cbbd86da9b1 Mon Sep 17 00:00:00 2001 From: Asaf Manassen <amanassen@gmail.com> Date: Sat, 28 Jan 2017 17:33:13 +0200 Subject: [PATCH] add warning from issue #2495 fix comments of Deniel15 remove spaces fix spaces Drop `diff`. (#2592) Remove empty lines Replace `user-home` with `os.homedir`. (#2635) * Replace `user-home` with `os.homedir`. * Replace `os.homedir` with `user-home-dir`. * Fix use `require('user-home-dir').default`. add space that were removed marge with master --- src/reporters/lang/en.js | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/reporters/lang/en.js b/src/reporters/lang/en.js index 9de45e86e5..c94fb4015f 100644 --- a/src/reporters/lang/en.js +++ b/src/reporters/lang/en.js @@ -34,7 +34,6 @@ 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).', @@ -251,7 +250,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', @@ -260,13 +259,7 @@ 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.',