You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
69 lines
1.6 KiB
69 lines
1.6 KiB
15 years ago
|
msgid ""
|
||
|
|
msgstr ""
|
||
|
|
"Project-Id-Version: all2.po\n"
|
||
|
|
"POT-Creation-Date: 2006-11-19 08:46+0100\n"
|
||
|
|
"PO-Revision-Date: 2004-09-20 15:44+0200\n"
|
||
|
|
"Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
|
||
|
|
"Language-Team: br <LL@li.org>\n"
|
||
|
|
"MIME-Version: 1.0\n"
|
||
|
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||
|
|
"Content-Transfer-Encoding: 8bit\n"
|
||
|
|
|
||
|
|
#: kdiff3plugin.cpp:97
|
||
|
|
msgid "KDiff3"
|
||
|
|
msgstr "KDiff3"
|
||
|
|
|
||
|
|
#: kdiff3plugin.cpp:104
|
||
|
|
#, c-format
|
||
|
|
msgid "Compare with %1"
|
||
|
|
msgstr ""
|
||
|
|
|
||
|
|
#: kdiff3plugin.cpp:109
|
||
|
|
#, c-format
|
||
|
|
msgid "Merge with %1"
|
||
|
|
msgstr ""
|
||
|
|
|
||
|
|
#: kdiff3plugin.cpp:114
|
||
|
|
msgid "Save '%1' for later"
|
||
|
|
msgstr ""
|
||
|
|
|
||
|
|
#: kdiff3plugin.cpp:119
|
||
|
|
msgid "3-way merge with base"
|
||
|
|
msgstr ""
|
||
|
|
|
||
|
|
#: kdiff3plugin.cpp:125
|
||
|
|
msgid "Compare with ..."
|
||
|
|
msgstr ""
|
||
|
|
|
||
|
|
#: kdiff3plugin.cpp:137
|
||
|
|
msgid "Compare"
|
||
|
|
msgstr ""
|
||
|
|
|
||
|
|
#: kdiff3plugin.cpp:142
|
||
|
|
msgid "3 way comparison"
|
||
|
|
msgstr ""
|
||
|
|
|
||
|
|
#: kdiff3plugin.cpp:145
|
||
|
|
msgid "About KDiff3 menu plugin ..."
|
||
|
|
msgstr ""
|
||
|
|
|
||
|
|
#: kdiff3plugin.cpp:240
|
||
|
|
msgid ""
|
||
|
|
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
|
||
|
|
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
|
||
|
|
"\n"
|
||
|
|
msgstr ""
|
||
|
|
|
||
|
|
#: kdiff3plugin.cpp:242
|
||
|
|
msgid ""
|
||
|
|
"Using the contextmenu extension:\n"
|
||
|
|
"For simple comparison of two selected 2 files choose \"Compare\".\n"
|
||
|
|
"If the other file is somewhere else \"Save\" the first file for later. It will "
|
||
|
|
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
|
||
|
|
"file.\n"
|
||
|
|
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
|
||
|
|
"choose \"3-way merge with base\" on the other branch which will be used as "
|
||
|
|
"destination.\n"
|
||
|
|
"Same also applies to directory comparison and merge."
|
||
|
|
msgstr ""
|