summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-includes/etc
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-10-29 18:27:19 +0000
committerTails developers <amnesia@boum.org>2013-10-29 18:27:19 +0000
commit3a54750127ec277b9009f041e3455a656455ed3a (patch)
treea93ed59464db6b93d4b7defabf2906e03129eb51 /config/chroot_local-includes/etc
parent7ba60df590b188b79abcadc2bd641899e07a7b70 (diff)
parent0306fffd3addcb906a44468ca12b7b870951be98 (diff)
Merge branch 'master' into devel
Conflicts: debian/changelog wiki/src/about.fr.po
Diffstat (limited to 'config/chroot_local-includes/etc')
-rw-r--r--config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop b/config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop
index 9f72b52..9938697 100644
--- a/config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop
+++ b/config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop
@@ -2,6 +2,7 @@
Version=1.0
Encoding=UTF-8
Name=Report an error
+Name[fr]=Rapporter une erreur
Type=Application
Terminal=false
Exec=/usr/local/bin/tails-documentation support/troubleshooting