diff options
author | erich koslovsky <erikos@localhost.localdomain> | 2007-08-20 14:17:05 (GMT) |
---|---|---|
committer | erich koslovsky <erikos@localhost.localdomain> | 2007-08-20 14:17:05 (GMT) |
commit | d2ecf45efb44dedf4e5fb002297afe5495a29b8d (patch) | |
tree | 48fc6fa76afec4cf5b314296f4306212b5255f10 /po/fr.po | |
parent | f9166988b59b77c0584f4cd004f27eebc662cad5 (diff) | |
parent | 61aab39861892f73e211ab477df94eb895bb38ff (diff) |
Merge branch 'master' of git://dev.laptop.org/web-activity
Removed a few conflicts for the merge.
Conflicts:
po/Web.pot
po/ar.po
po/de.po
po/el.po
po/es.po
po/fr.po
po/mk.po
po/pt.po
po/pt_BR.po
Diffstat (limited to 'po/fr.po')
-rw-r--r-- | po/fr.po | 30 |
1 files changed, 5 insertions, 25 deletions
@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-19 20:16+0200\n" +"POT-Creation-Date: 2007-08-20 10:55-0400\n" "PO-Revision-Date: 2007-07-31 09:48+0200\n" "Last-Translator: Samuel Bizien <samuel@bizien.info>\n" "Language-Team: Traduc-fr <traduc@traduc.org>\n" @@ -15,6 +15,10 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: activity/activity.info:2 webactivity.py:64 +msgid "Browse" +msgstr "Naviguer" + #: downloadmanager.py:114 #, python-format msgid "" @@ -42,30 +46,6 @@ msgstr "" "Téléchargement de %s depuis \n" "%s." -#: linktoolbar.py:52 -msgid "title: " -msgstr "" - -#: linktoolbar.py:52 -msgid "url: " -msgstr "" - -#: linktoolbar.py:52 -msgid "owner: " -msgstr "" - -#: linktoolbar.py:62 -msgid "remove" -msgstr "" - -#: webactivity.py:79 -msgid "Browse" -msgstr "Naviguer" - -#: webactivity.py:104 webactivity.py:105 -msgid "blank" -msgstr "" - #: webtoolbar.py:41 msgid "Back" msgstr "Précédent" |