summaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2014-11-30 23:18:44 +0100
committerTails developers <amnesia@boum.org>2014-11-30 23:18:44 +0100
commitd38d1317484544512800a58b1bc9733ca682b893 (patch)
treea07b92ac43d9d3d4568f79d98676947de1d2c964 /po
parent512835163a51672c07b1585cbd6139f6253836fc (diff)
parent96447276b870e20cac824520d7358fa53aa6d8e0 (diff)
Merge remote-tracking branch 'origin/feature/7740-remove-truecrypt' into stable
Conflicts: features/step_definitions/truecrypt.rb
Diffstat (limited to 'po')
-rw-r--r--po/POTFILES.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 70321ff..3da5f72 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,7 +13,6 @@ tmp/pot/tails-upgrade-frontend-wrapper.pot
tmp/pot/tails-virt-notify-user.pot
tmp/pot/tor-browser.pot
tmp/pot/unsafe-browser.pot
-tmp/pot/truecrypt-wrapper.disabled.pot
tmp/pot/tails-i2p.pot
# Files updated by intltool-update