diff options
Diffstat (limited to 'po/fr_FR.po')
| -rw-r--r-- | po/fr_FR.po | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/po/fr_FR.po b/po/fr_FR.po index 5909c0c..fa3d514 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -10,7 +10,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/fr_FR.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/fr_FR.po "PO-Revision-Date: 2008-04-30 08:36+0200\n" "Last-Translator: Patrice Staudt <patrice.staudt@laposte.net>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -814,9 +818,6 @@ msgstr "surveiller" msgid "recording with device" msgstr "Enregistrement avec appareil" -msgid "File" -msgstr "Fichier" - msgid "Button$With subtitle" msgstr "Avec les sous-titres" @@ -1212,6 +1213,12 @@ msgstr "en %02ldh" msgid "in %02ldm" msgstr "en %02ldm" +<<<<<<< HEAD:po/fr_FR.po +#~ msgid "File" +#~ msgstr "Fichier" + +======= +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/fr_FR.po #~ msgid "Day" #~ msgstr "Jour" |