diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2012-11-25 17:17:20 +0100 |
|---|---|---|
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | 2012-12-27 16:57:38 +0100 |
| commit | c310fa0c802f40a774edb58641de3ac5bfad0e2c (patch) | |
| tree | 28dc002136ce8a2c122e2cb012a317aa7d8a0efa /org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java | |
| parent | 03d50dc50b584caf2826f7db8a4748435b610f63 (diff) | |
| download | jgit-c310fa0c802f40a774edb58641de3ac5bfad0e2c.tar.gz jgit-c310fa0c802f40a774edb58641de3ac5bfad0e2c.zip | |
Mark non-externalizable strings as such
A few classes such as Constanrs are marked with @SuppressWarnings, as are
toString() methods with many liternal, but otherwise $NLS-n$ is used for
string containing text that should not be translated. A few literals may
fall into the gray zone, but mostly I've tried to only tag the obvious
ones.
Change-Id: I22e50a77e2bf9e0b842a66bdf674e8fa1692f590
Diffstat (limited to 'org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java')
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java index 6fe68810a1..7eaa5fa351 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java @@ -103,7 +103,7 @@ class Merge extends TextBuiltin { // determine the other revision we want to merge with HEAD final Ref srcRef = db.getRef(ref); - final ObjectId src = db.resolve(ref + "^{commit}"); + final ObjectId src = db.resolve(ref + "^{commit}"); //$NON-NLS-1$ if (src == null) throw die(MessageFormat.format( CLIText.get().refDoesNotExistOrNoCommit, ref)); @@ -144,11 +144,11 @@ class Merge extends TextBuiltin { case DIRTY_WORKTREE: case DIRTY_INDEX: outw.println(CLIText.get().dontOverwriteLocalChanges); - outw.println(" " + entry.getKey()); + outw.println(" " + entry.getKey()); //$NON-NLS-1$ break; case COULD_NOT_DELETE: outw.println(CLIText.get().cannotDeleteFile); - outw.println(" " + entry.getKey()); + outw.println(" " + entry.getKey()); //$NON-NLS-1$ break; } break; @@ -157,7 +157,7 @@ class Merge extends TextBuiltin { if (!isMergedInto(oldHead, src)) name = mergeStrategy.getName(); else - name = "recursive"; + name = "recursive"; //$NON-NLS-1$ outw.println(MessageFormat.format(CLIText.get().mergeMadeBy, name)); break; case MERGED_SQUASHED: |