L10n for Git 2.21.0 round 2.1

-----BEGIN PGP SIGNATURE-----
 
 iQJNBAABCgA3FiEET/4dIHc7EQTOoGRdx6TpG3VEeigFAlx838YZHHdvcmxkaGVs
 bG8ubmV0QGdtYWlsLmNvbQAKCRDHpOkbdUR6KHevD/43gIJiWeg7J2aEqfp6hciW
 PHlDAHOkWJypAvwbUlPvwSb1svCIZMguddgKZfHAVq2181vbkIUXtXVSKPGJpkbe
 uFeE7RWmGEMcNpBLu84DGA1htfSzrc6hhWTHJNh5xvye59DS98qZuOGvHNMTmIYu
 3Mfatnogj+hiurYosnNnjPK72IC6rIglSmcSM1x9A16awwSxw+0nnza5oPvN2aOg
 bjpVTAS+rdhwjbLo8+pTDguIrTiK8fLrtjgXxXgfEjVxiGWObmBzsscF87I5rgk5
 63K0FaJRISH0A+nLpqghZhT8ZJNgdREPAN7/qv/l6moXJt6povN3TcZraQlVG8B6
 w2uReHDHsxJVT0fORrrZDTVjoDZn74RC64f5LF9I4sir8kBH0jaWnPNAbe1Jj3yb
 rZZcxKK2DTN0ql4Ef+91H6QfbK9Vh7dU4ymhaxM5Wfqip/cUO9feUaqhCt7kcxs5
 1C/USbsJuSzNSBRMG/QRJl7WkDOP0HC/moUyPHfbSKpBtzg6qA5L0Jjs3XhAtozr
 lqoLhaLeK+ChfM/zivOUPx+cxYlOGeyRqxWK6rzK6ctvpYEZ4aZC3HtMA5p9T3Fr
 SvsD9gSo7LPT21ffxh+BFo+5U4jPOjEi2gVQRhU5n6pPiCIVUofpWDgTmz85GzGj
 n7YzH4gCuJepsNK6vLC9Yw==
 =SDYM
 -----END PGP SIGNATURE-----

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

po/ca.po

@@ -1,7 +1,7 @@
 # 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:"