[Pkg-privacy-commits] [tails-installer] 05/30: Merge branch 'master' of https://git-tails.immerda.ch/liveusb-creator
anonym
anonym-tails-guest at moszumanska.debian.org
Fri Jun 9 16:22:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
anonym-tails-guest pushed a commit to branch tails/jessie
in repository tails-installer.
commit d8badf864c0acebdad4036191cf5ba39eaaadde2
Merge: b4f8a6d 50b71b3
Author: Andres Gomez <andres.gomez at iri.uni-frankfurt.de>
Date: Thu Nov 17 18:52:14 2016 +0100
Merge branch 'master' of https://git-tails.immerda.ch/liveusb-creator
Conflicts:
po/fr.po
po/ar.po | 138 ++++++-------
po/ast.po | 135 ++++++-------
po/az.po | 139 ++++++-------
po/bg.po | 139 ++++++-------
po/bn_IN.po | 135 ++++++-------
po/bs.po | 135 ++++++-------
po/ca.po | 139 ++++++-------
po/cs.po | 138 ++++++-------
po/da.po | 138 ++++++-------
po/de.po | 139 ++++++-------
po/el.po | 142 ++++++-------
po/en_GB.po | 138 ++++++-------
po/es.po | 138 ++++++-------
po/es_AR.po | 141 ++++++-------
po/eu.po | 138 ++++++-------
po/fa.po | 138 ++++++-------
po/fi.po | 332 +++++++++++++++---------------
po/fr.po | 139 ++++++-------
po/fr_CA.po | 139 ++++++-------
po/gl.po | 139 ++++++-------
po/he.po | 138 ++++++-------
po/hr_HR.po | 189 ++++++++---------
po/hu.po | 333 +++++++++++++++---------------
po/id.po | 138 ++++++-------
po/is.po | 135 ++++++-------
po/it.po | 140 ++++++-------
po/ja.po | 140 ++++++-------
po/km.po | 138 ++++++-------
po/ko.po | 138 ++++++-------
po/{en_GB.po => lb.po} | 498 ++++++++++++++++++++++-----------------------
po/lv.po | 138 ++++++-------
po/ms.po | 135 ++++++-------
po/nb.po | 138 ++++++-------
po/nds.po | 135 ++++++-------
po/nl.po | 138 ++++++-------
po/{nb.po => nn.po} | 473 +++++++++++++++++++++----------------------
po/pa.po | 135 ++++++-------
po/pl.po | 138 ++++++-------
po/pt.po | 140 ++++++-------
po/pt_BR.po | 138 ++++++-------
po/ro.po | 139 ++++++-------
po/ru.po | 138 ++++++-------
po/si_LK.po | 138 ++++++-------
po/sk.po | 138 ++++++-------
po/{hr_HR.po => sk_SK.po} | 501 +++++++++++++++++++++++-----------------------
po/sl_SI.po | 138 ++++++-------
po/sq.po | 138 ++++++-------
po/sr.po | 135 ++++++-------
po/sr at latin.po | 135 ++++++-------
po/sv.po | 138 ++++++-------
po/tails-installer.pot | 132 ++++++------
po/th.po | 138 ++++++-------
po/tr.po | 141 ++++++-------
po/uk.po | 138 ++++++-------
po/vi.po | 138 ++++++-------
po/zh_CN.po | 152 +++++++-------
po/zh_HK.po | 138 ++++++-------
po/zh_TW.po | 138 ++++++-------
58 files changed, 4863 insertions(+), 4644 deletions(-)
diff --cc po/fr.po
index 0a7d328,85b3608..2f240f8
--- a/po/fr.po
+++ b/po/fr.po
@@@ -12,8 -12,8 +12,6 @@@ msgid "
msgstr ""
"Project-Id-Version: liveusb-creator 3.9\n"
"Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2016-04-24 16:21+0200\n"
- "PO-Revision-Date: 2016-09-22 08:28-0000\n"
-"POT-Creation-Date: 2016-09-02 15:20+0200\n"
-"PO-Revision-Date: 2015-11-10 16:37+0100\n"
"Last-Translator: \n"
"Language-Team: French <kde-i18n-doc at kde.org>\n"
"Language: fr\n"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git
More information about the Pkg-privacy-commits
mailing list