Commit 36eb1cb9 authored by Junio C Hamano's avatar Junio C Hamano

Merge tag 'l10n-2.21.0-rnd2.1' of git://github.com/git-l10n/git-po

L10n for Git 2.21.0 round 2.1

* tag 'l10n-2.21.0-rnd2.1' of git://github.com/git-l10n/git-po:
  l10n: Fixes to Catalan translation
  l10n: Updated Vietnamese translation for v2.21 rd2
  l10n: fr.po remove obsolete entries
parents 8104ec99 3ece05c5
# Catalan translations for Git.
# This file is distributed under the same license as the Git package.
# Alex Henrie <alexhenrie24@gmail.com>, 2014-2016.
# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2016-2018
# Jordi Mas i Hernàndez <jmas@softcatala.org>, 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:"
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment