[Pkg-privacy-commits] [tails-installer] 13/43: Merge branch 'master' of https://git-tails.immerda.ch/liveusb-creator into translation

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

u-guest pushed a commit to branch debian/sid
in repository tails-installer.

commit b2342012aa6f1e1bff82090772afef2a1ee4f75e
Merge: 5a2a81c 127cf20
Author: Your Name <you at example.com>
Date:   Sat Mar 19 22:09:16 2016 +0000

    Merge branch 'master' of https://git-tails.immerda.ch/liveusb-creator into translation

 po/ar.po                   |  56 +++---
 po/ast.po                  |  56 +++---
 po/az.po                   |  56 +++---
 po/bg.po                   |  56 +++---
 po/bn_IN.po                |  56 +++---
 po/bs.po                   |  56 +++---
 po/ca.po                   |  56 +++---
 po/cs.po                   |  56 +++---
 po/da.po                   |  58 +++---
 po/de.po                   |  66 +++----
 po/el.po                   |  56 +++---
 po/en_GB.po                |  56 +++---
 po/es.po                   |  56 +++---
 po/es_AR.po                |  56 +++---
 po/eu.po                   |  56 +++---
 po/fa.po                   |  56 +++---
 po/fi.po                   |  56 +++---
 po/fr.po                   |  56 +++---
 po/fr_CA.po                |  56 +++---
 po/{da.po => gl.po}        | 425 +++++++++++++++++++++----------------------
 po/he.po                   |  56 +++---
 po/hr_HR.po                |  56 +++---
 po/hu.po                   |  56 +++---
 po/id.po                   |  56 +++---
 po/is.po                   |  56 +++---
 po/it.po                   |  56 +++---
 po/ja.po                   |  56 +++---
 po/km.po                   |  56 +++---
 po/ko.po                   | 295 +++++++++++++++---------------
 po/lv.po                   |  56 +++---
 po/ms.po                   |  56 +++---
 po/nb.po                   |  56 +++---
 po/nds.po                  |  56 +++---
 po/nl.po                   |  56 +++---
 po/pa.po                   |  56 +++---
 po/pl.po                   |  56 +++---
 po/pt.po                   |  56 +++---
 po/pt_BR.po                |  56 +++---
 po/ro.po                   | 258 +++++++++++++--------------
 po/{uk.po => ru.po}        | 417 ++++++++++++++++++++++---------------------
 po/si_LK.po                |  56 +++---
 po/sk.po                   |  56 +++---
 po/sl_SI.po                |  56 +++---
 po/sq.po                   |  56 +++---
 po/sr.po                   |  56 +++---
 po/sr at latin.po             |  56 +++---
 po/sv.po                   |  56 +++---
 po/tails-installer.pot     |  56 +++---
 po/th.po                   |  56 +++---
 po/{da.po => tr.po}        | 435 +++++++++++++++++++++++----------------------
 po/uk.po                   |  56 +++---
 po/vi.po                   |  56 +++---
 po/zh_CN.po                |  56 +++---
 po/zh_TW.po                |  56 +++---
 tails_installer/creator.py |   2 +
 55 files changed, 2296 insertions(+), 2292 deletions(-)

diff --cc po/fr.po
index 9888e4d,a436325..2272c29
--- a/po/fr.po
+++ b/po/fr.po
@@@ -219,12 -219,12 +219,12 @@@ msgstr "Impossible de changer le label 
  msgid "Installing bootloader..."
  msgstr "Installation du chargeur de démarrage..."
  
- #: ../tails_installer/creator.py:1017
+ #: ../tails_installer/creator.py:1013
  #, python-format
  msgid "Could not find the '%s' COM32 module"
 -msgstr "Impossible de trouver le module COM32 '%s"
 +msgstr "Impossible de trouver le module COM32 '%s'"
  
- #: ../tails_installer/creator.py:1025 ../tails_installer/creator.py:1416
+ #: ../tails_installer/creator.py:1021 ../tails_installer/creator.py:1413
  #, python-format
  msgid "Removing %(file)s"
  msgstr "Suppression du fichier %(file)s"
@@@ -243,11 -243,11 +243,11 @@@ msgstr "Impossible de trouver la partit
  msgid "Formatting %(device)s as FAT32"
  msgstr "Création d'un système de fichiers FAT32 sur %(device)s"
  
- #: ../tails_installer/creator.py:1238
+ #: ../tails_installer/creator.py:1235
  msgid "Could not find syslinux' gptmbr.bin"
 -msgstr "Impossible de trouver syslinux - gptmbr.bin"
 +msgstr "Impossible de trouver le fichier gptmbr.bin appartenant à syslinux"
  
- #: ../tails_installer/creator.py:1251
+ #: ../tails_installer/creator.py:1248
  #, python-format
  msgid "Reading extracted MBR from %s"
  msgstr "Lecture du MBR extrait de %s"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git