Translation by Artem Sereda with my minor changes

[kde-ru.git] / docmessages / extragear-utils / kdiff3.po

# translation of kdiff3.docmessages.po to Russian
#
# Kalimullin Artur <kalimullin@gmail.com>, 2006.
# Nick Shaforostoff <shafff@ukr.net>, 2006.
msgid ""
msgstr ""
"Project-Id-Version: kdiff3\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-07-24 18:38+0000\n"
"PO-Revision-Date: 2006-05-30 10:17+0300\n"
"Last-Translator: Nick Shaforostoff <shafff@ukr.net>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-KDE-DocBook-SVN-URL: trunk/extragear/utils/doc/kdiff3/index.docbook\n"
"X-KDE-DocBook-SVN-Changed-Revision: 527750\n"
"X-Generator: KBabel 1.11.2\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

#. Tag: title
#: index.docbook:16
#, no-c-format
msgid "The &kdiff3; Handbook"
msgstr "Руководство &kdiff3;"

#. Tag: author
#: index.docbook:19
#, no-c-format
msgid "<firstname>Joachim</firstname> <surname>Eibl</surname>"
msgstr "<firstname>Joachim</firstname> <surname>Eibl</surname>"

#. Tag: email
#: index.docbook:25
#, no-c-format
msgid "joachim.eibl at gmx.de"
msgstr "joachim.eibl@gmx.de"

#. Tag: trans_comment
#: index.docbook:28
#, no-c-format
msgid "ROLES_OF_TRANSLATORS"
msgstr ""
"<othercredit role=\"translator\"><firstname>Артур <</"
"firstname><surname>Калимуллин </"
"surname><affiliation><address><email>kalimullin@gmail.com</email></address></"
"affiliation><contrib>Перевод на русский язык</contrib></othercredit> "

#. Tag: holder
#: index.docbook:33
#, no-c-format
msgid "Joachim Eibl"
msgstr "Joachim Eibl"

#. Tag: para
#: index.docbook:52
#, no-c-format
msgid "&kdiff3; is a file and directory diff and merge tool which"
msgstr ""
"&kdiff3; - это программа для поиска различий между файлами и каталогами, "
"которая"

#. Tag: para
#: index.docbook:55
#, no-c-format
msgid "compares and merges two or three text input files or directories,"
msgstr "сравнивает и объединяет два или три текстовых файла или каталога"

#. Tag: para
#: index.docbook:56
#, no-c-format
msgid "shows the differences line by line and character by character(!),"
msgstr "показывает различия построчно и посимвольно (!)"

#. Tag: para
#: index.docbook:57
#, no-c-format
msgid "provides an automatic merge-facility,"
msgstr "поддерживает автоматическое объединение"

#. Tag: para
#: index.docbook:58
#, no-c-format
msgid "has an editor for comfortable solving of merge-conflicts,"
msgstr "имеет редактор для комфортного решения проблем при объединении"

#. Tag: para
#: index.docbook:59
#, no-c-format
msgid "provides networktransparency via KIO,"
msgstr "поддерживает сетевую прозрачность через KIO"

#. Tag: para
#: index.docbook:60
#, no-c-format
msgid "has options to highlight or hide changes in white-space or comments,"
msgstr ""
"имеет возможность подсветки или отключения показа пустых мест или "
"комментариев"

#. Tag: para
#: index.docbook:61
#, no-c-format
msgid "supports Unicode, UTF-8 and other file encodings,"
msgstr "поддерживает Юникод, UTF-8 и другие кодировки"

#. Tag: para
#: index.docbook:62
#, no-c-format
msgid "prints differences,"
msgstr "показывает различия"

#. Tag: para
#: index.docbook:63
#, no-c-format
msgid "supports version control keyword and history merging."
msgstr "поддерживает контроль версий ключевых слов и историю объединений"

#. Tag: para
#: index.docbook:65
#, fuzzy, no-c-format
msgid "This document describes &kdiff3;-version 0.9.92."
msgstr "Это руководство для &kdiff3; версии 0.9.89"

#. Tag: keyword
#: index.docbook:75
#, no-c-format
msgid "<keyword>KDE</keyword>"
msgstr "<keyword>KDE</keyword>"

#. Tag: keyword
#: index.docbook:76
#, no-c-format
msgid "kdeextragear"
msgstr "kdeextragear"

#. Tag: keyword
#: index.docbook:77
#, no-c-format
msgid "kdiff3"
msgstr "kdiff3"

#. Tag: keyword
#: index.docbook:78
#, no-c-format
msgid "diff"
msgstr "diff"

#. Tag: keyword
#: index.docbook:79
#, no-c-format
msgid "merge"
msgstr "merge"

#. Tag: keyword
#: index.docbook:80
#, no-c-format
msgid "<keyword>CVS</keyword>"
msgstr "<keyword>CVS</keyword>"

#. Tag: keyword
#: index.docbook:81
#, no-c-format
msgid "triplediff"
msgstr "triplediff"

#. Tag: keyword
#: index.docbook:82
#, no-c-format
msgid "compare"
msgstr "compare"

#. Tag: keyword
#: index.docbook:83
#, no-c-format
msgid "files"
msgstr "файлы"

#. Tag: keyword
#: index.docbook:84
#, no-c-format
msgid "directories"
msgstr "каталоги"

#. Tag: keyword
#: index.docbook:85
#, no-c-format
msgid "version control"
msgstr "контроль версий"

#. Tag: keyword
#: index.docbook:86
#, no-c-format
msgid "three-way-merge"
msgstr "объединение в три столбца"

#. Tag: keyword
#: index.docbook:87
#, no-c-format
msgid "in-line-differences"
msgstr "различия на строке"

#. Tag: keyword
#: index.docbook:88
#, no-c-format
msgid "synchronise"
msgstr "синхронизация"

#. Tag: keyword
#: index.docbook:89
#, no-c-format
msgid "kpart"
msgstr "kpart"

#. Tag: keyword
#: index.docbook:90
#, no-c-format
msgid "<keyword>kio</keyword>"
msgstr "<keyword>kio</keyword>"

#. Tag: keyword
#: index.docbook:91
#, no-c-format
msgid "networktransparent"
msgstr "сетевая прозрачность"

#. Tag: keyword
#: index.docbook:92
#, no-c-format
msgid "editor"
msgstr "редактор"

#. Tag: keyword
#: index.docbook:93
#, no-c-format
msgid "white space"
msgstr "пустые места"

#. Tag: keyword
#: index.docbook:94
#, no-c-format
msgid "comments"
msgstr "комментарии"

#. Tag: title
#: index.docbook:99
#, no-c-format
msgid "Introduction"
msgstr "Введение"

#. Tag: title
#: index.docbook:100
#, no-c-format
msgid "Yet Another Diff Frontend?"
msgstr "Ещё одна графическая оболочка к diff?"

#. Tag: para
#: index.docbook:101
#, no-c-format
msgid ""
"Several graphical diff tools exist. Why choose &kdiff3;? Let me say, why I "
"wrote it."
msgstr ""
"На данный момент уже существует несколько графических оболочек к diff. "
"Почему лучше выбрать &kdiff3;? Постараюсь объяснить, зачем я написал эту "
"программу."

#. Tag: para
#: index.docbook:103
#, no-c-format
msgid ""
"&kdiff3; started because I had to do a difficult merge. Merging is necessary "
"when several people work on the same files in a project. A merge can be "
"somewhat automated, when the merge-tool not only has the new modified files "
"(called \"branches\"), but also the original file (called \"base\"). The "
"merge tool will automatically choose any modification that was only done in "
"one branch. When several contributors change the same lines, then the merge "
"tool detects a conflict which must be solved manually."
msgstr ""
"Я начал работу над &kdiff3; потому, что мне часто приходится делать сложные "
"объединения. Объединение необходимо когда несколько людей в проекте "
"одновременно работают над одними и теми же файлами. Кое-где оно может быть "
"автоматизировано: когда программа объединения имеет не только новые "
"модифицированные файлы ( \"ветки\"), но ещё и оригинальный файл (\"базовый"
"\"). Программа объединения будет автоматически дополнять и изменять \"базу\" "
"только теми изменениями, которые были сделаны в одной ветке. Когда несколько "
"человек редактируют одни и те же строки, программа объединения увидит "
"конфликт, который должен быть разрешён вручную"

#. Tag: para
#: index.docbook:110
#, no-c-format
msgid ""
"The merge then was difficult because one contributor had changed many things "
"and corrected the indentation in many places. Another contributor also had "
"changed much text in the same file, which resulted in several merge "
"conflicts."
msgstr ""
"Часто возникала ситуация, когда один разработчик многое изменил и "
"отредактировал во многих местах, и другой разработчик также поменял много "
"текста в одном и том же файле. В результате получались конфликты объединения."

#. Tag: para
#: index.docbook:114
#, no-c-format
msgid ""
"The tool I used then, only showed the changed lines, but not what had "
"changed within these lines. And there was no information about where only "
"the indentation was changed. The merge was a little nightmare."
msgstr ""
"Программа, которую я использовал, показывала только изменённые строки, но не "
"показывала изменения внутри этих строк. Также не было никакой информации где "
"изменились всего несколько слов."

#. Tag: para
#: index.docbook:118
#, no-c-format
msgid ""
"So this was the start. The first version could show differences within a "
"line and showed white space differences. Later many other features were "
"added to increase the usefulness."
msgstr ""
"Итак, это было начало. Первая версия умела показывать различия внутри строк "
"и различия в пробелах. Позднее, в программу  было добавлено много новых "
"возможностей для повышения удобства использования."

#. Tag: para
#: index.docbook:121
#, no-c-format
msgid ""
"For example if you want to compare some text quickly, then you can copy it "
"to the clipboard and paste it into either diff window."
msgstr ""
"Например, если вы хотите быстро сравнить какой-то текст, вы можете "
"скопировать его в буфер обмена и вставить в окно сравнения."

#. Tag: para
#: index.docbook:124
#, no-c-format
msgid ""
"A feature that required a big effort was the directory comparison and merge "
"facility, which turned the program almost into a full file browser."
msgstr ""
"Возможности, на реализацию которых ушло много времени - это сравнение "
"каталогов и функция объединения, благодаря которым в программу был включён "
"полноценный файловый браузер."

#. Tag: para
#: index.docbook:127
#, no-c-format
msgid "I hope &kdiff3; works for you too. Have fun!"
msgstr "Я надеюсь, что вам понравится &kdiff3;. Удачи!"

#. Tag: para
#: index.docbook:129
#, no-c-format
msgid "Joachim Eibl (2003)"
msgstr "Joachim Eibl (2003)"

#. Tag: title
#: index.docbook:134
#, no-c-format
msgid "Screenshots and Features"
msgstr "Снимки экрана и возможности"

#. Tag: para
#: index.docbook:135
#, no-c-format
msgid "This screenshot shows the difference between two text files"
msgstr "Этот скриншот показывает различия между двумя файлами."

#. Tag: para
#: index.docbook:136
#, no-c-format
msgid "(Using an early version of &kdiff3;):"
msgstr "(ранняя версия &kdiff3;)"

#. Tag: para
#: index.docbook:141
#, no-c-format
msgid ""
"3-way-merging is fully supported. This is useful if two people change code "
"independently. The original file (the base) is used to help &kdiff3; to "
"automatically select the correct changes. The merge-editor below the diff-"
"windows allows you to solve conflicts, while showing you the output you will "
"get. You can even edit the output. This screenshot shows three input files "
"being merged:"
msgstr ""
"Полностью поддерживается объединение трёх файлов. Это может быть полезно, "
"когда один и тот же файл редактировали несколько человек. Оригинальный файл "
"(\"база\") используется для того, чтобы помочь &kdiff3; автоматически "
"сделать исправления. Редактор объединения, располагаемый ниже окна просмотра "
"различий, позволяет вам разрешить конфликт, показывая то, что вы получите в "
"случае объединения. Вы также можете редактировать вывод в редакторе "
"объединения. Этот скриншот показывает три входных файла, которые надо "
"объединить:"

#. Tag: para
#: index.docbook:154
#, no-c-format
msgid ""
"&kdiff3; also helps you to compare and merge complete directories. This "
"screenshot shows &kdiff3; during a directory merge:"
msgstr ""
"&kdiff3; также возволяет сравнивать и объединять целые каталоги. Этот "
"скриншот показывает &kdiff3; в процессе объединения каталогов:"

#. Tag: title
#: index.docbook:163
#, no-c-format
msgid "More Features"
msgstr "Дополнительные возможности"

#. Tag: title
#: index.docbook:164
#, no-c-format
msgid "Line-By-Line And Char-By-Char Diff-Viewer"
msgstr "Построчное и посимвольное сравнение"

#. Tag: para
#: index.docbook:165
#, no-c-format
msgid ""
"By using the possiblities of a graphical color display &kdiff3; shows "
"exactly what the difference is. When you have to do many code-reviews, you "
"will like this."
msgstr ""
"&kdiff3; показывает, где находятся различия, выделяя их разными цветами. "
"Если вам приходится просматривать много кода, вам очень пригодится такая "
"возможность."

#. Tag: title
#: index.docbook:173
#, no-c-format
msgid "See White-Space Differences At One Glance"
msgstr "Наглядное отображение различий в пробелах"

#. Tag: para
#: index.docbook:174
#, no-c-format
msgid ""
"Spaces and tabs that differ appear visibly. When lines differ only in the "
"amount of white space this can be seen at one look in the summary column on "
"the left side. (No more worries when people change the indentation.)"
msgstr ""
"KDiff3 может отображать различающиеся пробелы и табуляции. Если строки "
"отличаются только в количестве пробелов или табуляций, то это будет отражено "
"в левом столбце сводки"

#. Tag: title
#: index.docbook:183
#, no-c-format
msgid "Triple-Diff"
msgstr "Сравнение трёх файлов"

#. Tag: para
#: index.docbook:184
#, no-c-format
msgid "Analyze three files and see where they differ."
msgstr "Сравнение трёх файлов и отображение их различий."

#. Tag: para
#: index.docbook:185
#, no-c-format
msgid ""
"The left/middle/right windows are named A/B/C and have the blue/green/"
"magenta color respectively."
msgstr ""
"Левое/среднее/правое окна под названием А/В/С, имеющие цвета синий/зелёный/"
"фиолетовый в соответствующем порядке."

#. Tag: para
#: index.docbook:188
#, no-c-format
msgid ""
"If one file is the same and one file is different on a line then the color "
"shows which file is different. The red color means that both other files are "
"different."
msgstr ""
"Если один из файлов будет одинаковым, а другой будет иметь отличия в строке, "
"то KDiff3 покажет где разница. Красный цвет означает, что оба файла различны."

#. Tag: title
#: index.docbook:198
#, no-c-format
msgid "Comfortable Merge Of Two Or Three Input Files"
msgstr "Комфортное объединение двух или трёх файлов"

#. Tag: para
#: index.docbook:199
#, no-c-format
msgid ""
"&kdiff3; can be used to merge two or three input files and automatically "
"merges as much as possible. The result is presented in an editable window "
"where most conflicts can be solved with a single mouseclick: Select the "
"buttons A/B/C from the button-bar to select the source that should be used. "
"You can also select more than one source. Since this output window is an "
"editor even conflicts which need further corrections can be solved here "
"without requiring another tool."
msgstr ""
"&kdiff3; может использоваться для объединения двух или трёх входных файлов "
"и, если это возможно, автоматически объединять их. Результат будет "
"показываться в редактируемом окне, где большинство конфликтов можно "
"разрешить одним кликом мыши. Нажмите кнопки А/В/С на панели инструментов, "
"чтобы выбрать источник, который следует использовать. Можно выбрать более "
"одного источника. Окно результата позволяет редактировать текст, так что "
"дополнительные правки можно вносить на месте, не прибегая к помощи внешних "
"программ"

#. Tag: title
#: index.docbook:209
#, no-c-format
msgid "And ..."
msgstr "А также... "

#. Tag: para
#: index.docbook:211
#, no-c-format
msgid "Fast navigation via buttons."
msgstr "Быстрая навигация с помощью кнопок."

#. Tag: para
#: index.docbook:212
#, no-c-format
msgid ""
"A mouse-click into a summary column sync's all windows to show the same "
"position."
msgstr "Щёлкните на столбце сводки для синхронизации позиции с другими окнами."

#. Tag: para
#: index.docbook:213
#, no-c-format
msgid "Select and copy from any window and paste into the merge result window."
msgstr ""
"Допустимо выделение и копирование из любого окна и вставка в окно "
"объединения."

#. Tag: para
#: index.docbook:214
#, no-c-format
msgid "Overview column that shows where the changes and conflicts are."
msgstr "Отдельная обзорная колонка, обозначающая место конфликтов и изменений."

#. Tag: para
#: index.docbook:215
#, no-c-format
msgid "The colors are adjustable to your specific preferences."
msgstr "Цвета настраиваемы по вашему желанию."

#. Tag: para
#: index.docbook:216
#, no-c-format
msgid "Adjustable Tab size."
msgstr "Изменяемый размер вкладок."

#. Tag: para
#: index.docbook:217
#, no-c-format
msgid "Option to insert spaces instead of tabs."
msgstr "Возможность вставлять пробелы вместо табуляций."

#. Tag: para
#: index.docbook:218
#, no-c-format
msgid "Open files comfortably via dialog or specify files on the command line."
msgstr ""
"Удобное открытие файлов через диалог или передача имён файлов через "
"командную строку."

#. Tag: para
#: index.docbook:219
#, no-c-format
msgid ""
"Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)"
msgstr ""
"Поиск строк во всех окнах. \"Найти...\" (Ctrl-F) и \"Продолжить поиск\" (F3)."

#. Tag: para
#: index.docbook:220
#, no-c-format
msgid "Show the line numbers for each line."
msgstr "Отображение номеров строк."

#. Tag: para
#: index.docbook:221
#, no-c-format
msgid "Paste clipboard or drag text into a diff input window."
msgstr "Вставка из буфера обмена или перемещение в окно ввода различий."

#. Tag: para
#: index.docbook:222
#, no-c-format
msgid "Networktransparency via KIO."
msgstr "Прозрачная работа с сетью через KIO."

#. Tag: para
#: index.docbook:223
#, no-c-format
msgid "Can be used as diff-viewer in KDevelop 3."
msgstr "Может быть использован как программа просмотра различий в KDevelop 3."

#. Tag: para
#: index.docbook:224
#, no-c-format
msgid "Word-wrap for long lines."
msgstr "Перенос длинных строк."

#. Tag: para
#: index.docbook:225
#, no-c-format
msgid "Support for Unicode, UTF-8 and other codecs."
msgstr "Поддержка Юникода, UTF-8 и других кодировок."

#. Tag: para
#: index.docbook:226
#, no-c-format
msgid "Support for right to left languages."
msgstr "Поддержка языков с запись справа налево."

#. Tag: para
#: index.docbook:227 index.docbook:1246
#, no-c-format
msgid "<para>...</para>"
msgstr "<para>...</para>"

#. Tag: title
#: index.docbook:233
#, no-c-format
msgid "File Comparison And Merge"
msgstr "Сравнение и объединение файлов"

#. Tag: title
#: index.docbook:235
#, no-c-format
msgid "Command-Line Options"
msgstr "Ключи командной строки"

#. Tag: title
#: index.docbook:237
#, no-c-format
msgid "Comparing 2 files:"
msgstr "Сравнение 2 файлов:"

#. Tag: screen
#: index.docbook:238
#, no-c-format
msgid "<command>kdiff3</command> <replaceable>file1 file2</replaceable>"
msgstr "<command>kdiff3</command> <replaceable>file1 file2</replaceable>"

#. Tag: title
#: index.docbook:241
#, no-c-format
msgid "Merging 2 files:"
msgstr "Объединение 2 файлов:"

#. Tag: screen
#: index.docbook:242
#, no-c-format
msgid ""
"<command>kdiff3</command> <replaceable>file1 file2</replaceable> -m\n"
"   <command>kdiff3</command> <replaceable>file1 file2</replaceable> -o "
"<replaceable>outputfile</replaceable>"
msgstr ""
"<command>kdiff3</command> <replaceable>файл-1 файл-2</replaceable> -m\n"
"   <command>kdiff3</command> <replaceable>файл-1 файл-2</replaceable> -o "
"<replaceable>выходной файл</replaceable>"

#. Tag: title
#: index.docbook:245
#, no-c-format
msgid "Comparing 3 files:"
msgstr "Сравнение 3 файлов:"

#. Tag: screen
#: index.docbook:246
#, no-c-format
msgid "<command>kdiff3</command> <replaceable>file1 file2 file3</replaceable>"
msgstr ""
"<command>kdiff3</command> <replaceable>файл-1 файл-2 файл-3</replaceable>"

#. Tag: title
#: index.docbook:249
#, no-c-format
msgid "Merging 3 files:"
msgstr "Объединение 3 файлов:"

#. Tag: screen
#: index.docbook:250
#, no-c-format
msgid ""
"<command>kdiff3</command> <replaceable>file1 file2 file3</replaceable> -m\n"
"   <command>kdiff3</command> <replaceable>file1 file2 file3</replaceable> -o "
"<replaceable>outputfile</replaceable>"
msgstr ""
"<command>kdiff3</command> <replaceable>file1 file2 file3</replaceable> -m\n"
"   <command>kdiff3</command> <replaceable>file1 file2 file3</replaceable> -o "
"<replaceable>outputfile</replaceable>"

#. Tag: para
#: index.docbook:251
#, no-c-format
msgid ""
"Note that <replaceable>file1</replaceable> will be treated as base of "
"<replaceable>file2</replaceable> and <replaceable>file3</replaceable>."
msgstr ""
"Заметьте, что <replaceable>file1</replaceable> будет пониматься как \"базовый"
"\" для <replaceable>file2</replaceable> и <replaceable>file3</replaceable>."

#. Tag: title
#: index.docbook:258
#, no-c-format
msgid "Special case: Files with the same name"
msgstr "Частный случай: файлы с одинаковыми названиями"

#. Tag: para
#: index.docbook:259
#, no-c-format
msgid ""
"If all files have the same name but are in different directories, you can "
"reduce typework by specifying the filename only for the first file. E.g.:"
msgstr ""
"Если все файлы имеют одинаковое название, но находятся в разных каталогах, "
"вы можете просто ввести название первого файла:"

#. Tag: screen
#: index.docbook:263
#, no-c-format
msgid ""
"<command>kdiff3</command> <replaceable>dir1/filename dir2 dir3</replaceable>"
msgstr ""
"<command>kdiff3</command> <replaceable>dir1/filename dir2 dir3</replaceable>"

#. Tag: title
#: index.docbook:266
#, no-c-format
msgid "Commandline for starting a directory comparison or merge:"
msgstr "Ключ командной строки для сравнения и объединения каталогов:"

#. Tag: para
#: index.docbook:267
#, no-c-format
msgid "This is very similar, but now it's about directories."
msgstr ""
"Очень похоже на сравнение и объединение файлов, только меняются объекты."

#. Tag: screen
#: index.docbook:268
#, no-c-format
msgid ""
"<command>kdiff3</command> <replaceable>dir1 dir2</replaceable>\n"
"   <command>kdiff3</command> <replaceable>dir1 dir2</replaceable> -o "
"<replaceable>destdir</replaceable>\n"
"   <command>kdiff3</command> <replaceable>dir1 dir2 dir3</replaceable>\n"
"   <command>kdiff3</command> <replaceable>dir1 dir2 dir3</replaceable> -o "
"<replaceable>destdir</replaceable>"
msgstr ""
"<command>kdiff3</command> <replaceable>dir1 dir2</replaceable>\n"
"   <command>kdiff3</command> <replaceable>dir1 dir2</replaceable> -o "
"<replaceable>destdir</replaceable>\n"
"   <command>kdiff3</command> <replaceable>dir1 dir2 dir3</replaceable>\n"
"   <command>kdiff3</command> <replaceable>dir1 dir2 dir3</replaceable> -o "
"<replaceable>destdir</replaceable>"

#. Tag: para
#: index.docbook:269
#, no-c-format
msgid ""
"For directory comparison and merge you can continue to read <link linkend="
"\"dirmerge\">here</link>."
msgstr ""
"Подробнее о сравнении и объединении каталогов можно прочитать <link linkend="
"\"dirmerge\">здесь</link>."

#. Tag: title
#: index.docbook:272
#, no-c-format
msgid "Other command line options"
msgstr "Другие ключи командной строки"

#. Tag: para
#: index.docbook:273
#, no-c-format
msgid "To see all available command line options type"
msgstr "Для того, чтобы увидеть все опции командной строки введите:"

#. Tag: screen
#: index.docbook:274
#, no-c-format
msgid "<command>kdiff3</command> --help"
msgstr "<command>kdiff3</command> --help"

#. Tag: para
#: index.docbook:275
#, no-c-format
msgid "Example output:"
msgstr "Примерный вывод:"

#. Tag: screen
#: index.docbook:276
#, no-c-format
msgid ""
"Options:\n"
"  -m, --merge               Merge the input.\n"
"  -b, --base file           Explicit base file. For compatibility with "
"certain tools.\n"
"  -o, --output file         Output file. Implies -m. E.g.: -o newfile.txt\n"
"  --out file                Output file, again. (For compatibility with "
"certain tools.)\n"
"  --auto                    No GUI if all conflicts are auto-solvable. "
"(Needs -o file)\n"
"  --qall                    Don't solve conflicts automatically. (For "
"compatibility...)\n"
"  --L1 alias1               Visible name replacement for input file 1 "
"(base).\n"
"  --L2 alias2               Visible name replacement for input file 2.\n"
"  --L3 alias3               Visible name replacement for input file 3.\n"
"  -L, --fname alias         Alternative visible name replacement. Supply "
"this once for every input.\n"
"  --cs string               Override a config setting. Use once for every "
"setting. E.g.: --cs \"AutoAdvance=1\"\n"
"  --confighelp              Show list of config settings and current "
"values.\n"
"  --config file             Use a different config file."
msgstr ""
"Options:\n"
"  -m, --merge               Объединить файлы/каталоги.\n"
"  -b, --base file           Указать \"базу\" (для совместимости с нек-ми "
"программами).\n"
"  -o, --output file         Получаемый файл. Напр.: -o newfile.txt\n"
"  --out file                Получаемый файл. (для совместимости с нек-ми "
"программами)\n"
"  --auto                    Не запускать графический интерфейс, если не "
"будет конфликтов объединения. (необходимо -o file)\n"
"  --qall                    Не разрешать конфликты автоматически. (для "
"совместимости...)\n"
"  --L1 alias1               Замена (alias) для входного file 1 (\"база\").\n"
"  --L2 alias2               Замена (alias) для входного file 2.\n"
"  --L3 alias3               Замена (alias) для входного file 3.\n"
"  -L, --fname alias         Альтернативная замена. Предполагает введения "
"один раз и последующего использования.\n"
"  --cs string               Перезапись настройки.Используется один раз для "
"одной настройки: --cs \"AutoAdvance=1\"\n"
"  --confighelp              Показывает текущие настройки.\n"
"  --config file             Использовать другой конфигурационный файл."

#. Tag: para
#: index.docbook:277
#, no-c-format
msgid ""
"The option <option>--cs</option> allows you to adjust a configuration value "
"that is otherwise only adjustable via the configure dialogs. But be aware "
"that when &kdiff3; then terminates the changed value will be stored along "
"with the other settings. With <option>--confighelp</option> you can find out "
"the names of the available items and current values."
msgstr ""
"Ключ <option>--cs</option> Позволяет указать конфигурационное значение, "
"которое иным образом можно исправить только через диалоги настройки. Но "
"помните, что если после этой настройки будут наблюдаться сбои, то исправить "
"положение можно будет только через настройку с помощью командной строки.\n"
"<option>--confighelp</option> позволяет можете увидеть все возможные "
"настройки и текущие значения."

#. Tag: para
#: index.docbook:280
#, no-c-format
msgid ""
"Via <option>--config</option> you can specify a different config file. When "
"you often use &kdiff3; with completely different setups this allows you to "
"easily switch between them."
msgstr ""
"С помощью <option>--config</option> можно указать другой конфигурационный "
"файл. Если вы часто используете &kdiff3; с разными настройками, то эта опция "
"позволяет вам легко переключаться между ними."

#. Tag: title
#: index.docbook:283
#, no-c-format
msgid "Ignorable command line options"
msgstr "Игнорируемые ключи командной строки"

#. Tag: para
#: index.docbook:284
#, no-c-format
msgid ""
"Many people want to use &kdiff3; with some version control system. But when "
"that version control system calls &kdiff3; using command line parameters "
"that &kdiff3; doesn't recognise, then &kdiff3; terminates with an error. The "
"integration settings allow to specify command line parameters that should be "
"ignored by &kdiff3;. They will appear in the usage help like in this example:"
msgstr ""
"Часто &kdiff3; используется совместно с системами контроля версий. Но если "
"эта система вызывает &kdiff3; с ключами командной строки, которые не "
"поддерживает &kdiff3;, то последний сообщает об ошибке. В диалоге настройки "
"есть параметр \"Интеграция\" (\"Integration\"), где вы можете указать, какие "
"опции командной строки следует игнорировать. Например:"

#. Tag: screen
#: index.docbook:288
#, no-c-format
msgid ""
"--<replaceable>foo</replaceable>                     Ignored. (User defined.)"
msgstr ""
"--<replaceable>foo</replaceable>                     Игнорируется (указано "
"пользователем)."

#. Tag: emphasis
#: index.docbook:290
#, no-c-format
msgid "Command line options to ignore:"
msgstr "Игнорируемые ключи командной строки:"

#. Tag: para
#: index.docbook:290
#, no-c-format
msgid ""
"A list of options, separated via semicolon ';'. When one of these options "
"appears on the commandline, then &kdiff3; will ignore it and run without "
"reporting an error. (Default is \"u;query;html;abort\")."
msgstr ""
"Разные опции следует разделять точкой с запятой (;). Если одна из этих опций "
"будет использоваться командной строкой, то &kdiff3; будет игнорировать и "
"продолжать работать без вылета с сообщением об ошибке. По умолчанию "
"игнорируются эти опции: \"u;query;html;abort\"."

#. Tag: para
#: index.docbook:295
#, no-c-format
msgid ""
"When this isn't enough, then it is recommended to write a shell script that "
"does the option translation."
msgstr ""
"Если этого не достаточно, можно написать сценарий оболочки, транслирующий "
"ключи."

#. Tag: title
#: index.docbook:300
#, no-c-format
msgid "Open-Dialog"
msgstr "Диалог выбора файлов"

#. Tag: para
#: index.docbook:301
#, no-c-format
msgid ""
"Since many input files must be selectable, the program has a special open "
"dialog:"
msgstr "Программа имеет собственный диалог выбора файлов:"

#. Tag: para
#: index.docbook:307
#, no-c-format
msgid ""
"The open dialog allows to edit the filenames by hand, selecting a file via "
"the file-browser (\"File...\") or allows to choose recent files from the "
"drop-down lists. If you open the dialog again, then the current names still "
"remain there. The third input file is not required. If the entry for \"C\" "
"remains empty, then only a two file diff analysis will be done."
msgstr ""
"Диалог выбора файлов позволяет вам вручную редактировать имена файлов, "
"выбирать файлы через стандартный диалог (\"Файл...\") или выбирать недавние "
"файлы из выпадающего списка. Если вы открываете диалог снова, имена файлов, "
"редактируемых в данный момент, все ещё будут там. Третий файл указывать "
"необязательно. Если поле для файла \"С\" останется пустой, то будет "
"проведено сравнение только двух файлов."

#. Tag: para
#: index.docbook:314
#, no-c-format
msgid ""
"You can also select a directory via \"Dir...\". If for A a directory is "
"specified then a directory-comparison/merge starts. If A specifies a file "
"but B, C or the output specify a directory, then &kdiff3; uses the filename "
"from A in the specified directories."
msgstr ""
"Выбрать каталог с помощью кнопки \"Каталог...\". Если \"А\", \"В\" и \"С\" "
"указаны как каталоги, то будет проведено сравнение/объединение каталогов. "
"Если же в \"А\" указан файл, а в \"В\" и \"С\" - каталоги, то &kdiff3; будет "
"сравнивать файл \"А\" с файлами, имеющими такое же название в каталогах \"В"
"\" и \"С\"."

#. Tag: para
#: index.docbook:319
#, no-c-format
msgid ""
"If \"Merge\" is selected, then the \"Output\"-line becomes editable. But it "
"is not required to specify the output filename immediately. You can also "
"postpone this until saving."
msgstr ""
"Если отмечено  \"Объединить\", то строка \"Вывод\" станет доступна для "
"редактирования. Но необязательно указывать название конечного файла прямо "
"сейчас. Вы можете отложить это действие до сохранения."

#. Tag: para
#: index.docbook:323
#, no-c-format
msgid ""
"The \"Configure...\"-button opens the options-dialog, so that you can set "
"the options before running the analysis."
msgstr ""
"Кнопка \"Настроить\" открывает диалог настройки, где вы можете изменить "
"какие-либо параметры перед сравнением."

#. Tag: title
#: index.docbook:329
#, no-c-format
msgid "Paste and Drop Input"
msgstr "Вставка и \"Drag-and-Drop\""

#. Tag: para
#: index.docbook:330
#, no-c-format
msgid ""
"Sometimes you want to compare parts of a text that is not an own file. "
"&kdiff3; also allows you to paste text from the clipboard into the diff "
"input window that has the focus. The diff analysis happens immediately then. "
"In the open dialog you need not specify files then, but just close it via "
"\"Cancel\"."
msgstr ""
"Иногда может понадобиться сравнить только части текста, не находящиеся в "
"отдельном файле. &kdiff3; позволяет вставлять текст из буфера обмена в окно "
"сравнения. Сразу же будет произведён сравнительный анализ. Тогда в диалоге "
"выбора файлов не обязательно указывать их, вы просто можете закрыть это "
"окно, нажав на кнопку \"Отмена\"."

#. Tag: para
#: index.docbook:335
#, no-c-format
msgid ""
"You can also use drag and drop: Drag a file from a file manager or selected "
"text from an editor and drop it onto a diff input window."
msgstr ""
"Также можно использовать механизм \"Drag and Drop\". Перетащите файл из "
"файлового менеджера или выделенный текст из редактора в окно сравнения."

#. Tag: para
#: index.docbook:338
#, no-c-format
msgid ""
"What's the idea? Sometimes a file contains two similar functions, but "
"checking how similar they really are is a big effort if you first must "
"create two files and then load them. Now you can simply copy, paste and "
"compare the relevant sections."
msgstr ""
"В чём смысл? Иногда файл содержит две похожие функции, но чтобы найти в них "
"различия понадобятся титанические усилия: сначала вам необходимо создать два "
"файла и потом загрузить их в программу. Но вы можете просто скопировать, "
"вставить и сравнить только нужные вам части текста."

#. Tag: para
#: index.docbook:342
#, no-c-format
msgid ""
"Note: Currently you cannot drag anything from &kdiff3;. Only dropping in the "
"diff input is supported."
msgstr ""
"Помните: На данный момент вы не можете перенести что-либо из &kdiff3;. "
"Возможен только перенос в окно ввода сравнения."

#. Tag: para
#: index.docbook:345
#, no-c-format
msgid ""
"Warning: Some editors still interpret the drag and drop into another program "
"like cut (instead of copy) and paste. Your original data might be lost then."
msgstr ""
"Внимание: некоторые текстовые редакторы до сих пор при перетаскивании из них "
"текста и вставке в другую программу любят вырезать (а не копировать) и "
"вставлять. Поэтому вы можете потерять ваши исходные данные."

#. Tag: title
#: index.docbook:351
#, no-c-format
msgid "Comparing Files And Interpreting The Information In The Input Windows"
msgstr ""

#. Tag: title
#: index.docbook:355
#, no-c-format
msgid "Info Line"
msgstr ""

#. Tag: para
#: index.docbook:355
#, no-c-format
msgid ""
"At the top of each text window is its \"info line\". The info lines of the "
"input windows contain a letter \"A\", \"B\" or \"C\", the editable filename, "
"a button for browsing, and the line number of the first visible line in the "
"window. (Note that window \"C\" is optional.) Each info line appears in a "
"different color."
msgstr ""

#. Tag: para
#: index.docbook:360
#, no-c-format
msgid ""
"When you selected another file via browsing or finished editing the filename "
"here by pressing enter, the new file will be loaded and compared with the "
"already loaded file(s)."
msgstr ""

#. Tag: title
#: index.docbook:364
#, no-c-format
msgid "Coloring"
msgstr ""

#. Tag: para
#: index.docbook:364
#, no-c-format
msgid ""
"The three input windows are assigned the letters \"A\", \"B\" and \"C\". \"A"
"\" has color blue, \"B\" has green and \"C\" has magenta. (These are the "
"defaults, but can be changed in the Settings-Menu.)"
msgstr ""

#. Tag: para
#: index.docbook:368
#, no-c-format
msgid ""
"When a difference is detected then the color shows which input file differs. "
"When both other input files differ then the color used to express this is "
"red by default (\"Conflict color\" in the Settings). This colorscheme is "
"especially useful in the case of three input files, which will be seen in "
"the next section (<link linkend=\"merging\">Merging</link>)."
msgstr ""

#. Tag: title
#: index.docbook:374
#, no-c-format
msgid "Summary Column"
msgstr ""

#. Tag: para
#: index.docbook:374
#, no-c-format
msgid ""
"Left of each text is the \"summary column\". If differences occurred on a "
"line then the summary column shows the respective color. For a white-space-"
"only difference the summary is chequered. For programming languages where "
"white space is not so important this is useful to see at one glance if "
"anything of importance was modified. (In C/C++ white space is only "
"interesting within strings, comments, for the preprocessor, and some only "
"very esoteric situations.)"
msgstr ""

#. Tag: para
#: index.docbook:381
#, no-c-format
msgid ""
"The vertical line separating the summary column and the text is interrupted "
"if the input file had no lines there. When word-wrap is enabled then this "
"vertical line appears dotted for wrapped lines."
msgstr ""

#. Tag: title
#: index.docbook:385
#, no-c-format
msgid "Overview Column"
msgstr ""

#. Tag: para
#: index.docbook:385
#, no-c-format
msgid ""
"On the right side a \"overview\"-column is visible left of the vertical "
"scrollbar. It shows the compressed summary column of input \"A\". All the "
"differences and conflicts are visible at one glance. When only two input "
"windows are used, then all differences appear red here because every "
"difference is also a conflict. A black rectangle frames the visible part of "
"the inputs. For very long input files, when the number of input lines is "
"bigger than the height of the overview column in pixels, then several input "
"lines share one overview line. A conflict then has top priority over simple "
"differences, which have priority over no change, so that no difference or "
"conflict is lost here. By clicking into this overview column the "
"corresponding text will be shown."
msgstr ""

#. Tag: title
#: index.docbook:397
#, no-c-format
msgid "Manually Aligning Lines"
msgstr ""

#. Tag: para
#: index.docbook:397
#, no-c-format
msgid ""
"Sometimes the algorithm places the wrong lines next to each other. Or you "
"want to compare one piece of text with text at a completely different "
"position in the other file. For these situations you can manually instruct "
"&kdiff3; to align certain lines. Mark the text for which you want to improve "
"the alignment with the mouse as you would for copy and paste in the first "
"diff view and then choose \"Add Manual Diff Alignment\" in the \"Diffview\"-"
"menu (keyboard shortcut \"Ctrl-Y\") . An orange bar will appear in the "
"summary column next to the chosen text. Repeat this for the second and (if "
"available) third diff view. &kdiff3; will immediately recalculate the "
"differences everytime you do this. and will align the chosen lines. Of "
"course some of the previously matching lines in between might not match "
"anymore."
msgstr ""

#. Tag: para
#: index.docbook:408
#, no-c-format
msgid "Currently merging doesn't support the use of manual diff help."
msgstr ""

#. Tag: title
#: index.docbook:410
#, no-c-format
msgid "Manually Joining and Splitting Diff Sections"
msgstr ""

#. Tag: para
#: index.docbook:410
#, no-c-format
msgid ""
"In some cases &kdiff3; will see too many or too few diff sections for "
"merging. In such a case you can join or split existing sections."
msgstr ""

#. Tag: para
#: index.docbook:413
#, no-c-format
msgid ""
"Add new sections by first selecting text in the lines that belong together "
"in either input window (as for copying to the clipboard). Then choose "
"\"Split Diff At Selection\" in the \"Merge\" menu. Splits will be added "
"above the first line and below the last line of the selected text. If you "
"only want to add one section, then select text beginning at another section-"
"split."
msgstr ""

#. Tag: para
#: index.docbook:418
#, no-c-format
msgid ""
"For joining sections in either input window select something in the lines "
"from the sections to join. (You can join several sections in one step too.) "
"Then choose \"Join selected Diffs\" in the \"Merge\"-menu."
msgstr ""

#. Tag: title
#: index.docbook:425
#, no-c-format
msgid "Merging And The Merge Output Editor Window"
msgstr ""

#. Tag: para
#: index.docbook:429
#, no-c-format
msgid ""
"The merge output editor window (below the diff input windows) also has an "
"info line at the top showing \"Output:\", the filename and \"[Modified]\" if "
"you edited something. Usually it will contain some text through the "
"automatic merge facilities, but often it will also contain conflicts."
msgstr ""

#. Tag: para
#: index.docbook:434
#, no-c-format
msgid ""
"!!! Saving is disabled until all conflicts are resolved !!! (Use the \"Go to "
"prev/next unsolved conflicts\"-buttons to find the remaining conflicts.)"
msgstr ""

#. Tag: para
#: index.docbook:437
#, no-c-format
msgid ""
"With only two input files every difference is also a conflict that must be "
"solved manually."
msgstr ""

#. Tag: para
#: index.docbook:440
#, no-c-format
msgid ""
"With three input files the first file is treated as base, while the second "
"and third input files contain modifications. When at any line only either "
"input B or input C have changed but not both then the changed source will "
"automatically be selected. Only when B and C have changed on the same lines, "
"then the tool detects a conflict that must be solved manually. When B and C "
"are the same, but not the same as A, then C is selected."
msgstr ""

#. Tag: title
#: index.docbook:447
#, no-c-format
msgid "The Summary Column"
msgstr ""

#. Tag: para
#: index.docbook:447
#, no-c-format
msgid ""
"The merge output editor window also has a summary column on the left. It "
"shows the letter of the input from which a line was selected or nothing if "
"all three sources where equal on a line. For conflicts it shows a "
"questionmark \"?\" and the line shows \"&lt;Merge Conflict&gt;\", all in "
"red. Because solving conflicts line by line would take very long, the lines "
"are grouped into groups that have the same difference and conflict "
"characteristics. But only-white-space-conflicts are separated from non-white-"
"space-conflicts in order to ease the merging of files were the indentation "
"changed for many lines."
msgstr ""

#. Tag: title
#: index.docbook:457
#, no-c-format
msgid ""
"Setting The Current Group And Synchronising Merge And Diff View Position"
msgstr ""

#. Tag: para
#: index.docbook:457
#, no-c-format
msgid ""
"When clicking into the summary column with the left mouse button in either "
"window then the beginning of the group belonging to that line will shown in "
"all windows. This group then becomes the \"current group\". It is "
"highlighted with the \"Current range (diff) background color\" and a black "
"bar appears on the left side of the text."
msgstr ""

#. Tag: title
#: index.docbook:463
#, no-c-format
msgid "Choosing Inputs A, B or C For Current Conflict And Editing"
msgstr ""

#. Tag: para
#: index.docbook:463
#, no-c-format
msgid ""
"The button bar below the menubar contains three input selector buttons "
"containing the letters \"A\", \"B\" and \"C\". Click the input selector "
"button to insert (or remove if already inserted) the lines from the "
"respective source. To choose the lines from several inputs click the "
"respective buttons in the needed order. For example if you want that the "
"lines from \"B\" appear before the lines from \"A\" in the output, first "
"click \"B\", then \"A\"."
msgstr ""

#. Tag: para
#: index.docbook:470
#, no-c-format
msgid ""
"If you use the auto-advance option (<link linkend=\"autoadvance\">"
"\"Automatically go to next unsolved conflict after source selection\"</"
"link>), you should disable this before choosing lines from several inputs or "
"if you want to edit the lines after your choice. Otherwise &kdiff3; will "
"jump to the next conflict after choosing the first input."
msgstr ""

#. Tag: para
#: index.docbook:476
#, no-c-format
msgid ""
"It is often helpful directly edit the merge output. The summary column will "
"show \"m\" for every line that was manually modified. When for instance the "
"differences are aligned in a way that simply choosing the inputs won't be "
"satisfactory, then you can mark the needed text and use normal <link linkend="
"\"selections\">copy and paste</link> to put it into the merge output."
msgstr ""

#. Tag: para
#: index.docbook:482
#, no-c-format
msgid ""
"Sometimes, when a line is removed either by automatic merge or by editing "
"and no other lines remain in that group, then the text &lt;No src line&gt; "
"will appear in that line. This is just a placeholder for the group for when "
"you might change your mind and select some source again. This text won't "
"appear in the saved file or in any selections you want to copy and paste."
msgstr ""

#. Tag: para
#: index.docbook:488
#, no-c-format
msgid ""
"The text \"&lt;Merge Conflict&gt;\" will appear in the clipboard if you copy "
"and paste some text containing such a line. But still be careful to do so."
msgstr ""

#. Tag: title
#: index.docbook:492
#, no-c-format
msgid "Choosing Input A, B, or C for All Conflicts"
msgstr ""

#. Tag: para
#: index.docbook:492
#, no-c-format
msgid ""
"The normal merge will start by solving simple conflicts automatically. But "
"the \"Merge\"-menu provides some actions for other common needs. If you have "
"to select the same source for most conflicts, then you can choose \"A\", \"B"
"\" or \"C\" everywhere, or only for the remaining unsolved conflicts, or for "
"unsolved white space conflicts. If you want to decide every single delta "
"yourself, you can \"Set deltas to conflicts\". Or if you want to return to "
"the automatic choices of &kdiff3; then select \"Automatically solve simple "
"conflicts\". &kdiff3; then restarts the merge. For actions that change your "
"previous modifications &kdiff3; will ask for your confirmation before "
"proceeding."
msgstr ""

#. Tag: para
#: index.docbook:503
#, no-c-format
msgid ""
"Note: When choosing either source for unsolved white space conflicts and the "
"options \"Ignore Numbers\" or \"Ignore C/C++ Comments\" are used then "
"changes in numbers or comments will be treated like white space too."
msgstr ""

#. Tag: title
#: index.docbook:508
#, no-c-format
msgid "Automatic Merge of Version Control Keywords and History (Log)"
msgstr ""

#. Tag: para
#: index.docbook:508
#, no-c-format
msgid ""
"Many version control systems support special keywords in the file. (e.g. "
"\"&#36;Date&#36;\", \"&#36;Header&#36;\", \"&#36;Author&#36;\", \"&#36;"
"Log&#36;\" etc.) During the check-in the version control system (VCS) "
"changes these lines. For instance \"&#36;Date&#36;\" will turn into \"&#36;"
"Date: 2005/03/22 18:45:01 &#36;\". Since this line will be different in "
"every version of the file, it would require manual interaction during the "
"merge."
msgstr ""

#. Tag: para
#: index.docbook:515
#, no-c-format
msgid ""
"&kdiff3; offers automatic merge for these items. For simple lines that match "
"the \"Auto merge regular expression\"-option in all input-files &kdiff3; "
"will choose the line from B or - if available - from C. (Additionally it is "
"necessary that the lines in question line up in the comparison and the "
"previous line contains no conflict.) This auto merge can either be run "
"immediately after a merge starts (activate the option \"Run regular "
"expression auto merge on merge start\") or later via the merge menu \"Run "
"Regular Expression Auto Merge\"."
msgstr ""

#. Tag: para
#: index.docbook:523
#, no-c-format
msgid ""
"Automatic merge for version control history (also called \"log\") is also "
"supported. The history automerge can either run immediately when the merge "
"starts by activating the option \"Merge version control history on merge "
"start\" or later via the merge menu \"Automatically Solve History Conflicts"
"\"."
msgstr ""

#. Tag: para
#: index.docbook:528
#, no-c-format
msgid ""
"Usually the version control history begins with a line containing the "
"keyword \"&#36;Log&#36;\". This must be matched by the \"History start "
"regular expression\"-option. &kdiff3; detects which subsequent lines are in "
"the history by analysing the leading characters that came before the \"&#36;"
"Log&#36;\"-keyword. If the same \"leading comment\"-characters also appears "
"in the following lines, then they are also included in the history."
msgstr ""

#. Tag: para
#: index.docbook:534
#, no-c-format
msgid ""
"During each check-in the VCS writes a unique line specifying version-, date- "
"and time-information followed by lines with user comments. These lines form "
"one history-entry. This history section grows with every check-in and the "
"most recent entries appear at the top (after the history start line)."
msgstr ""

#. Tag: para
#: index.docbook:539
#, no-c-format
msgid ""
"When for parallel development two or more developers check-in a branch of "
"the file then the merge history will contain several entries that appear as "
"conflicts during the merge of the branches. Since merging these can become "
"very tedious, &kdiff3; offers support with two possible strategies: Just "
"insert the history information from both contributors at the top or sort the "
"history information by a user defined key."
msgstr ""

#. Tag: para
#: index.docbook:545
#, no-c-format
msgid ""
"The just-insert-all-entries-method is easier to configure. &kdiff3; just "
"needs a method to detect, which lines belong to one history entry. Most VCS "
"insert an empty line after each history entry. If there are no other empty "
"lines, this is a sufficient criterion for &kdiff3;. Just set an empty "
"\"History entry start regular expression\". If the empty line criterion "
"isn't sufficient, you can specify a regular expression to detect the history "
"entry start."
msgstr ""

#. Tag: para
#: index.docbook:551
#, no-c-format
msgid ""
"Note that &kdiff3; will remove duplicate history entrys. If a history entry "
"appeared several times in the history of a input file, only one entry will "
"remain in the output."
msgstr ""

#. Tag: para
#: index.docbook:554
#, no-c-format
msgid ""
"If you want to sort the history, then you have to specify how the sort key "
"should be built. Use parentheses in the \"History entry start regular "
"expression\" to group parts of the regular expression that should later be "
"used for the sort key. Then specify the \"History entry start sort key order"
"\" specifying a comma \",\" separated list of numbers referring to the "
"position of the group in the regular expression."
msgstr ""

#. Tag: para
#: index.docbook:560
#, no-c-format
msgid ""
"Because this is not so easy to get right immediately, you are able to test "
"and improve the regular expressions and key-generation in a dedicated dialog "
"by pressing the \"Test your regular expressions\"-button."
msgstr ""

#. Tag: para
#: index.docbook:564
#, no-c-format
msgid ""
"Example: Assume a history that looks like this: <screen>\n"
"/**************************************************************************\n"
"** HISTORY:    &#36;Log: \\toms_merge_main_view\\MyApplication\\src"
"\\complexalgorithm.cpp &#36;\n"
"**\n"
"**     \\main\\integration_branch_12   2 Apr 2001 10:45:41   tom\n"
"**  Merged branch simon_branch_15.\n"
"**\n"
"**     \\main\\henry_bugfix_branch_7\\1   30 Mar 2001 19:22:05   henry\n"
"**  Improved the speed for subroutine convertToMesh().\n"
"**  Fixed crash.\n"
"**************************************************************************/\n"
"</screen> The history start line matches the regular expression \".*\\&#36;"
"Log.*\\&#36;.*\". Then follow the history entries."
msgstr ""

#. Tag: para
#: index.docbook:568
#, no-c-format
msgid ""
"The line with the \"&#36;Log&#36;\"-keyword begins with two \"*\" after "
"which follows a space. &kdiff3; uses the first non-white-space string as "
"\"leading comment\" and assumes that the history ends in the first line "
"without this leading comment. In this example the last line ends with a "
"string that also starts with two \"*\", but instead of a space character "
"more \"*\" follow. Hence this line ends the history."
msgstr ""

#. Tag: para
#: index.docbook:574
#, no-c-format
msgid ""
"If history sorting isn't required then the history entry start line regular "
"expression could look like this. (This line is split in two because it "
"wouldn't fit otherwise.) <screen>\n"
"\\s*\\\\main\\\\\\S+\\s+[0-9]+ (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|"
"Dec)\n"
" [0-9][0-9][0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\\s+.*\n"
"</screen> For details about regular expressions please see the <ulink url="
"\"http://doc.trolltech.com/3.3/qregexp.html#details\">regular expression "
"documentation by Trolltech</ulink>. Note that \"\\s\" (with lowercase \"s\") "
"matches any white space and \"\\S\" (with uppercase \"S\") matches any non-"
"white-space. In our example the history entry start contains first the "
"version info with reg. exp. \"\\\\main\\\\\\S+\", the date consisting of day "
"\"[0-9]+\", month \"(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\" and "
"year \"[0-9][0-9][0-9][0-9]\", the time \"[0-9][0-9]:[0-9][0-9]:[0-9][0-9]\" "
"and finally the developers login name \".*\"."
msgstr ""

#. Tag: para
#: index.docbook:582
#, no-c-format
msgid ""
"Note that the \"leading comment\"-characters (in the example \"**\") will "
"already be removed by &kdiff3; before trying to match, hence the regular "
"expression begins with a match for none or more white-space characters \"\\s*"
"\". Because comment characters can differ in each file (e.g. C/C++ uses "
"other comment characters than a Perl script) &kdiff3; takes care of the "
"leading comment characters and you should not specify them in the regular "
"expression."
msgstr ""

#. Tag: para
#: index.docbook:587
#, no-c-format
msgid ""
"If you require a sorted history. Then the sortkey must be calculated. For "
"this the relevant parts in the regular expression must be grouped by "
"parentheses. (The extra parentheses can also stay in if history sorting is "
"disabled.) <screen>\n"
"\\s*\\\\main\\\\(\\S+)\\s+([0-9]+) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|"
"Nov|Dec)\n"
" ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\\s+(.*)\n"
"</screen> The parentheses now contain 1. version info, 2. day, 3. month, 4. "
"year, 5. time, 6. name. But if we want to sort by date and time, we need to "
"construct a key with the elements in a different order of appearance: First "
"the year, followed by month, day, time, version info and name. Hence the "
"sortkey order to specify is \"4,3,2,5,1,6\"."
msgstr ""

#. Tag: para
#: index.docbook:595
#, no-c-format
msgid ""
"Because month names aren't good for sorting (\"Apr\" would be first) "
"&kdiff3; detects in which order the month names were given and uses that "
"number instead (\"Apr\"->\"04\"). And if a pure number is found it will be "
"transformed to a 4-digit value with leading zeros for sorting. Finally the "
"resulting sort key for the first history entry start line will be:"
msgstr ""

#. Tag: screen
#: index.docbook:600
#, no-c-format
msgid "2001 04 0002 10:45:41 integration_branch_12   tom"
msgstr ""

#. Tag: para
#: index.docbook:601
#, no-c-format
msgid ""
"For more information also see <link linkend=\"mergeoptions\">Merge Settings</"
"link>."
msgstr ""

#. Tag: title
#: index.docbook:607
#, no-c-format
msgid "Navigation And Editing"
msgstr ""

#. Tag: para
#: index.docbook:608
#, no-c-format
msgid ""
"Much navigation will be done with the scroll bars and the mouse but you can "
"also navigate with the keys. If you click into either window then you can "
"use the cursor buttons left, right, up, down, page up, page down, home, end, "
"ctrl-home, ctrl-end as you would in other programs. The overview-column next "
"to the vertical scroll bar of the input files can also be used for "
"navigating by clicking into it."
msgstr ""

#. Tag: para
#: index.docbook:615
#, no-c-format
msgid "You can also use the wheel mouse to scroll up and down."
msgstr ""

#. Tag: para
#: index.docbook:617
#, no-c-format
msgid ""
"In the merge output editor you can also use the other keys for editing. You "
"can toggle between insert and overwrite mode with the insert key. (Default "
"is insert-mode.)"
msgstr ""

#. Tag: para
#: index.docbook:621
#, no-c-format
msgid ""
"A left-mouse-button-click into any summary column will synchronise all "
"windows to show the beginning of the same group of lines (as explained in "
"section <link linkend=\"synchronise_views\">\"Setting The Current Group And "
"Synchronising Merge And Diff View Position\"</link>)."
msgstr ""

#. Tag: para
#: index.docbook:625
#, no-c-format
msgid ""
"The button bar also contains nine navigation buttons with which you can jump "
"to the current/first/last difference, to the next/previous difference (ctrl-"
"down/ctrl-up), to the next/previous conflict (ctrl-pgdown/ctrl-pgup), or to "
"the next/previous unsolved conflict. Note that for &kdiff3; a \"conflict\" "
"that was not automatically solved at the start of the merge stays a "
"\"conflict\" even if it is solved. Hence the necessity to distinguish "
"\"unsolved conflicts\"."
msgstr ""

#. Tag: title
#: index.docbook:633
#, no-c-format
msgid "Auto-Advance"
msgstr ""

#. Tag: para
#: index.docbook:634
#, no-c-format
msgid ""
"There also is a button \"Automatically go to next unsolved conflict after "
"source selection\" (Auto-Advance). If you enable this, then, when one source "
"is selected, &kdiff3; will jump to and select the next unsolved conflict "
"automatically. This can help when you always want to choose one source only. "
"When you need both sources, or you want to edit after selecting, then you "
"probably want to switch this off. Before proceeding to the next unsolved "
"conflict &kdiff3; shows you the effect of your choice for a short time. This "
"delay is adjustable in the Diff- &amp; Merge-Settings: You can specify the "
"\"Auto-Advance delay\" in milli seconds between 0 and 2000. Hint: Tired of "
"many clicks? - Use a small Auto-Advance-delay and the shortcuts Ctrl-1/2/3 "
"to select A/B/C for many conflicts."
msgstr ""

#. Tag: title
#: index.docbook:650
#, no-c-format
msgid "Select, Copy And Paste"
msgstr ""

#. Tag: para
#: index.docbook:651
#, no-c-format
msgid ""
"The input windows don't show a cursor, so selections must be made with the "
"mouse by clicking with the left mouse button at the start, holding down the "
"mousebutton and moving to the end, where you release the mouse button again. "
"You can also select a word by double clicking it. In the merge output editor "
"you can also select via the keyboard by holding the \"shift\"-button and "
"navigation with the cursor keys."
msgstr ""

#. Tag: para
#: index.docbook:658
#, no-c-format
msgid ""
"If the selection exceeds the visible range you can move the mouse over the "
"window borders which causes &kdiff3; to scroll in that direction."
msgstr ""

#. Tag: para
#: index.docbook:661
#, no-c-format
msgid ""
"For very large selections you can also use the navigation keys while holding "
"down the mouse. E.g. use page up and page down to quickly go to a certain "
"position. At the end position release the mouse button."
msgstr ""

#. Tag: para
#: index.docbook:665
#, no-c-format
msgid ""
"In order to select everything in the current window use menu \"Edit\"->"
"\"Select All\" (Ctrl-A)."
msgstr ""

#. Tag: para
#: index.docbook:667
#, no-c-format
msgid ""
"To copy to the clipboard you must press the \"Copy\"-button (Ctrl-C or Ctrl-"
"Insert). But there exists an option \"Auto Copy Selection\". If this is "
"enabled, then whatever you select is copied immediately and you don't need "
"to explicitely copy. But pay attention when using this because the contents "
"of the clipboard might then be destroyed accidentally."
msgstr ""

#. Tag: para
#: index.docbook:673
#, no-c-format
msgid ""
"\"Cut\" (Ctrl-X or Shift-Delete) copies to the clipboard and deletes the "
"selected text."
msgstr ""

#. Tag: para
#: index.docbook:676
#, no-c-format
msgid ""
"\"Paste\" (Ctrl-V or Shift-Insert) inserts the text in the clipboard at the "
"cursorposition or over the current selection. If you paste to either diff "
"input window the contents of the clipboard will be shown in that window and "
"the comparison will restart immediately. This is useful if you want to "
"quickly grab a piece of text from somewhere and compare it with something "
"else without first creating files."
msgstr ""

#. Tag: title
#: index.docbook:686
#, no-c-format
msgid "Saving"
msgstr ""

#. Tag: para
#: index.docbook:687
#, no-c-format
msgid ""
"Saving will only be allowed, when all conflicts were solved. If the file "
"already exists and the \"Backup files\"-option is enabled then the existing "
"file will be renamed with an \".orig\"-extension, but if such a file exists "
"it will be deleted. When you exit or start another diff-analysis and data "
"wasn't saved yet, then &kdiff3; will ask if you want to save, cancel or "
"proceed without saving. (&kdiff3; does not catch any signals. So if you "
"\"kill\" &kdiff3; then your data will be lost.)"
msgstr ""

#. Tag: para
#: index.docbook:695
#, no-c-format
msgid ""
"Line endings are saved according to the normal method on the underlying "
"operating system. For Unices each line ends with an linefeed-character \"\\n"
"\", while for Win32-based systems each line ends with a carriage-return + a "
"linefeed \"\\r\\n\". &kdiff3; does not preserve the line-endings of the "
"input files, which also means that you shouldn't use &kdiff3; with binary "
"files."
msgstr ""

#. Tag: title
#: index.docbook:704
#, no-c-format
msgid "Finding Strings"
msgstr ""

#. Tag: para
#: index.docbook:705
#, no-c-format
msgid ""
"You can search for a string in any text-window of &kdiff3;. The \"Find ...\"-"
"command (Ctrl-F) in the Edit-menu opens a dialog that lets you specify the "
"string to search for. You can also select the windows which should be "
"searched. Searching will always start at the top. Use the \"Find Next\"-"
"command (F3) to proceed to the next occurrence. If you select to search "
"several windows then the first window will be searched from top to bottom "
"before the search starts in the next window at the top again, etc."
msgstr ""

#. Tag: title
#: index.docbook:716
#, no-c-format
msgid "Printing"
msgstr ""

#. Tag: para
#: index.docbook:717
#, no-c-format
msgid ""
"&kdiff3; supports printing for textfile differences. The \"Print...\"-"
"command (Ctrl-P) in the File-menu opens a dialog that allows you to select "
"the printer and to adjust other options."
msgstr ""

#. Tag: para
#: index.docbook:721
#, no-c-format
msgid ""
"There are several possibilities to adjust the range. Due to different "
"printing dialogs on different operating systems, the method to achieve "
"certain range selections varies."
msgstr ""

#. Tag: term
#: index.docbook:726
#, no-c-format
msgid "All:"
msgstr ""

#. Tag: para
#: index.docbook:726
#, no-c-format
msgid "Print everything."
msgstr ""

#. Tag: term
#: index.docbook:727
#, no-c-format
msgid "Current:"
msgstr ""

#. Tag: para
#: index.docbook:727
#, no-c-format
msgid ""
"Print a page starting at the first visible line in the window. (On systems "
"without this option this can be achived by specifying page number 10000 for "
"printing.)"
msgstr ""

#. Tag: term
#: index.docbook:729
#, no-c-format
msgid "Selection:"
msgstr ""

#. Tag: para
#: index.docbook:729
#, no-c-format
msgid ""
"Before choosing to print select text with the mouse (like for copy and "
"paste) in one of the diff input windows to define the start and end line. If "
"no text in one of the diff input windows was selected, then this won't be an "
"available choice. (On systems without this option this can be achived by "
"specifying page number 9999 for printing.)"
msgstr ""

#. Tag: term
#: index.docbook:735
#, no-c-format
msgid "Range:"
msgstr ""

#. Tag: para
#: index.docbook:735
#, no-c-format
msgid "Specify the first and last page."
msgstr ""

#. Tag: para
#: index.docbook:738
#, no-c-format
msgid ""
"Other important options for printing will be taken from the normal options:"
msgstr ""

#. Tag: para
#: index.docbook:741
#, no-c-format
msgid "Font, font size"
msgstr ""

#. Tag: para
#: index.docbook:742
#, no-c-format
msgid "Show line numbers"
msgstr ""

#. Tag: para
#: index.docbook:743
#, no-c-format
msgid "Word wrap"
msgstr ""

#. Tag: para
#: index.docbook:744
#, no-c-format
msgid "<para>Colors</para>"
msgstr ""

#. Tag: para
#: index.docbook:745
#, no-c-format
msgid "etc."
msgstr ""

#. Tag: para
#: index.docbook:747
#, no-c-format
msgid "Landscape formatting is also recommended for printing."
msgstr ""

#. Tag: title
#: index.docbook:752
#, no-c-format
msgid "Options"
msgstr ""

#. Tag: para
#: index.docbook:753
#, no-c-format
msgid ""
"Options and the recent-file-list will be saved when you exit the program, "
"and reloaded when you start it. (Menu Settings->Configure &kdiff3; ...)"
msgstr ""

#. Tag: title
#: index.docbook:757
#, no-c-format
msgid "Font"
msgstr ""

#. Tag: para
#: index.docbook:758
#, no-c-format
msgid ""
"Select a fixed width font. (On some systems this dialog will also present "
"variable width fonts, but you should not use them.)"
msgstr ""

#. Tag: emphasis
#: index.docbook:763
#, no-c-format
msgid "Italic Font for Deltas:"
msgstr ""

#. Tag: para
#: index.docbook:763
#, no-c-format
msgid ""
"If you select this, then text differences will be drawn with the italic "
"version of the selected font. If the font doesn't support italic, then this "
"does nothing."
msgstr ""

#. Tag: title
#: index.docbook:770
#, no-c-format
msgid "<title>Colors</title>"
msgstr ""

#. Tag: emphasis
#: index.docbook:772
#, no-c-format
msgid "Foreground color:"
msgstr ""

#. Tag: para
#: index.docbook:772 index.docbook:785
#, no-c-format
msgid "Usually black."
msgstr ""

#. Tag: emphasis
#: index.docbook:773
#, no-c-format
msgid "Background color:"
msgstr ""

#. Tag: para
#: index.docbook:773
#, no-c-format
msgid "Usually white."
msgstr ""

#. Tag: emphasis
#: index.docbook:774
#, no-c-format
msgid "Diff Background color:"
msgstr ""

#. Tag: para
#: index.docbook:774
#, no-c-format
msgid "Usually light gray."
msgstr ""

#. Tag: emphasis
#: index.docbook:775
#, no-c-format
msgid "Color A:"
msgstr ""

#. Tag: para
#: index.docbook:775
#, no-c-format
msgid "Usually dark blue."
msgstr ""

#. Tag: emphasis
#: index.docbook:776
#, no-c-format
msgid "Color B:"
msgstr ""

#. Tag: para
#: index.docbook:776
#, no-c-format
msgid "Usually dark green."
msgstr ""

#. Tag: emphasis
#: index.docbook:777
#, no-c-format
msgid "Color C:"
msgstr ""

#. Tag: para
#: index.docbook:777
#, no-c-format
msgid "Usually dark magenta."
msgstr ""

#. Tag: emphasis
#: index.docbook:778
#, no-c-format
msgid "Conflict Color:"
msgstr ""

#. Tag: para
#: index.docbook:778 index.docbook:783
#, no-c-format
msgid "Usually red."
msgstr ""

#. Tag: emphasis
#: index.docbook:779
#, no-c-format
msgid "Current range background color:"
msgstr ""

#. Tag: para
#: index.docbook:779
#, no-c-format
msgid "Usually light yellow."
msgstr ""

#. Tag: emphasis
#: index.docbook:780
#, no-c-format
msgid "Current range diff background color:"
msgstr ""

#. Tag: para
#: index.docbook:780 index.docbook:784
#, no-c-format
msgid "Usually dark yellow."
msgstr ""

#. Tag: emphasis
#: index.docbook:781
#, no-c-format
msgid "Color for manually selected diff ranges:"
msgstr ""

#. Tag: para
#: index.docbook:781
#, no-c-format
msgid "Usually orange."
msgstr ""

#. Tag: emphasis
#: index.docbook:782
#, no-c-format
msgid "Newest file color in directory comparison:"
msgstr ""

#. Tag: para
#: index.docbook:782
#, no-c-format
msgid "Usually green."
msgstr ""

#. Tag: emphasis
#: index.docbook:783
#, no-c-format
msgid "Oldest file color in directory comparison:"
msgstr ""

#. Tag: emphasis
#: index.docbook:784
#, no-c-format
msgid "Middle age file color in directory comparison:"
msgstr ""

#. Tag: emphasis
#: index.docbook:785
#, no-c-format
msgid "Color for missing files in directory comparison:"
msgstr ""

#. Tag: para
#: index.docbook:787
#, no-c-format
msgid ""
"Changing the colors for directory comparison will be effective only when "
"starting the next directory comparison."
msgstr ""

#. Tag: para
#: index.docbook:790
#, no-c-format
msgid ""
"On systems with only 16 or 256 colors some colors are not available in pure "
"form. On such systems the \"Defaults\"-button will choose a pure color."
msgstr ""

#. Tag: title
#: index.docbook:796
#, no-c-format
msgid "Editor Settings"
msgstr ""

#. Tag: emphasis
#: index.docbook:798
#, no-c-format
msgid "Tab inserts spaces:"
msgstr ""

#. Tag: para
#: index.docbook:798
#, no-c-format
msgid ""
"If this is disabled and you press the tabulator key, a tab-character is "
"inserted, otherwise the appropriate amount of characters is inserted."
msgstr ""

#. Tag: emphasis
#: index.docbook:801
#, no-c-format
msgid "Tab size:"
msgstr ""

#. Tag: para
#: index.docbook:801
#, no-c-format
msgid "Can be adjusted for your specific needs. Default is 8."
msgstr ""

#. Tag: emphasis
#: index.docbook:802
#, no-c-format
msgid "Auto indentation:"
msgstr ""

#. Tag: para
#: index.docbook:802
#, no-c-format
msgid ""
"When pressing Enter or Return the indentation of the previous line is used "
"for the new line."
msgstr ""

#. Tag: emphasis
#: index.docbook:804
#, no-c-format
msgid "Auto copy selection:"
msgstr ""

#. Tag: para
#: index.docbook:804
#, no-c-format
msgid ""
"Every selection is immediately copied to the clipboard when active and you "
"needn't explicitely copy it."
msgstr ""

#. Tag: emphasis
#: index.docbook:806
#, no-c-format
msgid "Line end style:"
msgstr ""

#. Tag: para
#: index.docbook:806
#, no-c-format
msgid ""
"When saving you can select what line end style you prefer. The default "
"setting is the common choice for the used operating system."
msgstr ""

#. Tag: title
#: index.docbook:811
#, no-c-format
msgid "Diff Settings"
msgstr ""

#. Tag: para
#: index.docbook:812
#, no-c-format
msgid ""
"When comparing files, &kdiff3; first it tries to match lines that are equal "
"in all input files. Only during this step it might ignore white space. The "
"second step compares each line. In this step white space will not be "
"ignored. Also during the merge white space will not be ignored."
msgstr ""

#. Tag: emphasis
#: index.docbook:820
#, no-c-format
msgid "Preserve Carriage Return:"
msgstr ""

#. Tag: para
#: index.docbook:820
#, no-c-format
msgid ""
"Some editors (on some systems) save carriage return '\\r' and linefeed '\\n'-"
"characters at the end of line, while others will only save the linefeed "
"'\\n'. Usually &kdiff3; ignores the carriage return, but then files that "
"don't have equal sizes, look equal in side by side comparison. When this "
"option is on, then the carriage return characters are made visible but are "
"treated as white space. This option must be off during a merge. Default is "
"off."
msgstr ""

#. Tag: emphasis
#: index.docbook:827
#, no-c-format
msgid "Ignore numbers:"
msgstr ""

#. Tag: para
#: index.docbook:827
#, no-c-format
msgid ""
"Default is off. Number characters ('0'-'9', '.', '-') will be ignored in the "
"first part of the analysis in which the line matching is done. In the result "
"the differences will be shown nevertheless, but they are treated as white "
"space."
msgstr ""

#. Tag: emphasis
#: index.docbook:832
#, no-c-format
msgid "Ignore C/C++ comments:"
msgstr ""

#. Tag: para
#: index.docbook:832
#, no-c-format
msgid ""
"Default is off. Changes in comments will be treated like changes in white "
"space."
msgstr ""

#. Tag: emphasis
#: index.docbook:835
#, no-c-format
msgid "Ignore case:"
msgstr ""

#. Tag: para
#: index.docbook:835
#, no-c-format
msgid ""
"Default is off. Case-differences of characters (like 'A' vs. 'a') will be "
"treated like changes in white space."
msgstr ""

#. Tag: emphasis
#: index.docbook:838 index.docbook:1005
#, no-c-format
msgid "Preprocessor-Command:"
msgstr ""

#. Tag: para
#: index.docbook:838 index.docbook:841
#, no-c-format
msgid "See <link linkend=\"preprocessors\">next section</link>."
msgstr ""

#. Tag: emphasis
#: index.docbook:841 index.docbook:1012
#, no-c-format
msgid "Line-Matching Preprocessor-Command:"
msgstr ""

#. Tag: emphasis
#: index.docbook:844
#, no-c-format
msgid "Try Hard:"
msgstr ""

#. Tag: para
#: index.docbook:844
#, no-c-format
msgid ""
"Try hard to find an even smaller delta. (Default is on.) This will probably "
"be effective for complicated and big files. And slow for very big files."
msgstr ""

#. Tag: title
#: index.docbook:851
#, no-c-format
msgid "Merge Settings"
msgstr ""

#. Tag: emphasis
#: index.docbook:853
#, no-c-format
msgid "Auto Advance Delay (ms):"
msgstr ""

#. Tag: para
#: index.docbook:853
#, no-c-format
msgid ""
"When in auto-advance-mode this setting specifies how long to show the result "
"of the selection before jumping to the next unsolved conflict."
msgstr ""

#. Tag: emphasis
#: index.docbook:857
#, no-c-format
msgid "White space 2/3-file merge default:"
msgstr ""

#. Tag: para
#: index.docbook:857
#, no-c-format
msgid ""
"Automatically solve all white-space conflict by choosing the specified file. "
"(Default is manual choice.) Useful if white space really isn't important in "
"many files. If you need this only occasionally better use \"Choose A/B/C For "
"All Unsolved Whitespace Conflicts\" in the merge menu. Note that if you "
"enable either \"Ignore numbers\" or \"Ignore C/C++ comments\" then this auto-"
"choice also applies for conflicts in numbers or comments."
msgstr ""

#. Tag: emphasis
#: index.docbook:864
#, no-c-format
msgid "Auto merge regular expression:"
msgstr ""

#. Tag: para
#: index.docbook:864
#, no-c-format
msgid ""
"Regular expression for lines where &kdiff3; should automatically choose one "
"source. See also <link linkend=\"vcskeywordsmergesupport\">Automatic "
"Merge ...</link>"
msgstr ""

#. Tag: emphasis
#: index.docbook:867
#, no-c-format
msgid "Run regular expression auto merge on merge start:"
msgstr ""

#. Tag: para
#: index.docbook:867
#, no-c-format
msgid ""
"If activated &kdiff3; runs the automatic merge using the \"Auto merge "
"regular expression\" when a merge is started."
msgstr ""

#. Tag: emphasis
#: index.docbook:870
#, no-c-format
msgid "History start regular expression:"
msgstr ""

#. Tag: para
#: index.docbook:870
#, no-c-format
msgid ""
"Regular expression for the start of the merge history entry. Usually this "
"line contains the \"&#36;Log&#36;\"-keyword. Default value: \".*\\&#36;Log.*"
"\\&#36;.*\""
msgstr ""

#. Tag: emphasis
#: index.docbook:875
#, no-c-format
msgid "History entry start regular expression:"
msgstr ""

#. Tag: para
#: index.docbook:875
#, no-c-format
msgid ""
"A merge history entry consists of several lines. Specify the regular "
"expression to detect the first line (without the leading comment). Use "
"parentheses to group the keys you want to use for sorting. If left empty, "
"then &kdiff3; assumes that empty lines separate history entries. See also "
"<link linkend=\"vcskeywordsmergesupport\">Automatic Merge ...</link>"
msgstr ""

#. Tag: emphasis
#: index.docbook:882
#, no-c-format
msgid "History merge sorting:"
msgstr ""

#. Tag: para
#: index.docbook:882
#, no-c-format
msgid "Enable version control history sorting."
msgstr ""

#. Tag: emphasis
#: index.docbook:885
#, no-c-format
msgid "History entry start sort key order:"
msgstr ""

#. Tag: para
#: index.docbook:885
#, no-c-format
msgid ""
"Each parentheses used in the regular expression for the history start entry "
"groups a key that can be used for sorting. Specify the list of keys (that "
"are numbered in order of occurrence starting with 1) using ',' as separator "
"(e.g. \"4,5,6,1,2,3,7\"). If left empty, then no sorting will be done. See "
"also <link linkend=\"vcskeywordsmergesupport\">Automatic Merge ...</link>"
msgstr ""

#. Tag: emphasis
#: index.docbook:893
#, no-c-format
msgid "Merge version control history on merge start:"
msgstr ""

#. Tag: para
#: index.docbook:893
#, no-c-format
msgid ""
"If activated &kdiff3; runs the automatic history merging using "
"aforementioned options when a merge is started."
msgstr ""

#. Tag: emphasis
#: index.docbook:896
#, no-c-format
msgid "Max number of history entries:"
msgstr ""

#. Tag: para
#: index.docbook:896
#, no-c-format
msgid ""
"&kdiff3; truncates the history list after the specified number of entries. "
"Use -1 to avoid truncation. (Default is -1)."
msgstr ""

#. Tag: emphasis
#: index.docbook:899
#, no-c-format
msgid "Test your regular expressions"
msgstr ""

#. Tag: para
#: index.docbook:899
#, no-c-format
msgid ""
"This button shows a dialog that allows you to improve and test the regular "
"expressions above. Just copy the respective data from your files into the "
"example lines. The \"Match results\" will immediately show whether the match "
"succeeds or not. The \"Sort key result\" will display the key used for "
"history merge sorting."
msgstr ""

#. Tag: emphasis
#: index.docbook:905
#, no-c-format
msgid "Irrelevant merge command:"
msgstr ""

#. Tag: para
#: index.docbook:905
#, no-c-format
msgid ""
"Specify a command of your own that should be called when &kdiff3; detects "
"that for a three file merge the file from B doesn't contribute any relevant "
"data that isn't already contained in the file from C. The command is called "
"with the three filenames as parameters. Data matched by the \"Auto merge "
"regular expression\" or in the history isn't considered relevant."
msgstr ""

#. Tag: title
#: index.docbook:917
#, no-c-format
msgid "Directory Merge"
msgstr ""

#. Tag: para
#: index.docbook:918
#, no-c-format
msgid ""
"These options are concerned with scanning the directory and handling the "
"merge: See the <link linkend=\"dirmergeoptions\">Directory Comparison/Merge "
"Docs</link> for details."
msgstr ""

#. Tag: para
#: index.docbook:922
#, no-c-format
msgid ""
"Yet there is one option here that is also relevant for saving single files:"
msgstr ""

#. Tag: emphasis
#: index.docbook:926 index.docbook:1628
#, no-c-format
msgid "Backup files:"
msgstr ""

#. Tag: para
#: index.docbook:926
#, no-c-format
msgid ""
"When a file is saved and an older version already exists, then the original "
"version will be renamed with an \".orig\" extension. If an old backup file "
"with \".orig\" extension already exists then this will be deleted without "
"backup."
msgstr ""

#. Tag: title
#: index.docbook:934
#, no-c-format
msgid "Regional and Language Options"
msgstr ""

#. Tag: emphasis
#: index.docbook:936
#, no-c-format
msgid "Language:"
msgstr ""

#. Tag: para
#: index.docbook:936
#, no-c-format
msgid ""
"Adjust the language of the user interface. Changing this option doesn't "
"affect the running program. You have to exit and restart &kdiff3; so that "
"the language is changed. (This option is not available in the KDE version of "
"&kdiff3; because the language is adjustable in the global KDE settings.)"
msgstr ""

#. Tag: emphasis
#: index.docbook:938
#, no-c-format
msgid "Use the same encoding for everything:"
msgstr ""

#. Tag: para
#: index.docbook:938
#, no-c-format
msgid ""
"The following encoding options can be adjusted separately for each item or "
"if this option is true, all values will take the first value."
msgstr ""

#. Tag: emphasis
#: index.docbook:940
#, no-c-format
msgid "Local Encoding:"
msgstr ""

#. Tag: para
#: index.docbook:940
#, no-c-format
msgid ""
"Above the codec-selectors appears a note that tells you what the local "
"encoding is. (This is not adjustable but for your information just in case "
"you don't know your local encoding, but need to select it.)"
msgstr ""

#. Tag: emphasis
#: index.docbook:942
#, no-c-format
msgid "File Encoding for A/B/C:"
msgstr ""

#. Tag: para
#: index.docbook:942
#, no-c-format
msgid ""
"Adjust the file encoding for input files. This has an effect on how the "
"special characters are interpreted. Since you can adjust each codec "
"separately you can even compare and merge files that were saved using "
"different codecs."
msgstr ""

#. Tag: emphasis
#: index.docbook:944
#, no-c-format
msgid "File Encoding for Merge Output and Saving:"
msgstr ""

#. Tag: para
#: index.docbook:944
#, no-c-format
msgid ""
"When you have edited a file, then you can adjust which encoding will be used "
"when saving to disk."
msgstr ""

#. Tag: emphasis
#: index.docbook:946
#, no-c-format
msgid "File Encoding for Preprocessor Files:"
msgstr ""

#. Tag: para
#: index.docbook:946
#, no-c-format
msgid ""
"When you define preprocessors then they might not be able to operate on your "
"codec. (e.g.: Your files are 16-bit-unicode and your preprocessor can only "
"take 8-bit-ascii.) With this option you can define the encoding of "
"preprocessor output."
msgstr ""

#. Tag: emphasis
#: index.docbook:948
#, no-c-format
msgid "Right To Left Language:"
msgstr ""

#. Tag: para
#: index.docbook:948
#, no-c-format
msgid ""
"Some languages are written right to left. When this option is enabled, "
"&kdiff3; draws the text from right to left in the diff input windows and in "
"the merge output window. Note that if you start &kdiff3; with the command "
"line option \"--reverse\" then all layouting will be done right to left too. "
"(This is a feature provided by Qt.) This documentation was written assuming "
"that \"Right To Left Language\" or reverse layout are disabled. So some "
"references to \"left\" or \"right\" must be replaced by their respective "
"counterpart if you use these options."
msgstr ""

#. Tag: title
#: index.docbook:954
#, no-c-format
msgid "Miscellaneous"
msgstr ""

#. Tag: para
#: index.docbook:955
#, no-c-format
msgid "(These options and actions are available in menus or the buttonbar.)"
msgstr ""

#. Tag: emphasis
#: index.docbook:957
#, no-c-format
msgid "Show line numbers:"
msgstr ""

#. Tag: para
#: index.docbook:957
#, no-c-format
msgid "You can select if line numbers should be shown for the input files."
msgstr ""

#. Tag: emphasis
#: index.docbook:959
#, no-c-format
msgid "Show space and tabulator characters for differences:"
msgstr ""

#. Tag: para
#: index.docbook:959
#, no-c-format
msgid ""
"Sometimes the visible spaces and tabs are disturbing. You can turn this off."
msgstr ""

#. Tag: emphasis
#: index.docbook:961
#, no-c-format
msgid "Show white space:"
msgstr ""

#. Tag: para
#: index.docbook:961
#, no-c-format
msgid ""
"Turn this off to suppress any highlighting of white-space-only changes in "
"the text or overview-columns. (Note that this also applies to changes in "
"numbers or comments if the options \"Ignore numbers\" or \"Ignore C/C++ "
"comments\" are active.)"
msgstr ""

#. Tag: emphasis
#: index.docbook:965
#, no-c-format
msgid "Overview options:"
msgstr ""

#. Tag: para
#: index.docbook:965
#, no-c-format
msgid ""
"These choices are only available when you compare three files. In normal "
"mode all differences are shown in one color-coded overview-column. But "
"sometimes you are especially interested in the differences between only two "
"of these three files. Selecting \"A vs. B\", \"A vs. C\" or \"B vs. C\"-"
"overview will show a second overview column with the required information "
"next to the normal overview."
msgstr ""

#. Tag: emphasis
#: index.docbook:972
#, no-c-format
msgid "Word wrap diff windows:"
msgstr ""

#. Tag: para
#: index.docbook:972
#, no-c-format
msgid "Wrap lines when their length would exceed the width of a window."
msgstr ""

#. Tag: emphasis
#: index.docbook:975
#, no-c-format
msgid "Show Window A/B/C:"
msgstr ""

#. Tag: para
#: index.docbook:975
#, no-c-format
msgid ""
"Sometimes you want to use the space on the screen better for long lines. "
"Hide the windows that are not important. (In the Windows-menu.)"
msgstr ""

#. Tag: emphasis
#: index.docbook:978
#, no-c-format
msgid "Toggle Split Orientation:"
msgstr ""

#. Tag: para
#: index.docbook:978
#, no-c-format
msgid ""
"Switch between diff windows shown next to each other (A left of B left of C) "
"or above each other (A above B above C). This should also help for long "
"lines. (In the Windows-menu.)"
msgstr ""

#. Tag: emphasis
#: index.docbook:982
#, no-c-format
msgid "Start a merge quickly:"
msgstr ""

#. Tag: para
#: index.docbook:982
#, no-c-format
msgid ""
"Sometimes you are viewing the deltas and decide to merge. "
"<inlinemediaobject><imageobject><imagedata fileref=\"merge_current.png\" "
"format=\"PNG\"/></imageobject></inlinemediaobject> \"Merge current file\" in "
"the Directory-menu also works if you only compare two files. A single click "
"starts the merge and uses the filename of the last input-file as the default "
"output filename. (When this is used to restart a merge, then the output "
"filename will be preserved.)"
msgstr ""

#. Tag: title
#: index.docbook:992
#, no-c-format
msgid "Configuring Keyboard-Shortcuts"
msgstr ""

#. Tag: para
#: index.docbook:993
#, no-c-format
msgid ""
"Currently only the KDE-version supports user-configurable keyboard-"
"shortcuts. (Menu Settings->Configure Shortcuts...)"
msgstr ""

#. Tag: title
#: index.docbook:1000
#, no-c-format
msgid "Preprocessor Commands"
msgstr ""

#. Tag: para
#: index.docbook:1001
#, no-c-format
msgid "&kdiff3; supports two preprocessor options."
msgstr ""

#. Tag: para
#: index.docbook:1005
#, no-c-format
msgid ""
"When any file is read, it will be piped through this external command. The "
"output of this command will be visible instead of the original file. You can "
"write your own preprocessor that fulfills your specific needs. Use this to "
"cut away disturbing parts of the file, or to automatically correct the "
"indentation etc."
msgstr ""

#. Tag: para
#: index.docbook:1012
#, no-c-format
msgid ""
"When any file is read, it will be piped through this external command. If a "
"preprocessor-command (see above) is also specified, then the output of the "
"preprocessor is the input of the line-matching preprocessor. The output will "
"only be used during the line matching phase of the analysis. You can write "
"your own preprocessor that fulfills your specific needs. Each input line "
"must have a corresponding output line."
msgstr ""

#. Tag: para
#: index.docbook:1022
#, no-c-format
msgid ""
"The idea is to allow the user greater flexibility while configuring the diff-"
"result. But this requires an external program, and many users don't want to "
"write one themselves. The good news is that very often <command>sed</"
"command> or <command>perl</command> will do the job."
msgstr ""

#. Tag: para
#: index.docbook:1028
#, no-c-format
msgid ""
"Example: Simple testcase: Consider file a.txt (6 lines): <screen>\n"
"      aa\n"
"      ba\n"
"      ca\n"
"      da\n"
"      ea\n"
"      fa\n"
"</screen> And file b.txt (3 lines): <screen>\n"
"      cg\n"
"      dg\n"
"      eg\n"
"</screen> Without a preprocessor the following lines would be placed next to "
"each other: <screen>\n"
"      aa - cg\n"
"      ba - dg\n"
"      ca - eg\n"
"      da\n"
"      ea\n"
"      fa\n"
"</screen> This is probably not wanted since the first letter contains the "
"actually interesting information. To help the matching algorithm to ignore "
"the second letter we can use a line matching preprocessor command, that "
"replaces 'g' with 'a': <screen>\n"
"   <command>sed</command> 's/g/a/'\n"
"</screen> With this command the result of the comparison would be: <screen>\n"
"      aa\n"
"      ba\n"
"      ca - cg\n"
"      da - dg\n"
"      ea - eg\n"
"      fa\n"
"</screen> Internally the matching algorithm sees the files after running the "
"line matching preprocessor, but on the screen the file is unchanged. (The "
"normal preprocessor would change the data also on the screen.)"
msgstr ""

#. Tag: title
#: index.docbook:1045
#, no-c-format
msgid "<command>sed</command> Basics"
msgstr ""

#. Tag: para
#: index.docbook:1046
#, no-c-format
msgid ""
"This section only introduces some very basic features of <command>sed</"
"command>. For more information see <ulink url=\"info:/sed\">info:/sed</"
"ulink> or <ulink url=\"http://www.gnu.org/software/sed/manual/html_mono/sed."
"html\"> http://www.gnu.org/software/sed/manual/html_mono/sed.html</ulink>. A "
"precompiled version for Windows can be found at <ulink url=\"http://unxutils."
"sourceforge.net\"> http://unxutils.sourceforge.net</ulink>. Note that the "
"following examples assume that the <command>sed</command>-command is in some "
"directory in the PATH-environment variable. If this is not the case, you "
"have to specify the full absolute path for the command."
msgstr ""

#. Tag: para
#: index.docbook:1057
#, no-c-format
msgid ""
"Also note that the following examples use the single quotation mark (') "
"which won't work for Windows. On Windows you should use the double quotation "
"marks (\") instead."
msgstr ""

#. Tag: para
#: index.docbook:1059
#, no-c-format
msgid ""
"In this context only the <command>sed</command>-substitute-command is used: "
"<screen>\n"
"   <command>sed</command> 's/<replaceable>REGEXP</replaceable>/"
"<replaceable>REPLACEMENT</replaceable>/<replaceable>FLAGS</replaceable>'\n"
"</screen> Before you use a new command within &kdiff3;, you should first "
"test it in a console. Here the <command>echo</command>-command is useful. "
"Example: <screen>\n"
"   <command>echo</command> abrakadabra | <command>sed</command> 's/a/o/'\n"
"   -> obrakadabra\n"
"</screen> This example shows a very simple sed-command that replaces the "
"first occurance of \"a\" with \"o\". If you want to replace all occurances "
"then you need the \"g\"-flag: <screen>\n"
"   <command>echo</command> abrakadabra | <command>sed</command> 's/a/o/g'\n"
"   -> obrokodobro\n"
"</screen> The \"|\"-symbol is the pipe-command that transfers the output of "
"the previous command to the input of the following command. If you want to "
"test with a longer file then you can use <command>cat</command> on Unix-like "
"systems or <command>type</command> on Windows-like systems. <command>sed</"
"command> will do the substitution for each line."
msgstr ""

#. Tag: screen
#: index.docbook:1072
#, no-c-format
msgid ""
"<command>cat</command> <replaceable>filename</replaceable> | <command>sed</"
"command> <replaceable>options</replaceable>"
msgstr ""

#. Tag: title
#: index.docbook:1075
#, no-c-format
msgid "Examples For <command>sed</command>-Use In &kdiff3;"
msgstr ""

#. Tag: title
#: index.docbook:1076
#, no-c-format
msgid "Ignoring Other Types Of Comments"
msgstr ""

#. Tag: para
#: index.docbook:1077
#, no-c-format
msgid ""
"Currently &kdiff3; understands only C/C++ comments. Using the Line-Matching-"
"Preprocessor-Command you can also ignore other types of comments, by "
"converting them into C/C++-comments. Example: To ignore comments starting "
"with \"#\", you would like to convert them to \"//\". Note that you also "
"must enable the \"Ignore C/C++-Comments\" option to get an effect. An "
"appropriate Line-Matching-Preprocessor-Command would be: <screen>\n"
"   <command>sed</command> 's/#/\\/\\//'\n"
"</screen> Since for <command>sed</command> the \"/\"-character has a special "
"meaning, it is necessary to place the \"\\\"-character before each \"/\" in "
"the replacement-string. Sometimes the \"\\\" is required to add or remove a "
"special meaning of certain characters. The single quotation marks (') before "
"and after the substitution-command are important now, because otherwise the "
"shell will try to interpret some special characters like '#', '$' or '\\' "
"before passing them to <command>sed</command>. <emphasis>Note that on "
"Windows you will need the double quotation marks (\") here. Windows "
"substitutes other characters like '%', so you might have to experiment a "
"little bit.</emphasis>"
msgstr ""

#. Tag: title
#: index.docbook:1096
#, no-c-format
msgid "Caseinsensitive Diff"
msgstr ""

#. Tag: para
#: index.docbook:1097
#, no-c-format
msgid ""
"Use the following Line-Matching-Preprocessor-Command to convert all input to "
"uppercase: <screen>\n"
"   <command>sed</command> 's/\\(.*\\)/\\U\\1/'\n"
"</screen> Here the \".*\" is a regular expression that matches any string "
"and in this context matches all characters in the line. The \"\\1\" in the "
"replacement string refers to the matched text within the first pair of "
"\"\\(\" and \"\\)\". The \"\\U\" converts the inserted text to uppercase."
msgstr ""

#. Tag: title
#: index.docbook:1107
#, no-c-format
msgid "Ignoring Version Control Keywords"
msgstr ""

#. Tag: para
#: index.docbook:1108
#, no-c-format
msgid ""
"CVS and other version control systems use several keywords to insert "
"automatically generated strings (<ulink url=\"info:/cvs/Keyword substitution"
"\">info:/cvs/Keyword substitution</ulink>). All of them follow the pattern "
"\"$KEYWORD generated text$\". We now need a Line-Matching-Preprocessor-"
"Command that removes only the generated text: <screen>\n"
"   <command>sed</command> 's/\\$\\(Revision\\|Author\\|Log\\|Header\\|Date"
"\\).*\\$/\\$\\1\\$/'\n"
"</screen> The \"\\|\" separates the possible keywords. You might want to "
"modify this list according to your needs. The \"\\\" before the \"$\" is "
"necessary because otherwise the \"$\" matches the end of the line."
msgstr ""

#. Tag: para
#: index.docbook:1118
#, no-c-format
msgid ""
"While experimenting with <command>sed</command> you might come to understand "
"and even like these regular expressions. They are useful because there are "
"many other programs that also support similar things."
msgstr ""

#. Tag: title
#: index.docbook:1125
#, no-c-format
msgid "Ignoring Numbers"
msgstr ""

#. Tag: para
#: index.docbook:1126
#, no-c-format
msgid ""
"Ignoring numbers actually is a built-in option. But as another example, this "
"is how it would look as a Line-Matching-Preprocessor-command. <screen>\n"
"   <command>sed</command> 's/[0123456789.-]//g'\n"
"</screen> Any character within '[' and ']' is a match and will be replaced "
"with nothing."
msgstr ""

#. Tag: title
#: index.docbook:1134
#, no-c-format
msgid "Ignoring Certain Columns"
msgstr ""

#. Tag: para
#: index.docbook:1135
#, no-c-format
msgid ""
"Sometimes a text is very strictly formatted, and contains columns that you "
"always want to ignore, while there are other columns you want to preserve "
"for analysis. In the following example the first five columns (characters) "
"are ignored, the next ten columns are preserved, then again five columns are "
"ignored and the rest of the line is preserved. <screen>\n"
"   <command>sed</command> 's/.....\\(..........\\).....\\(.*\\)/\\1\\2/'\n"
"</screen> Each dot '.' matches any single character. The \"\\1\" and \"\\2\" "
"in the replacement string refer to the matched text within the first and "
"second pair of \"\\(\" and \"\\)\" denoting the text to be preserved."
msgstr ""

#. Tag: title
#: index.docbook:1145
#, no-c-format
msgid "Combining Several Substitutions"
msgstr ""

#. Tag: para
#: index.docbook:1146
#, no-c-format
msgid ""
"Sometimes you want to apply several substitutions at once. You can then use "
"the semicolon ';' to separate these from each other. Example:"
msgstr ""

#. Tag: screen
#: index.docbook:1149
#, no-c-format
msgid ""
"<command>echo</command> abrakadabra | <command>sed</command> 's/a/o/g;s/\\(.*"
"\\)/\\U\\1/'\n"
"   -> OBROKODOBRO"
msgstr ""

#. Tag: title
#: index.docbook:1153
#, no-c-format
msgid "Using <command>perl</command> instead of <command>sed</command>"
msgstr ""

#. Tag: para
#: index.docbook:1154
#, no-c-format
msgid ""
"Instead of <command>sed</command> you might want to use something else like "
"<command>perl</command>. <screen>\n"
"   <command>perl</command> -p -e 's/<replaceable>REGEXP</replaceable>/"
"<replaceable>REPLACEMENT</replaceable>/<replaceable>FLAGS</replaceable>'\n"
"</screen> But some details are different in <command>perl</command>. Note "
"that where <command>sed</command> needed \"\\(\" and \"\\)\" <command>perl</"
"command> requires the simpler \"(\" and \")\" without preceding '\\'. "
"Example:"
msgstr ""

#. Tag: screen
#: index.docbook:1161
#, no-c-format
msgid ""
"<command>sed</command> 's/\\(.*\\)/\\U\\1/'\n"
"   <command>perl</command> -p -e 's/(.*)/\\U\\1/'"
msgstr ""

#. Tag: title
#: index.docbook:1166
#, no-c-format
msgid "Order Of Preprocessor Execution"
msgstr ""

#. Tag: para
#: index.docbook:1167
#, no-c-format
msgid ""
"The data is piped through all internal and external preprocessors in the "
"following order:"
msgstr ""

#. Tag: para
#: index.docbook:1172
#, no-c-format
msgid "Normal preprocessor,"
msgstr ""

#. Tag: para
#: index.docbook:1173
#, no-c-format
msgid "Line-Matching-Preprocessor,"
msgstr ""

#. Tag: para
#: index.docbook:1174
#, no-c-format
msgid "Ignore case (conversion to uppercase),"
msgstr ""

#. Tag: para
#: index.docbook:1175
#, no-c-format
msgid "Detection of C/C++ comments,"
msgstr ""

#. Tag: para
#: index.docbook:1176
#, no-c-format
msgid "Ignore numbers,"
msgstr ""

#. Tag: para
#: index.docbook:1177
#, no-c-format
msgid "Ignore white space"
msgstr ""

#. Tag: para
#: index.docbook:1179
#, no-c-format
msgid ""
"The data after the normal preprocessor will be preserved for display and "
"merging. The other operations only modify the data that the line-matching-"
"diff-algorithm sees."
msgstr ""

#. Tag: para
#: index.docbook:1182
#, no-c-format
msgid ""
"In the rare cases where you use a normal preprocessor note that the line-"
"matching-preprocessor sees the output of the normal preprocessor as input."
msgstr ""

#. Tag: title
#: index.docbook:1188
#, no-c-format
msgid "Warning"
msgstr ""

#. Tag: para
#: index.docbook:1189
#, no-c-format
msgid ""
"The preprocessor-commands are often very useful, but as with any option that "
"modifies your texts or hides away certain differences automatically, you "
"might accidentally overlook certain differences and in the worst case "
"destroy important data."
msgstr ""

#. Tag: para
#: index.docbook:1193
#, no-c-format
msgid ""
"For this reason during a merge if a normal preprocessor-command is being "
"used &kdiff3; will tell you so and ask you if it should be disabled or not. "
"But it won't warn you if a Line-Matching-Preprocessor-command is active. The "
"merge will not complete until all conflicts are solved. If you disabled "
"\"Show White Space\" then the differences that were removed with the Line-"
"Matching-Preprocessor-command will also be invisible. If the Save-button "
"remains disabled during a merge (because of remaining conflicts), make sure "
"to enable \"Show White Space\". If you don't wan't to merge these less "
"important differences manually you can select \"Choose [A|B|C] For All "
"Unsolved White space Conflicts\" in the Merge-menu."
msgstr ""

#. Tag: title
#: index.docbook:1208
#, no-c-format
msgid "Directory Comparison and Merge with &kdiff3;"
msgstr ""

#. Tag: title
#: index.docbook:1209
#, no-c-format
msgid "Introduction into Directory Comparison and Merge"
msgstr ""

#. Tag: para
#: index.docbook:1210
#, no-c-format
msgid ""
"Often programmers must modify many files in a directory to achieve their "
"purpose. For this &kdiff3; also lets you compare and merge complete "
"directories recursively!"
msgstr ""

#. Tag: para
#: index.docbook:1214
#, no-c-format
msgid ""
"Even though comparing and merging directories seems to be quite obvious, "
"there are several details that you should know about. Most important is of "
"course the fact that now many files might be affected by each operation. If "
"you don't have backups of your original data, then it can be very hard or "
"even impossible to return to the original state. So before starting a merge, "
"make sure that your data is safe, and going back is possible. If you make an "
"archive or use some version control system is your decision, but even "
"experienced programmers and integrators need the old sources now and then. "
"And note that even though I (the author of &kdiff3;) try to do my best, I "
"can't guarantee that there are no bugs. According to the GNU-GPL there is NO "
"WARRANTY whatsoever for this program. So be humble and always keep in mind:"
msgstr ""

#. Tag: emphasis
#: index.docbook:1228
#, no-c-format
msgid "To err is human, but to really mess things up you need a computer."
msgstr ""

#. Tag: para
#: index.docbook:1230
#, no-c-format
msgid "So this is what this program can do for you: &kdiff3; ..."
msgstr ""

#. Tag: para
#: index.docbook:1234
#, no-c-format
msgid "... reads and compares two or three directories recursively,"
msgstr ""

#. Tag: para
#: index.docbook:1235
#, no-c-format
msgid "... takes special care of symbolic links,"
msgstr ""

#. Tag: para
#: index.docbook:1236
#, no-c-format
msgid "... lets you browse files on mouse double click,"
msgstr ""

#. Tag: para
#: index.docbook:1237
#, no-c-format
msgid ""
"... for each item proposes a merge operation, which you can change before "
"starting the directory merge,"
msgstr ""

#. Tag: para
#: index.docbook:1239
#, no-c-format
msgid ""
"... lets you simulate the merge and lists the actions that would take place, "
"without actually doing them,"
msgstr ""

#. Tag: para
#: index.docbook:1241
#, no-c-format
msgid ""
"... lets you really do the merge, and lets you interact whenever manual "
"interaction is needed,"
msgstr ""

#. Tag: para
#: index.docbook:1243
#, no-c-format
msgid ""
"... lets you run the selected operation for all items (key F7) or the "
"selected item (key F6),"
msgstr ""

#. Tag: para
#: index.docbook:1244
#, no-c-format
msgid "... lets you continue the merge after manual interaction with key F7,"
msgstr ""

#. Tag: para
#: index.docbook:1245
#, no-c-format
msgid "... optionally creates backups, with the \".orig\" extension,"
msgstr ""

#. Tag: title
#: index.docbook:1250
#, no-c-format
msgid "Starting Directory Comparison Or Merge"
msgstr ""

#. Tag: para
#: index.docbook:1251
#, no-c-format
msgid ""
"This is very similar to the single file merge and comparison. You just have "
"to specify directories on the command line or in the file-open dialog."
msgstr ""

#. Tag: title
#: index.docbook:1256
#, no-c-format
msgid "Compare/Merge two directories:"
msgstr ""

#. Tag: screen
#: index.docbook:1257
#, no-c-format
msgid ""
"<command>kdiff3</command> <replaceable>dir1 dir2</replaceable>\n"
"   <command>kdiff3</command> <replaceable>dir1 dir2</replaceable> -o "
"<replaceable>destdir</replaceable>"
msgstr ""

#. Tag: para
#: index.docbook:1258
#, no-c-format
msgid ""
"If no destination directory is specified, then &kdiff3; will use "
"<replaceable>dir2</replaceable>."
msgstr ""

#. Tag: title
#: index.docbook:1263
#, no-c-format
msgid "Compare/Merge three directories:"
msgstr ""

#. Tag: screen
#: index.docbook:1264
#, no-c-format
msgid ""
"<command>kdiff3</command> <replaceable>dir1 dir2 dir3</replaceable>\n"
"   <command>kdiff3</command> <replaceable>dir1 dir2 dir3</replaceable> -o "
"<replaceable>destdir</replaceable>"
msgstr ""

#. Tag: para
#: index.docbook:1265
#, no-c-format
msgid ""
"When three directories are merged then <replaceable>dir1</replaceable> is "
"used as the base for the merge. If no destination directory is specified, "
"then &kdiff3; will use <replaceable>dir3</replaceable> as the destination "
"directory for the merge."
msgstr ""

#. Tag: para
#: index.docbook:1272
#, no-c-format
msgid ""
"Note that only the comparison starts automatically, not the merge. For this "
"you first must select a menu entry or the key F7. (More details later.)"
msgstr ""

#. Tag: title
#: index.docbook:1279
#, no-c-format
msgid "Directory Merge Visible Information"
msgstr ""

#. Tag: para
#: index.docbook:1280
#, no-c-format
msgid ""
"While reading the directories a message-box appears that informs you of the "
"progress. If you abort the directory scan, then only files that have been "
"compared until then will be listed."
msgstr ""

#. Tag: para
#: index.docbook:1284
#, no-c-format
msgid ""
"When the directory scan is complete then &kdiff3; will show a listbox with "
"the results left, ..."
msgstr ""

#. Tag: para
#: index.docbook:1291
#, no-c-format
msgid "... and details about the currently selected item on the right:"
msgstr ""

#. Tag: title
#: index.docbook:1299
#, no-c-format
msgid "The Name Column"
msgstr ""

#. Tag: para
#: index.docbook:1300
#, no-c-format
msgid ""
"Each file and directory that was found during the scan is shown here in a "
"tree. You can select an item by clicking it with the mouse once."
msgstr ""

#. Tag: para
#: index.docbook:1303
#, no-c-format
msgid ""
"The directories are collapsed by default. You can expand and collapse them "
"by clicking on the \"+\"/\"-\" or by double-clicking the item or by using "
"the left/right-arrow-keys. The \"Directory\"-menu also contains two actions "
"\"Fold all subdirs\" and \"Unfold all subdirs\" with which you can collapse "
"or expand all directories at once."
msgstr ""

#. Tag: para
#: index.docbook:1309
#, no-c-format
msgid ""
"If you double-click a file item then the file comparison starts and the file-"
"diff-window will appear."
msgstr ""

#. Tag: para
#: index.docbook:1313
#, no-c-format
msgid ""
"The image in the name column reflects the file type in the first directory "
"(\"A\"). It can be one of these:"
msgstr ""

#. Tag: para
#: index.docbook:1318
#, no-c-format
msgid "Normal file"
msgstr ""

#. Tag: para
#: index.docbook:1319
#, no-c-format
msgid "Normal directory (directory-image)"
msgstr ""

#. Tag: para
#: index.docbook:1320
#, no-c-format
msgid "Link to a file (file-image with a link arrow)"
msgstr ""

#. Tag: para
#: index.docbook:1321
#, no-c-format
msgid "Link to a directory (directory-image with a link arrow)"
msgstr ""

#. Tag: para
#: index.docbook:1323
#, no-c-format
msgid ""
"If the file type is different in the other directories, then this is visible "
"in the columns A/B/C and in the window that shows the details about the "
"selected item. Note that for such a case no merge operation can be selected "
"automatically. When starting the merge, then the user will be informed of "
"problems of that kind."
msgstr ""

#. Tag: title
#: index.docbook:1332
#, no-c-format
msgid "The Columns A/B/C and the Coloring Scheme"
msgstr ""

#. Tag: para
#: index.docbook:1333
#, no-c-format
msgid ""
"As can be seen in the image above the colors red, green, yellow and black "
"are used in the columns A/B/C."
msgstr ""

#. Tag: para
#: index.docbook:1338
#, no-c-format
msgid "Black: This item doesn't exist in this directory."
msgstr ""

#. Tag: para
#: index.docbook:1339
#, no-c-format
msgid "Green: Newest item."
msgstr ""

#. Tag: para
#: index.docbook:1340
#, no-c-format
msgid "Yellow: Older than green, newer than red."
msgstr ""

#. Tag: para
#: index.docbook:1341
#, no-c-format
msgid "Red: Oldest item."
msgstr ""

#. Tag: para
#: index.docbook:1343
#, no-c-format
msgid ""
"But for items that were identical in the comparison their color also is "
"identical even if the age is not."
msgstr ""

#. Tag: para
#: index.docbook:1346
#, no-c-format
msgid ""
"Directories are considered equal if all items they contain are identical. "
"Then they also will have the same color. But the age of a directory is not "
"considered for its color."
msgstr ""

#. Tag: para
#: index.docbook:1350
#, no-c-format
msgid ""
"The idea for this coloring scheme I came upon in <ulink url=\"http://samba."
"org/cgi-bin/cvsweb/dirdiff\">dirdiff</ulink>. The colors resemble the colors "
"of a leaf that is green when new, turns yellow later and red when old."
msgstr ""

#. Tag: title
#: index.docbook:1357
#, no-c-format
msgid "The Operation Column"
msgstr ""

#. Tag: para
#: index.docbook:1358
#, no-c-format
msgid ""
"After comparing the directories &kdiff3; also evaluates a proposal for a "
"merge operation. This is shown in the \"Operation\" column. You can modify "
"the operation by clicking on the operation you want to change. A small menu "
"will popup and allows you to select an operation for that item. (You can "
"also select the most needed operations via keyboard. Ctrl+1/2/3/4/Del will "
"select A/B/C/Merge/Delete respectively if available.) This operation will be "
"executed during the merge. It depends on the item and on the merge-mode you "
"are in, what operations are available. The merge-mode is one of"
msgstr ""

#. Tag: para
#: index.docbook:1369
#, no-c-format
msgid "Three directory-merge (\"A\" is treated as older base of both)."
msgstr ""

#. Tag: para
#: index.docbook:1370
#, no-c-format
msgid "Two directory-merge."
msgstr ""

#. Tag: para
#: index.docbook:1371
#, no-c-format
msgid ""
"Two directory-sync-mode (activate via option \"Synchronize Directories\")."
msgstr ""

#. Tag: para
#: index.docbook:1373
#, no-c-format
msgid ""
"In three directory merge the operation proposal will be: If for an item ..."
msgstr ""

#. Tag: para
#: index.docbook:1377
#, no-c-format
msgid "... all three directories are equal: Copy from C"
msgstr ""

#. Tag: para
#: index.docbook:1378
#, no-c-format
msgid ""
"... A and C are equal but B is not: Copy from B (or if B does not exist, "
"delete the destination if exists)"
msgstr ""

#. Tag: para
#: index.docbook:1380
#, no-c-format
msgid ""
"... A and B are equal but C is not: Copy from C (or if C does not exist, "
"delete the destination if exists)"
msgstr ""

#. Tag: para
#: index.docbook:1382
#, no-c-format
msgid ""
"... B and C are equal but A is not: Copy from C (or if C does not exist, "
"delete the destination if exists)"
msgstr ""

#. Tag: para
#: index.docbook:1384
#, no-c-format
msgid "... only A exists: Delete the destination (if exists)"
msgstr ""

#. Tag: para
#: index.docbook:1385
#, no-c-format
msgid "... only B exists: Copy from B"
msgstr ""

#. Tag: para
#: index.docbook:1386
#, no-c-format
msgid "... only C exists: Copy from C"
msgstr ""

#. Tag: para
#: index.docbook:1387
#, no-c-format
msgid "... A, B and C are not equal: Merge"
msgstr ""

#. Tag: para
#: index.docbook:1388
#, no-c-format
msgid ""
"... A, B and C don't have the same file type (e.g. A is a directory, B is a "
"file): \"Error: Conflicting File Types\". While such items exist the "
"directory merge cannot start."
msgstr ""

#. Tag: para
#: index.docbook:1392
#, no-c-format
msgid ""
"In two directory merge the operation proposal will be: If for an item ..."
msgstr ""

#. Tag: para
#: index.docbook:1396
#, no-c-format
msgid "... both directories are equal: Copy from B"
msgstr ""

#. Tag: para
#: index.docbook:1397
#, no-c-format
msgid "... A exists, but not B: Copy from A"
msgstr ""

#. Tag: para
#: index.docbook:1398
#, no-c-format
msgid "... B exists, but not A: Copy from B"
msgstr ""

#. Tag: para
#: index.docbook:1399
#, no-c-format
msgid "... A and B exist but are not equal: Merge"
msgstr ""

#. Tag: para
#: index.docbook:1400 index.docbook:1417
#, no-c-format
msgid ""
"... A and B don't have the same file type (e.g. A is a directory, B is a "
"file): \"Error: Conflicting File Types\". While such items exist the "
"directory merge cannot start."
msgstr ""

#. Tag: para
#: index.docbook:1404
#, no-c-format
msgid ""
"Sync-mode is active if only two directories and no explicit destination were "
"specified and if the option \"Synchronize directories\" is active. &kdiff3; "
"then selects a default operation so that both directories are the same "
"afterwards. If for an item ..."
msgstr ""

#. Tag: para
#: index.docbook:1411
#, no-c-format
msgid "... both directories are equal: Nothing will be done."
msgstr ""

#. Tag: para
#: index.docbook:1412
#, no-c-format
msgid "... A exists, but not B: Copy A to B"
msgstr ""

#. Tag: para
#: index.docbook:1413
#, no-c-format
msgid "... B exists, but not A: Copy B to A"
msgstr ""

#. Tag: para
#: index.docbook:1414
#, no-c-format
msgid ""
"... A and B exist, but are not equal: Merge and store the result in both "
"directories. (For the user the visible save-filename is B, but then &kdiff3; "
"copies B also to A.)"
msgstr ""

#. Tag: para
#: index.docbook:1421
#, no-c-format
msgid ""
"When two directories are merged and the option \"Copy newer instead of "
"merging\" is selected, then &kdiff3; looks at the dates and proposes to "
"choose the newer file. If the files are not equal but have equal dates, then "
"the operation will contain \"Error: Dates are equal but files are not.\" "
"While such items exist the directory merge cannot start."
msgstr ""

#. Tag: title
#: index.docbook:1430
#, no-c-format
msgid "The Status Column"
msgstr ""

#. Tag: para
#: index.docbook:1431
#, no-c-format
msgid ""
"During the merge one file after the other will be processed. The status "
"column will show \"Done\" for items where the merge operation has succeeded, "
"and other texts if something unexpected happened. When a merge is complete, "
"then you should make a last check to see if the status for all items is "
"agreeable."
msgstr ""

#. Tag: title
#: index.docbook:1440
#, no-c-format
msgid "Statistics Columns"
msgstr ""

#. Tag: para
#: index.docbook:1441
#, no-c-format
msgid ""
"When the file comparison mode \"Full Analysis\" is enabled in the options, "
"then &kdiff3; will show extra columns containing the numbers of unsolved, "
"solved, nonwhite and whitespace conflicts. (The solved-column will only show "
"when comparing or merging three directories.)"
msgstr ""

#. Tag: title
#: index.docbook:1448
#, no-c-format
msgid "Selecting Listed Files"
msgstr ""

#. Tag: para
#: index.docbook:1449
#, no-c-format
msgid ""
"Several options influence which files are listed here. Some are accessible "
"in the <link linkend=\"dirmergeoptions\">settings dialog</link>. The "
"Directory-menu contains the entries:"
msgstr ""

#. Tag: para
#: index.docbook:1453
#, no-c-format
msgid ""
"\"Show Identical Files\": Files that have been detected equal in all input "
"directories."
msgstr ""

#. Tag: para
#: index.docbook:1454
#, no-c-format
msgid ""
"\"Show Different Files\": Files that exist in two or more directories but "
"are not equal."
msgstr ""

#. Tag: para
#: index.docbook:1455
#, no-c-format
msgid ""
"\"Show Files only in A\": Files that exist only in A, but not in B or C."
msgstr ""

#. Tag: para
#: index.docbook:1456
#, no-c-format
msgid ""
"\"Show Files only in B\": Files that exist only in B, but not in A or B."
msgstr ""

#. Tag: para
#: index.docbook:1457
#, no-c-format
msgid ""
"\"Show Files only in C\": Files that exist only in C, but not in A or B."
msgstr ""

#. Tag: para
#: index.docbook:1459
#, no-c-format
msgid ""
"Activate only the \"Show\"-options for the items you want listed. If for "
"example you only want to list all items that exist either in A or in B but "
"not in both, you'll have to activate \"Show Files only in A\" and \"Show "
"Files only in B\" and deactivate all others (\"Show Identical Files\", "
"\"Show Different Files\", \"Show Files only in C\"). The list will be "
"updated immediately to reflect the change."
msgstr ""

#. Tag: para
#: index.docbook:1464
#, no-c-format
msgid ""
"These options also apply for directories with one exception: Disabling "
"\"Show Different Files\" will not hide any complete directories. This will "
"work only for files within."
msgstr ""

#. Tag: para
#: index.docbook:1467
#, no-c-format
msgid ""
"Note that of these only the \"Show Identical Files\"-option is persistant. "
"The others are enabled when starting &kdiff3;."
msgstr ""

#. Tag: title
#: index.docbook:1475
#, no-c-format
msgid "Doing A Directory Merge"
msgstr ""

#. Tag: para
#: index.docbook:1476
#, no-c-format
msgid ""
"You can either merge the currently selected item (file or directory), or all "
"items. When you have made all your operation choices (in all subdirectories "
"too) then you can start the merge."
msgstr ""

#. Tag: para
#: index.docbook:1480
#, no-c-format
msgid ""
"Be aware that if you didn't specify a destination directory explicitely, "
"then the destination will be \"C\" in three directory mode, \"B\" in two "
"directory merge mode, and in sync-mode it will be \"A\" or/and \"B\"."
msgstr ""

#. Tag: para
#: index.docbook:1484
#, no-c-format
msgid ""
"If you have specified a destination directory also check that all items that "
"should be in the output, are in the tree. There are some options that cause "
"certain items to be omitted from the directory comparison and merge. Check "
"these options to avoid unpleasant surprises:"
msgstr ""

#. Tag: para
#: index.docbook:1491
#, no-c-format
msgid ""
"\"Recursive Directories\": If this is off, then items in subdirectories will "
"not be found."
msgstr ""

#. Tag: para
#: index.docbook:1493
#, no-c-format
msgid "\"Pattern\"/\"Anti-Pattern\": Include/exclude items that match"
msgstr ""

#. Tag: para
#: index.docbook:1494
#, no-c-format
msgid "\"Exclude Hidden Files\""
msgstr ""

#. Tag: para
#: index.docbook:1495
#, no-c-format
msgid ""
"<link linkend=\"selectingvisiblefiles\">\"Show\"-options</link> (Show "
"Identical/Different Files, Files only in A/B/C)"
msgstr ""

#. Tag: para
#: index.docbook:1497
#, no-c-format
msgid ""
"If you change the settings in order to list more files, you must do a rescan "
"via menu \"Directory\"->\"Rescan\" yourself. (The reason for this is that "
"for faster comparison-speed &kdiff3; omits the comparison for files "
"suppressed by these criteria.) If you changed your file and dir patterns to "
"exclude files, then the file-list will immediately be updated on closing the "
"options-dialog."
msgstr ""

#. Tag: para
#: index.docbook:1502
#, no-c-format
msgid ""
"Note that when you write to a completely new directory then you usually also "
"want to copy the identical files. In that case enable the \"Show Identical "
"Files\"-option. If your destination-directory is one of the inputs, then "
"this isn't necessary because the file is already there."
msgstr ""

#. Tag: para
#: index.docbook:1506
#, no-c-format
msgid "If you are satisfied so far, the rest is easy."
msgstr ""

#. Tag: para
#: index.docbook:1508
#, no-c-format
msgid ""
"To merge all items: Select \"Start/Continue directory merge\" in the "
"\"Directory\"-menu or press F7 (which is the default shortcut). To merge "
"only the current item: Select \"Run Operation For Current Item\" or press F6."
msgstr ""

#. Tag: para
#: index.docbook:1513
#, no-c-format
msgid ""
"If due to conflicting filetypes still some items with invalid operations "
"exist, then a messagebox will appear and these items will be pointed out, so "
"you can select a valid operation for the item."
msgstr ""

#. Tag: para
#: index.docbook:1517
#, no-c-format
msgid ""
"If you merge all items a dialog will appear giving you the options \"Do it"
"\", \"Simulate it\" and \"Cancel\"."
msgstr ""

#. Tag: para
#: index.docbook:1522
#, no-c-format
msgid ""
"Select \"Simulate it\" if you want to see what would be done without "
"actually doing it. A verbose list of all operations will be shown."
msgstr ""

#. Tag: para
#: index.docbook:1524
#, no-c-format
msgid "Otherwise select \"Do it\" to really start merging."
msgstr ""

#. Tag: para
#: index.docbook:1526
#, no-c-format
msgid ""
"Then &kdiff3; will run the specified operation for all items. If manual "
"interaction is required (single file merge), then a merge window will open "
"(<link linkend=\"dirmergebigscreenshot\">see the big screenshot</link>)."
msgstr ""

#. Tag: para
#: index.docbook:1530
#, no-c-format
msgid ""
"When you have finished with manually merging a file, again select \"Start/"
"Continue directory merge\" or the key F7. If you haven't saved it yet, a "
"dialog will ask you to do so. Then &kdiff3; will continue with the next item."
msgstr ""

#. Tag: para
#: index.docbook:1534
#, no-c-format
msgid ""
"When &kdiff3; encounters an error, it will tell you so and will show the "
"verbose-status-information. At the bottom of this list, there will be some "
"error messages which should help you to understand the cause of the problem. "
"When you continue merging (F7 key) &kdiff3; will give you the choice to "
"retry or skip the item that caused the problem. This means that before "
"continuing you can choose another operation or solve the problem by other "
"means."
msgstr ""

#. Tag: para
#: index.docbook:1541
#, no-c-format
msgid ""
"When the merge is complete, then &kdiff3; will inform you via a message box."
msgstr ""

#. Tag: para
#: index.docbook:1544
#, no-c-format
msgid ""
"If some items were merged individually before running the directorymerge "
"then &kdiff3; remembers this (while this merge-session goes on), and doesn't "
"merge them again when later the merge for all items is run. Even when the "
"merge was skipped or nothing was saved these items count as completed. Only "
"when you change the merge operation the \"Done\"-status of the item will be "
"removed and it can be merged again."
msgstr ""

#. Tag: title
#: index.docbook:1554
#, no-c-format
msgid "Options for Comparing and Merging Directories"
msgstr ""

#. Tag: para
#: index.docbook:1555
#, no-c-format
msgid ""
"The &kdiff3;-preferences (menu \"Settings\"-&gt;\"Configure &kdiff3;\") has "
"a section called \"Directory Merge\" with these options:"
msgstr ""

#. Tag: emphasis
#: index.docbook:1561
#, no-c-format
msgid "Recursive Directories:"
msgstr ""

#. Tag: para
#: index.docbook:1561
#, no-c-format
msgid "Select whether to search directories recursively."
msgstr ""

#. Tag: emphasis
#: index.docbook:1563
#, no-c-format
msgid "File Pattern(s):"
msgstr ""

#. Tag: para
#: index.docbook:1563
#, no-c-format
msgid ""
"Only files that match any pattern here will be put in the tree. More than "
"one pattern may be specified here by using the semicolon \";\" as separator. "
"Valid wildcards: '*' and '?'. (e.g. \"*.cpp;*.h\"). Default is \"*\". This "
"pattern is not used on directories."
msgstr ""

#. Tag: emphasis
#: index.docbook:1567
#, no-c-format
msgid "File Anti-Pattern(s):"
msgstr ""

#. Tag: para
#: index.docbook:1567
#, no-c-format
msgid ""
"Files that match this pattern will be excluded from the tree. More than one "
"pattern may be specified here via using the semicolon \";\" as separator. "
"Valid wildcards: '*' and '?'. Default is \"*.orig;*.o;*.obj\"."
msgstr ""

#. Tag: emphasis
#: index.docbook:1571
#, no-c-format
msgid "Directory Anti-Pattern(s):"
msgstr ""

#. Tag: para
#: index.docbook:1571
#, no-c-format
msgid ""
"Directories that match this pattern will be excluded from the tree. More "
"than one pattern may be specified here via using the semicolon \";\" as "
"separator. Valid wildcards: '*' and '?'. Default is \"CVS;deps;.svn\"."
msgstr ""

#. Tag: emphasis
#: index.docbook:1575
#, no-c-format
msgid "Use CVS-Ignore:"
msgstr ""

#. Tag: para
#: index.docbook:1575
#, no-c-format
msgid ""
"Ignore files and directories that would also be ignored by CVS. Many "
"automatically generated files are ignored by CVS. The big advantage is that "
"this can be directory specific via a local \".cvsignore\"-file. (See <ulink "
"url=\"info:/cvs/cvsignore\">info:/cvs/cvsignore</ulink>.)"
msgstr ""

#. Tag: emphasis
#: index.docbook:1580
#, no-c-format
msgid "Find Hidden Files and Directories:"
msgstr ""

#. Tag: para
#: index.docbook:1580
#, no-c-format
msgid ""
"On some file systems files have an \"Hidden\"-attribute. On other systems a "
"filename starting with a dot \".\" causes it to be hidden. This option "
"allows you to decide whether to include these files in the tree or not. "
"Default is on."
msgstr ""

#. Tag: emphasis
#: index.docbook:1584
#, no-c-format
msgid "Follow File Links:"
msgstr ""

#. Tag: para
#: index.docbook:1584
#, no-c-format
msgid ""
"For links to files: When disabled, then the symbolic links are compared. "
"When enabled, then the files behind the links are compared. Default is off."
msgstr ""

#. Tag: emphasis
#: index.docbook:1587
#, no-c-format
msgid "Follow Directory Links:"
msgstr ""

#. Tag: para
#: index.docbook:1587
#, no-c-format
msgid ""
"For links to directories: When disabled, then the symbolic links will be "
"compared. When enabled then the link will be treated like a directory and it "
"will be scanned recursively. (Note that the program doesn't check if the "
"link is \"recursive\". So for example a directory that contains a link to "
"the directory would cause an infinite loop, and after some time when the "
"stack overflows or all memory is used up, crash the program.) Default is off."
msgstr ""

#. Tag: emphasis
#: index.docbook:1594
#, no-c-format
msgid "Case Sensitive Filename Comparison:"
msgstr ""

#. Tag: para
#: index.docbook:1594
#, no-c-format
msgid "Default is false on Windows, true for other operating systems."
msgstr ""

#. Tag: emphasis
#: index.docbook:1596
#, no-c-format
msgid "File Comparison Mode:"
msgstr ""

#. Tag: emphasis
#: index.docbook:1598
#, no-c-format
msgid "Binary Comparison:"
msgstr ""

#. Tag: para
#: index.docbook:1598
#, no-c-format
msgid "This is the default file comparison mode."
msgstr ""

#. Tag: emphasis
#: index.docbook:1601
#, no-c-format
msgid "Full Analysis:"
msgstr ""

#. Tag: para
#: index.docbook:1601
#, no-c-format
msgid ""
"Do a full analysis of each file and show the statistics information columns. "
"(Number of solved, unsolved, nonwhite and white conflicts.) The full "
"analysis is slower than a simple binary analysis, and much slower when used "
"on files that don't contain text. (Specify the appropriate file-"
"antipatterns.)"
msgstr ""

#. Tag: emphasis
#: index.docbook:1608
#, no-c-format
msgid "Trust the modification date:"
msgstr ""

#. Tag: para
#: index.docbook:1608
#, no-c-format
msgid ""
"If you compare big directories over a slow network, it might be faster to "
"compare the modification dates and file length alone. But this speed "
"improvement comes with the price of a little uncertainty. Use this option "
"with care. Default is off."
msgstr ""

#. Tag: emphasis
#: index.docbook:1612
#, no-c-format
msgid "Trust the size:"
msgstr ""

#. Tag: para
#: index.docbook:1612
#, no-c-format
msgid ""
"Similar to trusting the modification date. No real comparison happens. Two "
"files are considered equal if their file-sizes are equal. This is useful "
"when the file-copy operation didn't preserve the modification date. Use this "
"option with care. Default is off."
msgstr ""

#. Tag: emphasis
#: index.docbook:1619
#, no-c-format
msgid "Synchronize Directories:"
msgstr ""

#. Tag: para
#: index.docbook:1619
#, no-c-format
msgid ""
"Activates \"Sync-Mode\" when two directories are compared and no explicit "
"destination directory was specified. In this mode the proposed operations "
"will be chosen so that both source directories are equal afterwards. Also "
"the merge result will be written to both directories. Default is off."
msgstr ""

#. Tag: emphasis
#: index.docbook:1624
#, no-c-format
msgid "Copy newer instead of merging:"
msgstr ""

#. Tag: para
#: index.docbook:1624
#, no-c-format
msgid ""
"Instead of merging the proposed operation will copy the newer source if "
"changes happened. (Considered unsafe, because it implies that you know, that "
"the other file hasn't been edited too. Check to make sure in every case.) "
"Default is off."
msgstr ""

#. Tag: para
#: index.docbook:1628
#, no-c-format
msgid ""
"If a file or complete directory is replaced by another or is deleted then "
"the original version will be renamed with an \".orig\" extension. If an old "
"backup file with \".orig\" extension already exists then this will be "
"deleted without backup. This also affects the normal merging of single "
"files, not only in directory-merge mode. Default is on."
msgstr ""

#. Tag: title
#: index.docbook:1636
#, no-c-format
msgid "Other Functions in Directory Merge Window"
msgstr ""

#. Tag: title
#: index.docbook:1637
#, no-c-format
msgid "Split/Full Screen Mode"
msgstr ""

#. Tag: para
#: index.docbook:1638
#, no-c-format
msgid ""
"Usually the directory merge list view remains visible while a single file is "
"compared or merged. With the mouse you can move the the splitter bar that "
"separates the file list from the text-diff windows. If you don't want this, "
"you can disable \"Split Screen View\" in the \"Directory\"-menu. Then you "
"can use \"Toggle View\" in the \"Directory\"-menu to switch between the file "
"list and the text-diff view that then occupy the full screen."
msgstr ""

#. Tag: title
#: index.docbook:1647
#, no-c-format
msgid "Comparing or Merging a Single File"
msgstr ""

#. Tag: para
#: index.docbook:1648
#, no-c-format
msgid ""
"Probably you will prefer a simple double mouse click on a file in order to "
"compare it. Nevertheless there also exists an entry in the \"Directory\"-"
"menu. You can also directly merge a single file by selecting it and choosing "
"\"Merge current file\" in the \"Merge\"-Menu. On saving the result, the "
"status will be set to done, and the file will not be merged again if a "
"directory merge is started."
msgstr ""

#. Tag: para
#: index.docbook:1655
#, no-c-format
msgid ""
"But note that this status information will be lost when you rerun a "
"directory scan: \"Directory\"-menu: \"Rescan\""
msgstr ""

#. Tag: title
#: index.docbook:1660
#, no-c-format
msgid "Comparing or Merging Files with Different Names"
msgstr ""

#. Tag: para
#: index.docbook:1661
#, no-c-format
msgid ""
"Sometimes you need to compare or merge files with different names (e.g. the "
"current file and the backup in the same folder)."
msgstr ""

#. Tag: para
#: index.docbook:1664
#, no-c-format
msgid ""
"Select the exact file by clicking onto the icon in the column A, B or C. The "
"first file selected thus will be marked with an \"A\", the second and third "
"with \"B\" and \"C\" regardless on what column they are in. Only up to three "
"files can be chosen like this."
msgstr ""

#. Tag: para
#: index.docbook:1668
#, no-c-format
msgid ""
"Proceed by choosing \"Compare Explicitely Selected Files\" or \"Merge "
"Explicitely Selected Files\" from the \"Directory\"-menu. For your "
"convenience these menu entries also appear as context menu when you right-"
"click the last selected file."
msgstr ""

#. Tag: para
#: index.docbook:1672
#, no-c-format
msgid ""
"The comparison or merge of a file will happen in the same window. If this "
"method is used for directories a new window will be opened."
msgstr ""

#. Tag: title
#: index.docbook:1680
#, no-c-format
msgid "Miscellaneous Topics"
msgstr ""

#. Tag: title
#: index.docbook:1682
#, no-c-format
msgid "Networktransparency via KIO"
msgstr ""

#. Tag: title
#: index.docbook:1683
#, no-c-format
msgid "KIO-Slaves"
msgstr ""

#. Tag: para
#: index.docbook:1684
#, no-c-format
msgid ""
"KDE supports networktransparency via KIO-slaves. &kdiff3; uses this for "
"reading input files and for scanning directories. This means that you can "
"specify files and directories on local and remote resources via URLs."
msgstr ""

#. Tag: para
#: index.docbook:1689
#, no-c-format
msgid "Example:"
msgstr ""

#. Tag: screen
#: index.docbook:1692
#, no-c-format
msgid ""
"<command>kdiff3</command> test.cpp  ftp://ftp.faraway.org/test.cpp\n"
"   <command>kdiff3</command> tar:/home/hacker/archive.tar.gz/dir ./dir"
msgstr ""

#. Tag: para
#: index.docbook:1694
#, no-c-format
msgid ""
"The first line compares a local file with a file on an FTP-server. The "
"second line compares a directory within an compressed archive with a local "
"directory."
msgstr ""

#. Tag: para
#: index.docbook:1696
#, no-c-format
msgid "Other KIO-slaves that are interesting are:"
msgstr ""

#. Tag: para
#: index.docbook:1700
#, no-c-format
msgid "Files from the WWW (http:),"
msgstr ""

#. Tag: para
#: index.docbook:1701
#, no-c-format
msgid "Files from the FTP (ftp:),"
msgstr ""

#. Tag: para
#: index.docbook:1702
#, no-c-format
msgid "Encrypted file transfer (fish:, sftp:),"
msgstr ""

#. Tag: para
#: index.docbook:1703
#, no-c-format
msgid "Windows-ressources (smb:),"
msgstr ""

#. Tag: para
#: index.docbook:1704
#, no-c-format
msgid "Local files (file:),"
msgstr ""

#. Tag: para
#: index.docbook:1706
#, no-c-format
msgid "Other things that are possible, but probably less useful are:"
msgstr ""

#. Tag: para
#: index.docbook:1710
#, no-c-format
msgid "Man-pages (man:),"
msgstr ""

#. Tag: para
#: index.docbook:1711
#, no-c-format
msgid "Info-pages (info:),"
msgstr ""

#. Tag: title
#: index.docbook:1715
#, no-c-format
msgid "How To Write URLs"
msgstr ""

#. Tag: para
#: index.docbook:1716
#, no-c-format
msgid ""
"An URL has a different syntax compared with paths for local files and "
"directories. Some things should be considered:"
msgstr ""

#. Tag: para
#: index.docbook:1721
#, no-c-format
msgid ""
"A path can be relative and can contain \".\" or \"..\". This is not possible "
"for URLs which are always absolute."
msgstr ""

#. Tag: para
#: index.docbook:1724
#, no-c-format
msgid ""
"Special characters must be written with \"escaping\". (\"#\"->\"%23\", space-"
">\"%20\", etc.) E.g. A file with the name \"/#foo#\" would have the URL "
"\"file:/%23foo%23\"."
msgstr ""

#. Tag: para
#: index.docbook:1727
#, no-c-format
msgid "When URLs don't work as expected, try to open them in Konqueror first."
msgstr ""

#. Tag: title
#: index.docbook:1734
#, no-c-format
msgid "Capabilities of KIO-Slaves"
msgstr ""

#. Tag: para
#: index.docbook:1735
#, no-c-format
msgid ""
"Networktransparency has one drawback: Not all ressources have the same "
"cababilities."
msgstr ""

#. Tag: para
#: index.docbook:1737
#, no-c-format
msgid ""
"Sometimes this is due to the file system of the server, sometimes due to the "
"protocol. Here is a short list of restrictions:"
msgstr ""

#. Tag: para
#: index.docbook:1742
#, no-c-format
msgid "Sometimes there is no support for links."
msgstr ""

#. Tag: para
#: index.docbook:1744
#, no-c-format
msgid ""
"Or there is no way to distinguish if a link points to a file or a directory; "
"always assuming a file. (ftp:, sftp:)."
msgstr ""

#. Tag: para
#: index.docbook:1747
#, no-c-format
msgid "Can't always determine the filesize."
msgstr ""

#. Tag: para
#: index.docbook:1749
#, no-c-format
msgid "Limited support for permissions."
msgstr ""

#. Tag: para
#: index.docbook:1751
#, no-c-format
msgid ""
"No possibility to modify permissions or modification time, so permissions or "
"time of a copy will differ from the original. (See the option \"Trust the "
"size\".) (To modify permissions or modification time is only possible for "
"local files.)"
msgstr ""

#. Tag: title
#: index.docbook:1761
#, no-c-format
msgid "Using &kdiff3; as a KPart"
msgstr ""

#. Tag: para
#: index.docbook:1762
#, no-c-format
msgid ""
"&kdiff3; is a KPart. Currently it implements the KParts::ReadOnlyPart-"
"interface."
msgstr ""

#. Tag: para
#: index.docbook:1764
#, no-c-format
msgid ""
"It's main use is as difference-viewer in KDevelop. KDevelop always starts "
"the internal difference viewer first. To invoke &kdiff3; press the right "
"mouse button on the difference viewer window and select \"Show in KDiff3Part"
"\" from the contextmenu."
msgstr ""

#. Tag: para
#: index.docbook:1768
#, no-c-format
msgid ""
"&kdiff3; normally requires two complete files as input. When used as part "
"&kdiff3; will assume that the inputfile is a patch-file in the unified "
"format. &kdiff3; then retrieves the original filenames from the patch-file. "
"At least one of the two files must be available. &kdiff3; will then invoke "
"<command>patch</command> to recreate the second file."
msgstr ""

#. Tag: para
#: index.docbook:1774
#, no-c-format
msgid ""
"In Konqueror you can select a patch-file and select \"Preview in\"-"
"\"KDiff3Part\" from the contextmenu. Be aware that this won't work if none "
"of the original files are available, and it is not reliable if the original "
"file(s) have changed since the patch-file was generated."
msgstr ""

#. Tag: para
#: index.docbook:1779
#, no-c-format
msgid ""
"When run as a part &kdiff3; only provides the a two-file-diff, a very small "
"toolbar and menu. Merging or directory-comparison are not supported then."
msgstr ""

#. Tag: title
#: index.docbook:1787
#, no-c-format
msgid "Questions and Answers"
msgstr ""

#. Tag: chapter
#: index.docbook:1787
#, no-c-format
msgid "&reporting.bugs; &updating.documentation;"
msgstr ""

#. Tag: para
#: index.docbook:1794
#, no-c-format
msgid "Why is it called \"&kdiff3;\"?"
msgstr ""

#. Tag: para
#: index.docbook:1796
#, no-c-format
msgid ""
"Tools named \"KDiff\" and \"KDiff2\" (now called \"Kompare\") already exist. "
"Also \"KDiff3\" should suggest that it can merge like the \"diff3\"-tool in "
"the Diff-Tool collection."
msgstr ""

#. Tag: para
#: index.docbook:1801
#, no-c-format
msgid "Why did I release it under GPL?"
msgstr ""

#. Tag: para
#: index.docbook:1803
#, no-c-format
msgid ""
"I'm using GPL programs for a very long time now and learned very much by "
"having a look at many of the sources. Hence this is my \"Thank You\" to all "
"programmers that also did so or will do the same."
msgstr ""

#. Tag: para
#: index.docbook:1809
#, no-c-format
msgid "Some buttons and functions are missing. What's wrong?"
msgstr ""

#. Tag: para
#: index.docbook:1811
#, no-c-format
msgid ""
"You compiled from source but you probably didn't specify the correct KDE-"
"prefix with configure. By default configure wants to install in /usr/local "
"but then KDE can't find the user-interface ressource file (i.e. kdiff3ui."
"rc). The README-file contains more information about the correct prefix."
msgstr ""

#. Tag: para
#: index.docbook:1818
#, no-c-format
msgid ""
"Often lines that are similar but not identical appear next to each other but "
"sometimes not. Why?"
msgstr ""

#. Tag: para
#: index.docbook:1821
#, no-c-format
msgid ""
"Lines where only the amount of white space characters is different are "
"treated as \"equal\" at first, while just one different non-white character "
"causes the lines to be \"different\". If similar lines appear next to each "
"other, this actually is coincidence but this fortunately is often the case. "
"See also <link linkend=\"manualdiffhelp\">Manual Diff Help</link>."
msgstr ""

#. Tag: para
#: index.docbook:1829
#, no-c-format
msgid "Why must all conflicts be solved before the merge result can be saved?"
msgstr ""

#. Tag: para
#: index.docbook:1831
#, no-c-format
msgid ""
"For each equal or different section the editor in the merge result window "
"remembers where it begins or ends. This is needed so that conflicts can be "
"solved manually by simply selecting the source button (A, B or C). This "
"information is lost while saving as text and it is too much effort to create "
"a special file format that supports saving and restoring all necessary "
"information."
msgstr ""

#. Tag: para
#: index.docbook:1840
#, no-c-format
msgid ""
"How can I synchronise the diff and merge views, so that all views show the "
"same text position?"
msgstr ""

#. Tag: para
#: index.docbook:1842
#, no-c-format
msgid ""
"Click into the summary column left of the text. (<link linkend="
"\"synchronise_views\">See also here.</link>)"
msgstr ""

#. Tag: para
#: index.docbook:1846
#, no-c-format
msgid ""
"Why does the editor in the merge result window not have an \"undo\"-function?"
msgstr ""

#. Tag: para
#: index.docbook:1848
#, no-c-format
msgid ""
"This was too much effort until now. You can always restore a version from "
"one source (A, B or C) by clicking the respective button. For big editing "
"the use of another editor is recommended anyway."
msgstr ""

#. Tag: para
#: index.docbook:1854
#, no-c-format
msgid ""
"When I removed some text, then suddenly \"&lt;No src line&gt;\" appeared and "
"cannot be deleted. What does that mean and how can one remove this?"
msgstr ""

#. Tag: para
#: index.docbook:1857
#, no-c-format
msgid ""
"For each equal or different section the editor in the merge result window "
"remembers where it begins or ends. \"&lt;No src line&gt;\" means that there "
"is nothing left in a section, not even a new line character. This can happen "
"either while merging automatically or by editing. This is no problem, since "
"this hint won't appear in the saved file. If you want the orignal source "
"back just select the section (click on the left summary column) and then "
"click the source button with the needed contents (A/B or C)."
msgstr ""

#. Tag: para
#: index.docbook:1868
#, no-c-format
msgid "Why doesn't &kdiff3; support syntax-highlighting?"
msgstr ""

#. Tag: para
#: index.docbook:1870
#, no-c-format
msgid ""
"&kdiff3; already uses many colors for difference highlighting. More "
"highlighting would be confusing. Use another editor for this."
msgstr ""

#. Tag: para
#: index.docbook:1875
#, no-c-format
msgid ""
"Can I use &kdiff3; to compare OpenOffice.Org, Word, Excel, PDF-, &etc; files?"
msgstr ""

#. Tag: para
#: index.docbook:1877
#, no-c-format
msgid ""
"Although &kdiff3; will analyse any kind of file the result will probably not "
"be very satisfactory for you."
msgstr ""

#. Tag: para
#: index.docbook:1880
#, no-c-format
msgid ""
"&kdiff3; was made to compare pure text files. OpenOffice, Word, Excel etc. "
"store much more information in the files (about fonts, pictures, pages, "
"colors etc.) which &kdiff3; doesn't know about. So &kdiff3; will show you "
"the contents of the file interpreted as pure text, but this might be "
"unreadable or at least it will look very odd."
msgstr ""

#. Tag: para
#: index.docbook:1886
#, no-c-format
msgid ""
"Since most programs nowadays store their contents in XML-format, you might "
"be able to read it as pure text. So if the change was only small, &kdiff3; "
"still might help you."
msgstr ""

#. Tag: para
#: index.docbook:1890
#, no-c-format
msgid ""
"The best solution if you only want to compare the text (without embedded "
"objects like pictures) is to use \"Select All\" and \"Copy\" in your program "
"to copy the interesting text to the clipoard and then in &kdiff3; paste the "
"text into either diff input window. (See also <link linkend=\"selections"
"\">Select, Copy And Paste</link>.)"
msgstr ""

#. Tag: para
#: index.docbook:1898
#, no-c-format
msgid "Where has the the directory option \"List only deltas\" gone?"
msgstr ""

#. Tag: para
#: index.docbook:1900
#, no-c-format
msgid ""
"There are now several <link linkend=\"selectingvisiblefiles\">\"Show\"-"
"options</link> in the directory menu. Disabling \"Show identical files\" "
"will achieve what enabling \"List only deltas\" used to do."
msgstr ""

#. Tag: para
#: index.docbook:1905
#, no-c-format
msgid ""
"How can I make a big selection in the diff input window because scrolling "
"takes so long?"
msgstr ""

#. Tag: para
#: index.docbook:1908
#, no-c-format
msgid ""
"Start the selection as usual (click and hold the left mouse button). Then "
"use the navigation keys (e.g. page up, page down) while holding the left "
"mouse button down. (See also <link linkend=\"selections\">Select, Copy And "
"Paste</link>.)"
msgstr ""

#. Tag: para
#: index.docbook:1914
#, no-c-format
msgid ""
"There is so much information here, but your question is still not answered?"
msgstr ""

#. Tag: para
#: index.docbook:1916
#, no-c-format
msgid "Please send me your question. I appreciate every comment."
msgstr ""

#. Tag: title
#: index.docbook:1925
#, no-c-format
msgid "Credits and License"
msgstr ""

#. Tag: para
#: index.docbook:1927
#, no-c-format
msgid "&kdiff3; - File and Directory Comparison and Merge Tool"
msgstr ""

#. Tag: para
#: index.docbook:1930
#, no-c-format
msgid ""
"Program copyright 2002-2007 Joachim Eibl <email>joachim.eibl at gmx.de</"
"email>"
msgstr ""

#. Tag: para
#: index.docbook:1933
#, no-c-format
msgid ""
"Several cool ideas and bugreports came from colleagues and many people out "
"in the Wild Wild Web. Thank you!"
msgstr ""

#. Tag: para
#: index.docbook:1937
#, no-c-format
msgid ""
"Documentation Copyright &copy; 2002-2007 Joachim Eibl <email>joachim.eibl at "
"gmx.de</email>"
msgstr ""

#. Tag: trans_comment
#: index.docbook:1941
#, no-c-format
msgid "CREDIT_FOR_TRANSLATORS"
msgstr ""

#. Tag: chapter
#: index.docbook:1941
#, no-c-format
msgid "&underFDL; &underGPL;"
msgstr ""

#. Tag: title
#: index.docbook:1951
#, no-c-format
msgid "Installation"
msgstr ""

#. Tag: title
#: index.docbook:1954
#, no-c-format
msgid "How to obtain &kdiff3;"
msgstr ""

#. Tag: para
#: index.docbook:1956
#, no-c-format
msgid ""
"You can download the latest version of &kdiff3; from its homepage <ulink url="
"\"http://kdiff3.sourceforge.net\">http://kdiff3.sourceforge.net</ulink>."
msgstr ""

#. Tag: para
#: index.docbook:1958
#, no-c-format
msgid ""
"&kdiff3; is also available for other platforms. See the homepage for details."
msgstr ""

#. Tag: title
#: index.docbook:1966
#, no-c-format
msgid "Requirements"
msgstr ""

#. Tag: para
#: index.docbook:1968
#, no-c-format
msgid ""
"In order to successfully use all features of &kdiff3;, you need &kde; >3.1."
msgstr ""

#. Tag: para
#: index.docbook:1970
#, no-c-format
msgid ""
"For information about how to run &kdiff3; on other platforms without KDE "
"please see the <ulink url=\"http://kdiff3.sourceforge.net\">homepage</ulink>."
msgstr ""

#. Tag: para
#: index.docbook:1973
#, no-c-format
msgid ""
"You can find a list of changes at <ulink url=\"http://kdiff3.sourceforge.net/"
"ChangeLog\">http://kdiff3.sourceforge.net/ChangeLog</ulink> or in the "
"\"ChangeLog\"-file of the source package."
msgstr ""

#. Tag: title
#: index.docbook:1981
#, no-c-format
msgid "Compilation and Installation"
msgstr ""

#. Tag: para
#: index.docbook:1983
#, no-c-format
msgid ""
"In order to compile and install &kdiff3; on a system with KDE, type the "
"following in the base directory of the &kdiff3; distribution:"
msgstr ""

#. Tag: screen
#: index.docbook:1986
#, no-c-format
msgid ""
"<prompt>%</prompt> <userinput><command>./configure --prefix=<replaceable>kde-"
"dir</replaceable></command></userinput>\n"
"<prompt>%</prompt> <userinput><command>make</command></userinput>\n"
"<prompt>%</prompt> <userinput><command>make</command> install</userinput>"
msgstr ""

#. Tag: para
#: index.docbook:1987
#, no-c-format
msgid ""
"<replaceable>kde-dir</replaceable> specifies the directory containing KDE on "
"your system. If you are not sure, read the README-file for details."
msgstr ""

#. Tag: para
#: index.docbook:1991
#, no-c-format
msgid ""
"If you don't use KDE don't use <command>configure</command> but follow the "
"instructions for Qt-only systems in the README file."
msgstr ""

#. Tag: para
#: index.docbook:1992
#, no-c-format
msgid ""
"Since &kdiff3; uses <command>autoconf</command> and <command>automake</"
"command> you should have no trouble compiling it. Should you run into "
"problems please report them to the &kde; mailing lists."
msgstr ""