-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Jordi Mas <[email protected]>
- Loading branch information
Showing
1 changed file
with
3 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
# Catalan translations for Git. | ||
# This file is distributed under the same license as the Git package. | ||
# Alex Henrie <[email protected]>, 2014-2016. | ||
# Jordi Mas i Hernàndez <[email protected]>, 2016-2018 | ||
# Jordi Mas i Hernàndez <[email protected]>, 2016-2019 | ||
# | ||
# Terminologia i criteris utilitzats | ||
# | ||
|
@@ -3284,7 +3284,7 @@ msgid "Adding %s" | |
msgstr "S'està afegint %s" | ||
|
||
#: merge-recursive.c:3300 | ||
#y, c-format | ||
#, c-format | ||
msgid "" | ||
"Your local changes to the following files would be overwritten by merge:\n" | ||
" %s" | ||
|
@@ -6758,7 +6758,7 @@ msgstr "" | |
#, c-format | ||
msgid " (use \"git %s <file>...\" to include in what will be committed)" | ||
msgstr "" | ||
" (useu \"git %s <fitxer>...\" per a incloure-ho en el qual es cometrà)" | ||
" (useu \"git %s <fitxer>...\" per a incloure-ho en el que es cometrà)" | ||
|
||
#: wt-status.c:256 | ||
msgid "both deleted:" | ||
|